couch_scheduler 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/features/scheduling.feature

@@ -17,12 +17,12 @@ Feature: Scheduling
 
     When I set "start" to now:
       """
-        @article.start = Time.now
+        @article.start = Time.now.to_date
       """
 
     And I set "end" to a day from now:
       """
-        @article.end = 1.day.from_now
+        @article.end = 1.day.from_now.to_date
       """
 
     Then I should be able to save my document:
@@ -46,12 +46,12 @@ Feature: Scheduling
 
     When I set "start" to now:
       """
-        @article.start = Time.now
+        @article.start = Time.now.to_date
       """
 
     And I set "end" to yesterday:
       """
-        @article.end = 1.day.ago
+        @article.end = 1.day.ago.to_date
       """
 
     Then I should not be able to save my document:
@@ -75,12 +75,12 @@ Feature: Scheduling
 
     When I set "start" to now:
       """
-        @article.start = Time.now
+        @article.start = Time.now.to_date
       """
 
     And I set "end" to tomorrow:
       """
-        @article.end = 1.day.from_now
+        @article.end = 1.day.from_now.to_date
       """
 
     Then "within_schedule?" should return true on my instance:
@@ -111,7 +111,7 @@ Feature: Scheduling
 
     When I set "start" to now:
       """
-        @article.start = Time.now
+        @article.start = Time.now.to_date
       """
     
     Then "within_schedule?" should return true on my instance:
@@ -144,7 +144,7 @@ Feature: Scheduling
 
     When I set "end" to tomorrow:
       """
-        @article.end = 1.day.from_now
+        @article.end = 1.day.from_now.to_date
       """
     
     Then "within_schedule?" should return true on my instance:

data/lib/couch_scheduler.rb

@@ -2,6 +2,5 @@ require 'couch_view'
 require 'couch_scheduler/map'
 require 'couch_scheduler/couch_visible_integration'
 require 'couch_scheduler/couch_publish_integration'
-require 'couch_scheduler/couch_publish_and_couch_visible_integration'
 require 'couch_scheduler/couch_scheduler'
 require 'couch_scheduler/conditions'

data/lib/couch_scheduler/couch_publish_integration.rb

@@ -9,4 +9,3 @@ module CouchScheduler
     end
   end
 end
-

data/lib/couch_scheduler/couch_scheduler.rb

@@ -9,18 +9,17 @@ module CouchScheduler
     base.validate :validate_start_and_end
     base.extend ClassMethods
 
-    if defined?(CouchVisible) && base.ancestors.include?(CouchVisible) && defined?(CouchPublish) && base.ancestors.include?(CouchPublish)
-      base.send :include, CouchVisibleCouchPublishIntegration
-    elsif defined?(CouchPublish) && base.ancestors.include?(CouchPublish)
+    base.couch_view :within_couch_schedule do
+      map CouchScheduler::Map
+    end
+
+    if defined?(CouchPublish) && base.ancestors.include?(CouchPublish)
       base.send :include, CouchPublishIntegration
-    elsif defined?(CouchVisible) && base.ancestors.include?(CouchVisible)
+    end
+    
+    if defined?(CouchVisible) && base.ancestors.include?(CouchVisible)
       base.send :include, CouchVisibleIntegration
-    else
-      base.couch_view :within_couch_schedule do
-        map CouchScheduler::Map
-      end
     end
-
   end
 
   module ClassMethods
@@ -45,8 +44,8 @@ module CouchScheduler
     start_valid = true
     end_valid   = true
 
-    start_valid = Time.now >= self.start  if self.start
-    end_valid   = Time.now < self.end     if self.end
+    start_valid = Time.now.to_date >= self.start  if self.start
+    end_valid   = Time.now.to_date < self.end     if self.end
 
     start_valid && end_valid
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: couch_scheduler
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 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: cucumber
@@ -127,12 +127,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 25
         segments: 
         - 0
         - 0
-        - 2
-        version: 0.0.2
+        - 3
+        version: 0.0.3
   type: :runtime
   version_requirements: *id008
 description: Create a publishing system that allows you to schedule your documents for publication.
@@ -145,7 +145,6 @@ extra_rdoc_files: []
 
 files: 
 - lib/couch_scheduler/conditions.rb
-- lib/couch_scheduler/couch_publish_and_couch_visible_integration.rb
 - lib/couch_scheduler/couch_publish_integration.rb
 - lib/couch_scheduler/couch_scheduler.rb
 - lib/couch_scheduler/couch_visible_integration.rb

data/lib/couch_scheduler/couch_publish_and_couch_visible_integration.rb

@@ -1,11 +0,0 @@
-module CouchScheduler
-  module CouchVisibleCouchPublishIntegration
-    def self.included(base)
-      base.couch_view :within_couch_schedule do
-        map CouchScheduler::Map do
-          conditions ::Published, ::Unpublished, ::Hidden, ::Shown
-        end
-      end
-    end
-  end
-end