json_record 1.1.0.b6 → 1.1.1

data/Rakefile

@@ -1,23 +1,22 @@
 require 'rubygems'
 require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 desc 'Default: run unit tests.'
 task :default => :test
 
 begin
-  require 'spec/rake/spectask'
-  desc 'Test json_record.'
-  Spec::Rake::SpecTask.new(:test) do |t|
-    t.spec_files = FileList.new('spec/**/*_spec.rb')
-  end
+  require 'rspec'
+  require 'rspec/core/rake_task'
+  desc 'Run the unit tests'
+  RSpec::Core::RakeTask.new(:test)
 rescue LoadError
-  tast :test do
-    STDERR.puts "You must have rspec >= 1.3.0 to run the tests"
+  task :test do
+    STDERR.puts "You must have rspec 2.0 installed to run the tests"
   end
 end
 
-desc 'Generate documentation for json_record.'
+desc 'Generate rdoc documentation'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.options << '--title' << 'JSON Record' << '--line-numbers' << '--inline-source' << '--main' << 'README.rdoc'
@@ -33,12 +32,16 @@ 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", "MIT_LICENSE"].to_a
+    gem.has_rdoc = true
+    gem.extra_rdoc_files = ["README.rdoc", "MIT_LICENSE"]
+    gem.rdoc_options = ["--charset=UTF-8", "--main", "README.rdoc"]
   
-    gem.add_dependency('activerecord', '>= 3.0.0.beta2')
-    gem.add_development_dependency('rspec', '>= 1.3.0')
+    gem.add_dependency('activerecord', '>= 3.0.0')
+    gem.add_development_dependency('rspec', '>=2.0.0')
     gem.add_development_dependency('jeweler')
   end
 
   Jeweler::GemcutterTasks.new
 rescue LoadError
-end
+end

data/lib/json_record.rb

@@ -1,18 +1,24 @@
 require 'active_record'
 
+unless defined?(Yajl) || defined?(JSON)
+  if ActiveRecord::Base.logger
+    ActiveRecord::Base.logger.warn("*** You really should install the json or yajl gem for optimal performance with json_record ***")
+  end
+end
+
 unless defined?(Boolean)
   class Boolean
   end
 end
 
 module JsonRecord
-  autoload :Schema, File.expand_path(File.join(File.dirname(__FILE__), 'json_record', 'schema'))
-  autoload :AttributeMethods, File.expand_path(File.join(File.dirname(__FILE__), 'json_record', 'attribute_methods'))
-  autoload :EmbeddedDocument, File.expand_path(File.join(File.dirname(__FILE__), 'json_record', 'embedded_document'))
-  autoload :EmbeddedDocumentArray, File.expand_path(File.join(File.dirname(__FILE__), 'json_record', 'embedded_document_array'))
-  autoload :FieldDefinition, File.expand_path(File.join(File.dirname(__FILE__), 'json_record', 'field_definition'))
-  autoload :JsonField, File.expand_path(File.join(File.dirname(__FILE__), 'json_record', 'json_field'))
-  autoload :Serialized, File.expand_path(File.join(File.dirname(__FILE__), 'json_record', 'serialized'))
+  autoload :AttributeMethods, File.expand_path("../json_record/attribute_methods.rb", __FILE__)
+  autoload :EmbeddedDocument, File.expand_path("../json_record/embedded_document.rb", __FILE__)
+  autoload :EmbeddedDocumentArray, File.expand_path("../json_record/embedded_document_array.rb", __FILE__)
+  autoload :FieldDefinition, File.expand_path("../json_record/field_definition.rb", __FILE__)
+  autoload :JsonField, File.expand_path("../json_record/json_field.rb", __FILE__)
+  autoload :Schema, File.expand_path("../json_record/schema.rb", __FILE__)
+  autoload :Serialized, File.expand_path("../json_record/serialized.rb", __FILE__)
 end
 
-ActiveRecord::Base.send(:include, JsonRecord::Serialized)
+ActiveRecord::Base.send(:include, JsonRecord::Serialized)

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

@@ -16,8 +16,8 @@ module JsonRecord
       base.alias_method_chain(:valid?, :callbacks)
       base.extend ValidationCallbacks
       
-      base.write_inheritable_attribute(:schema, Schema.new(base, nil))
-      base.class_inheritable_reader :schema
+      base.class_attribute :schema
+      base.schema = Schema.new(base, nil)
     end
     
     module ValidationCallbacks #:nodoc:
@@ -79,6 +79,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
@@ -87,6 +91,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/lib/json_record/json_field.rb

@@ -6,10 +6,12 @@ module JsonRecord
     
     def initialize (record, name, schemas)
       @record = record
-      @name = name
+      @name = name.to_s
       @schemas = schemas
       @attributes = nil
-      @compressed = record.class.columns_hash[name].type == :binary
+      json_column = record.class.columns_hash[@name]
+      raise ArgumentError.new("column #{name} does not exist in #{table_name}") unless json_column
+      @compressed = json_column.type == :binary
     end
     
     def serialize

data/lib/json_record/serialized.rb

@@ -11,16 +11,16 @@ module JsonRecord
       # can have multiple fields that store JSON documents if necessary.
       def serialize_to_json (field_name, &block)
         unless include?(InstanceMethods)
-          class_inheritable_accessor :json_serialized_fields
+          class_attribute :json_serialized_fields
           extend ClassMethods
           include InstanceMethods
         end
         field_name = field_name.to_s
-        self.json_serialized_fields ||= {}
+        self.json_serialized_fields = json_serialized_fields ? json_serialized_fields.clone : {}
         schema = Schema.new(self, field_name)
         field_schemas = json_serialized_fields[field_name]
         if field_schemas
-          field_schemas = field_schemas.dup
+          field_schemas = field_schemas.clone
         else
           field_schemas = []
         end
@@ -55,6 +55,10 @@ module JsonRecord
         base.alias_method_chain :write_attribute, :serialized_json
         base.alias_method_chain :read_attribute_before_type_cast, :serialized_json
         base.alias_method_chain :attributes_before_type_cast, :serialized_json
+        # Alias method chain doesn't work on [] methods and these are aliased directly in Rails 3.1
+        base.send :alias_method, :[], :read_attribute_with_serialized_json
+        base.send :alias_method, :[]=, :write_attribute_with_serialized_json
+        base.send :public, :[], :[]=
       end
       
       # Get the JsonField objects for the record.
@@ -93,6 +97,8 @@ module JsonRecord
         json_attributes_before_type_cast.merge(attributes_before_type_cast_without_serialized_json)
       end
       
+      protected
+      
       def read_attribute_with_serialized_json (name)
         name = name.to_s
         json_field, field_definition = self.class.json_field_definition(name)
@@ -113,8 +119,6 @@ module JsonRecord
         end
       end
       
-      protected
-      
       # Returns a hash of all the JsonField objects merged together.
       def json_attributes
         attrs = {}

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"}
@@ -142,9 +148,12 @@ describe JsonRecord::Serialized do
   end
   
   it "should initialize json attributes with blank values" do
-    JsonRecord::Test::Model.new.attributes.should == {
+    json_attributes = JsonRecord::Test::Model.new.attributes
+    json_attributes.delete('id').should == nil
+    json_attributes.should == {
       "name"=>nil,
       "price"=>nil,
+      "ratio"=>nil,
       "string_field"=>nil,
       "verified_at"=>nil,
       "viewed_at"=>nil,
@@ -154,6 +163,7 @@ describe JsonRecord::Serialized do
       "field_4"=>nil,
       "field_5"=>nil,
       "unit_price"=>nil,
+      "unit_ratio"=>nil,
       "traits"=>[],
       "value"=>0,
       "strings"=>[],
@@ -194,7 +204,7 @@ describe JsonRecord::Serialized do
   
   it "should reserialize json attributes into a JSON field" do
     model = JsonRecord::Test::Model.new(:name => "test name", :value => 1)
-    model.save!
+    model.save! rescue puts  $@.join("\n")
     model = JsonRecord::Test::Model.find(model.id)
     ActiveSupport::JSON.decode(model.json).should == {"name" => "test name", "value" => 1}
     model.value = 2
@@ -479,4 +489,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,12 +1,13 @@
 require 'rubygems'
 
-active_record_version = ENV["ACTIVE_RECORD_VERSION"] || [">= 3.0.0.beta2"]
+active_record_version = ENV["ACTIVE_RECORD_VERSION"] || [">=3.0.0"]
 active_record_version = [active_record_version] unless active_record_version.is_a?(Array)
 gem 'activerecord', *active_record_version
 
-require 'spec'
 require 'active_record'
 puts "Testing Against ActiveRecord #{ActiveRecord::VERSION::STRING}"
 
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'json_record'))
-require File.expand_path(File.join(File.dirname(__FILE__), 'test_models'))
+ActiveRecord::Base.establish_connection("adapter" => "sqlite3", "database" => ":memory:")
+
+require File.expand_path("../../lib/json_record.rb", __FILE__)
+require File.expand_path("../test_models.rb", __FILE__)

data/spec/test_models.rb

@@ -1,11 +1,6 @@
 module JsonRecord
   module Test
     def self.create_tables
-      db_dir = File.expand_path(File.join(__FILE__, '..', 'tmp'))
-      Dir.mkdir(db_dir) unless File.exist?(db_dir)
-      db = File.join(db_dir, 'test_JsonRecord.sqlite3')
-      Model.establish_connection("adapter" => "sqlite3", "database" => db)
-      
       Model.connection.create_table(:models) do |t|
         t.text :json
         t.binary :compressed_json
@@ -20,11 +15,7 @@ module JsonRecord
     end
     
     def self.drop_tables
-      db_dir = File.expand_path(File.join(__FILE__, '..', 'tmp'))
-      db = File.join(db_dir, 'test_JsonRecord.sqlite3')
       Model.connection.disconnect!
-      File.delete(db) if File.exist?(db)
-      Dir.delete(db_dir) if File.exist?(db_dir) and Dir.entries(db_dir).reject{|f| f.match(/^\.+$/)}.empty?
     end
 
     class Trait
@@ -59,6 +50,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 +69,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 +90,14 @@ 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,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: json_record
 version: !ruby/object:Gem::Version 
-  hash: 6629696
-  prerelease: true
+  hash: 17
+  prerelease: 
   segments: 
   - 1
   - 1
-  - 0
-  - b6
-  version: 1.1.0.b6
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Brian Durand
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-25 00:00:00 -05:00
+date: 2011-07-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,13 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1848230022
+        hash: 7
         segments: 
         - 3
         - 0
         - 0
-        - beta2
-        version: 3.0.0.beta2
+        version: 3.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,12 +42,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 15
         segments: 
-        - 1
-        - 3
+        - 2
         - 0
-        version: 1.3.0
+        - 0
+        version: 2.0.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -73,15 +71,12 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- MIT_LICENSE
 - 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
@@ -103,6 +98,8 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
+- --main
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -117,25 +114,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: ActiveRecord support for mapping complex documents in a single RDBMS row via JSON serialization.
-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
+test_files: []
+

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/VERSION

@@ -1 +0,0 @@
-1.1.0.b6

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.1.0.b6"
-
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Brian Durand"]
-  s.date = %q{2010-05-25}
-  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.7}
-  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::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0.beta2"])
-      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-    else
-      s.add_dependency(%q<activerecord>, [">= 3.0.0.beta2"])
-      s.add_dependency(%q<rspec>, [">= 1.3.0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<activerecord>, [">= 3.0.0.beta2"])
-    s.add_dependency(%q<rspec>, [">= 1.3.0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-  end
-end
-