json_record 1.0.2 → 1.0.3

data/CHANGE_LOG

@@ -0,0 +1,13 @@
+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

data/README.rdoc

@@ -21,6 +21,8 @@ To make you flexible schema really powerful, add some embedded documents to it.
 
 Embedded documents have their own schema that is serialized to JSON. This schema can also contain embedded documents allowing you to easily create very rich data structures all with only one database table. And because there is only one table, you don't need to worry at all about ensuring your changes to embedded documents are saved along with the parent record.
 
+Embedded documents support validations and before_validation and after_validation callbacks.
+
 == Example
 
   class Post < ActiveRecord::Base
@@ -43,6 +45,10 @@ Embedded documents have their own schema that is serialized to JSON. This schema
     schema.key :author, Person, :required => true
     schema.key :body, :required => true
     schema.many :replies, Comment
+    
+    after_validation do |comment|
+      comment.body = ERB::Util.html_escape(comment.body)
+    end
   end
 
 Create a new post with a title and author:

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/json_record.gemspec

@@ -5,17 +5,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{json_record}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Durand"]
-  s.date = %q{2010-02-16}
+  s.date = %q{2010-02-20}
   s.email = %q{brian@embellishedvisions.com}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
-    "MIT_LICENSE",
+    "CHANGE_LOG",
+     "MIT_LICENSE",
      "README.rdoc",
      "Rakefile",
      "VERSION",

data/lib/json_record/embedded_document.rb

@@ -37,6 +37,16 @@ module JsonRecord
     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.
@@ -47,7 +57,20 @@ module JsonRecord
       base.send :include, ActiveRecordStub
       base.send :include, ActiveRecord::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.write_inheritable_attribute(:schema, Schema.new(base, nil))
       base.class_inheritable_reader :schema
     end
@@ -110,6 +133,19 @@ module JsonRecord
       "#<#{self.class.name} #{attributes.inspect}>"
     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?
+      end
+    end
+    
     protected
     
     def json_attributes

data/lib/json_record/field_definition.rb

@@ -34,7 +34,7 @@ module JsonRecord
     # the original value will be returned. Blank values are always translated to nil. Hashes will be converted
     # to EmbeddedDocument objects if the field type extends from EmbeddedDocument.
     def convert (val)
-      return nil if val.blank?
+      return nil if val.blank? and val != false
       if @type == String
         return val.to_s
       elsif @type == Integer

data/spec/serialized_spec.rb

@@ -428,4 +428,9 @@ describe JsonRecord::Serialized do
     subtrait.errors[:count].should be_blank
   end
   
+  it "should perform validation callbacks on embedded documents" do
+    trait = JsonRecord::Test::Trait.new(:name => "name")
+    trait.valid?.should == true
+    trait.callbacks.should == [:before_validation, :after_validation]
+  end
 end

data/spec/test_models.rb

@@ -33,6 +33,10 @@ module JsonRecord
       schema.key :value
       schema.key :count, Integer
       schema.many :sub_traits, Trait, :unique => [:name, :value]
+      
+      attr_accessor :callbacks
+      before_validation{|record| record.callbacks ||= []; record.callbacks << :before_validation}
+      after_validation{|record| record.callbacks ||= []; record.callbacks << :after_validation}
     end
     
     class Dimension

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: json_record
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Brian Durand
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-16 00:00:00 -06:00
+date: 2010-02-20 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,6 +51,7 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
+- CHANGE_LOG
 - MIT_LICENSE
 - README.rdoc
 - Rakefile