couchrest_model 1.0.0 → 1.1.0.beta

data/spec/couchrest/view_spec.rb

@@ -27,6 +27,20 @@ describe "Model views" do
       end
 
     end
+
+    describe "#has_view?" do
+      it "should check the design doc" do
+        Article.design_doc.should_receive(:has_view?).with(:test).and_return(true)
+        Article.has_view?(:test).should be_true
+      end
+    end
+
+    describe "#can_reduce_view?" do
+      it "should check if view has a reduce method" do
+        Article.design_doc.should_receive(:can_reduce_view?).with(:test).and_return(true)
+        Article.can_reduce_view?(:test).should be_true
+      end
+    end
   end
 
   describe "a model with simple views and a default param" do
@@ -184,6 +198,11 @@ describe "Model views" do
       course.title.should eql('bbb')
     end
 
+    it "should perform a search for first when reduce method present" do
+      course = Course.first_from_view('by_active')
+      course.should_not be_nil
+    end
+
   end
   
   describe "a ducktype view" do
@@ -374,96 +393,5 @@ describe "Model views" do
       Article.design_doc["views"].keys.should include("by_updated_at")
     end
   end
-  
-  describe "with a collection" do
-    before(:all) do
-      reset_test_db!
-      titles = ["very uniq one", "really interesting", "some fun",
-        "really awesome", "crazy bob", "this rocks", "super rad"]
-      titles.each_with_index do |title,i|
-        a = Article.new(:title => title, :date => Date.today)
-        a.save
-      end
-      
-      titles = ["yesterday very uniq one", "yesterday really interesting", "yesterday some fun",
-        "yesterday really awesome", "yesterday crazy bob", "yesterday this rocks"]
-      titles.each_with_index do |title,i|
-        a = Article.new(:title => title, :date => Date.today - 1)
-        a.save
-      end
-    end 
-    require 'date'
-    it "should return a proxy that looks like an array of 7 Article objects" do
-      articles = Article.by_date :key => Date.today
-      articles.class.should == Array
-      articles.size.should == 7
-    end
-    it "should get a subset of articles using paginate" do
-      articles = Article.by_date :key => Date.today
-      articles.paginate(:page => 1, :per_page => 3).size.should == 3
-      articles.paginate(:page => 2, :per_page => 3).size.should == 3
-      articles.paginate(:page => 3, :per_page => 3).size.should == 1
-    end
-    it "should get all articles, a few at a time, using paginated each" do
-      articles = Article.by_date :key => Date.today
-      articles.paginated_each(:per_page => 3) do |a|
-        a.should_not be_nil
-      end
-    end 
-    it "should provide a class method to access the collection directly" do
-      articles = Article.collection_proxy_for('Article', 'by_date', :descending => true,
-        :key => Date.today, :include_docs => true)
-      articles.class.should == Array
-      articles.size.should == 7
-    end
-    it "should provide a class method for paginate" do
-      articles = Article.paginate(:design_doc => 'Article', :view_name => 'by_date',
-        :per_page => 3, :descending => true, :key => Date.today, :include_docs => true)
-      articles.size.should == 3
-      
-      articles = Article.paginate(:design_doc => 'Article', :view_name => 'by_date',
-        :per_page => 3, :page => 2, :descending => true, :key => Date.today, :include_docs => true)
-      articles.size.should == 3
-      
-      articles = Article.paginate(:design_doc => 'Article', :view_name => 'by_date',
-        :per_page => 3, :page => 3, :descending => true, :key => Date.today, :include_docs => true)
-      articles.size.should == 1
-    end
-    it "should provide a class method for paginated_each" do
-      options = { :design_doc => 'Article', :view_name => 'by_date',
-        :per_page => 3, :page => 1, :descending => true, :key => Date.today,
-        :include_docs => true }
-      Article.paginated_each(options) do |a|
-        a.should_not be_nil
-      end
-    end
-    it "should provide a class method to get a collection for a view" do
-      articles = Article.find_all_article_details(:key => Date.today)
-      articles.class.should == Array
-      articles.size.should == 7
-    end
-    it "should raise an exception if design_doc is not provided" do
-      lambda{Article.collection_proxy_for(nil, 'by_date')}.should raise_error
-      lambda{Article.paginate(:view_name => 'by_date')}.should raise_error
-    end
-    it "should raise an exception if view_name is not provided" do
-      lambda{Article.collection_proxy_for('Article', nil)}.should raise_error
-      lambda{Article.paginate(:design_doc => 'Article')}.should raise_error
-    end
-    it "should be able to span multiple keys" do
-      articles = Article.by_date :startkey => Date.today, :endkey => Date.today - 1
-      articles.paginate(:page => 1, :per_page => 3).size.should == 3
-      articles.paginate(:page => 2, :per_page => 3).size.should == 3
-      articles.paginate(:page => 3, :per_page => 3).size.should == 3
-      articles.paginate(:page => 4, :per_page => 3).size.should == 3
-      articles.paginate(:page => 5, :per_page => 3).size.should == 1
-    end
-    it "should pass database parameter to pager" do
-      proxy = mock(:proxy)
-      proxy.stub!(:paginate)
-      ::CouchRest::Model::Collection::CollectionProxy.should_receive(:new).with('database', anything(), anything(), anything(), anything()).and_return(proxy)
-      Article.paginate(:design_doc => 'Article', :view_name => 'by_date', :database => 'database')
-    end
-  end
 
 end

data/spec/fixtures/base.rb

@@ -20,20 +20,22 @@ end
 class WithCallBacks < CouchRest::Model::Base
   use_database TEST_SERVER.default_database
   property :name
-  property :run_before_validate
-  property :run_after_validate
+  property :run_before_validation
+  property :run_after_validation
   property :run_before_save
   property :run_after_save
   property :run_before_create
   property :run_after_create
   property :run_before_update
   property :run_after_update
+
+  validates_presence_of :run_before_validation
   
-  before_validate do |object|
-    object.run_before_validate = true
+  before_validation do |object|
+    object.run_before_validation = true
   end
-  after_validate do |object| 
-    object.run_after_validate = true
+  after_validation do |object| 
+    object.run_after_validation = true
   end
   before_save do |object| 
     object.run_before_save = true

data/spec/fixtures/more/article.rb

@@ -18,7 +18,7 @@ class Article < CouchRest::Model::Base
     :reduce => 
       "function(keys, values, rereduce) {
         return sum(values);
-      }"  
+      }"
 
   property :date, Date
   property :slug, :read_only => true

data/spec/fixtures/more/course.rb

@@ -13,13 +13,15 @@ class Course < CouchRest::Model::Base
   property :hours, Integer
   property :profit, BigDecimal
   property :started_on, :type => Date
-  property :updated_at, :type => DateTime
+  property :updated_at, DateTime
   property :active, :type => TrueClass
   property :very_active, :type => TrueClass
   property :klass, :type => Class
-  
+
   view_by :title
   view_by :title, :active
   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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: couchrest_model
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
+  prerelease: true
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  - beta
+  version: 1.1.0.beta
 platform: ruby
 authors: 
 - J. Chris Anderson
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-16 00:00:00 -02:00
+date: 2011-01-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,12 +30,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 1
         - 0
-        - 1
-        version: 1.0.1
+        - 2
+        version: 1.0.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -46,7 +45,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
         - 1
         - 15
@@ -61,7 +59,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 3
         - 0
@@ -77,7 +74,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
         segments: 
         - 0
         - 3
@@ -93,7 +89,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 3
         - 0
@@ -109,46 +104,28 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
-  type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 2
         - 0
         - 0
         version: 2.0.0
   type: :development
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rack-test
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 0
         - 5
         - 7
         version: 0.5.7
   type: :development
-  version_requirements: *id008
+  version_requirements: *id007
 description: CouchRest Model provides aditional features to the standard CouchRest Document class such as properties, view designs, associations, callbacks, typecasting and validations.
 email: jchris@apache.org
 executables: []
@@ -182,6 +159,8 @@ files:
 - lib/couchrest/model/collection.rb
 - lib/couchrest/model/configuration.rb
 - lib/couchrest/model/design_doc.rb
+- lib/couchrest/model/designs.rb
+- lib/couchrest/model/designs/view.rb
 - lib/couchrest/model/document_queries.rb
 - lib/couchrest/model/errors.rb
 - lib/couchrest/model/extended_attachments.rb
@@ -189,6 +168,7 @@ files:
 - lib/couchrest/model/properties.rb
 - lib/couchrest/model/property.rb
 - lib/couchrest/model/property_protection.rb
+- lib/couchrest/model/proxyable.rb
 - lib/couchrest/model/support/couchrest.rb
 - lib/couchrest/model/support/hash.rb
 - lib/couchrest/model/typecast.rb
@@ -196,7 +176,6 @@ files:
 - lib/couchrest/model/validations/casted_model.rb
 - lib/couchrest/model/validations/locale/en.yml
 - lib/couchrest/model/validations/uniqueness.rb
-- lib/couchrest/model/view.rb
 - lib/couchrest/model/views.rb
 - lib/couchrest/railtie.rb
 - lib/couchrest_model.rb
@@ -210,13 +189,17 @@ files:
 - spec/couchrest/casted_model_spec.rb
 - spec/couchrest/casted_spec.rb
 - spec/couchrest/class_proxy_spec.rb
+- spec/couchrest/collection_spec.rb
 - spec/couchrest/configuration_spec.rb
+- spec/couchrest/designs/view_spec.rb
+- spec/couchrest/designs_spec.rb
 - spec/couchrest/inherited_spec.rb
 - spec/couchrest/persistence_spec.rb
 - spec/couchrest/property_protection_spec.rb
 - spec/couchrest/property_spec.rb
+- spec/couchrest/proxyable_spec.rb
 - spec/couchrest/subclass_spec.rb
-- spec/couchrest/validations.rb
+- spec/couchrest/validations_spec.rb
 - spec/couchrest/view_spec.rb
 - spec/fixtures/attachments/README
 - spec/fixtures/attachments/couchdb.png
@@ -255,7 +238,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -264,7 +246,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      hash: 25
       segments: 
       - 1
       - 3
@@ -273,45 +254,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Extends the CouchRest Document for advanced modelling.
-test_files: 
-- spec/couchrest/assocations_spec.rb
-- spec/couchrest/attachment_spec.rb
-- spec/couchrest/base_spec.rb
-- spec/couchrest/casted_model_spec.rb
-- spec/couchrest/casted_spec.rb
-- spec/couchrest/class_proxy_spec.rb
-- spec/couchrest/configuration_spec.rb
-- spec/couchrest/inherited_spec.rb
-- spec/couchrest/persistence_spec.rb
-- spec/couchrest/property_protection_spec.rb
-- spec/couchrest/property_spec.rb
-- spec/couchrest/subclass_spec.rb
-- spec/couchrest/validations.rb
-- spec/couchrest/view_spec.rb
-- spec/fixtures/attachments/README
-- spec/fixtures/attachments/couchdb.png
-- spec/fixtures/attachments/test.html
-- spec/fixtures/base.rb
-- spec/fixtures/more/article.rb
-- spec/fixtures/more/card.rb
-- spec/fixtures/more/cat.rb
-- spec/fixtures/more/client.rb
-- spec/fixtures/more/course.rb
-- spec/fixtures/more/event.rb
-- spec/fixtures/more/invoice.rb
-- spec/fixtures/more/person.rb
-- spec/fixtures/more/question.rb
-- spec/fixtures/more/sale_entry.rb
-- spec/fixtures/more/sale_invoice.rb
-- spec/fixtures/more/service.rb
-- spec/fixtures/more/user.rb
-- spec/fixtures/views/lib.js
-- spec/fixtures/views/test_view/lib.js
-- spec/fixtures/views/test_view/only-map.js
-- spec/fixtures/views/test_view/test-map.js
-- spec/fixtures/views/test_view/test-reduce.js
-- spec/spec_helper.rb
+test_files: []
+

data/lib/couchrest/model/view.rb

@@ -1,190 +0,0 @@
-
-#### NOTE Work in progress! Not yet used!
-
-module CouchRest
-  module Model
-
-    # A proxy class that allows view queries to be created using
-    # chained method calls. After each call a new instance of the method
-    # is created based on the original in a similar fashion to ruby's sequel 
-    # library, or Rails 3's Arel.
-    #
-    # CouchDB views have inherent limitations, so joins and filters as used in 
-    # a normal relational database are not possible. At least not yet!
-    #
-    # 
-    #
-    class View
-
-      attr_accessor :query, :design, :database, :name
-
-      # Initialize a new View object. This method should not be called from outside CouchRest Model.
-      def initialize(parent, new_query = {}, name = nil)
-        if parent.is_a? Base
-          raise "Name must be provided for view to be initialized" if name.nil?
-          @name = name
-          @database = parent.database
-          @query = { :reduce => false }
-        elsif parent.is_a? View
-          @database = parent.database
-          @query = parent.query.dup
-        else
-          raise "View cannot be initialized without a parent Model or View"
-        end
-        @query.update(new_query)
-        super
-      end
-
-
-      # == View Execution Methods
-      #
-      # Send a request to the CouchDB database using the current query values.
-
-      # Inmediatly send a request to the database for all documents provided by the query.
-      #
-      def all(&block)
-        args = include_docs.query
-        
-      end
-
-      # Inmediatly send a request for the first result of the dataset. This will override 
-      # any limit set in the view previously.
-      def first(&block)
-        args = limit(1).include_docs.query
-
-      end
-
-      def info
-
-      end
-
-      def offset
-
-      end
-
-      def total_rows
-
-      end
-
-      def rows
-
-      end
-
-
-      # == View Filter Methods
-      # 
-      # View filters return an copy of the view instance with the query 
-      # modified appropriatly. Errors will be raised if the methods
-      # are combined in an incorrect fashion.
-      #
-      
-
-      # Find all entries in the index whose key matches the value provided.
-      #
-      # Cannot be used when the +#startkey+ or +#endkey+ have been set.
-      def key(value)
-        raise "View#key cannot be used when startkey or endkey have been set" unless query[:startkey].nil? && query[:endkey].nil?
-        update_query(:key => value)
-      end
-
-      # Find all index keys that start with the value provided. May or may not be used in
-      # conjunction with the +endkey+ option.
-      #
-      # When the +#descending+ option is used (not the default), the start and end keys should
-      # be reversed.
-      #
-      # Cannot be used if the key has been set.
-      def startkey(value)
-        raise "View#startkey cannot be used when key has been set" unless query[:key].nil?
-        update_query(:startkey => value)
-      end
-
-      # The result set should start from the position of the provided document. 
-      # The value may be provided as an object that responds to the +#id+ call
-      # or a string.
-      def startkey_doc(value)
-        update_query(:startkey_docid => value.is_a?(String) ? value : value.id
-      end
-
-      # The opposite of +#startkey+, finds all index entries whose key is before the value specified.
-      #
-      # See the +#startkey+ method for more details and the +#inclusive_end+ option.
-      def endkey(value)
-        raise "View#endkey cannot be used when key has been set" unless query[:key].nil?
-        update_query(:endkey => value)
-      end
-
-      # The result set should end at the position of the provided document. 
-      # The value may be provided as an object that responds to the +#id+ call
-      # or a string.
-      def endkey_doc(value)
-        update_query(:endkey_docid => value.is_a?(String) ? value : value.id
-      end
-
-
-      # The results should be provided in descending order.
-      #
-      # Descending is false by default, this method will enable it and cannot be undone.
-      def descending
-        update_query(:descending => true)
-      end
-
-      # Limit the result set to the value supplied.
-      def limit(value)
-        update_query(:limit => value)
-      end
-
-      # Skip the number of entries in the index specified by value. This would be
-      # the equivilent of an offset in SQL.
-      #
-      # The CouchDB documentation states that the skip option should not be used
-      # with large data sets as it is inefficient. Use the +startkey_doc+ method
-      # instead to skip ranges efficiently.
-      def skip(value = 0)
-        update_query(:skip => value)
-      end
-
-      # Use the reduce function on the view. If none is available this method will fail. 
-      def reduce
-        update_query(:reduce => true)
-      end
-
-      # Control whether the reduce function reduces to a set of distinct keys or to a single
-      # result row.
-      #
-      # By default the value is false, and can only be set when the view's +#reduce+ option
-      # has been set.
-      def group
-        raise "View#reduce must have been set before grouping is permitted" unless query[:reduce]
-        update_query(:group => true)
-      end
-
-      def group_level(value)
-        raise "View#reduce and View#group must have been set before group_level is called" unless query[:reduce] && query[:group]
-        update_query(:group_level => value.to_i)
-      end
-
-
-      protected
-
-      def update_query(new_query = {})
-        self.class.new(self, new_query)
-      end
-
-      # Used internally to ensure that docs are provided. Should not be used outside of 
-      # the view class under normal circumstances.
-      def include_docs
-        raise "Documents cannot be returned from a view that is prepared for a reduce" if query[:reduce]
-        update_query(:include_docs => true)
-      end
-      
-      
-      def execute(&block)
-
-
-      end
-
-
-    end
-  end
-end