publishable 0.2.2 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/db/schema.rb

@@ -2,4 +2,7 @@ ActiveRecord::Schema.define(:version => 0) do
   create_table :albums, :force => true do |t|
     t.datetime :published_at
   end
+  create_table :features, :force => true do |t|
+    t.datetime :public_since
+  end
 end

data/lib/publishable.rb

@@ -1,31 +1,37 @@
 require 'publishable/railtie' if defined?(Rails)
 
 module Publishable
+  def self.extended(base)
+    base.extend ClassMethods
+  end
+  
   module ClassMethods
-    def publishable
-      scope :published, lambda { |time = Time.now|
-        where('published_at IS NOT NULL AND published_at <= ?', time.utc)
-      }
+    def publishable(options = {})
+      column_name = (options[:on] || :published_at).to_s
+
+      if respond_to?(:scope)
+        scope :published, lambda { |time = Time.now|
+          where("#{column_name} IS NOT NULL AND #{column_name} <= ?", time.utc)
+        }
 
-      scope :unpublished, lambda { |time = Time.now|
-        where('published_at IS NULL OR published_at > ?', time.utc)
-      }
+        scope :unpublished, lambda { |time = Time.now|
+          where("#{column_name} IS NULL OR #{column_name} > ?", time.utc)
+        }
+      end
       
-      include InstanceMethods
-    end
-  end
-  
-  module InstanceMethods
-    def published?(time = Time.now)
-      published_at ? published_at <= time : false
-    end
+      class_eval <<-EVIL, __FILE__, __LINE__ + 1
+        def published?(time = Time.now)
+          #{column_name} ? #{column_name} <= time : false
+        end
 
-    def publish(time = Time.now)
-      self.published_at = time unless published?(time)
-    end
-    
-    def publish!(time = Time.now)
-      publish(time) && save
+        def publish(time = Time.now)
+          self.#{column_name} = time unless published?(time)
+        end
+
+        def publish!(time = Time.now)
+          publish(time) && (!respond_to?(:save) || save)
+        end        
+      EVIL
     end
   end
 end

data/publishable.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{publishable}
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Linkhorst"]

data/spec/publishable_spec.rb

@@ -1,10 +1,15 @@
 require File.expand_path('../spec_helper', __FILE__)
 
 class Album < ActiveRecord::Base
-  extend Publishable::ClassMethods
+  extend Publishable
   publishable
 end
 
+class Feature < ActiveRecord::Base
+  extend Publishable
+  publishable :on => :public_since
+end
+
 describe Publishable do
   ActiveRecord::Base.establish_connection :adapter  => 'sqlite3',
                                           :database => File.expand_path('../../db/test.sqlite3', __FILE__)
@@ -50,9 +55,9 @@ describe Publishable do
   describe "scope" do
     before do
       @album_1 = Album.create!(:published_at => nil)
-      @album_2 = Album.create!(:published_at => Time.now.utc - 60)
-      @album_3 = Album.create!(:published_at => Time.now.utc)
-      @album_4 = Album.create!(:published_at => Time.now.utc + 60)
+      @album_2 = Album.create!(:published_at => Time.now - 60)
+      @album_3 = Album.create!(:published_at => Time.now)
+      @album_4 = Album.create!(:published_at => Time.now + 60)
     end
   
     it "should find published records" do
@@ -63,4 +68,31 @@ describe Publishable do
       Album.unpublished.should == [@album_1, @album_4]
     end
   end
+  
+  describe "other column" do
+    it "should be publishable" do
+      @feature = Feature.new
+      @feature.should_not be_published
+      @feature.publish
+      @feature.should be_published
+    end
+    
+    describe "scope" do
+      before do
+        Feature.delete_all
+        @feature_1 = Feature.create!(:public_since => nil)
+        @feature_2 = Feature.create!(:public_since => Time.now - 60)
+        @feature_3 = Feature.create!(:public_since => Time.now)
+        @feature_4 = Feature.create!(:public_since => Time.now + 60)
+      end
+
+      it "should find published records" do
+        Feature.published.should == [@feature_2, @feature_3]
+      end
+
+      it "should find unpublished records" do
+        Feature.unpublished.should == [@feature_1, @feature_4]
+      end
+    end    
+  end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Martin Linkhorst