match_point 0.0.9 → 0.0.10

data/lib/match_point/version.rb

@@ -1,3 +1,3 @@
 module MatchPoint
-    VERSION = '0.0.9'
+    VERSION = '0.0.10'
 end

data/lib/match_point/xml_instance.rb

@@ -3,13 +3,28 @@ module MatchPoint
 
     SPEC_NODE="MatchPointSpec"
 
-    def initialize template, xml, data = {}
+    def self.from_xml template, xml
+      instance = self.new template
+      instance.xml= xml
+      instance
+    end
+
+    def self.from_hash template, data
+      instance = self.new template
+      instance.assign_values data
+      instance
+    end
+
+    def initialize template
       @template= Nokogiri::XML(template)
-      @xml = Nokogiri::XML(xml)
+      @xml = Nokogiri::XML(template)
       @nodes_paths = {}
 
       synchronize_object_to_xml
-      assign_values data
+    end
+
+    def xml= an_xml
+      @xml = Nokogiri::XML(an_xml)
     end
 
     def to_xml
@@ -36,48 +51,52 @@ module MatchPoint
       @xml.at_xpath a_path
     end
 
-    protected
-
     def assign_values data
       data.each do |key, value|
-        specify_value value, node_path(key)
+        assign_value value, node_path(key)
       end
     end
 
+    protected
+
     def node_path node_name
       @nodes_paths[node_name]
     end
 
-    def specify_value value, path
+    def assign_value value, path
       @xml.xpath(remove_spec_node_from(path)).first.content = value
     end
 
     def synchronize_object_to_xml
       nodes_in_template = @template.xpath("//#{SPEC_NODE}")
-      nodes_in_template.each do | node_in_template |
+      nodes_in_template.each do |node_in_template|
         define_accessors_for node_in_template
-        @nodes_paths = @nodes_paths.merge ({ node_in_template.text.to_sym => node_in_template.path })
+        @nodes_paths = @nodes_paths.merge ({node_in_template.text.to_sym => node_in_template.path})
       end
     end
-    
+
     def define_accessors_for node_in_template
-      attr_value = @xml.xpath(remove_spec_node_from(node_in_template.path)).text
-      self.class.add_attr_reader_for node_in_template, attr_value
-      self.class.add_attr_writer_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
 
     def remove_spec_node_from a_path
       a_path.gsub("/#{SPEC_NODE}", "")
     end
 
-    def self.add_attr_reader_for node_in_template, attr_value
-      define_method node_in_template.text.to_sym, lambda { attr_value }
+    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
+      }
     end
 
-    def self.add_attr_writer_for node_in_template
-      define_method (node_in_template.text).concat('=').to_sym, Proc.new { | new_value |
-        specify_value new_value, node_in_template.path
-        self.class.add_attr_reader_for node_in_template, new_value
+    def add_attr_writer_for node_in_template
+      define_singleton_method (node_in_template.text).concat('=').to_sym, Proc.new { |new_value|
+        assign_value new_value, node_in_template.path
+        add_attr_reader_for node_in_template, remove_spec_node_from(node_path(node_in_template.text.to_sym))
       }
     end
   end

data/spec/match_point_spec.rb

@@ -6,13 +6,13 @@ describe MatchPoint do
 
     let(:template) do
       "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>
-      <TIX version=\"TIX 4.11.0\">
-        <AccessControl method=\"AccessControlAuthenticate\">
-          <AuthRequest>
-            <AuthID><MatchPointSpec>auth_id</MatchPointSpec></AuthID>
-          </AuthRequest>
-        </AccessControl>
-      </TIX>"
+        <TIX version=\"TIX 4.11.0\">
+          <AccessControl method=\"AccessControlAuthenticate\">
+            <AuthRequest>
+              <AuthID><MatchPointSpec>auth_id</MatchPointSpec></AuthID>
+            </AuthRequest>
+          </AccessControl>
+        </TIX>"
     end
 
     let(:response_xml) do
@@ -26,8 +26,8 @@ describe MatchPoint do
         </TIX>"
     end
 
-    let(:response) { MatchPoint::XmlInstance.new(template, response_xml) }
-    let(:request) { MatchPoint::XmlInstance.new(template, response_xml, {:auth_id=>"NeWVaLue"})}
+    let(:response) { MatchPoint::XmlInstance.from_xml(template, response_xml) }
+    let(:request) { MatchPoint::XmlInstance.from_hash(template, {:auth_id=>"NeWVaLue"})}
 
     it "should get the auth_id from the xml if the template for that field is defined" do
       response.auth_id.should == "1ua5J1gJz3TryPEMQZkeWFarOagSJvYY"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: match_point
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors: