couch_view 0.0.2 → 0.0.3

data/features/couch_view.config.feature

@@ -86,7 +86,17 @@ Feature: CouchView::Config
             "reduce" => "_count"
           }
         }
+    
 
+  Conditions are additive; the more you call conditions, the more conditions get added to it. If you attempt to add the same condition twice, it will silently ignore the second attempt:
+      
+      config = CouchView::Config.new Article
+      config.conditions Published
+      config.conditions #==> [Published]
+      condig.conditions Visible
+      config.conditions #==> [Published, Visible]
+      config.conditions Published
+      config.conditions #==> [Published, Visible]
 
   @db
   Scenario: Generating a name based on the properties passed in to map over
@@ -224,7 +234,7 @@ Feature: CouchView::Config
       """
     
 
-  @db @focus
+  @db
   Scenario: Creating conditions by passing a block to the map
     
     Given the following model:
@@ -347,7 +357,7 @@ Feature: CouchView::Config
       """
 
 
-  @db @focus
+  @db
   Scenario: Giving your view a custom base name
     
     Given the following model:
@@ -394,3 +404,46 @@ Feature: CouchView::Config
       """
         @config.view_names.sort.should == ["funny", "funny_published", "funny_published_visible", "funny_visible"]
       """
+
+
+  @db @focus
+  Scenario: Adding the same condition multiple times to a config will result in the condition only being added once
+     
+    Given the following model:
+      """
+        class Article < CouchRest::Model::Base
+          include CouchView
+        end
+      """
+    
+    And the following conditions:
+      """
+        module Published
+          def conditions
+            "#{super} && doc.published == true"
+          end
+        end
+        
+        module Visible
+          def conditions
+            "#{super} && doc.visible == true"
+          end
+        end
+      """
+
+    When I create a CouchView::Config for my Article model:
+      """
+        @config = CouchView::Config.new Article
+      """
+
+    Then adding the same condition multiple times will result in the condition only being added once:
+      """
+        @config.conditions Published
+        @config.conditions.should == [Published]
+        @config.conditions Visible
+        @config.conditions.should == [Published, Visible]
+        @config.conditions Published
+        @config.conditions.should == [Published, Visible]
+        @config.conditions Visible
+        @config.conditions.should == [Published, Visible]
+      """

data/features/couch_view.feature

@@ -1,10 +1,10 @@
+@db
 Feature: CouchView
   As a programmer
   I want a `CouchView` mixin for my `CouchRest::Model::Base` models
   So that I can define maps and reduces on my model 
   
   
-  @db
   Scenario: Define a map over a property
     Given the following model definition:
       """
@@ -38,7 +38,6 @@ Feature: CouchView
       """
 
 
-  @db @focus
   Scenario: Define a map on your model with conditions
     Given the following conditions:
       """
@@ -94,7 +93,6 @@ Feature: CouchView
       """
 
 
-  @db
   Scenario: Define a map on your model with the `map` class method
     Given the following map definition:
       """
@@ -123,7 +121,6 @@ Feature: CouchView
       """
 
 
-  @db
   Scenario: Retrieve a map proxy
     
     Given the following map definition:
@@ -162,7 +159,6 @@ Feature: CouchView
       """
 
 
-  @db
   Scenario: Generate a reduce proxy for counting the number of results in your query
 
     Given the following map definition:
@@ -200,7 +196,7 @@ Feature: CouchView
         @proxy.class.should be(CouchView::Count::Proxy)
       """
 
-  @db
+
   Scenario: Counting the number of rows in a reduce query
     
     Given the following map definition:
@@ -228,7 +224,7 @@ Feature: CouchView
         Article.count_by_id!.should == 4
       """
 
-  @db
+
   Scenario: Query a map on your model
     
     Given the following map definition:
@@ -263,7 +259,6 @@ Feature: CouchView
       """
 
 
-  @db
   Scenario: Defining a custom "reduce" on your view
     
     Given a Article model:
@@ -306,7 +301,7 @@ Feature: CouchView
         Article.reduce_by_label!['rows'].first['value'].should == -1
       """
   
-  @db @focus
+  
   Scenario: Giving your view a custom name
     
     Given the following model:
@@ -357,3 +352,63 @@ Feature: CouchView
       """
         Article.count_over_label!.should == 2
       """
+
+
+  @focus
+  Scenario: Chaining together multiple conditions by defining a map multiple times
+    
+    Given the following model:
+      """
+        class Article < CouchRest::Model::Base
+          include CouchView
+        end
+      """
+    
+    And the following conditions:
+      """
+        module Published
+          def conditions
+            "#{super} && doc.published == true"
+          end
+        end
+        
+        module Visible
+          def conditions
+            "#{super} && doc.visible == true"
+          end
+        end
+      """
+
+    When I define a map over labels that includes a published condition:
+      """
+        Article.map :label do
+          conditions Published
+        end
+      """
+
+    Then Article should respond to "by_by_label_published":
+      """
+        proc { Article.by_by_label_published }.should_not raise_exception
+      """
+
+    When I update the map over label definition with a visible condition:
+      """
+        Article.map :label do
+          conditions Visible
+        end
+      """
+
+    Then Article should respond to "by_by_label_published":
+      """
+        proc { Article.by_by_label_published }.should_not raise_exception
+      """
+
+    Then Article should respond to "by_by_label_visible":
+      """
+        proc { Article.by_by_label_visible }.should_not raise_exception
+      """
+
+    Then Article should respond to "by_by_label_published_visible":
+      """
+        proc { Article.by_by_label_published_visible }.should_not raise_exception
+      """

data/features/step_definitions/couch_view.config.rb

@@ -9,3 +9,7 @@ end
 When /^I give it a base name of .*:$/ do |code|
   eval code
 end
+
+Then /^adding the same condition multiple times will result in the condition only being added once:$/ do |code|
+  eval code
+end

data/features/step_definitions/couch_view.rb

@@ -85,3 +85,15 @@ end
 Then /^".*" should return.*:$/ do |code|
   eval code
 end
+
+When /^I define a map over labels that includes a published condition:$/ do |code|
+  eval code
+end
+
+Then /^Article should respond to ".*":$/ do |code|
+  eval code
+end
+
+When /^I update the map over label definition with a visible condition:$/ do |code|
+  eval code
+end

data/lib/couch_view/config.rb

@@ -25,6 +25,7 @@ module CouchView
         @conditions
       else
         @conditions += args
+        @conditions.uniq!
       end
     end
 

data/lib/couch_view/couch_view.rb

@@ -12,12 +12,19 @@ module CouchView
       view_config = CouchView::Config.new self
       view_config.instance_eval &block
       view_config.base_view_name name if name
+      base_view_name = view_config.base_view_name
+
+      if view_configs[base_view_name]
+        view_config.conditions *view_configs[base_view_name].conditions
+        view_configs[base_view_name] = view_config
+      else
+        view_configs[base_view_name] = view_config
+      end
+
       view_config.views.each do |view_name, view|  
         view_by view_name, :map => view[:map], :reduce => view[:reduce]
       end
 
-      base_view_name = view_config.base_view_name
-
       instance_eval <<-METHODS
         def map_#{base_view_name}!
           generate_view_proxy_for("#{base_view_name}").get!
@@ -57,5 +64,9 @@ module CouchView
     def generate_view_proxy_for(view)
       CouchView::Proxy.new self, "by_#{view}".to_sym
     end
+
+    def view_configs
+      @view_configs ||= {}
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: couch_view
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Matt Parker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-17 00:00:00 Z
+date: 2011-08-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: couchrest