couchrest_model 1.1.2 → 1.2.0.beta

data/lib/couchrest/model/designs.rb

@@ -19,15 +19,32 @@ module CouchRest
     module Designs
       extend ActiveSupport::Concern
 
+
       module ClassMethods
 
         # Add views and other design document features
         # to the current model.
-        def design(*args, &block)
-          mapper = DesignMapper.new(self)
-          mapper.create_view_method(:all)
+        def design(prefix = nil, &block)
+
+          # Store ourselves a copy of this design spec incase any other model inherits.
+          (@_design_blocks ||= [ ]) << {:args => [prefix], :block => block}
 
+          mapper = DesignMapper.new(self, prefix)
           mapper.instance_eval(&block) if block_given?
+
+          # Create an 'all' view if no prefix and one has not been defined already
+          mapper.view(:all) if prefix.nil? and !mapper.design_doc.has_view?(:all)
+        end
+
+        def inherited(model)
+          super
+
+          # Go through our design blocks and re-implement them in the child.
+          unless @_design_blocks.nil?
+            @_design_blocks.each do |row|
+              model.design(*row[:args], &row[:block])
+            end
+          end
         end
 
         # Override the default page pagination value:
@@ -47,22 +64,43 @@ module CouchRest
           @_default_per_page || 25
         end
 
+        def design_docs
+          @_design_docs ||= []
+        end
+
       end
 
-      # 
+      # Map method calls defined in a design block to actions
+      # in the Design Document.
       class DesignMapper
 
-        attr_accessor :model
+        # Basic mapper attributes
+        attr_accessor :model, :method, :prefix
 
-        def initialize(model)
-          self.model = model
+        # Temporary variable storing the design doc
+        attr_accessor :design_doc
+
+        def initialize(model, prefix = nil)
+          self.model  = model
+          self.prefix = prefix
+          self.method = Design.method_name(prefix)
+
+          create_model_design_doc_reader
+          self.design_doc = model.send(method) || assign_model_design_doc
         end
 
-        # Define a view and generate a method that will provide a new 
-        # View instance when requested.
+        def disable_auto_update
+          design_doc.auto_update = false
+        end
+
+        def enable_auto_update
+          design_doc.auto_update = true
+        end
+
+        # Add the specified view to the design doc the definition was made in
+        # and create quick access methods in the model.
         def view(name, opts = {})
-          View.create(model, name, opts)
-          create_view_method(name)
+          design_doc.create_view(name, opts)
         end
 
         # Really simple design function that allows a filter
@@ -72,16 +110,31 @@ module CouchRest
         # No methods are created here, the design is simply updated.
         # See the CouchDB API for more information on how to use this.
         def filter(name, function)
-          filters = (self.model.design_doc['filters'] ||= {})
-          filters[name.to_s] = function
+          design_doc.create_filter(name, function)
         end
 
-        def create_view_method(name)
-          model.class_eval <<-EOS, __FILE__, __LINE__ + 1
-            def self.#{name}(opts = {})
-              CouchRest::Model::Designs::View.new(self, opts, '#{name}')
-            end
-          EOS
+        # Convenience wrapper to access model's type key option.
+        def model_type_key
+          model.model_type_key
+        end
+
+        protected
+
+        # Create accessor in model and assign a new design doc.
+        # New design doc is returned ready to use.
+        def create_model_design_doc_reader
+          model.instance_eval "def #{method}; @#{method}; end"
+        end
+
+        def assign_model_design_doc
+          doc = Design.new(model, prefix)
+          model.instance_variable_set("@#{method}", doc)
+          model.design_docs << doc
+
+          # Set defaults
+          doc.auto_update = model.auto_update_design_doc
+
+          doc
         end
 
       end

data/lib/couchrest/model/document_queries.rb

@@ -5,52 +5,22 @@ module CouchRest
 
       module ClassMethods
 
-        # Load all documents that have the model_type_key's field equal to the
-        # name of the current class. Take the standard set of
-        # CouchRest::Database#view options.
-        def all(opts = {}, &block)
-          view(:all, opts, &block)
+        # Wrapper for the master design documents all method to provide
+        # a total count of entries.
+        def count
+          all.count
         end
-        
-        # Returns the number of documents that have the model_type_key's field
-        # equal to the name of the current class. Takes the standard set of 
-        # CouchRest::Database#view options
-        def count(opts = {}, &block)
-          all({:raw => true, :limit => 0}.merge(opts), &block)['total_rows']
-        end
-        
-        # Load the first document that have the model_type_key's field equal to
-        # the name of the current class.
-        #
-        # ==== Returns
-        # Object:: The first object instance available
-        # or
-        # Nil:: if no instances available
-        #
-        # ==== Parameters
-        # opts<Hash>::
-        # View options, see <tt>CouchRest::Database#view</tt> options for more info.
-        def first(opts = {})
-          first_instance = self.all(opts.merge!(:limit => 1))
-          first_instance.empty? ? nil : first_instance.first
+
+        # Wrapper for the master design document's first method on all view.
+        def first
+          all.first
         end
-        
-        # Load the last document that have the model_type_key's field equal to
-        # the name of the current class.
-        # It's similar to method first, just adds :descending => true
-        #
-        # ==== Returns
-        # Object:: The last object instance available
-        # or
-        # Nil:: if no instances available
-        #
-        # ==== Parameters
-        # opts<Hash>::
-        # View options, see <tt>CouchRest::Database#view</tt> options for more info.
-        def last(opts = {})
-          first(opts.merge!(:descending => true))
+
+        # Wrapper for the master design document's last method on all view.
+        def last
+          all.last
         end
-        
+
         # Load a document from the database by id
         # No exceptions will be raised if the document isn't found
         #
@@ -91,9 +61,9 @@ module CouchRest
           raise CouchRest::Model::DocumentNotFound
         end
         alias :find! :get!
-        
+
       end
-      
+
     end
   end
 end

data/lib/couchrest/model/properties.rb

@@ -106,13 +106,22 @@ module CouchRest
       # that have not been accepted.
       def directly_set_attributes(hash, mass_assign = false)
         return if hash.nil?
+
+        multi_parameter_attributes = []
+
         hash.reject do |key, value|
-          if self.respond_to?("#{key}=")
-            self.send("#{key}=", value)
+          if key.to_s.include?("(")
+            multi_parameter_attributes << [ key, value ]
+            false
+          elsif self.respond_to?("#{key}=")
+            self.send("#{key}=", value) 
           elsif mass_assign || mass_assign_any_attribute
+            couchrest_attribute_will_change!(key) if use_dirty? && self[key] != value
             self[key] = value
           end
         end
+
+        assign_multiparameter_attributes(multi_parameter_attributes, hash) unless multi_parameter_attributes.empty?
       end
 
       def directly_set_read_only_attributes(hash)
@@ -125,7 +134,39 @@ module CouchRest
         end
       end
 
+      def assign_multiparameter_attributes(pairs, hash)
+        execute_callstack_for_multiparameter_attributes(
+          extract_callstack_for_multiparameter_attributes(pairs), hash
+        )
+      end
+      def execute_callstack_for_multiparameter_attributes(callstack, hash)
+        callstack.each do |name, values_with_empty_parameters|
+          if self.respond_to?("#{name}=")
+            casted_attrib = send("#{name}=", values_with_empty_parameters) 
+            unless casted_attrib.is_a?(Hash)
+              hash.reject { |key, value| key.include?(name.to_s)}
+            end
+          end
+        end
+        hash
+      end
+
+      def extract_callstack_for_multiparameter_attributes(pairs)
+        attributes = { }
+
+        pairs.each do |pair|
+          multiparameter_name, value = pair
+          attribute_name = multiparameter_name.split("(").first
+          attributes[attribute_name] = {} unless attributes.include?(attribute_name)
+          attributes[attribute_name][find_parameter_name(multiparameter_name)] ||= value
+        end
+        attributes
+      end
 
+      def find_parameter_name(multiparameter_name)
+        position = multiparameter_name.scan(/\(([0-9]*).*\)/).first.first.to_i
+        {1 => :year, 2 => :month, 3 => :day, 4 => :hour, 5 => :min, 6 => :sec}[position]
+      end
 
       module ClassMethods
 

data/lib/couchrest/model/proxyable.rb

@@ -70,6 +70,8 @@ module CouchRest
           @owner      = owner
           @owner_name = owner_name
           @database   = database
+
+          create_view_methods
         end
 
         # Base
@@ -81,39 +83,18 @@ module CouchRest
           proxy_block_update(:build_from_database, attrs, options, &block)
         end
 
-        def method_missing(m, *args, &block)
-          if has_view?(m)
-            if model.respond_to?(m)
-              return model.send(m, *args).proxy(self)
-            else
-              query = args.shift || {}
-              return view(m, query, *args, &block)
-            end
-          elsif m.to_s =~ /^find_(by_.+)/
-            view_name = $1
-            if has_view?(view_name)
-              return first_from_view(view_name, *args) 
-            end
-          end
-          super
-        end
-
-        # DocumentQueries
-
-        def all(opts = {}, &block)
-          proxy_update_all(@model.all({:database => @database}.merge(opts), &block))
-        end
+        # From DocumentQueries (The old fashioned way)
 
         def count(opts = {})
-          @model.count({:database => @database}.merge(opts))
+          all(opts).count
         end
 
         def first(opts = {})
-          proxy_update(@model.first({:database => @database}.merge(opts)))
+          all(opts).first
         end
 
         def last(opts = {})
-          proxy_update(@model.last({:database => @database}.merge(opts)))
+          all(opts).last
         end
 
         def get(id)
@@ -121,38 +102,23 @@ module CouchRest
         end
         alias :find :get
 
-        # Views
-
-        def has_view?(view)
-          @model.has_view?(view)
-        end
-
-        def view_by(*args)
-          @model.view_by(*args)
-        end
-
-        def view(name, query={}, &block)
-          proxy_update_all(@model.view(name, {:database => @database}.merge(query), &block))
-        end
-
-        def first_from_view(name, *args)
-          # add to first hash available, or add to end
-          (args.last.is_a?(Hash) ? args.last : (args << {}).last)[:database] = @database
-          proxy_update(@model.first_from_view(name, *args))
-        end
-
-        # DesignDoc
-        def design_doc
-          @model.design_doc
-        end
+        protected
 
-        def save_design_doc(db = nil)
-          @model.save_design_doc(db || @database)
+        def create_view_methods
+          model.design_docs.each do |doc|
+            doc.view_names.each do |name|
+              class_eval <<-EOS, __FILE__, __LINE__ + 1
+                def #{name}(opts = {})
+                  model.#{name}({:proxy => self}.merge(opts))
+                end
+                def find_#{name}(*key)
+                  #{name}.key(*key).first()
+                end
+              EOS
+            end
+          end
         end
 
-
-        protected
-
         # Update the document's proxy details, specifically, the fields that
         # link back to the original document.
         def proxy_update(doc)

data/lib/couchrest/model/typecast.rb

@@ -123,7 +123,7 @@ module CouchRest
 
         # Creates a Date instance from a Hash with keys :year, :month, :day
         def typecast_hash_to_date(value)
-          Date.new(*extract_time(value)[0, 3])
+          Date.new(*extract_time(value)[0, 3].map(&:to_i))
         end
 
         # Creates a Time instance from a Hash with keys :year, :month, :day,

data/lib/couchrest/model/validations/uniqueness.rb

@@ -15,9 +15,10 @@ module CouchRest
             attributes.each do |attribute|
               opts = merge_view_options(attribute)
 
-              if model.respond_to?(:has_view?) && !model.has_view?(opts[:view_name])
-                opts[:keys] << {:allow_nil => true}
-                model.view_by(*opts[:keys])
+              unless model.respond_to?(opts[:view_name])
+                model.design do
+                  view opts[:view_name], :allow_nil => true
+                end
               end
             end
           end
@@ -33,15 +34,15 @@ module CouchRest
           # Determine the base of the search
           base = opts[:proxy].nil? ? model : document.instance_eval(opts[:proxy])
 
-          if base.respond_to?(:has_view?) && !base.has_view?(opts[:view_name])
+          unless base.respond_to?(opts[:view_name])
             raise "View #{document.class.name}.#{opts[:view_name]} does not exist for validation!"
           end
 
-          rows = base.view(opts[:view_name], :key => values, :limit => 2, :include_docs => false)['rows']
+          rows = base.send(opts[:view_name], :key => values, :limit => 2, :include_docs => false).rows
           return if rows.empty?
 
           unless document.new?
-            return if rows.find{|row| row['id'] == document.id}
+            return if rows.find{|row| row.id == document.id}
           end
 
           if rows.length > 0

data/lib/couchrest_model.rb

@@ -36,20 +36,16 @@ require "couchrest/model/casted_hash"
 require "couchrest/model/validations"
 require "couchrest/model/callbacks"
 require "couchrest/model/document_queries"
-require "couchrest/model/views"
-require "couchrest/model/design_doc"
 require "couchrest/model/extended_attachments"
-require "couchrest/model/class_proxy"
 require "couchrest/model/proxyable"
-require "couchrest/model/collection"
 require "couchrest/model/associations"
 require "couchrest/model/configuration"
 require "couchrest/model/connection"
 require "couchrest/model/designs"
+require "couchrest/model/designs/design"
 require "couchrest/model/designs/view"
 
 # Monkey patches applied to couchrest
-require "couchrest/model/support/couchrest_design"
 require "couchrest/model/support/couchrest_database"
 
 # Core Extensions

data/spec/fixtures/models/article.rb

@@ -1,24 +1,26 @@
 class Article < CouchRest::Model::Base
   use_database DB
   unique_id :slug
-  
-  provides_collection :article_details, 'Article', 'by_date', :descending => true, :include_docs => true
-  view_by :date, :descending => true
-  view_by :user_id, :date
-    
-  view_by :tags,
-    :map => 
-      "function(doc) {
-        if (doc['#{model_type_key}'] == 'Article' && doc.tags) {
-          doc.tags.forEach(function(tag){
-            emit(tag, 1);
-          });
-        }
-      }",
-    :reduce => 
-      "function(keys, values, rereduce) {
-        return sum(values);
-      }"
+
+  design do
+    view :by_date # Default options not supported: :descending => true
+    view :by_user_id_and_date
+
+    view :by_tags,
+      :map => 
+        "function(doc) {
+          if (doc['#{model.model_type_key}'] == 'Article' && doc.tags) {
+            doc.tags.forEach(function(tag){
+              emit(tag, 1);
+            });
+          }
+        }",
+      :reduce => 
+        "function(keys, values, rereduce) {
+          return sum(values);
+        }"
+
+  end
 
   property :date, Date
   property :slug, :read_only => true
@@ -27,9 +29,9 @@ class Article < CouchRest::Model::Base
   property :tags, [String]
 
   timestamps!
-  
+
   before_save :generate_slug_from_title
-  
+
   def generate_slug_from_title
     self['slug'] = title.downcase.gsub(/[^a-z0-9]/,'-').squeeze('-').gsub(/^\-|\-$/,'') if new?
   end

data/spec/fixtures/models/base.rb

@@ -1,5 +1,5 @@
 class WithDefaultValues < CouchRest::Model::Base
-  use_database TEST_SERVER.default_database
+  use_database DB
   property :preset, Object, :default => {:right => 10, :top_align => false}
   property :set_by_proc, Time, :default => Proc.new{Time.now}
   property :tags, [String], :default => []
@@ -10,7 +10,7 @@ class WithDefaultValues < CouchRest::Model::Base
 end
 
 class WithSimplePropertyType < CouchRest::Model::Base
-  use_database TEST_SERVER.default_database
+  use_database DB
   property :name, String
   property :preset, String, :default => 'none'
   property :tags, [String]
@@ -18,7 +18,7 @@ class WithSimplePropertyType < CouchRest::Model::Base
 end
 
 class WithCallBacks < CouchRest::Model::Base
-  use_database TEST_SERVER.default_database
+  use_database DB
   property :name
   property :run_before_validation
   property :run_after_validation
@@ -85,27 +85,30 @@ end
 
 # Following two fixture classes have __intentionally__ diffent syntax for setting the validation context
 class WithContextualValidationOnCreate < CouchRest::Model::Base
+  use_database DB
   property(:name, String)
   validates(:name, :presence => {:on => :create})
 end
 
 class WithContextualValidationOnUpdate < CouchRest::Model::Base
+  use_database DB
   property(:name, String)
   validates(:name, :presence => true, :on => :update)
 end
 
 class WithTemplateAndUniqueID < CouchRest::Model::Base
-  use_database TEST_SERVER.default_database
+  use_database DB
   unique_id do |model|
     model.slug
   end
   property :slug
   property :preset, :default => 'value'
   property :has_no_default
+  design
 end
 
 class WithGetterAndSetterMethods < CouchRest::Model::Base
-  use_database TEST_SERVER.default_database
+  use_database DB
 
   property :other_arg
   def arg
@@ -118,7 +121,7 @@ class WithGetterAndSetterMethods < CouchRest::Model::Base
 end
 
 class WithAfterInitializeMethod < CouchRest::Model::Base
-  use_database TEST_SERVER.default_database
+  use_database DB
 
   property :some_value
 
@@ -147,6 +150,7 @@ class WithUniqueValidationView < CouchRest::Model::Base
   end
   property :title
 
+  design
   validates_uniqueness_of :code, :view => 'all'
 end
 
@@ -159,4 +163,8 @@ class WithScopedUniqueValidation < CouchRest::Model::Base
   validates_uniqueness_of :title, :scope => :parent_id
 end
 
-
+class WithDateAndTime < CouchRest::Model::Base
+  use_database DB
+  property :exec_date, Date
+  property :exec_time, Time
+end

data/spec/fixtures/models/course.rb

@@ -18,10 +18,13 @@ class Course < CouchRest::Model::Base
   property :very_active, :type => TrueClass
   property :klass, :type => Class
 
-  view_by :title
-  view_by :title, :active
-  view_by :dept, :ducktype => true
+  design do
+    view :by_title
+    view :by_title_and_active
 
-  view_by :active, :map => "function(d) { if (d['#{model_type_key}'] == 'Course' && d['active']) { emit(d['updated_at'], 1); }}", :reduce => "function(k,v,r) { return sum(v); }"
+    view :by_dept, :ducktype => true
+
+    view :by_active, :map => "function(d) { if (d['#{model_type_key}'] == 'Course' && d['active']) { emit(d['updated_at'], 1); }}", :reduce => "function(k,v,r) { return sum(v); }"
+  end
 
 end

data/spec/fixtures/models/project.rb

@@ -2,5 +2,8 @@ class Project < CouchRest::Model::Base
   use_database DB
   property :name,   String
   timestamps!
-  view_by :name
+
+  design do
+    view :by_name
+  end
 end

data/spec/fixtures/models/sale_entry.rb

@@ -3,7 +3,9 @@ class SaleEntry < CouchRest::Model::Base
 
   property :description
   property :price
+
+  design do
+    view :by_description
+  end
   
-  view_by :description
-  
-end
+end