json_record 1.0.0 → 1.0.1

data/Rakefile

@@ -29,12 +29,12 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "json_record"
-    gem.summary = %Q{ActiveRecord support for mapping complex documents within a single RDBMS record via JSON serialization.}
+    gem.summary = %Q{ActiveRecord support for mapping complex documents in a single RDBMS row via JSON serialization.}
     gem.email = "brian@embellishedvisions.com"
     gem.homepage = "http://github.com/bdurand/json_record"
     gem.authors = ["Brian Durand"]
   
-    gem.add_dependency('activerecord', '>= 2.2.2', '< 3.0')
+    gem.add_dependency('activerecord', '>= 2.2.2')
     gem.add_development_dependency('rspec', '>= 1.2.9')
     gem.add_development_dependency('jeweler')
   end

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/json_record.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{json_record}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Durand"]
-  s.date = %q{2010-02-07}
+  s.date = %q{2010-02-16}
   s.email = %q{brian@embellishedvisions.com}
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   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 within a single RDBMS record via JSON serialization.}
+  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",
@@ -55,16 +55,16 @@ Gem::Specification.new do |s|
     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", "< 3.0"])
+      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", "< 3.0"])
+      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", "< 3.0"])
+    s.add_dependency(%q<activerecord>, [">= 2.2.2"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<jeweler>, [">= 0"])
   end

data/lib/json_record/embedded_document.rb

@@ -45,20 +45,19 @@ module JsonRecord
     include ActiveRecord::Validations
     include AttributeMethods
     
+    write_inheritable_attribute(:schema, Schema.new(self, nil))
     class_inheritable_reader :schema
     
     class << self
       # Define a field for the schema. This is a shortcut for calling schema.key.
       # See Schema#key for details. 
       def key (name, *args)
-        write_inheritable_attribute(:schema, Schema.new(self, nil)) unless schema
         schema.key(name, *args)
       end
       
       # Define a multivalued field for the schema. This is a shortcut for calling schema.many.
       # See Schema#many for details. 
       def many (name, *args)
-        write_inheritable_attribute(:schema, Schema.new(self, nil)) unless schema
         schema.many(name, *args)
       end
     end
@@ -117,6 +116,10 @@ module JsonRecord
       attributes.hash + parent.hash
     end
     
+    def inspect
+      "#<#{self.class.name} #{attributes.inspect}>"
+    end
+    
     protected
     
     def json_attributes

data/lib/json_record.rb

@@ -11,10 +11,10 @@ unless defined?(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', 'schema'))
 require File.expand_path(File.join(File.dirname(__FILE__), 'json_record', 'serialized'))

data/spec/serialized_spec.rb

@@ -237,7 +237,7 @@ describe JsonRecord::Serialized do
     model.name_change.should == ["test name", "new name"]
     model.name = "test name"
     model.changes.should == {"value" => [0, 1]}
-    model.name_changed?.should == false
+    model.name_changed?.should be_blank
     model.name_was.should == "test name"
     model.name_change.should == nil
   end
@@ -245,7 +245,7 @@ describe JsonRecord::Serialized do
   it "should validate the presence of a json attribute" do
     model = JsonRecord::Test::Model.new
     model.valid?.should == false
-    model.errors.on(:name).should_not == nil
+    model.errors[:name].should_not be_blank
     model.name = "woo"
     model.valid?.should == true
   end
@@ -253,16 +253,16 @@ describe JsonRecord::Serialized do
   it "should validate the length of a json attribute" do
     model = JsonRecord::Test::Model.new(:name => "this name value is way too long", :field_4 => "a", :field_5 => "b")
     model.valid?.should == false
-    model.errors.on(:name).should_not == nil
-    model.errors.on(:field_4).should_not == nil
-    model.errors.on(:field_5).should_not == nil
+    model.errors[:name].should_not be_blank
+    model.errors[:field_4].should_not be_blank
+    model.errors[:field_5].should_not be_blank
     model.name = "shorter name"
     model.field_4 = "a much longer name that won't fit"
     model.field_5 = "a much longer name that will fit because it is OK"
     model.valid?.should == false
-    model.errors.on(:name).should == nil
-    model.errors.on(:field_4).should_not == nil
-    model.errors.on(:field_5).should == nil
+    model.errors[:name].should be_blank
+    model.errors[:field_4].should_not be_blank
+    model.errors[:field_5].should be_blank
     model.field_4 = "just right"
     model.valid?.should == true
   end
@@ -270,11 +270,11 @@ describe JsonRecord::Serialized do
   it "should validate the type of a json attribute" do
     model = JsonRecord::Test::Model.new(:name => "test name", :value => "purple", :price => "free", :when => "2010-40-52", :verified_at => "2010-40-50T00:00:00", :viewed_at => "2010-02-01T00:90:00")
     model.valid?.should == false
-    model.errors.on(:value).should_not == nil
-    model.errors.on(:price).should_not == nil
-    model.errors.on(:when).should_not == nil
-    model.errors.on(:verified_at).should_not == nil
-    model.errors.on(:viewed_at).should_not == nil
+    model.errors[:value].should_not be_blank
+    model.errors[:price].should_not be_blank
+    model.errors[:when].should_not be_blank
+    model.errors[:verified_at].should_not be_blank
+    model.errors[:viewed_at].should_not be_blank
     model.value = "1"
     model.price = "100"
     model.when = "2010-02-01"
@@ -286,7 +286,7 @@ describe JsonRecord::Serialized do
   it "should validate that a json attribute is in a range" do
     model = JsonRecord::Test::Model.new(:name => "test name", :field_3 => "Z")
     model.valid?.should == false
-    model.errors.on(:field_3).should_not == nil
+    model.errors[:field_3].should_not be_blank
     model.field_3 = "B"
     model.valid?.should == true
   end
@@ -294,7 +294,7 @@ describe JsonRecord::Serialized do
   it "should validate the format of a json attribute" do
     model = JsonRecord::Test::Model.new(:name => "test name", :field_2 => "ABC")
     model.valid?.should == false
-    model.errors.on(:field_2).should_not == nil
+    model.errors[:field_2].should_not be_blank
     model.field_2 = "abc"
     model.valid?.should == true
   end
@@ -391,15 +391,15 @@ describe JsonRecord::Serialized do
   it "should validate uniqueness of embedded documents" do
     model = JsonRecord::Test::Model.new(:name => "test", :traits => [{:name => "n1", :value => "v1"}, {:name => "n1", :value => "v2"}])
     model.valid?.should == false
-    model.errors.on(:traits).should_not == nil
-    model.traits.first.errors.on(:name).should == nil
-    model.traits.last.errors.on(:name).should_not == nil
+    model.errors[:traits].should_not be_blank
+    model.traits.first.errors[:name].should be_blank
+    model.traits.last.errors[:name].should_not be_blank
     
     model.traits.last.name = "n2"
     model.valid?.should == true
-    model.errors.on(:traits).should == nil
-    model.traits.first.errors.on(:name).should == nil
-    model.traits.last.errors.on(:name).should == nil
+    model.errors[:traits].should be_blank
+    model.traits.first.errors[:name].should be_blank
+    model.traits.last.errors[:name].should be_blank
   end
   
   it "should perform validations on embedded documents" do
@@ -408,23 +408,23 @@ describe JsonRecord::Serialized do
     trait = model.traits.build(:value => "v1")
     subtrait = trait.sub_traits.build(:name => "s1", :count => "plaid")
     model.valid?.should == false
-    model.errors.on(:primary_trait).should_not == nil
-    model.errors.on(:traits).should_not == nil
-    model.primary_trait.errors.on(:name).should_not == nil
-    trait.errors.on(:name).should_not == nil
-    trait.errors.on(:sub_traits).should_not == nil
-    subtrait.errors.on(:count).should_not == nil
+    model.errors[:primary_trait].should_not be_blank
+    model.errors[:traits].should_not be_blank
+    model.primary_trait.errors[:name].should_not be_blank
+    trait.errors[:name].should_not be_blank
+    trait.errors[:sub_traits].should_not be_blank
+    subtrait.errors[:count].should_not be_blank
     
     model.primary_trait.name = "p1"
     trait.name = "n1"
     subtrait.count = 1
     model.valid?.should == true
-    model.errors.on(:primary_trait).should == nil
-    model.errors.on(:traits).should == nil
-    model.primary_trait.errors.on(:name).should == nil
-    trait.errors.on(:name).should == nil
-    trait.errors.on(:sub_traits).should == nil
-    subtrait.errors.on(:count).should == nil
+    model.errors[:primary_trait].should be_blank
+    model.errors[:traits].should be_blank
+    model.primary_trait.errors[:name].should be_blank
+    trait.errors[:name].should be_blank
+    trait.errors[:sub_traits].should be_blank
+    subtrait.errors[:count].should be_blank
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: json_record
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Brian Durand
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-07 00:00:00 -06:00
+date: 2010-02-16 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,9 +21,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: 2.2.2
-    - - <
-      - !ruby/object:Gem::Version 
-        version: "3.0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -101,7 +98,7 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: ActiveRecord support for mapping complex documents within a single RDBMS record via JSON serialization.
+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