match_point 0.0.13 → 0.0.14

data/lib/match_point/version.rb

@@ -1,3 +1,3 @@
 module MatchPoint
-    VERSION = '0.0.13'
+    VERSION = '0.0.14'
 end

data/lib/match_point/xml_instance.rb

@@ -4,8 +4,7 @@ module MatchPoint
     SPEC_NODE="MatchPointSpec"
 
     def self.from_xml template, xml, error_node
-      instance = self.new template
-      instance.xml= xml
+      instance = self.new template, xml
       instance.error_node = error_node
       instance
     end
@@ -20,10 +19,6 @@ module MatchPoint
       @error_node = error_node
     end
 
-    def xml= an_xml
-      @xml = Nokogiri::XML(an_xml)
-    end
-
     def to_xml
       @xml.to_xml
     end
@@ -59,7 +54,9 @@ module MatchPoint
       !@xml.at_xpath(@error_node[:path]).has_attribute?(@error_node[:attribute])
     end
 
-    def remove_unspecified_values
+    def inject_node(new_node, injection_path)
+      self_node = @xml.at_xpath(injection_path)
+      self_node.add_child(new_node)
 
     end
 
@@ -81,7 +78,7 @@ module MatchPoint
 
     def has_children? node
       return false if node.nil?
-      !node.children.select { |child| !is_a? Nokogiri::XML::Text}.empty?
+      !node.children.select { |child| !is_a? Nokogiri::XML::Text }.empty?
     end
 
     def remove_parent_node parent
@@ -89,9 +86,9 @@ module MatchPoint
       remove_parent_node parent.parent if has_children? parent.parent
     end
 
-    def initialize template
+    def initialize template, xml = nil
       @template= Nokogiri::XML(template)
-      @xml = Nokogiri::XML(template)
+      @xml = Nokogiri::XML(xml || template)
       @nodes_paths = {}
 
       synchronize_object_to_xml
@@ -115,8 +112,6 @@ module MatchPoint
 
     def define_accessors_for node_in_template
       attr_path = remove_spec_node_from(node_in_template.path)
-      attr_value = @xml.xpath(attr_path).text
-
       add_attr_reader_for node_in_template, attr_path
       add_attr_writer_for node_in_template
     end
@@ -126,9 +121,28 @@ module MatchPoint
     end
 
     def add_attr_reader_for node_in_template, attr_path
+      if @xml.xpath(attr_path).size == 1
+        add_unique_attr_reader_for(node_in_template, attr_path)
+      else
+        add_multiple_attr_reader_for(node_in_template, attr_path)
+      end
+    end
+
+    def add_unique_attr_reader_for node_in_template, attr_path
+      define_singleton_method node_in_template.text.to_sym, lambda {
+        @xml.at_xpath(attr_path).text
+      }
+    end
+
+    def add_multiple_attr_reader_for node_in_template, attr_path
       define_singleton_method node_in_template.text.to_sym, lambda {
-        value = @xml.at_xpath(attr_path).text
+        raise StandardError.new 'Node is duplicated'
       }
+      define_singleton_method((node_in_template.text + '_with').to_sym, lambda { | hash |
+        key, value = hash.first
+        @xml.at_xpath(remove_spec_node_from(@nodes_paths[key])+"[text()=\" + value.to_s +\"]")
+        @xml.at_xpath(attr_path + '[' + key.to_s + '=' + value + ']').text
+      })
     end
 
     def add_attr_writer_for node_in_template

data/spec/match_point_spec.rb

@@ -37,7 +37,7 @@ describe MatchPoint do
         </TIX>"
     end
 
-    let(:uncomplete_xml) do
+    let(:uncomplete_template) do
       "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>
         <TIX errCd=\"123\" version=\"TIX 4.11.0\">
           <AccessControl method=\"AccessControlAuthenticate\">
@@ -45,6 +45,28 @@ describe MatchPoint do
               <AuthID><MatchPointSpec>auth_id</MatchPointSpec></AuthID>
               <SubNode>
                 <AnotherId><MatchPointSpec>another_id</MatchPointSpec></AnotherId>
+                <SomeSubNodeValue><MatchPointSpec>some_sub_node_value</MatchPointSpec></SomeSubNodeValue>
+              </SubNode>
+            </AuthRequest>
+          </AccessControl>
+        </TIX>"
+    end
+
+
+
+    let(:duplicated_nodes_xml) do
+      "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>
+        <TIX errCd=\"123\" version=\"TIX 4.11.0\">
+          <AccessControl method=\"AccessControlAuthenticate\">
+            <AuthRequest>
+              <AuthID>1234</AuthID>
+              <SubNode>
+                <AnotherId>18</AnotherId>
+                <SomeSubNodeValue>v18</SomeSubNodeValue>
+              </SubNode>
+              <SubNode>
+                <AnotherId>19</AnotherId>
+                <SomeSubNodeValue>v19</SomeSubNodeValue>
               </SubNode>
             </AuthRequest>
           </AccessControl>
@@ -109,10 +131,34 @@ describe MatchPoint do
     end
 
     it "should remove auth_id because was not specified" do
-      some_operation = MatchPoint::XmlInstance.from_hash uncomplete_xml, {:auth_id => "1234" }
+      some_operation = MatchPoint::XmlInstance.from_hash uncomplete_template, {:auth_id => "1234"}
       some_operation.auth_id.should == "1234"
       some_operation.at_xpath("/TIX/AccessControl/AuthRequest/SubNode/AnotherId").nil?.should be_true
       some_operation.at_xpath("/TIX/AccessControl/AuthRequest/SubNode").nil?.should be_true
     end
+
+    it "should throw exception if there are multiple nodes with the same path" do
+      some_operation = MatchPoint::XmlInstance.from_xml uncomplete_template, duplicated_nodes_xml, error_node
+      expect { some_operation.some_sub_node_value }.to raise_error(StandardError, 'Node is duplicated')
+    end
+
+    it "should return a specific value on multiple equal nodes" do
+      some_operation = MatchPoint::XmlInstance.from_xml uncomplete_template, duplicated_nodes_xml, error_node
+      some_operation.some_sub_node_value_with(:another_id => '18').should == 'v18'
+      some_operation.some_sub_node_value_with(:another_id => '19').should == 'v19'
+    end
+
+    it "should be able to inject some node into an xml path" do
+      injection_path = "/TIX/AccessControl/AuthRequest/SubNode[AnotherId=18]"
+      auth_node = response.at_xpath("/TIX/AccessControl/AuthRequest")
+      some_operation = MatchPoint::XmlInstance.from_xml uncomplete_template, duplicated_nodes_xml, error_node
+
+      some_operation.inject_node(auth_node, injection_path)
+
+      some_operation.at_xpath(injection_path + "/AuthRequest").to_s.should == auth_node.to_s
+
+    end
+
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: match_point
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec