json_record 1.1.0.b2 → 1.1.0.b6

data/CHANGE_LOG

@@ -26,6 +26,3 @@
 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
-
-1.0.8
-  - Fix Rakefile so it loads even without rspec

data/Rakefile

@@ -12,8 +12,8 @@ begin
     t.spec_files = FileList.new('spec/**/*_spec.rb')
   end
 rescue LoadError
-  task :test do
-    STDERR.puts "You must have rspec >= 1.2.9 to run the tests"
+  tast :test do
+    STDERR.puts "You must have rspec >= 1.3.0 to run the tests"
   end
 end
 
@@ -33,15 +33,12 @@ 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')
+    gem.add_dependency('activerecord', '>= 3.0.0.beta2')
+    gem.add_development_dependency('rspec', '>= 1.3.0')
     gem.add_development_dependency('jeweler')
   end
 
   Jeweler::GemcutterTasks.new
 rescue LoadError
-end
+end

data/VERSION

@@ -1 +1 @@
-1.0.8
+1.1.0.b6

data/json_record.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{json_record}
-  s.version = "1.1.0.b2"
+  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-04-06}
+  s.date = %q{2010-05-25}
   s.email = %q{brian@embellishedvisions.com}
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   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.6}
+  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",
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    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"])

data/lib/json_record.rb

@@ -1,22 +1,18 @@
 require 'active_record'
 
-begin
-  require 'json'
-rescue LoadError
-  ActiveRecord::Base.logger.warn("*** You really should install the json gem for optimal performance with json_record ***")
-end
-
 unless defined?(Boolean)
   class Boolean
   end
 end
 
-require File.expand_path(File.join(File.dirname(__FILE__), 'json_record', 'schema'))
-require File.expand_path(File.join(File.dirname(__FILE__), 'json_record', 'attribute_methods'))
-require File.expand_path(File.join(File.dirname(__FILE__), 'json_record', 'embedded_document'))
-require File.expand_path(File.join(File.dirname(__FILE__), 'json_record', 'embedded_document_array'))
-require File.expand_path(File.join(File.dirname(__FILE__), 'json_record', 'field_definition'))
-require File.expand_path(File.join(File.dirname(__FILE__), 'json_record', 'json_field'))
-require File.expand_path(File.join(File.dirname(__FILE__), 'json_record', 'serialized'))
+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'))
+end
 
-ActiveRecord::Base.send(:include, JsonRecord::Serialized)
+ActiveRecord::Base.send(:include, JsonRecord::Serialized)

data/lib/json_record/attribute_methods.rb

@@ -47,7 +47,7 @@ module JsonRecord
             json_attributes.delete(field.name)
           end
         end
-        context.attributes_before_type_cast[field.name] = val
+        context.json_attributes_before_type_cast[field.name] = val
       end
       return val
     end

data/lib/json_record/embedded_document.rb

@@ -1,52 +1,4 @@
 module JsonRecord
-  # OK, this is ugly, but necessary to get ActiveRecord::Errors to be compatible with
-  # EmbeddedDocument. This will all be fixed with Rails 3 and ActiveModel. Until then
-  # we'll just live with this.
-  module ActiveRecordStub #:nodoc:
-    def self.included (base)
-      base.extend(ClassMethods)
-    end
-    
-    module ClassMethods
-      def human_name (options = {})
-        name.split('::').last.humanize
-      end
-      
-      def human_attribute_name (attribute, options = {})
-        attribute.to_s.humanize
-      end
-      
-      def self_and_descendants_from_active_record
-        [self]
-      end
-      
-      def self_and_descendents_from_active_record
-        [self]
-      end
-    end
-    
-    def deprecated_callback_method (*args)
-    end
-    
-    private
-    def save (*args); end;
-    def save! (*args); end;
-    def destroy (*args); end;
-    def create (*args); end;
-    def update (*args); end;
-    def new_record?; false; end;
-  end
-  
-  module ActiveSupport3Callbacks #:nodoc:
-    def before_validation (*args, &block)
-      set_callback(:validation, :before, *args, &block)
-    end
-    
-    def after_validation (*args, &block)
-      set_callback(:validation, :after, *args, &block)
-    end
-  end
-  
   # Classes that include EmbeddedDocument can be used as the type for keys or many field definitions
   # in Schema. Embedded documents are then extensions of the schema. In this way, complex
   # documents represented in JSON can be deserialized as complex objects.
@@ -54,27 +6,30 @@ module JsonRecord
   # To define the schema for an embedded document, call schema.key or schema.many from the class definition.
   module EmbeddedDocument
     def self.included (base)
-      base.send :include, ActiveRecordStub
-      base.send :include, ActiveRecord::Validations
+      base.send :include, ActiveModel::AttributeMethods
+      base.send :include, ActiveModel::Dirty
+      base.send :include, ActiveModel::Validations
       base.send :include, AttributeMethods
       base.send :include, ActiveSupport::Callbacks
       
-      if base.respond_to?(:set_callback)
-        # Poor man's check for ActiveSupport 3.0 which completely changed around how callbacks work.
-        # This is a temporary work around so that the same gem can be compatible with both 2.x and 3.x for now.
-        # Incoporating ActiveModel will fix all.
-        base.define_callbacks :validation
-        base.alias_method_chain(:valid?, :callbacks_3)
-        base.extend(ActiveSupport3Callbacks)
-      else
-        base.define_callbacks :before_validation, :after_validation
-        base.alias_method_chain(:valid?, :callbacks)
-      end
+      base.define_callbacks :validation
+      base.alias_method_chain(:valid?, :callbacks)
+      base.extend ValidationCallbacks
       
       base.write_inheritable_attribute(:schema, Schema.new(base, nil))
       base.class_inheritable_reader :schema
     end
     
+    module ValidationCallbacks #:nodoc:
+      def before_validation (*args, &block)
+        set_callback(:validation, :before, *args, &block)
+      end
+
+      def after_validation (*args, &block)
+        set_callback(:validation, :after, *args, &block)
+      end
+    end
+    
     # The parent object of the document.
     attr_accessor :parent
     
@@ -105,22 +60,7 @@ module JsonRecord
     
     # Get the attribute values of the document before they were type cast.
     def attributes_before_type_cast
-      @attributes
-    end
-    
-    # Determine if the document has been changed.
-    def changed?
-      !changed_attributes.empty?
-    end
-
-    # Get the list of attributes changed.
-    def changed
-      changed_attributes.keys
-    end
-
-    # Get a list of changes to the document.
-    def changes
-      changed.inject({}) {|h, attr| h[attr] = attribute_change(attr); h}
+      json_attributes_before_type_cast
     end
     
     # Get a field from the schema with the specified name.
@@ -156,15 +96,8 @@ module JsonRecord
     end
     
     def valid_with_callbacks? #:nodoc:
-      run_callbacks(:before_validation)
-      valid = valid_without_callbacks?
-      run_callbacks(:after_validation)
-      valid
-    end
-    
-    def valid_with_callbacks_3? #:nodoc:
       run_callbacks(:validation) do
-        valid_without_callbacks_3?
+        valid_without_callbacks?
       end
     end
     
@@ -174,6 +107,10 @@ module JsonRecord
       @json_attributes
     end
     
+    def json_attributes_before_type_cast
+      @attributes
+    end
+    
     def read_json_attribute (json_field_name, field)
       read_attribute(field, self)
     end
@@ -181,7 +118,7 @@ module JsonRecord
     def write_json_attribute (json_field_name, field, value)
       write_attribute(field, value, self)
     end
-  
+      
     def changed_attributes
       @changed_attributes ||= {}
     end
@@ -189,18 +126,5 @@ module JsonRecord
     def read_attribute_before_type_cast (name)
       @attributes[name.to_s]
     end
-    
-    def attribute_changed? (name)
-      changed_attributes.include?(name.to_s)
-    end
-    
-    def attribute_change (name)
-      name = name.to_s
-      [changed_attributes[name], read_json_attribute(nil, schema.fields[name])] if attribute_changed?(name)
-    end
-    
-    def attribute_was (name)
-      changed_attributes[name.to_s]
-    end
   end
 end

data/lib/json_record/embedded_document_array.rb

@@ -50,5 +50,10 @@ module JsonRecord
       self << obj
       obj
     end
+    
+    def to_json (*args)
+      # TODO this was required by a bug in Rails 3.0.beta3; remove later
+      ActiveSupport::JSON.encode(self, args.first)
+    end
   end
 end

data/lib/json_record/field_definition.rb

@@ -22,7 +22,7 @@ module JsonRecord
     
     # Get the default value.
     def default
-      (@default.dup rescue @default )if @default
+      (@default.dup rescue @default) if @default
     end
     
     # Indicates the field is multivalued.

data/lib/json_record/json_field.rb

@@ -63,7 +63,7 @@ module JsonRecord
     end
     
     def changed_attributes
-      @record.send(:changed_attributes)
+      @record.instance_variable_get(:@changed_attributes)
     end
     
   end

data/lib/json_record/schema.rb

@@ -131,6 +131,8 @@ module JsonRecord
         @klass.send(:define_method, "#{field.name}_changed?") {self.send(:attribute_changed?, field.name)}
         @klass.send(:define_method, "#{field.name}_change") {self.send(:attribute_change, field.name)}
         @klass.send(:define_method, "#{field.name}_was") {self.send(:attribute_was, field.name)}
+        @klass.send(:define_method, "#{field.name}_will_change!") {self.send(:attribute_will_change!, field.name)}
+        @klass.send(:define_method, "reset_#{field.name}!") {self.send(:reset_attribute!, field.name)}
       end
     end
     

data/lib/json_record/serialized.rb

@@ -53,6 +53,8 @@ module JsonRecord
         base.alias_method_chain :attributes, :serialized_json
         base.alias_method_chain :read_attribute, :serialized_json
         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
       end
       
       # Get the JsonField objects for the record.
@@ -66,8 +68,13 @@ module JsonRecord
         @json_fields
       end
       
+      def json_attributes_before_type_cast # :nodoc:
+        @json_attributes_before_type_cast ||= {}
+      end
+            
       def reload_with_serialized_json (*args) #:nodoc:
         @json_fields = nil
+        @json_attributes_before_type_cast = nil
         reload_without_serialized_json(*args)
       end
       
@@ -78,6 +85,14 @@ module JsonRecord
         return attrs
       end
       
+      def read_attribute_before_type_cast_with_serialized_json (attr_name) #:nodoc:
+        json_attributes_before_type_cast[attr_name.to_s] || read_attribute_before_type_cast_without_serialized_json(attr_name)
+      end
+
+      def attributes_before_type_cast_with_serialized_json #:nodoc:
+        json_attributes_before_type_cast.merge(attributes_before_type_cast_without_serialized_json)
+      end
+      
       def read_attribute_with_serialized_json (name)
         name = name.to_s
         json_field, field_definition = self.class.json_field_definition(name)
@@ -109,7 +124,7 @@ module JsonRecord
         attrs
       end
       
-      def json_field_names
+      def json_field_names # :nodoc:
         @json_field_names = json_serialized_fields.values.flatten.collect{|s| s.fields.keys}.flatten
       end
       

data/spec/embedded_document_array_spec.rb

@@ -1,6 +1,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 
 describe JsonRecord::EmbeddedDocumentArray do
+  
   it "should be an Array" do
     a = JsonRecord::EmbeddedDocumentArray.new(JsonRecord::Test::Trait, nil)
     a.is_a?(Array).should == true

data/spec/serialized_spec.rb

@@ -259,6 +259,19 @@ describe JsonRecord::Serialized do
     model.name_changed?.should be_blank
     model.name_was.should == "test name"
     model.name_change.should == nil
+    
+    model.reset_value!
+    model.value_changed?.should == false
+    model.value.should == 0
+    
+    model.value_will_change!
+    model.value_changed?.should == true
+  end
+  
+  it "should track the value before type casting on json attributes" do
+    model = JsonRecord::Test::Model.new(:name => "test", :value => "1")
+    model.name_before_type_cast.should == "test"
+    model.value_before_type_cast.should == "1"
   end
   
   it "should validate the presence of a json attribute" do

data/spec/spec_helper.rb

@@ -1,13 +1,12 @@
 require 'rubygems'
 
-active_record_version = ENV["ACTIVE_RECORD_VERSION"] || [">= 2.2.2", "< 3.0"]
+active_record_version = ENV["ACTIVE_RECORD_VERSION"] || [">= 3.0.0.beta2"]
 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}" if defined?(ActiveRecord::VERSION)
-ActiveRecord.load_all! if ActiveRecord.respond_to?(:load_all!)
+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'))

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: json_record
 version: !ruby/object:Gem::Version 
+  hash: 6629696
   prerelease: true
   segments: 
   - 1
   - 1
   - 0
-  - b2
-  version: 1.1.0.b2
+  - b6
+  version: 1.1.0.b6
 platform: ruby
 authors: 
 - Brian Durand
@@ -15,16 +16,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-06 00:00:00 -05:00
+date: 2010-05-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: -1848230022
         segments: 
         - 3
         - 0
@@ -37,9 +40,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
@@ -51,9 +56,11 @@ dependencies:
   name: jeweler
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -99,16 +106,20 @@ 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"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3
@@ -117,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+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.