json_record 1.0.7 → 1.0.8

data/Rakefile

@@ -12,7 +12,7 @@ begin
     t.spec_files = FileList.new('spec/**/*_spec.rb')
   end
 rescue LoadError
-  tast :test do
+  task :test do
     STDERR.puts "You must have rspec >= 1.2.9 to run the tests"
   end
 end
@@ -33,6 +33,9 @@ begin
     gem.email = "brian@embellishedvisions.com"
     gem.homepage = "http://github.com/bdurand/json_record"
     gem.authors = ["Brian Durand"]
+    gem.files = FileList["lib/**/*", "spec/**/*", "README.rdoc", "Rakefile"].to_a
+    gem.has_rdoc = true
+    gem.extra_rdoc_files = ["README.rdoc"]
   
     gem.add_dependency('activerecord', '>= 2.2.2')
     gem.add_development_dependency('rspec', '>= 1.2.9')

data/lib/json_record/attribute_methods.rb

@@ -37,7 +37,7 @@ module JsonRecord
             if changes.include?(field.name)
               changes.delete(field.name) if converted_value == changes[field.name]
             else
-              old_value = (old_value.clone rescue old_value) unless old_value.nil?
+              old_value = (old_value.clone rescue old_value) unless old_value.nil? || old_value.is_a?(Numeric) || old_value.is_a?(Symbol) || old_value.is_a?(TrueClass) || old_value.is_a?(FalseClass)
               changes[field.name] = old_value
             end
           end

data/lib/json_record/embedded_document.rb

@@ -139,6 +139,10 @@ module JsonRecord
       @json_attributes.to_json(*args)
     end
     
+    def to_hash
+      @json_attributes
+    end
+    
     def eql? (val)
       val.class == self.class && val.attributes == attributes && val.parent == parent
     end
@@ -147,6 +151,10 @@ module JsonRecord
       eql?(val)
     end
     
+    def equal? (val)
+      eql?(val)
+    end
+    
     def hash
       attributes.hash + parent.hash
     end

data/lib/json_record/field_definition.rb

@@ -22,7 +22,13 @@ module JsonRecord
     
     # Get the default value.
     def default
-      (@default.dup rescue @default )if @default
+      if @default.nil?
+        nil
+      elsif @default.is_a?(Numeric) || @default.is_a?(Symbol) || @default.is_a?(TrueClass) || @default.is_a?(FalseClass)
+        @default
+      else
+        @default.dup rescue @default
+      end
     end
     
     # Indicates the field is multivalued.
@@ -72,6 +78,8 @@ module JsonRecord
       elsif @type == Hash
         raise ArgumentError.new("#{name} must be a Hash") unless val.is_a?(Hash)
         return val
+      elsif @type == BigDecimal
+      	return BigDecimal.new(val.to_s)
       else
         if val.is_a?(@type)
           val

data/spec/serialized_spec.rb

@@ -94,6 +94,12 @@ describe JsonRecord::Serialized do
     model.strings.should == ["a", "b"]
   end
   
+  it "should convert values to BigDecimal" do
+  	model = JsonRecord::Test::Model.new
+  	model.price = '5.55'
+  	model.price.should == BigDecimal.new('5.55')
+  end
+  
   it "should convert a hash to an embedded document" do
     model = JsonRecord::Test::Model.new
     model.primary_trait = {:name => "thing", :value => "stuff"}
@@ -145,6 +151,7 @@ describe JsonRecord::Serialized do
     JsonRecord::Test::Model.new.attributes.should == {
       "name"=>nil,
       "price"=>nil,
+      "ratio"=>nil,
       "string_field"=>nil,
       "verified_at"=>nil,
       "viewed_at"=>nil,
@@ -154,6 +161,7 @@ describe JsonRecord::Serialized do
       "field_4"=>nil,
       "field_5"=>nil,
       "unit_price"=>nil,
+      "unit_ratio"=>nil,
       "traits"=>[],
       "value"=>0,
       "strings"=>[],
@@ -466,4 +474,12 @@ describe JsonRecord::Serialized do
     model.unit_price = 1.2253
     model.unit_price.should == 1.23
   end
+
+  it "should blow up if the json column doesn't exist" do
+    lambda{JsonRecord::Test::Broken.new(:name => "Test", :value => "Moo")}.should raise_error
+  end
+  
+  it "should blow up if trying to set a json attribute hasn't been defined" do
+    lambda{model = JsonRecord::Test::Model.new(:undefined_attribute => "what?")}.should raise_error
+  end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 
-active_record_version = ENV["ACTIVE_RECORD_VERSION"] || [">= 2.2.2", "< 3.0"]
+active_record_version = ENV["ACTIVE_RECORD_VERSION"] || [">=2.2.2", "<=2.9.9"]
 active_record_version = [active_record_version] unless active_record_version.is_a?(Array)
 gem 'activerecord', *active_record_version
 

data/spec/test_models.rb

@@ -59,6 +59,7 @@ module JsonRecord
         schema.key :name, String, :required => true, :length => 15
         schema.key :value, Integer, :default => 0
         schema.key :price, Float
+        schema.key :ratio, BigDecimal
         schema.key :verified, Boolean
         schema.key :when, Date
         schema.key :verified_at, Time
@@ -77,6 +78,7 @@ module JsonRecord
         schema.key :field_4, :length => (4..15)
         schema.key :field_5, :length => {:minimum => 5}
         schema.key :unit_price, Float
+        schema.key :unit_ratio, BigDecimal
       end
       
       def unit_price
@@ -97,5 +99,13 @@ module JsonRecord
         schema.key :another_field
       end
     end
+
+    class Broken < ActiveRecord::Base
+      set_table_name :models
+      serialize_to_json(:no_such_column) do |schema|
+        schema.key :name, String
+        schema.key :value, String
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: json_record
 version: !ruby/object:Gem::Version 
-  version: 1.0.7
+  hash: 7
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 8
+  version: 1.0.8
 platform: ruby
 authors: 
 - Brian Durand
@@ -9,39 +15,55 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-26 00:00:00 -06:00
+date: 2010-08-31 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 2
+        - 2
         version: 2.2.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 description: 
 email: brian@embellishedvisions.com
 executables: []
@@ -51,13 +73,8 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- CHANGE_LOG
-- MIT_LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
-- init.rb
-- json_record.gemspec
 - lib/json_record.rb
 - lib/json_record/attribute_methods.rb
 - lib/json_record/embedded_document.rb
@@ -82,21 +99,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: ActiveRecord support for mapping complex documents in a single RDBMS row via JSON serialization.

data/CHANGE_LOG

@@ -1,28 +0,0 @@
-1.0.0
-  - Initial release
-  
-1.0.1
-  - Fixed bug where embedded documents couldn't reference the schema until a field was defined
-
-1.0.2
-  - Changed EmbeddedDocument to be a module instead of a class to fix inheritance problem with validations
-  - Remove key and many methods from EmbeddedDocument in favor of always calling the schema
-
-1.0.3
-  - Added before and after validation callbacks on EmbeddedDocument
-  - Fixed bug where fields couldn't be set to false
-
-1.0.4
-  - Fixed bug with tracking changes when initializing an EmbeddedDocument.
-  - 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.
-
-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 []=
-
-1.0.7
-  - Added attributes= to EmbeddedDocument for mass attribute assignment
-  - Changed deserialized Json values to go through setter methods instead of being directly set

data/MIT_LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2010 Brian Durand
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/VERSION

@@ -1 +0,0 @@
-1.0.7

data/init.rb

@@ -1 +0,0 @@
-require 'json_record'

data/json_record.gemspec

@@ -1,73 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{json_record}
-  s.version = "1.0.7"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Brian Durand"]
-  s.date = %q{2010-02-26}
-  s.email = %q{brian@embellishedvisions.com}
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    "CHANGE_LOG",
-     "MIT_LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "init.rb",
-     "json_record.gemspec",
-     "lib/json_record.rb",
-     "lib/json_record/attribute_methods.rb",
-     "lib/json_record/embedded_document.rb",
-     "lib/json_record/embedded_document_array.rb",
-     "lib/json_record/field_definition.rb",
-     "lib/json_record/json_field.rb",
-     "lib/json_record/schema.rb",
-     "lib/json_record/serialized.rb",
-     "spec/embedded_document_array_spec.rb",
-     "spec/embedded_document_spec.rb",
-     "spec/field_definition_spec.rb",
-     "spec/serialized_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/test_models.rb"
-  ]
-  s.homepage = %q{http://github.com/bdurand/json_record}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{ActiveRecord support for mapping complex documents in a single RDBMS row via JSON serialization.}
-  s.test_files = [
-    "spec/embedded_document_array_spec.rb",
-     "spec/embedded_document_spec.rb",
-     "spec/field_definition_spec.rb",
-     "spec/serialized_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/test_models.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 2.2.2"])
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-    else
-      s.add_dependency(%q<activerecord>, [">= 2.2.2"])
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<activerecord>, [">= 2.2.2"])
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-  end
-end
-