couch_potato 0.6.0 → 0.7.0.pre.1

data/lib/couch_potato/database.rb

@@ -35,11 +35,11 @@ module CouchPotato
     # For your convenience when passing a hash with only a key parameter you can just pass in the value
     #
     #   db.view(User.all(key: 1)) == db.view(User.all(1))
-    # 
+    #
     # Instead of passing a startkey and endkey you can pass in a key with a range:
     #
     #   db.view(User.all(key: 1..20)) == db.view(startkey: 1, endkey: 20) == db.view(User.all(1..20))
-    #   
+    #
     # You can also pass in multiple keys:
     #
     #   db.view(User.all(keys: [1, 2, 3]))
@@ -51,7 +51,8 @@ module CouchPotato
           :map => spec.map_function,
           :reduce => spec.reduce_function}
         },
-        ({spec.list_name => spec.list_function} unless spec.list_name.nil?)
+        ({spec.list_name => spec.list_function} unless spec.list_name.nil?),
+        spec.language
       ).query_view!(spec.view_parameters)
       processed_results = spec.process_results results
       processed_results.instance_eval "def total_rows; #{results['total_rows']}; end" if results['total_rows']
@@ -60,12 +61,12 @@ module CouchPotato
       end if processed_results.respond_to?(:each)
       processed_results
     end
-    
+
     # returns the first result from a #view query or nil
     def first(spec)
       view(spec).first
     end
-    
+
     # returns th first result from a #view or raises CouchPotato::NotFound
     def first!(spec)
       first(spec) || raise(CouchPotato::NotFound)
@@ -81,7 +82,7 @@ module CouchPotato
       end
     end
     alias_method :save, :save_document
-    
+
     # saves a document, raises a CouchPotato::Database::ValidationsFailedError on failure
     def save_document!(document)
       save_document(document) || raise(ValidationsFailedError.new(document.errors.full_messages))
@@ -98,27 +99,43 @@ module CouchPotato
     end
     alias_method :destroy, :destroy_document
 
-    # loads a document by its id
+    # loads a document by its id(s)
+    # id - either a single id or an array of ids
+    # returns either a single document or an array of documents (if an array of ids was passed).
+    # returns nil if the single document could not be found. when passing an array and some documents
+    # could not be found these are omitted from the returned array
     def load_document(id)
       raise "Can't load a document without an id (got nil)" if id.nil?
-      begin
-        instance = couchrest_database.get(id)
-        instance.database = self
-        instance
-      rescue(RestClient::ResourceNotFound)
-        nil
+
+      if id.is_a?(Array)
+        bulk_load id
+      else
+        begin
+          instance = couchrest_database.get(id)
+          instance.database = self
+          instance
+        rescue(RestClient::ResourceNotFound)
+          nil
+        end
       end
     end
     alias_method :load, :load_document
-    
+
+    # loads one or more documents by its id(s)
+    # behaves like #load except it raises a CouchPotato::NotFound if any of the documents could not be found
     def load!(id)
-      load(id) || raise(CouchPotato::NotFound)
+      doc = load(id)
+      if id.is_a?(Array)
+        missing_docs = id - doc.map(&:id)
+      end
+      raise(CouchPotato::NotFound, missing_docs.try(:join, ', ')) if doc.nil? || missing_docs.try(:any?)
+      doc
     end
 
     def inspect #:nodoc:
       "#<CouchPotato::Database @root=\"#{couchrest_database.root}\">"
     end
-    
+
     # returns the underlying CouchRest::Database instance
     def couchrest_database
       @couchrest_database
@@ -126,20 +143,27 @@ module CouchPotato
 
     private
 
+    def bulk_load(ids)
+      response = couchrest_database.bulk_load ids
+      existing_rows = response['rows'].select{|row| row.key? 'doc'}
+      docs = existing_rows.map{|row| row["doc"]}
+      docs.each{|doc| doc.database = self}
+    end
+
     def create_document(document, validate)
       document.database = self
-      
+
       if validate
         document.errors.clear
-        document.run_callbacks :validation_on_save do
-          document.run_callbacks :validation_on_create do
+        return false if false == document.run_callbacks(:validation_on_save) do
+          return false if false == document.run_callbacks(:validation_on_create) do
             return false unless valid_document?(document)
           end
         end
       end
-      
-      document.run_callbacks :save do
-        document.run_callbacks :create do
+
+      return false if false == document.run_callbacks(:save) do
+        return false if false == document.run_callbacks(:create) do
           res = couchrest_database.save_doc document.to_hash
           document._rev = res['rev']
           document._id = res['id']
@@ -151,15 +175,15 @@ module CouchPotato
     def update_document(document, validate)
       if validate
         document.errors.clear
-        document.run_callbacks :validation_on_save do
-          document.run_callbacks :validation_on_update do
+        return false if false == document.run_callbacks(:validation_on_save) do
+          return false if false == document.run_callbacks(:validation_on_update) do
             return false unless valid_document?(document)
           end
         end
       end
 
-      document.run_callbacks :save do
-        document.run_callbacks :update do
+      return false if false == document.run_callbacks(:save) do
+        return false if false == document.run_callbacks(:update) do
           res = couchrest_database.save_doc document.to_hash
           document._rev = res['rev']
         end
@@ -172,7 +196,11 @@ module CouchPotato
       errors.instance_variable_set("@messages", errors.messages.dup) if errors.respond_to?(:messages)
       document.valid?
       errors.each do |k, v|
-        document.errors.add(k, v)
+        if v.respond_to?(:each)
+          v.each {|message| document.errors.add(k, message)}
+        else
+          document.errors.add(k, v)
+        end
       end
       document.errors.empty?
     end

data/lib/couch_potato/persistence/active_model_compliance.rb

@@ -12,14 +12,18 @@ module CouchPotato
           self
         end
 
+        def to_partial_path
+          "#{self.class.name.underscore.pluralize}/#{self.class.name.underscore}"
+        end
+
         def errors
           super || {}
         end
-        
+
         def persisted?
           !self.new?
         end
-        
+
         def to_key
           persisted? ? [to_param] : nil
         end

data/lib/couch_potato/persistence/callbacks.rb

@@ -12,7 +12,6 @@ module CouchPotato
 
           define_model_callbacks :create, :save, :update, :destroy
           define_model_callbacks *[:save, :create, :update].map {|c| :"validation_on_#{c}"}
-          define_model_callbacks :validation unless Config.validation_framework == :active_model
         end
       end
 

data/lib/couch_potato/persistence/dirty_attributes.rb

@@ -2,45 +2,36 @@ require 'bigdecimal'
 module CouchPotato
   module Persistence
     module DirtyAttributes
-      
+
       def self.included(base) #:nodoc:
         base.send :include, ActiveModel::Dirty
         base.class_eval do
           after_save :reset_dirty_attributes
         end
       end
-      
+
       def initialize(attributes = {})
         super
       end
-    
+
       # returns true if a model has dirty attributes, i.e. their value has changed since the last save
-      def dirty? 
+      def dirty?
         changed? || @forced_dirty
       end
-      
+
       # marks a model as dirty
       def is_dirty
         @forced_dirty = true
       end
-      
-      def method_missing(name, *args)
-        if(name.to_s.include?('_will_change!'))
-          self.class.define_attribute_methods self.class.property_names
-          send(name, *args)
-        else
-          super
-        end
-      end
-      
+
       private
-      
+
       def reset_dirty_attributes
         @previously_changed = changes
         @changed_attributes.clear
         @forced_dirty = nil
       end
-      
+
       def clone_attribute(value)
         if [Fixnum, Symbol, TrueClass, FalseClass, NilClass, Float, BigDecimal].include?(value.class)
           value

data/lib/couch_potato/persistence/json.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/hash'
+
 module CouchPotato
   module Persistence
     module Json
@@ -39,10 +41,9 @@ module CouchPotato
         # creates a model instance from JSON
         def json_create(json)
           return if json.nil?
-          instance = self.new
+          instance = self.new :_document => HashWithIndifferentAccess.new(json)
           instance._id = json[:_id] || json['_id']
           instance._rev = json[:_rev] || json['_rev']
-          instance._document = json
           instance
         end
       end

data/lib/couch_potato/persistence/properties.rb

@@ -5,22 +5,22 @@ module CouchPotato
     module Properties
       class PropertyList
         include Enumerable
-        
+
         attr_accessor :list
-        
+
         def initialize(clazz)
           @clazz = clazz
           @list = []
         end
-        
+
         def each
           (list + inherited_properties).each {|property| yield property}
         end
-        
+
         def <<(property)
           @list << property
         end
-        
+
         def inherited_properties
           superclazz = @clazz.superclass
           properties = []
@@ -31,7 +31,7 @@ module CouchPotato
           properties.flatten
         end
       end
-      
+
       def self.included(base) #:nodoc:
         base.extend ClassMethods
         base.class_eval do
@@ -41,11 +41,11 @@ module CouchPotato
           end
         end
       end
-      
+
       def type_caster #:nodoc:
         @type_caster ||= TypeCaster.new
       end
-      
+
       module ClassMethods
         # returns all the property names of a model class that have been defined using the #property method
         #
@@ -70,9 +70,20 @@ module CouchPotato
         #    property :publisher, :type => Publisher
         #  end
         def property(name, options = {})
+          undefine_attribute_methods
+          define_attribute_methods property_names + [name]
           properties << SimpleProperty.new(self, name, options)
+          remove_attribute_accessors_from_activesupport_module
         end
 
+        def remove_attribute_accessors_from_activesupport_module
+          active_support_module = ancestors[1..-1].find{|m| m.name.nil? && (property_names - m.instance_methods).empty?}
+          if active_support_module
+            property_names.each do |name|
+              active_support_module.send :remove_method, name if active_support_module.instance_methods.include?(name)
+            end
+          end
+        end
       end
     end
   end

data/lib/couch_potato/persistence/simple_property.rb

@@ -52,12 +52,10 @@ module CouchPotato
 
       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}")
-            if value.nil? && options[:default]
+            if value.nil? && !options[:default].nil?
               default = clone_attribute(options[:default])
               self.instance_variable_set("@#{name}", default)
               default

data/lib/couch_potato/persistence/type_caster.rb

@@ -1,9 +1,14 @@
 module CouchPotato
   module Persistence
     class TypeCaster #:nodoc:
+      NUMBER_REGEX = /-?\d+\.?\d*/
+
       def cast(value, type)
         if type == :boolean
           cast_boolean(value)
+        elsif type.instance_of?(Array)
+          nested_type = type.first
+          value.map { |val| cast_native(val, nested_type) } if value
         else
           cast_native(value, type)
         end
@@ -24,9 +29,9 @@ module CouchPotato
       def cast_native(value, type)
         if type && !value.instance_of?(type)
           if type == Fixnum
-            value.to_s.scan(/-?\d+/).join.to_i unless value.blank?
+            BigDecimal.new(value.to_s.scan(NUMBER_REGEX).join).round unless value.blank?
           elsif type == Float
-            value.to_s.scan(/-?\d+\.?\d*/).join.to_f unless value.blank?
+            value.to_s.scan(NUMBER_REGEX).join.to_f unless value.blank?
           else
             type.json_create value unless value.blank?
           end

data/lib/couch_potato/persistence.rb

@@ -16,7 +16,7 @@ require File.dirname(__FILE__) + '/view/view_query'
 
 module CouchPotato
   module Persistence
-    
+
     def self.included(base) #:nodoc:
       base.send :include, Properties, Callbacks, Json, CouchPotato::View::CustomViews, CouchPotato::View::Lists
       base.send :include, DirtyAttributes, GhostAttributes, Attachments
@@ -27,15 +27,15 @@ module CouchPotato
         alias_method :id, :_id
         alias_method :id=, :_id=
       end
-      
+
       CouchPotato.models << base
     end
 
     # initialize a new instance of the model optionally passing it a hash of attributes.
     # the attributes have to be declared using the #property method.
     # the new model will be yielded to an optionally given block.
-    # 
-    # example: 
+    #
+    # example:
     #   class Book
     #     include CouchPotato::Persistence
     #     property :title
@@ -50,13 +50,15 @@ module CouchPotato
     #   book.title # => 'Time to Relax'
     def initialize(attributes = {})
       if attributes
+        @skip_dirty_tracking = true
         attributes.each do |name, value|
           self.send("#{name}=", value)
         end
+        @skip_dirty_tracking = false
       end
       yield self if block_given?
     end
-    
+
     # assign multiple attributes at once.
     # the attributes have to be declared using the #property method
     #
@@ -75,7 +77,7 @@ module CouchPotato
         self.send "#{attribute}=", value
       end
     end
-    
+
     # returns all of a model's attributes that have been defined using the #property method as a Hash
     #
     # example:
@@ -92,35 +94,47 @@ module CouchPotato
         res
       end
     end
-    
+
+    def []=(attribute, value)
+      send "#{attribute}=", value
+    end
+
+    def [](attribute)
+      send(attribute)
+    end
+
+    def has_key?(key)
+      attributes.has_key?(key)
+    end
+
     # returns true if a  model hasn't been saved yet, false otherwise
     def new?
       _rev.nil?
     end
     alias_method :new_record?, :new?
-    
+
     # returns the document id
     # this is used by rails to construct URLs
     # can be overridden to for example use slugs for URLs instead if ids
     def to_param
       _id
     end
-    
+
     def ==(other) #:nodoc:
       other.class == self.class && self.to_json == other.to_json
     end
-    
+
     def eql?(other)
       self == other
     end
-    
+
     def hash
       _id.hash * (_id.hash.to_s.size ** 10) + _rev.hash
     end
-   
+
     def inspect
       attributes_as_string = attributes.map {|attribute, value| "#{attribute}: #{value.inspect}"}.join(", ")
       %Q{#<#{self.class} _id: "#{_id}", _rev: "#{_rev}", #{attributes_as_string}>}
     end
-  end    
+  end
 end

data/lib/couch_potato/railtie.rb

@@ -8,8 +8,8 @@ module CouchPotato
       CouchPotato::Config.database_name = config
     else
       CouchPotato::Config.database_name = config['database']
-      CouchPotato::Config.validation_framework = config['validation_framework'] if config['validation_framework']
       CouchPotato::Config.split_design_documents_per_view = config['split_design_documents_per_view'] if config['split_design_documents_per_view']
+      CouchPotato::Config.default_language = config['default_language'] if config['default_language']
     end
   end
 

data/lib/couch_potato/rspec/matchers/list_as_matcher.rb

@@ -4,20 +4,20 @@ module CouchPotato
       def initialize(results_ruby)
         @results_ruby = results_ruby
       end
-      
+
       def as(expected_ruby)
         ListAsMatcher.new(expected_ruby, @results_ruby)
       end
     end
-    
+
     class ListAsMatcher
       include RunJS
-      
+
       def initialize(expected_ruby, results_ruby)
         @expected_ruby = expected_ruby
         @results_ruby = results_ruby
       end
-      
+
       def matches?(view_spec)
         js = <<-JS
           #{File.read(File.dirname(__FILE__) + '/print_r.js')}
@@ -25,7 +25,7 @@ module CouchPotato
           var results = #{@results_ruby.to_json};
           var listed = '';
           var list = #{view_spec.list_function};
-          
+
           var getRow = function() {
             return results.rows.shift();
           };
@@ -33,22 +33,22 @@ module CouchPotato
             listed = listed + text;
           };
           list();
-          print(print_r(JSON.parse(listed)));
+          print_r(JSON.parse(listed));
         JS
-        
+
         @actual_ruby = JSON.parse(run_js(js))
-        
+
         @expected_ruby == @actual_ruby
       end
-      
+
       def failure_message_for_should
         "Expected to list as #{@expected_ruby.inspect} but got #{@actual_ruby.inspect}."
       end
-      
+
       def failure_message_for_should_not
         "Expected to not list as #{@expected_ruby.inspect} but did."
       end
-      
+
     end
   end
-end
+end

data/lib/couch_potato/rspec/matchers/map_to_matcher.rb

@@ -7,20 +7,20 @@ module CouchPotato
       def initialize(input_ruby)
         @input_ruby = input_ruby
       end
-      
+
       def to(*expected_ruby)
         MapToMatcher.new(expected_ruby, @input_ruby)
       end
     end
-    
+
     class MapToMatcher
       include RunJS
-      
+
       def initialize(expected_ruby, input_ruby)
         @expected_ruby = expected_ruby
         @input_ruby = input_ruby
       end
-      
+
       def matches?(view_spec)
         js = <<-JS
           #{File.read(File.dirname(__FILE__) + '/print_r.js')}
@@ -31,19 +31,19 @@ module CouchPotato
             result.push([key, value]);
           };
           map(doc);
-          print(print_r(result));
+          print_r(result);
         JS
         @actual_ruby = JSON.parse(run_js(js))
         @expected_ruby == @actual_ruby
       end
-      
+
       def failure_message_for_should
         "Expected to map to #{@expected_ruby.inspect} but got #{@actual_ruby.inspect}."
       end
-      
+
       def failure_message_for_should_not
         "Expected not to map to #{@actual_ruby.inspect} but did."
       end
     end
   end
-end
+end

data/lib/couch_potato/rspec/matchers/reduce_to_matcher.rb

@@ -4,23 +4,23 @@ module CouchPotato
       def initialize(docs, keys, rereduce = false)
         @docs, @keys, @rereduce = docs, keys, rereduce
       end
-      
+
       def to(expected_ruby)
         ReduceToMatcher.new(expected_ruby, @docs, @keys, @rereduce)
       end
     end
-    
+
     class ReduceToMatcher
       include RunJS
-      
+
       def initialize(expected_ruby, docs, keys, rereduce = false)
         @expected_ruby, @docs, @keys, @rereduce = expected_ruby, docs, keys, rereduce
       end
-      
+
       def matches?(view_spec)
         js = <<-JS
           #{File.read(File.dirname(__FILE__) + '/print_r.js')}
-          
+
           sum = function(values) {
             var rv = 0;
             for (var i in values) {
@@ -28,23 +28,23 @@ module CouchPotato
             }
             return rv;
           };
-          
+
           var docs = #{@docs.to_json};
           var keys = #{@keys.to_json};
           var reduce = #{view_spec.reduce_function};
-          print(print_r({result: reduce(docs, keys, #{@rereduce})}));
+          print_r({result: reduce(docs, keys, #{@rereduce})});
         JS
         @actual_ruby = JSON.parse(run_js(js))['result']
         @expected_ruby == @actual_ruby
       end
-      
+
       def failure_message_for_should
         "Expected to reduce to #{@expected_ruby.inspect} but got #{@actual_ruby.inspect}."
       end
-      
+
       def failure_message_for_should_not
         "Expected not to reduce to #{@actual_ruby.inspect} but did."
       end
     end
   end
-end
+end