From 7ccca137b33362d7867086fd839c3199cb58c50a Mon Sep 17 00:00:00 2001 From: rubiii Date: Sun, 21 Apr 2013 14:55:48 +0200 Subject: [PATCH] renamed #servicename to #service_name /cc #22 --- lib/wasabi/document.rb | 6 +++--- lib/wasabi/parser.rb | 12 ++++++------ spec/wasabi/parser/get_servicename_spec.rb | 6 ++---- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/lib/wasabi/document.rb b/lib/wasabi/document.rb index 3f7184a0..29d1b29e 100644 --- a/lib/wasabi/document.rb +++ b/lib/wasabi/document.rb @@ -77,11 +77,11 @@ def operations end # Returns the service name. - def servicename - @servicename ||= parser.servicename + def service_name + @service_name ||= parser.service_name end - attr_writer :servicename + attr_writer :service_name def type_namespaces @type_namespaces ||= begin diff --git a/lib/wasabi/parser.rb b/lib/wasabi/parser.rb index cf49e329..23ada0a0 100644 --- a/lib/wasabi/parser.rb +++ b/lib/wasabi/parser.rb @@ -14,7 +14,7 @@ def initialize(document) self.document = document self.operations = {} self.namespaces = {} - self.servicename = '' + self.service_name = '' self.types = {} self.deferred_types = [] self.element_form_default = :unqualified @@ -42,7 +42,7 @@ def initialize(document) attr_accessor :endpoint # Returns the SOAP Service Name - attr_accessor :servicename + attr_accessor :service_name # Returns the elementFormDefault value. attr_accessor :element_form_default @@ -50,7 +50,7 @@ def initialize(document) def parse parse_namespaces parse_endpoint - parse_servicename + parse_service_name parse_operations parse_types parse_deferred_types @@ -80,9 +80,9 @@ def parse_endpoint end end - def parse_servicename - servicename = at_xpath("wsdl:definitions/@name") - @servicename = servicename.to_s if servicename + def parse_service_name + service_name = at_xpath("wsdl:definitions/@name") + @service_name = service_name.to_s if service_name end def parse_operations diff --git a/spec/wasabi/parser/get_servicename_spec.rb b/spec/wasabi/parser/get_servicename_spec.rb index 311a1404..6e85b3d1 100644 --- a/spec/wasabi/parser/get_servicename_spec.rb +++ b/spec/wasabi/parser/get_servicename_spec.rb @@ -11,10 +11,8 @@ let(:xml) { fixture(:geotrust).read } - it "does return the servicename attribute" do - name = subject.servicename - - name.should == "queryDefinitions" + it "returns the #service_name attribute" do + subject.service_name.should == "queryDefinitions" end end