xmlparsable 1.5.3 → 1.5.4

data/lib/xmlparsable.rb

@@ -39,11 +39,26 @@ module XmlParsable
       @parsers ||= Hash.new{|h,k| parent[k] }
       @parsers[elem_name.to_s] = [elem_type.parsable, arguments]
 
-      # Define accessor method (or don't, see if I care!)
-      attr_name = arguments.fetch(:accessor, elem_name)
+      # Define reader and writer methods (or don't, see if I care!)
+      accessor = arguments.fetch(:accessor, elem_name)
+      reader   = arguments.fetch(:reader, accessor)
+      writer   = arguments.fetch(:writer, accessor)
+
+      if reader and not method_defined?(reader)
+        define_method(reader) do
+          hash = instance_variable_get(:@xmlelems)
+          hash and hash[elem_name.to_sym]
+        end
+      end
 
-      if attr_name and not method_defined?(attr_name)
-        define_method(attr_name) { instance_variable_get(:@xmlelems)[elem_name.to_sym] }
+      if writer and not method_defined?("#{writer}=")
+        define_method("#{writer}=") do |value|
+          unless hash = instance_variable_get(:@xmlelems)
+            hash = Hash.new{|h,k| h.fetch(k.to_sym, nil) }
+            instance_variable_set(:@xmlelems, hash)
+          end
+          hash.update(elem_name.to_sym => value)
+        end
       end
     end
 

data/spec/examples/{accessors.example → attributes/readers.example}

@@ -13,6 +13,37 @@ describe XmlParsable, "accessors" do
     XML
   end
 
+  context "uninitialized" do
+    let(:parser) do
+      Class.new do
+        class Inner
+          attr_reader :xmlattrs
+          attr_reader :xmlelems
+
+          include XmlParsable
+          element :size
+          element :wise
+          element "a-z"
+        end
+
+        include XmlParsable
+        element :root, Inner
+      end
+    end
+
+    it "returns nil for elements" do
+      xml = parser.new
+      xml.root.should be_nil
+    end
+
+    it "returns nil for elements" do
+      xml = parser::Inner.new
+      xml.size.should be_nil
+      xml.wise.should be_nil
+      xml.send("a-z").should be_nil
+    end
+  end
+
   context "default" do
     let(:parser) do
       Class.new do
@@ -70,9 +101,9 @@ describe XmlParsable, "accessors" do
 
           include XmlParsable
           element :size
-          element :wise, accessor: :wisdom
-          element "a-z", accessor: "atoz"
-          element :secret, accessor: false
+          element :wise,    reader: :wisdom
+          element "a-z",    reader: "atoz"
+          element :secret,  reader: false
         end
 
         include XmlParsable

data/spec/examples/attributes/writers.example

@@ -0,0 +1,38 @@
+require "spec_helper"
+
+describe XmlParsable, "mutators" do
+
+  context "default" do
+    let(:parser) do
+      Class.new do
+        attr_reader :xmlelems
+
+        include XmlParsable
+        element :size
+        element :wise
+        element "a-z"
+      end
+    end
+
+    let(:xml) do
+      parser.new.tap do |xml|
+        xml.size = 100
+        xml.wise = 200
+        xml.send("a-z=", 300)
+      end
+    end
+
+    it "stores elements in `xmlelems`" do
+      expected = Hash[:size => 100, :wise => 200, :"a-z" => 300]
+      xml.xmlelems.should == expected
+    end
+
+    it "stores elements with 'indifferent access'" do
+      pp xml
+      xml.size.should == 100
+      xml.wise.should == 200
+      xml.send("a-z").should == 300
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xmlparsable
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -35,30 +35,31 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
+- lib/xmlparsable.rb
+- lib/xmlparsable/elements.rb
+- lib/xmlparsable/parser.rb
+- lib/xmlparsable/elements/string.rb
+- lib/xmlparsable/elements/time.rb
+- lib/xmlparsable/elements/date.rb
 - lib/xmlparsable/elements/abstract.rb
+- lib/xmlparsable/elements/text.rb
+- lib/xmlparsable/elements/xml.rb
 - lib/xmlparsable/elements/array.rb
-- lib/xmlparsable/elements/date.rb
 - lib/xmlparsable/elements/numeric.rb
 - lib/xmlparsable/elements/record.rb
-- lib/xmlparsable/elements/string.rb
-- lib/xmlparsable/elements/text.rb
-- lib/xmlparsable/elements/time.rb
-- lib/xmlparsable/elements/xml.rb
-- lib/xmlparsable/elements.rb
-- lib/xmlparsable/parser.rb
-- lib/xmlparsable.rb
-- spec/examples/accessors.example
+- spec/spec_helper.rb
+- spec/examples/repeated.example
+- spec/examples/elements/string.example
+- spec/examples/elements/xml.example
 - spec/examples/elements/array.example
 - spec/examples/elements/date.example
-- spec/examples/elements/numeric.example
+- spec/examples/elements/time.example
 - spec/examples/elements/record.example
-- spec/examples/elements/string.example
 - spec/examples/elements/text.example
-- spec/examples/elements/time.example
-- spec/examples/elements/xml.example
+- spec/examples/elements/numeric.example
+- spec/examples/attributes/readers.example
+- spec/examples/attributes/writers.example
 - spec/examples/inheritance.example
-- spec/examples/repeated.example
-- spec/spec_helper.rb
 homepage: https://github.com/kputnam/xmlparsable
 licenses: []
 post_install_message: 
@@ -84,14 +85,15 @@ signing_key:
 specification_version: 3
 summary: Simple declarative XML parsing
 test_files:
-- spec/examples/accessors.example
+- spec/examples/repeated.example
+- spec/examples/elements/string.example
+- spec/examples/elements/xml.example
 - spec/examples/elements/array.example
 - spec/examples/elements/date.example
-- spec/examples/elements/numeric.example
+- spec/examples/elements/time.example
 - spec/examples/elements/record.example
-- spec/examples/elements/string.example
 - spec/examples/elements/text.example
-- spec/examples/elements/time.example
-- spec/examples/elements/xml.example
+- spec/examples/elements/numeric.example
+- spec/examples/attributes/readers.example
+- spec/examples/attributes/writers.example
 - spec/examples/inheritance.example
-- spec/examples/repeated.example