son_jay 0.4.0 → 0.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDJkNWY1ZGNjOTVhYWZlOTA0ODc0NDY5MzFlMjIzYjg1YzIzNDkzOQ==
+    YTEwY2YzOGQ2MTRkMzUxNTliNGQ3NWUzMWY1ZGVjNDJiMzVkN2FmZg==
   data.tar.gz: !binary |-
-    ZDI3OTM3Y2YyMGVmZjc0YzI2MzJlMDZlZDQ0NTI0NzQyMDVmMWI2YQ==
+    NjVkMGQ5MDNmYmQyZDQ1MTU0NmQ1ZDgzZDczZmZkMWFiNzUxN2NhOA==
 SHA512:
   metadata.gz: !binary |-
-    MDQ0YTUxYjY1ZGZjMWQzNDg4Yzk4YWZlZjViYzIyOWIzZmI1OGY4NjM3ODQ2
-    MTljZjc3NjExODkyNDNhMjU4OGZkNGJkZjYzZjI5ZWEzMWUwZGFjNjYyMjM2
-    NjYwZTMyYjMzZDNlMTI4NDE1YTEzZjE4ZTA4NDI5MjM3ZWNhZjI=
+    YjIxZWJjODE3MDEzNGViMTJlMzQxYTRjODc5M2IxMmJlYTE0OWVjYzMxYjky
+    NThkMzMxYTQ4ZDBkZWE0NzlmYjhkNDY0NDgyNmVlZTI3MWUxYWQxYzUwN2Y1
+    ZTI5NTQyNmMxMmE4YmRhYjNhMTBjZTc0MzUxNDVjZDExMWEwZmM=
   data.tar.gz: !binary |-
-    YzNhZmZkZGM1YjU5NDdlMDMwOTc5MTMwNGFhZjc5ZTc1YzVmZDYwZjYzYTk0
-    ZmE5ZmFkYWI2YjU2NjBlNGQ1NjRjOWI4NTAyYTdkZjAzYzU3OTRiZjEyNjJj
-    ODFhOGJiMWRjOTZhZDIyZjQ1MDQ2YTRhZjcxOWNjODg5MjVlNDc=
+    M2I5Y2ZmYjk3ZTA4NjBiNWFhNmRhNDNkMjgwYjEyY2YxZGM0MDAzNDEyODg3
+    YzM1ZGRhNWNmOTdhNTU1YjljMDQ2ZWY2Nzc3NWVhOGM5Y2ViODc0NzBmNGZk
+    NzA4YzNiNWY0MjRlNTEwZGNmYjdiYTQ0ODEyNjZiOTAwMzNmZjc=

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+### 0.4.1
+* Enhamcements
+  * Add this CHANGELOG.md file
+  * Made feature scenarios more informative regarding bracket
+    operator behavior for defined properties when extra
+    properties are allowed.
+* Bugs fixed
+  * Incorrect writing/reading of defined object-model properties
+    using index operators when extra properties are allowed.
+
+### 0.4.0
+* Last version without a change-log

data/features/json_parsing.feature

@@ -254,5 +254,5 @@ Feature: Parsing data from JSON
       instance = SimpleObjectModel.parse_json( json )
       """
     Then the instance attributes and indexed properties are as follows:
-      | id  | name       | ['published'] | ['featured'] |
-      |  55 |  "Polygon" |  true         |  false       |
+      | id  | name       | ['id']  | ['name']   | ['published'] | ['featured'] |
+      |  55 |  "Polygon" |   55    |  "Polygon" |  true         |  false       |

data/features/json_serialization.feature

@@ -277,8 +277,8 @@ Feature: Serializing data to JSON
       """
     When the instance's property values are assigned as:
       """
-      instance.id   =  55
-      instance.name = "Polygon"
+      instance['id']        =  55
+      instance.name  = "Polygon"
       instance['published'] =  true
       instance['featured']  =  false
       """

data/lib/son_jay/object_model/properties/abstract.rb

@@ -10,6 +10,7 @@ module SonJay
         attr_reader :model_properties
 
         def initialize(property_definitions)
+          @property_definitions = property_definitions
           @data = {}
           @model_properties = Set.new
           property_definitions.each do |d|
@@ -25,19 +26,19 @@ module SonJay
         ]
 
         def [](name)
-          name = "#{name}" unless String === name
+          name = property_definitions.name_from(name)
           @data[name]
         end
 
         def fetch(name)
-          name = "#{name}" unless String === name
+          name = property_definitions.name_from(name)
           @data.fetch(name)
         rescue KeyError
           raise PropertyNameError.new(name)
         end
 
         def []=(name, value)
-          name = "#{name}" unless String === name
+          name = property_definitions.name_from(name)
           raise PropertyNameError.new(name) unless @data.has_key?(name)
           @data[name] = value
         end
@@ -49,7 +50,7 @@ module SonJay
         end
 
         def load_property(name, value)
-          name = "#{name}" unless String === name
+          name = property_definitions.name_from(name)
           if @data.has_key?( name )
             load_defined_property name, value
           else
@@ -84,6 +85,8 @@ module SonJay
           raise NotImplementedError, "Subclass responsibility"
         end
 
+        attr_reader :property_definitions
+
       end
 
     end

data/lib/son_jay/object_model/property_definitions.rb

@@ -0,0 +1,57 @@
+require 'set'
+
+module SonJay
+  class ObjectModel
+
+    class PropertyDefinitions
+      extend Forwardable
+      include Enumerable
+
+      def self.from_initializations(property_initializations)
+        new.tap do |instance|
+          definer = PropertiesDefiner.new( instance )
+          property_initializations.each do |pi|
+            definer.instance_eval &pi
+          end
+        end
+      end
+
+      def initialize
+        @definitions = []
+        @names = Set.new
+        @name_symbol_to_string_map = {}
+      end
+
+      def <<(definition)
+        @definitions << definition
+        name = definition.name
+        @names << name
+        @name_symbol_to_string_map[name.to_sym] = name
+      end
+
+      def_delegators :@definitions, :each
+
+      def name_from(name)
+        case name
+        when String then name
+        when Symbol then @name_symbol_to_string_map.fetch(name, name)
+        else            "#{name}"
+        end
+      end
+
+      def include_name?(name)
+        name = name_from( name )
+        names.include?( name )
+      end
+
+      def hard_model_dependencies
+        map( &:model_class ).compact.uniq
+      end
+
+      def names
+        @names.freeze
+      end
+    end
+
+  end
+end

data/lib/son_jay/object_model.rb

@@ -1,6 +1,7 @@
 require 'set'
 require 'son_jay/object_model/properties'
 require 'son_jay/object_model/property_definition'
+require 'son_jay/object_model/property_definitions'
 require 'son_jay/object_model/properties_definer'
 require 'son_jay/object_model/extra_data'
 
@@ -22,13 +23,13 @@ module SonJay
     end
 
     def []=(name, value)
-      name = "#{name}" unless String === name
+      name = self.class.property_definitions.name_from(name)
       target = property_store_for( name )
       target[ name ] = value
     end
 
     def [](name)
-      name = "#{name}" unless String === name
+      name = self.class.property_definitions.name_from(name)
       source = property_store_for( name )
       source[ name ]
     end
@@ -43,7 +44,7 @@ module SonJay
       store = sonj_content
       if (
         self.class.extras_allowed? &&
-        (! sonj_content.model_properties.include?(name_string) )
+        (! self.class.property_definitions.include_name?(name_string) )
       ) then
         store = sonj_content.extra
       end
@@ -71,16 +72,12 @@ module SonJay
       end
 
       def _evaluate_property_definitions
-        @property_definitions = [].tap do |definitions|
-          definer = PropertiesDefiner.new( definitions )
-          _property_initializations.each do |pi|
-            definer.instance_eval &pi
-          end
-        end
-
+        @property_definitions = PropertyDefinitions.from_initializations(
+          _property_initializations
+        )
         _validate_model_dependencies!
-
         _apply_property_definitions property_definitions
+        @property_definitions
       end
 
       def _property_initializations
@@ -100,15 +97,11 @@ module SonJay
       def _validate_model_dependencies!(dependants=Set.new)
         raise InfiniteRegressError if dependants.include?(self)
         dependants << self
-        _hard_model_dependencies.each do |d|
+        property_definitions.hard_model_dependencies.each do |d|
           next unless d.respond_to?( :_validate_model_dependencies!, true )
           d.send :_validate_model_dependencies!, dependants
         end
       end
-
-      def _hard_model_dependencies
-        property_definitions.map( &:model_class ).compact.uniq
-      end
     end
 
   end

data/lib/son_jay/version.rb

@@ -1,3 +1,3 @@
 module SonJay
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/object_model_spec.rb

@@ -289,18 +289,28 @@ describe SonJay::ObjectModel do
         end
       end
 
-      it "allows name-index writing of arbitrary extra properties" do
-        model_instance[ 'qqq' ] = 111
-        model_instance[ :rrr  ] = 222
+      it "allows name-index writing of both defined and arbitrary, extra properties" do
+        model_instance[ 'aaa' ] = 111
+        model_instance[ :bbb  ] = 222
+        model_instance[ 'qqq' ] = 333
+        model_instance[ :rrr  ] = 444
+
+        expect( model_instance.aaa ).to eq( 111 )
+        expect( model_instance.bbb ).to eq( 222 )
+
         expect( model_instance.sonj_content.extra.to_h ).
-          to eq( 'qqq' => 111, 'rrr' => 222 )
+          to eq( 'qqq' => 333, 'rrr' => 444 )
       end
 
-      it "allows name-index reading of arbitrary extra properties" do
-        model_instance.sonj_content.extra[ 'qqq' ] = 111
-        model_instance.sonj_content.extra[ :rrr  ] = 222
-        expect( model_instance[ :qqq  ] ).to eq( 111 )
-        expect( model_instance[ 'rrr' ] ).to eq( 222 )
+      it "allows name-index reading of both defined and arbitrary, extra properties" do
+        model_instance.aaa = 111
+        model_instance.bbb = 222
+        model_instance.sonj_content.extra[ 'qqq' ] = 333
+        model_instance.sonj_content.extra[ :rrr  ] = 444
+        expect( model_instance[ :aaa  ] ).to eq( 111 )
+        expect( model_instance[ 'bbb' ] ).to eq( 222 )
+        expect( model_instance[ :qqq  ] ).to eq( 333 )
+        expect( model_instance[ 'rrr' ] ).to eq( 444 )
       end
 
       it "serializes to a JSON object representation w/ properties and extras" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: son_jay
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Steve Jorgensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,6 +105,7 @@ files:
 - .rspec
 - .simplecov
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -130,6 +131,7 @@ files:
 - lib/son_jay/object_model/properties/properties_without_extra.rb
 - lib/son_jay/object_model/properties_definer.rb
 - lib/son_jay/object_model/property_definition.rb
+- lib/son_jay/object_model/property_definitions.rb
 - lib/son_jay/value_array.rb
 - lib/son_jay/version.rb
 - son_jay.gemspec