couch_potato 0.5.7 → 0.6.0

data/.gitignore

@@ -1,6 +1,5 @@
 *.gem
 .bundle
-Gemfile.lock
 couch_potato_js_runner.js
 pkg
 .rvmrc

data/CHANGES.md

@@ -1,5 +1,10 @@
 ## Changes
 
+### 0.6.0
+
+* ActiveSupport/Rails 3.1 compatibility (Maximilian Mack)
+* fix no such file to load with json/add/rails (Simone Carletti)
+
 ### 0.5.7
 
 * support CouchPotato::Database#first/#first! calls when using `stub_db` from tests (langalex)
@@ -105,7 +110,7 @@
 * automatically set a database instance on results of CouchPotato::Database#view (langalex)
 * improved auto loading of unloaded constants - can now load constants that have never been loaded before (langalex)
 * raise exception on invalid parameters passed to a couchdb view query (langalex)
-* when querying a view: pass in ranges as key instead of startkey/endkey, pass in plain value instead of hash with key (langalex) 
+* when querying a view: pass in ranges as key instead of startkey/endkey, pass in plain value instead of hash with key (langalex)
 
 ### 0.2.20
 * support for :boolean properties (jweiss)
@@ -150,4 +155,4 @@
 * support for namespaces models
 * removed belongs_to macro for now
 * removed CouchPotato::Config.database_server, just set CouchPotato::Config.database_name to the full url if you are not using localhost:5984
-* Ruby 1.9 was broken and is now working again
+* Ruby 1.9 was broken and is now working again

data/Gemfile.lock

@@ -0,0 +1,48 @@
+PATH
+  remote: .
+  specs:
+    couch_potato (0.5.7)
+      activemodel
+      couchrest (>= 1.0.1)
+      json
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.6)
+      activesupport (= 3.0.6)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activesupport (3.0.6)
+    builder (2.1.2)
+    couchrest (1.0.2)
+      json (~> 1.5.1)
+      mime-types (~> 1.15)
+      rest-client (~> 1.6.1)
+    diff-lcs (1.1.2)
+    i18n (0.5.0)
+    json (1.5.1)
+    mime-types (1.16)
+    rake (0.8.7)
+    rest-client (1.6.1)
+      mime-types (>= 1.16)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    timecop (0.3.5)
+    tzinfo (0.3.26)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  couch_potato!
+  rake
+  rspec (>= 2.0)
+  timecop
+  tzinfo

data/Rakefile

@@ -68,7 +68,17 @@ task :spec_unit => [:spec_unit_validatable, :spec_unit_active_model] do
 end
 
 desc "Run all specs"
-task :spec => [:spec_unit, :spec_functional] do
+task :spec do
+  ['3_0', '3_1'].each do |version|
+    Bundler.with_clean_env do
+      ENV['BUNDLE_GEMFILE'] = "active_support_#{version}"
+      sh "bundle install"
+      Rake::Task[:spec_unit_active_model].execute
+      Rake::Task[:spec_functional_active_model].execute
+      Rake::Task[:spec_unit_validatable].execute
+      Rake::Task[:spec_functional_validatable].execute
+    end
+  end
 end
 
 desc 'Generate documentation'

data/active_support_3_0

@@ -0,0 +1,4 @@
+source :rubygems
+
+gem 'activemodel', '~>3.0'
+gemspec

data/active_support_3_0.lock

@@ -0,0 +1,50 @@
+PATH
+  remote: .
+  specs:
+    couch_potato (0.6.0)
+      activemodel
+      couchrest (>= 1.0.1)
+      json (~> 1.6.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.6)
+      activesupport (= 3.0.6)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activesupport (3.0.6)
+    builder (2.1.2)
+    couchrest (1.1.2)
+      mime-types (~> 1.15)
+      multi_json (~> 1.0.0)
+      rest-client (~> 1.6.1)
+    diff-lcs (1.1.2)
+    i18n (0.5.0)
+    json (1.6.1)
+    mime-types (1.16)
+    multi_json (1.0.3)
+    rake (0.8.7)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    timecop (0.3.5)
+    tzinfo (0.3.26)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activemodel (~> 3.0)
+  couch_potato!
+  rake
+  rspec (>= 2.0)
+  timecop
+  tzinfo

data/active_support_3_1

@@ -0,0 +1,4 @@
+source :rubygems
+
+gem "activemodel", "~> 3.1.0"
+gemspec

data/active_support_3_1.lock

@@ -0,0 +1,53 @@
+PATH
+  remote: .
+  specs:
+    couch_potato (0.6.0)
+      activemodel
+      couchrest (>= 1.0.1)
+      json (~> 1.6.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
+    bcrypt-ruby (3.0.1)
+    builder (3.0.0)
+    couchrest (1.1.2)
+      mime-types (~> 1.15)
+      multi_json (~> 1.0.0)
+      rest-client (~> 1.6.1)
+    diff-lcs (1.1.2)
+    i18n (0.6.0)
+    json (1.6.1)
+    mime-types (1.16)
+    multi_json (1.0.3)
+    rake (0.9.2)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    timecop (0.3.5)
+    tzinfo (0.3.29)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activemodel (~> 3.1.0)
+  couch_potato!
+  rake
+  rspec (>= 2.0)
+  timecop
+  tzinfo

data/couch_potato.gemspec

@@ -11,16 +11,16 @@ Gem::Specification.new do |s|
   s.authors = ["Alexander Lang"]
   s.version     = CouchPotato::VERSION
   s.platform    = Gem::Platform::RUBY
-  
-  s.add_dependency 'json'
+
+  s.add_dependency 'json', '~> 1.6.0'
   s.add_dependency 'couchrest', '>=1.0.1'
   s.add_dependency 'activemodel'
-  
+
   s.add_development_dependency 'rspec', '>=2.0'
   s.add_development_dependency 'timecop'
   s.add_development_dependency 'tzinfo'
   s.add_development_dependency 'rake'
-  
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/lib/couch_potato.rb

@@ -1,7 +1,6 @@
 require 'couchrest'
 require 'json'
 require 'json/add/core'
-require 'json/add/rails'
 
 require 'ostruct'
 
@@ -11,9 +10,9 @@ module CouchPotato
   Config = Struct.new(:database_name, :validation_framework, :split_design_documents_per_view).new
   Config.validation_framework = :active_model
   Config.split_design_documents_per_view = false
-  
+
   class NotFound < StandardError; end
-  
+
   # returns all the classes that implement the CouchPotato::Persistence module
   def self.models
     @models ||= []

data/lib/couch_potato/database.rb

@@ -169,9 +169,10 @@ module CouchPotato
 
     def valid_document?(document)
       errors = document.errors.errors.dup
+      errors.instance_variable_set("@messages", errors.messages.dup) if errors.respond_to?(:messages)
       document.valid?
-      errors.each_pair do |k, v|
-        v.each {|message| document.errors.add(k, message)}
+      errors.each do |k, v|
+        document.errors.add(k, v)
       end
       document.errors.empty?
     end

data/lib/couch_potato/persistence/json.rb

@@ -4,15 +4,19 @@ module CouchPotato
       def self.included(base) #:nodoc:
         base.class_eval do
           extend ClassMethods
-          attr_accessor :_document
+          attr_writer :_document
+
+          def _document
+            @_document ||= {}
+          end
         end
       end
-      
+
       # returns a JSON representation of a model in order to store it in CouchDB
       def to_json(*args)
         to_hash.to_json(*args)
       end
-      
+
       # returns all the attributes, the ruby class and the _id and _rev of a model as a Hash
       def to_hash
         (self.class.properties).inject({}) do |props, property|
@@ -20,25 +24,25 @@ module CouchPotato
           props
         end.merge(JSON.create_id => self.class.name).merge(id_and_rev_json)
       end
-      
+
       private
-      
+
       def id_and_rev_json
         ['_id', '_rev', '_deleted'].inject({}) do |hash, key|
           hash[key] = self.send(key) unless self.send(key).nil?
           hash
         end
       end
-      
+
       module ClassMethods
-        
+
         # creates a model instance from JSON
         def json_create(json)
           return if json.nil?
           instance = self.new
           instance._id = json[:_id] || json['_id']
           instance._rev = json[:_rev] || json['_rev']
-          instance._document = HashWithIndifferentAccess.new(json)
+          instance._document = json
           instance
         end
       end

data/lib/couch_potato/persistence/simple_property.rb

@@ -2,9 +2,9 @@ module CouchPotato
   module Persistence
     module PropertyMethods
       private
-      
+
       def load_attribute_from_document(name)
-        if (_document || {}).has_key?(name.to_s)
+        if _document.has_key?(name.to_sym) || _document.has_key?(name.to_s)
           property = self.class.properties.find{|property| property.name == name}
           @skip_dirty_tracking = true
           value = property.build(self, _document)
@@ -13,47 +13,47 @@ module CouchPotato
         end
       end
     end
-    
+
     class SimpleProperty  #:nodoc:
       attr_accessor :name, :type
-      
+
       def initialize(owner_clazz, name, options = {})
         self.name = name
         self.type = options[:type]
         @type_caster = TypeCaster.new
         owner_clazz.send :include, PropertyMethods unless owner_clazz.ancestors.include?(PropertyMethods)
-        
+
         define_accessors accessors_module_for(owner_clazz), name, options
       end
-      
+
       def build(object, json)
         value = json[name.to_s].nil? ? json[name.to_sym] : json[name.to_s]
         object.send "#{name}=", value
       end
-      
+
       def dirty?(object)
         object.send("#{name}_changed?")
       end
-      
+
       def serialize(json, object)
         json[name] = object.send name
       end
       alias :value :serialize
-      
+
       private
-      
+
       def accessors_module_for(clazz)
         unless clazz.const_defined?('AccessorMethods')
-          accessors_module = clazz.const_set('AccessorMethods', Module.new) 
+          accessors_module = clazz.const_set('AccessorMethods', Module.new)
           clazz.send(:include, accessors_module)
         end
         clazz.const_get('AccessorMethods')
       end
-      
+
       def define_accessors(base, name, options)
         base.class_eval do
           include PropertyMethods
-          
+
           define_method "#{name}" do
             load_attribute_from_document(name) unless instance_variable_defined?("@#{name}")
             value = instance_variable_get("@#{name}")
@@ -65,13 +65,13 @@ module CouchPotato
               value
             end
           end
-          
+
           define_method "#{name}=" do |value|
             typecasted_value = type_caster.cast(value, options[:type])
             send("#{name}_will_change!") unless @skip_dirty_tracking || typecasted_value == send(name)
             self.instance_variable_set("@#{name}", typecasted_value)
           end
-          
+
           define_method "#{name}?" do
             !self.send(name).nil? && !self.send(name).try(:blank?)
           end

data/lib/couch_potato/version.rb

@@ -1,3 +1,3 @@
 module CouchPotato
-  VERSION = "0.5.7"
+  VERSION = "0.6.0"
 end

data/spec/callbacks_spec.rb

@@ -276,15 +276,15 @@ describe "validation callbacks" do
   it "should keep error messages set in custom before_validation filters" do
     user = ValidatedUser.new(:name => "john")
     user.valid?.should == false
-    user.errors.on(:name).should == "should be Paul"
+    user.errors[:name].should == ["should be Paul"]
   end
 
   it "should combine the errors from validations and callbacks" do
     user = ValidatedUser.new(:name => nil)
     user.valid?.should == false
-    user.errors.on(:name).any? {|msg| msg =~ /can't be (empty|blank)/ }.should == true
-    user.errors.on(:name).any? {|msg| msg == "should be Paul" }.should == true
-    user.errors.on(:name).size.should == 2
+    user.errors[:name].any? {|msg| msg =~ /can't be (empty|blank)/ }.should == true
+    user.errors[:name].any? {|msg| msg == "should be Paul" }.should == true
+    user.errors[:name].size.should == 2
   end
 
   it "should clear the errors on subsequent calls to valid?" do
@@ -292,6 +292,6 @@ describe "validation callbacks" do
     user.valid?.should == false
     user.name = 'Paul'
     user.valid?.should == true
-    user.errors.on(:name).should == nil
+    user.errors[:name].should == []
   end
 end

data/spec/unit/attributes_spec.rb

@@ -1,43 +1,52 @@
 require 'spec_helper'
 
+class Branch
+  include CouchPotato::Persistence
+
+  property :leafs
+end
+
+
 class Plant
   include CouchPotato::Persistence
   property :leaf_count
   property :typed_leaf_count, :type => Fixnum
   property :typed_leaf_size,  :type => Float
+  property :branch, type: Branch
 end
 
+
 describe "attributes" do
-  
-  describe 'attributes=' do
+  context 'attributes=' do
     it "should assign the attributes" do
-      plant = Plant.new 
+      plant = Plant.new
       plant.attributes = {:leaf_count => 1}
       plant.leaf_count.should == 1
     end
   end
 
-  describe "attributes" do
+  context "attributes" do
     it "should return the attributes" do
       plant = Plant.new(:leaf_count => 1)
-      plant.attributes.should == {:leaf_count => 1, :created_at => nil, :updated_at => nil, :typed_leaf_count => nil, :typed_leaf_size => nil}
+      plant.attributes.should == {:leaf_count => 1, :created_at => nil, :updated_at => nil,
+        :typed_leaf_count => nil, :typed_leaf_size => nil, :branch => nil}
     end
   end
-  
+
   # useful when loading models from custom views
-  describe "accessing ghost attributes" do
+  context "accessing ghost attributes" do
     it "should allow me to access attributes that are in the couchdb document but not defined as a property" do
       plant = Plant.json_create({JSON.create_id => "Plant", "color" => "red", "leaf_count" => 1})
       plant.color.should == 'red'
     end
-    
+
     it "should raise a no method error when trying to read attributes that are not in the document" do
       plant = Plant.json_create({JSON.create_id => "Plant", "leaf_count" => 1})
       lambda do
         plant.length
       end.should raise_error(NoMethodError)
     end
-    
+
     it "should raise a no method error if the document hasn't been loaded from the database" do
       plant = Plant.new
       lambda do
@@ -46,50 +55,55 @@ describe "attributes" do
     end
   end
 
-  describe 'typed attributes' do
-    
+  context 'typed attributes' do
     before(:each) do
       @plant = Plant.new
     end
-    
-    describe "fixnum" do  
+
+    context 'nested objects' do
+      it 'assigns the attributes of nested objects' do
+        Plant.new(:branch => {:leafs => 3}).branch.leafs.should == 3
+      end
+    end
+
+    describe "fixnum" do
       it "should convert a string into a fixnum" do
         @plant.typed_leaf_count = '4'
         @plant.typed_leaf_count.should == 4
       end
-      
+
       it "should convert a string into a negative fixnum" do
         @plant.typed_leaf_count = '-4'
         @plant.typed_leaf_count.should == -4
       end
-      
+
       it "should leave a fixnum as is" do
         @plant.typed_leaf_count = 4
         @plant.typed_leaf_count.should == 4
       end
-      
+
       it "should leave nil as is" do
         @plant.typed_leaf_count = nil
         @plant.typed_leaf_count.should be_nil
       end
-      
+
       it "should set the attributes to zero if a string given" do
         @plant.typed_leaf_count = 'x'
         @plant.typed_leaf_count.should == 0
       end
-      
+
       it "should parse numbers out of a string" do
         @plant.typed_leaf_count = 'x123'
         @plant.typed_leaf_count.should == 123
       end
-      
+
       it "should set the attributes to nil if given a blank string" do
         @plant.typed_leaf_count = ''
         @plant.typed_leaf_count.should be_nil
       end
     end
-    
-    describe "float" do  
+
+    context "float" do
       it "should convert a number in a string with a decimal place" do
         @plant.typed_leaf_size = '0.5001'
         @plant.typed_leaf_size.should == 0.5001
@@ -99,7 +113,7 @@ describe "attributes" do
         @plant.typed_leaf_size = '5'
         @plant.typed_leaf_size.should == 5.0
       end
-      
+
       it "should convert a negative number in a string" do
         @plant.typed_leaf_size = '-5.0'
         @plant.typed_leaf_size.should == -5.0
@@ -109,22 +123,22 @@ describe "attributes" do
         @plant.typed_leaf_size = 0.5
         @plant.typed_leaf_size.should == 0.5
       end
-      
+
       it "should leave nil as is" do
         @plant.typed_leaf_size = nil
         @plant.typed_leaf_size.should be_nil
       end
-      
+
       it "should set the attributes to zero if a string given" do
         @plant.typed_leaf_size = 'x'
         @plant.typed_leaf_size.should == 0
       end
-      
+
       it "should parse numbers out of a string" do
         @plant.typed_leaf_size = 'x00.123'
         @plant.typed_leaf_size.should == 0.123
       end
-      
+
       it "should set the attributes to nil if given a blank string" do
         @plant.typed_leaf_size = ''
         @plant.typed_leaf_size.should be_nil

data/spec/unit/database_spec.rb

@@ -173,7 +173,7 @@ describe CouchPotato::Database, 'save_document' do
     it "should keep errors added in before_validation_on_* callbacks when creating a new object" do
       spock = Vulcan.new(:name => 'spock')
       @db.save_document(spock)
-      spock.errors.on(:validation).should == 'failed'
+      spock.errors[:validation].should == ['failed']
     end
     
     it "should keep errors added in before_validation_on_* callbacks when creating a new object" do
@@ -182,14 +182,14 @@ describe CouchPotato::Database, 'save_document' do
       spock.new?.should == false
       spock.name = "spock's father"
       @db.save_document(spock)
-      spock.errors.on(:validation).should == 'failed'
+      spock.errors[:validation].should == ['failed']
     end
     
     it "should keep errors generated from normal validations together with errors set in normal validations" do
       spock = Vulcan.new
       @db.save_document(spock)
-      spock.errors.on(:validation).should == 'failed'
-      spock.errors.on(:name).should =~ /can't be (empty|blank)/
+      spock.errors[:validation].should == ['failed']
+      spock.errors[:name].first.should =~ /can't be (empty|blank)/
     end
     
     it "should clear errors on subsequent, valid saves when creating" do
@@ -198,7 +198,7 @@ describe CouchPotato::Database, 'save_document' do
       
       spock.name = 'Spock'
       @db.save_document(spock)
-      spock.errors.on(:name).should == nil
+      spock.errors[:name].should == []
     end
     
     it "should clear errors on subsequent, valid saves when updating" do
@@ -207,11 +207,11 @@ describe CouchPotato::Database, 'save_document' do
       
       spock.name = nil
       @db.save_document(spock)
-      spock.errors.on(:name).should =~ /can't be (empty|blank)/
+      spock.errors[:name].first.should =~ /can't be (empty|blank)/
       
       spock.name = 'Spock'
       @db.save_document(spock)
-      spock.errors.on(:name).should == nil
+      spock.errors[:name].should == []
     end
     
   end

metadata

@@ -2,7 +2,7 @@
 name: couch_potato
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.7
+  version: 0.6.0
 platform: ruby
 authors: 
 - Alexander Lang
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-10 00:00:00 +02:00
+date: 2011-09-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,9 +19,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.6.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -105,9 +105,14 @@ files:
 - CHANGES.md
 - CREDITS
 - Gemfile
+- Gemfile.lock
 - MIT-LICENSE.txt
 - README.md
 - Rakefile
+- active_support_3_0
+- active_support_3_0.lock
+- active_support_3_1
+- active_support_3_1.lock
 - couch_potato.gemspec
 - init.rb
 - lib/core_ext/date.rb