match_point 0.0.11 → 0.0.12

data/lib/match_point/version.rb

@@ -1,3 +1,3 @@
 module MatchPoint
-    VERSION = '0.0.11'
+    VERSION = '0.0.12'
 end

data/lib/match_point/xml_instance.rb

@@ -41,11 +41,12 @@ module MatchPoint
     end
 
     def document
-      @xml.document.clone
+      xml = @xml.document.clone
+      remove_unassigned_values_from xml
     end
 
     def at_xpath a_path
-      @xml.at_xpath a_path
+      document.at_xpath a_path
     end
 
     def assign_values data
@@ -58,8 +59,36 @@ module MatchPoint
       !@xml.at_xpath(@error_node[:path]).has_attribute?(@error_node[:attribute])
     end
 
+    def remove_unspecified_values
+
+    end
+
     protected
 
+    def remove_unassigned_values_from xml
+      @nodes_paths.each do |name, path|
+        node = xml.at_xpath(path)
+        remove_node node if !node.nil? && node.text == name.to_s
+      end
+      xml
+    end
+
+    def remove_node node
+      parent = node.parent.parent
+      node.parent.remove
+      remove_parent_node parent if has_children? parent
+    end
+
+    def has_children? node
+      return false if node.nil?
+      !node.children.select { |child| !is_a? Nokogiri::XML::Text}.empty?
+    end
+
+    def remove_parent_node parent
+      parent.remove
+      remove_parent_node parent.parent if has_children? parent.parent
+    end
+
     def initialize template
       @template= Nokogiri::XML(template)
       @xml = Nokogiri::XML(template)
@@ -98,7 +127,7 @@ module MatchPoint
 
     def add_attr_reader_for node_in_template, attr_path
       define_singleton_method node_in_template.text.to_sym, lambda {
-        @xml.at_xpath(attr_path).text
+        value = @xml.at_xpath(attr_path).text
       }
     end
 

data/spec/match_point_spec.rb

@@ -37,6 +37,20 @@ describe MatchPoint do
         </TIX>"
     end
 
+    let(:uncomplete_xml) do
+      "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>
+        <TIX errCd=\"123\" version=\"TIX 4.11.0\">
+          <AccessControl method=\"AccessControlAuthenticate\">
+            <AuthRequest>
+              <AuthID><MatchPointSpec>auth_id</MatchPointSpec></AuthID>
+              <SubNode>
+                <AnotherId><MatchPointSpec>another_id</MatchPointSpec></AnotherId>
+              </SubNode>
+            </AuthRequest>
+          </AccessControl>
+        </TIX>"
+    end
+
     let(:error_node) {
       {
           :path => "//TIX",
@@ -94,6 +108,11 @@ describe MatchPoint do
       failed_response.success?.should be_false
     end
 
+    it "should remove auth_id because was not specified" do
+      some_operation = MatchPoint::XmlInstance.from_hash uncomplete_xml, {: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
   end
-
 end

metadata

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