couch_visible 0.0.2 → 0.1.1

data/features/step_definitions/show_steps.rb

@@ -11,8 +11,8 @@ Given /^a document that is not shown$/ do
   @document = HiddenDoc.new.tap {|d| d.hide! and d.save }
 end
 
-When /^I call the "by_shown" method$/ do
-  @result = TestDoc.by_shown :reduce => false
+When /^I call the "map_by_shown" method$/ do
+  @result = TestDoc.map_by_shown.get!
 end
 
 Then /^I should receive the shown documents$/ do
@@ -27,8 +27,8 @@ Then /^I should not receive the hidden documents$/ do
 
 end
 
-When /^I call the "count_shown" method on my document model$/ do
-  @result = TestDoc.count_shown
+When /^I call the "count_by_shown" method on my document model$/ do
+  @result = TestDoc.count_by_shown!
 end
 
 Then /^I should receive the count of shown documents$/ do

data/features/step_definitions/show_steps.rbc

@@ -578,8 +578,8 @@ x
 Given
 n
 s
-30
-^I call the "by_shown" method$
+34
+^I call the "map_by_shown" method$
 M
 1
 p
@@ -593,33 +593,21 @@ x
 9
 __block__
 i
-24
+12
 45
 0
 1
-44
-43
-2
-79
 49
-3
-1
-13
-7
-4
-3
-49
-5
 2
-15
+0
 49
-6
-1
+3
+0
 38
-7
+4
 11
 I
-6
+2
 I
 0
 I
@@ -629,26 +617,17 @@ I
 I
 -2
 p
-8
+5
 x
 7
 TestDoc
 n
 x
-4
-Hash
-x
-16
-new_from_literal
-x
-6
-reduce
-x
-3
-[]=
+12
+map_by_shown
 x
-8
-by_shown
+4
+get!
 x
 7
 @result
@@ -659,7 +638,7 @@ I
 I
 f
 I
-18
+c
 x
 80
 /Users/mparker/work/github/couch_visible/features/step_definitions/show_steps.rb
@@ -982,8 +961,8 @@ p
 0
 n
 s
-54
-^I call the "count_shown" method on my document model$
+57
+^I call the "count_by_shown" method on my document model$
 M
 1
 p
@@ -1024,8 +1003,8 @@ x
 TestDoc
 n
 x
-11
-count_shown
+15
+count_by_shown!
 x
 7
 @result

data/features/support/env.rb

@@ -2,7 +2,7 @@ $LOAD_PATH.unshift './lib'
 
 require 'couch_visible'
 require 'couchrest_model_config'
-require 'memories'
+require 'couch_publish'
 
 class Document < CouchRest::Model::Base
   include CouchVisible
@@ -21,4 +21,10 @@ end
 Before do
   Document.database.recreate!
   CouchVisible.reset!
+
+  if defined? Query
+    Object.class_eval do
+      remove_const "Query"
+    end
+  end
 end

data/lib/couch_visible.rb

@@ -1,2 +1,8 @@
+require 'couch_view'
 require 'couch_visible/couch_visible'
+require 'couch_visible/integrations/couch_publish'
+require 'couch_visible/maps/by_hidden'
+require 'couch_visible/maps/by_shown'
+require 'couch_visible/conditions/published'
+require 'couch_visible/conditions/unpublished'
 require 'couch_visible/config'

data/lib/couch_visible.rbc

@@ -9,7 +9,7 @@ x
 10
 __script__
 i
-20
+47
 5
 7
 0
@@ -28,6 +28,33 @@ i
 1
 1
 15
+5
+7
+3
+64
+47
+49
+1
+1
+15
+5
+7
+4
+64
+47
+49
+1
+1
+15
+5
+7
+5
+64
+47
+49
+1
+1
+15
 2
 11
 I
@@ -40,18 +67,27 @@ I
 0
 n
 p
-3
+6
 s
-27
-couch_visible/couch_visible
+10
+couch_view
 x
 7
 require
 s
+27
+couch_visible/couch_visible
+s
+28
+couch_visible/maps/by_hidden
+s
+27
+couch_visible/maps/by_shown
+s
 20
 couch_visible/config
 p
-5
+11
 I
 0
 I
@@ -61,7 +97,19 @@ I
 I
 2
 I
-14
+12
+I
+3
+I
+1b
+I
+4
+I
+24
+I
+5
+I
+2f
 x
 61
 /Users/mparker/work/github/couch_visible/lib/couch_visible.rb

data/lib/couch_visible/conditions/published.rb

@@ -0,0 +1,9 @@
+module CouchVisible
+  module Conditions
+    module Published
+      def conditions
+        "#{super} && doc.milestone_memories.length > 0"
+      end
+    end
+  end
+end

data/lib/couch_visible/conditions/unpublished.rb

@@ -0,0 +1,9 @@
+module CouchVisible
+  module Conditions
+    module Unpublished
+      def conditions
+        "#{super} && doc.milestone_memories.length == 0"
+      end
+    end
+  end
+end

data/lib/couch_visible/couch_visible.rb

@@ -1,22 +1,17 @@
 module CouchVisible
 
   def self.included(base) 
+    base.send :include, ::CouchView unless base.ancestors.include?(::CouchView)
     base.extend ModelClassMethods
     base.property :couch_visible, TrueClass
-    base.view_by :hidden, :map => "
-      function(doc){
-        if (doc['couchrest-type'] == '#{base}' && doc.couch_visible == false){
-          emit(doc['_id'], null);
-        }
-      }
-    ", :reduce => "_count"
-    base.view_by :shown, :map => "
-      function(doc){
-        if (doc['couchrest-type'] == '#{base}' && doc.couch_visible == true){
-          emit(doc['_id'], null);
-        }
-      }
-    ", :reduce => "_count"
+
+    base.couch_view :by_hidden do
+      map CouchVisible::ByHidden
+    end
+
+    base.couch_view :by_shown do
+      map CouchVisible::ByShown
+    end
     
     base.before_create do |doc|
       doc.couch_visible = doc.class.show_by_default? if doc.couch_visible.nil?
@@ -26,6 +21,10 @@ module CouchVisible
     if defined?(Memories) && base.ancestors.include?(Memories)
       base.forget :couch_visible
     end
+
+    if defined?(::CouchPublish) && base.ancestors.include?(::CouchPublish)
+      base.send :include, CouchVisible::CouchPublish
+    end
   end
 
   module ModelClassMethods

data/lib/couch_visible/couch_visible.rbc

@@ -184,119 +184,80 @@ x
 8
 included
 i
-169
+130
 20
 0
-45
-0
-1
 49
-2
-1
-15
-20
 0
-7
-3
-45
-4
-5
-49
-6
-2
-15
-20
 0
-7
-7
 44
 43
-8
-80
+1
 49
+2
+1
 9
+16
 1
-13
-7
-10
-7
-11
+8
+26
 20
 0
-47
-101
-12
 7
-13
-63
 3
+44
+43
+1
 49
-14
-2
-15
-13
-7
-15
-7
-16
-64
-49
-14
+4
 2
 15
+20
+0
+45
+5
+6
 49
-17
-2
+7
+1
 15
 20
 0
 7
-18
-44
-43
 8
-80
-49
+45
 9
-1
-13
-7
 10
-7
+49
 11
+2
+15
 20
 0
-47
-101
-12
 7
-19
-63
-3
-49
+12
+56
+13
+50
 14
-2
+1
 15
-13
+20
+0
 7
 15
-7
+56
 16
-64
-49
+50
 14
-2
-15
-49
-17
-2
+1
 15
 20
 0
 56
-20
+17
 50
-21
+18
 0
 15
 26
@@ -304,58 +265,58 @@ i
 0
 15
 29
-129
+90
 0
 7
-22
+19
 98
-23
+20
 1
 30
 8
-135
+96
 25
 92
 0
 27
 8
-140
+101
 15
 7
-24
+21
 8
-141
+102
 1
 13
 9
-156
+117
 15
 20
 0
 49
-25
+0
 0
 45
+19
 22
-26
 49
-27
+2
 1
 9
-167
+128
 20
 0
 7
-3
+8
 49
-28
+23
 1
 8
-168
+129
 1
 11
 I
-a
+5
 I
 1
 I
@@ -364,7 +325,22 @@ I
 1
 n
 p
-29
+24
+x
+9
+ancestors
+x
+9
+CouchView
+x
+8
+include?
+x
+7
+include
+x
+4
+send
 x
 17
 ModelClassMethods
@@ -383,54 +359,134 @@ x
 8
 property
 x
-6
-hidden
+9
+by_hidden
+M
+1
+p
+2
 x
+9
+for_block
+t
+n
+x
+8
+included
+i
+11
+5
+45
+0
+1
+43
+2
+47
+49
+3
+1
+11
+I
+3
+I
+0
+I
+0
+I
+0
+I
+-2
+p
 4
-Hash
 x
-16
-new_from_literal
+12
+CouchVisible
+n
+x
+8
+ByHidden
 x
 3
 map
-s
-60
-
-      function(doc){
-        if (doc['couchrest-type'] == '
+p
+3
+I
+0
+I
+9
+I
+b
 x
-4
-to_s
-s
-90
-' && doc.couch_visible == false){
-          emit(doc['_id'], null);
-        }
-      }
-    
+75
+/Users/mparker/work/github/couch_visible/lib/couch_visible/couch_visible.rb
+p
+0
 x
+10
+couch_view
+x
+8
+by_shown
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+8
+included
+i
+11
+5
+45
+0
+1
+43
+2
+47
+49
 3
-[]=
+1
+11
+I
+3
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+4
 x
-6
-reduce
-s
-6
-_count
+12
+CouchVisible
+n
 x
 7
-view_by
+ByShown
 x
-5
-shown
-s
-89
-' && doc.couch_visible == true){
-          emit(doc['_id'], null);
-        }
-      }
-    
+3
+map
+p
+3
+I
+0
+I
+d
+I
+b
+x
+75
+/Users/mparker/work/github/couch_visible/lib/couch_visible/couch_visible.rb
+p
+0
 M
 1
 p
@@ -513,11 +569,11 @@ p
 I
 0
 I
-15
+10
 I
 4
 I
-16
+11
 I
 22
 I
@@ -525,7 +581,7 @@ I
 I
 23
 I
-17
+12
 I
 25
 x
@@ -548,18 +604,12 @@ vm_const_defined
 s
 8
 constant
-x
-9
-ancestors
 n
 x
-8
-include?
-x
 6
 forget
 p
-41
+25
 I
 -1
 I
@@ -569,79 +619,47 @@ I
 I
 4
 I
-9
-I
-5
-I
-14
+1a
 I
-6
+0
 I
-18
+1b
 I
-c
+5
 I
-20
+24
 I
 6
 I
-24
+2f
 I
 8
 I
-32
+39
 I
 c
 I
-3b
-I
-6
-I
-3f
-I
-d
-I
 43
 I
-13
+10
 I
 4b
 I
-d
-I
-4f
-I
-f
-I
-5d
-I
-13
-I
-66
-I
-d
-I
-6a
-I
 15
 I
-72
-I
-1a
-I
-9e
+77
 I
-1b
+16
 I
-a7
+80
 I
-1a
+15
 I
-a8
+81
 I
 0
 I
-a9
+82
 x
 75
 /Users/mparker/work/github/couch_visible/lib/couch_visible/couch_visible.rb
@@ -838,19 +856,19 @@ p
 I
 -1
 I
-20
+1b
 I
 0
 I
-21
+1c
 I
 f
 I
-24
+1f
 I
 13
 I
-22
+1d
 I
 19
 I
@@ -903,11 +921,11 @@ p
 I
 -1
 I
-28
+23
 I
 0
 I
-29
+24
 I
 4
 x
@@ -958,11 +976,11 @@ p
 I
 -1
 I
-2c
+27
 I
 0
 I
-2d
+28
 I
 c
 x
@@ -1005,11 +1023,11 @@ p
 I
 -1
 I
-30
+2b
 I
 0
 I
-31
+2c
 I
 4
 x
@@ -1120,15 +1138,15 @@ p
 I
 -1
 I
-34
+2f
 I
 0
 I
-35
+30
 I
 20
 I
-36
+31
 I
 2f
 I
@@ -1246,15 +1264,15 @@ p
 I
 -1
 I
-39
+34
 I
 0
 I
-3a
+35
 I
 20
 I
-3b
+36
 I
 2f
 I
@@ -1274,27 +1292,27 @@ p
 I
 2
 I
-20
+1b
 I
 10
 I
-28
+23
 I
 1e
 I
-2c
+27
 I
 2c
 I
-30
+2b
 I
 3a
 I
-34
+2f
 I
 48
 I
-39
+34
 I
 56
 x
@@ -1343,11 +1361,11 @@ p
 I
 -1
 I
-3f
+3a
 I
 0
 I
-40
+3b
 I
 7
 x
@@ -1408,11 +1426,11 @@ p
 I
 -1
 I
-43
+3e
 I
 0
 I
-44
+3f
 I
 d
 x
@@ -1462,15 +1480,15 @@ p
 I
 -1
 I
-47
+42
 I
 0
 I
-4e
+49
 I
 1
 I
-48
+43
 I
 b
 x
@@ -1520,15 +1538,15 @@ p
 I
 -1
 I
-4b
+46
 I
 0
 I
-4e
+49
 I
 1
 I
-4c
+47
 I
 b
 x
@@ -1545,23 +1563,23 @@ I
 I
 d
 I
-1f
+1a
 I
 27
 I
-3f
+3a
 I
 35
 I
-43
+3e
 I
 43
 I
-47
+42
 I
 51
 I
-4b
+46
 I
 5f
 x