json_record 1.0.5 → 1.0.6

data/CHANGE_LOG

@@ -17,4 +17,8 @@
   - Removed tracking changes of keys that are EmbeddedDocuments
 
 1.0.5
-  - Fixed bug with initializing new EmbeddedDocumentArray with the proper parent when there is no data to deserialize.
+  - Fixed bug with initializing new EmbeddedDocumentArray with the proper parent when there is no data to deserialize.
+
+1.0.6
+  - Allow EmbeddedDocument.new to call all accessors and not just those defined in the JSON schema.
+  - Allow getting and setting json attributes with [] and []=

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.0.6

data/json_record.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{json_record}
-  s.version = "1.0.5"
+  s.version = "1.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Durand"]
-  s.date = %q{2010-02-23}
+  s.date = %q{2010-02-24}
   s.email = %q{brian@embellishedvisions.com}
   s.extra_rdoc_files = [
     "README.rdoc"

data/lib/json_record/embedded_document.rb

@@ -84,7 +84,12 @@ module JsonRecord
       @json_attributes = {}
       attrs.each_pair do |name, value|
         field = schema.fields[name.to_s] || FieldDefinition.new(name, :type => value.class)
-        write_attribute(field, value, self)
+        writer = "#{name}=".to_sym
+        if respond_to?(writer)
+          send(writer, value)
+        else
+          write_attribute(field, value, self)
+        end
       end
     end
     
@@ -113,6 +118,18 @@ module JsonRecord
       changed.inject({}) {|h, attr| h[attr] = attribute_change(attr); h}
     end
     
+    # Get a field from the schema with the specified name.
+    def [] (name)
+      field = schema.fields[name.to_s]
+      read_attribute(field, self) if field
+    end
+    
+    # Set a field from the schema with the specified name.
+    def []= (name, value)
+      field = schema.fields[name.to_s] || FieldDefinition.new(name, :type => value.class)
+      write_attribute(field, value, self)
+    end
+    
     def to_json (*args)
       @json_attributes.to_json(*args)
     end

data/lib/json_record/serialized.rb

@@ -31,14 +31,18 @@ module JsonRecord
     end
     
     module ClassMethods
-      # Get the field definition of the JSON field from the schema it is defined in.
+      # Get the json field and the field definition of the JSON field from the schema it is defined in.
       def json_field_definition (name)
-        field = nil
         if json_serialized_fields
           name = name.to_s
-          json_serialized_fields.values.flatten.each{|schema| field = schema.fields[name]; break if field}
+          json_serialized_fields.each_pair do |fname, schemas|
+            schemas.each do |schema|
+              field = schema.fields[name];
+              return [fname, field] if field
+            end
+          end
         end
-        return field
+        return nil
       end
     end
     
@@ -47,6 +51,8 @@ module JsonRecord
         base.before_save :serialize_json_attributes
         base.alias_method_chain :reload, :serialized_json
         base.alias_method_chain :attributes, :serialized_json
+        base.alias_method_chain :read_attribute, :serialized_json
+        base.alias_method_chain :write_attribute, :serialized_json
       end
       
       # Get the JsonField objects for the record.
@@ -72,6 +78,26 @@ module JsonRecord
         return attrs
       end
       
+      def read_attribute_with_serialized_json (name)
+        name = name.to_s
+        json_field, field_definition = self.class.json_field_definition(name)
+        if field_definition
+          read_json_attribute(json_field, field_definition)
+        else
+          read_attribute_without_serialized_json(name)
+        end
+      end
+      
+      def write_attribute_with_serialized_json (name, value)
+        name = name.to_s
+        json_field, field_definition = self.class.json_field_definition(name)
+        if field_definition
+          write_json_attribute(json_field, field_definition, value)
+        else
+          write_attribute_without_serialized_json(name, value)
+        end
+      end
+      
       protected
       
       # Returns a hash of all the JsonField objects merged together.
@@ -87,12 +113,12 @@ module JsonRecord
         @json_field_names = json_serialized_fields.values.flatten.collect{|s| s.fields.keys}.flatten
       end
       
-      # Read a field value from a JsonField
+      # Read a field value from a JsonField.
       def read_json_attribute (json_field_name, field)
         json_fields[json_field_name].read_attribute(field, self)
       end
       
-      # Write a field value to a JsonField
+      # Write a field value to a JsonField.
       def write_json_attribute (json_field_name, field, value)
         json_fields[json_field_name].write_attribute(field, value, self)
       end

data/spec/embedded_document_spec.rb

@@ -65,4 +65,22 @@ describe JsonRecord::EmbeddedDocument do
     (trait_1.hash == trait_2.hash).should == true
   end
   
+  it "should read json attributes with []" do
+    dimension = JsonRecord::Test::Dimension.new(:width => 100)
+    dimension[:width].should == 100
+  end
+  
+  it "should be able to write json attributes with []=" do
+    dimension = JsonRecord::Test::Dimension.new
+    dimension[:width] = 100
+    dimension.width.should == 100
+  end
+  
+  it "should set all accessors on initialize" do
+    dimension = JsonRecord::Test::Dimension.new(:width => 100, :height => :infinity, :unit => "meters")
+    dimension.width.should == 100
+    dimension.height.should == 1000000000
+    dimension.unit.should == "meters"
+  end
+  
 end

data/spec/serialized_spec.rb

@@ -9,11 +9,19 @@ describe JsonRecord::Serialized do
     JsonRecord::Test.drop_tables
   end
   
-  it "should have accessors for json attributes" do
+  it "should have accessors for json attributes and not interfere with column attribute accessors" do
     model = JsonRecord::Test::Model.new
     model.name.should == nil
     model.name = "test"
     model.name.should == "test"
+    model[:name].should == "test"
+    model['name'].should == "test"
+    model[:name] = "new value"
+    model.name.should == "new value"
+    model.string_field = "a"
+    model.string_field.should == "a"
+    model[:string_field] = "b"
+    model[:string_field].should == "b"
   end
   
   it "should convert blank values to nil" do
@@ -145,6 +153,7 @@ describe JsonRecord::Serialized do
       "field_3"=>nil,
       "field_4"=>nil,
       "field_5"=>nil,
+      "unit_price"=>nil,
       "traits"=>[],
       "value"=>0,
       "strings"=>[],
@@ -393,9 +402,17 @@ describe JsonRecord::Serialized do
   end
   
   it "should get the json field definition for a field" do
-    JsonRecord::Test::Model.json_field_definition(:value).name.should == "value"
-    JsonRecord::Test::Model.json_field_definition("value").name.should == "value"
-    JsonRecord::Test::Model.json_field_definition("nothing").should == nil
+    json_field, field = JsonRecord::Test::Model.json_field_definition(:value)
+    json_field.should == "json"
+    field.name.should == "value"
+    
+    json_field, field = JsonRecord::Test::Model.json_field_definition("field_1")
+    json_field.should == "compressed_json"
+    field.name.should == "field_1"
+    
+    json_field, field = JsonRecord::Test::Model.json_field_definition("nothing")
+    json_field.should == nil
+    field.should == nil
   end
   
   it "should validate uniqueness of embedded documents" do
@@ -442,4 +459,11 @@ describe JsonRecord::Serialized do
     trait.valid?.should == true
     trait.callbacks.should == [:before_validation, :after_validation]
   end
+  
+  it "should allow overriding the attribute reader and writers" do
+    model = JsonRecord::Test::Model.new(:unit_price => :infinity)
+    model.unit_price.should == 1000000000
+    model.unit_price = 1.2253
+    model.unit_price.should == 1.23
+  end
 end

data/spec/test_models.rb

@@ -43,6 +43,15 @@ module JsonRecord
       include JsonRecord::EmbeddedDocument
       schema.key :height, Integer, :required => true
       schema.key :width, Integer, :required => true
+      attr_accessor :unit
+      
+      def height= (value)
+        if value == :infinity
+          self[:height] = 1000000000
+        else
+          self[:height] = value
+        end
+      end
     end
     
     class Model < ActiveRecord::Base
@@ -67,6 +76,17 @@ module JsonRecord
         schema.key :field_3, :in => ("A".."M")
         schema.key :field_4, :length => (4..15)
         schema.key :field_5, :length => {:minimum => 5}
+        schema.key :unit_price, Float
+      end
+      
+      def unit_price
+        p = self[:price]
+        p.is_a?(Numeric) ? (p * 100).round / 100.0 : p
+      end
+      
+      def unit_price= (value)
+        value = 1000000000 if value == :infinity
+        self[:price] = value
       end
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: json_record
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - Brian Durand
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 -06:00
+date: 2010-02-24 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency