acts_as_publishable 0.2.3 → 0.3.0

data/Gemfile.lock

@@ -1,41 +1,84 @@
 PATH
   remote: .
   specs:
-    acts_as_publishable (0.2.1)
-      rails (~> 2.3)
+    acts_as_publishable (0.3.0)
+      rails (~> 3.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (2.3.10)
-      actionpack (= 2.3.10)
-    actionpack (2.3.10)
-      activesupport (= 2.3.10)
-      rack (~> 1.1.0)
-    activerecord (2.3.10)
-      activesupport (= 2.3.10)
-    activeresource (2.3.10)
-      activesupport (= 2.3.10)
-    activesupport (2.3.10)
-    rack (1.1.0)
-    rails (2.3.10)
-      actionmailer (= 2.3.10)
-      actionpack (= 2.3.10)
-      activerecord (= 2.3.10)
-      activeresource (= 2.3.10)
-      activesupport (= 2.3.10)
-      rake (>= 0.8.3)
+    abstract (1.0.0)
+    actionmailer (3.0.3)
+      actionpack (= 3.0.3)
+      mail (~> 2.2.9)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+    activesupport (3.0.3)
+    arel (2.0.7)
+    builder (2.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.5.0)
+    mail (2.2.14)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.3)
+      actionmailer (= 3.0.3)
+      actionpack (= 3.0.3)
+      activerecord (= 3.0.3)
+      activeresource (= 3.0.3)
+      activesupport (= 3.0.3)
+      bundler (~> 1.0)
+      railties (= 3.0.3)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
     rake (0.8.7)
     rspec (1.3.1)
     sqlite3 (1.3.3)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.24)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   acts_as_publishable!
-  rails (~> 2.3)
+  rails (~> 3.0)
   rspec (= 1.3.1)
   sqlite3-ruby

data/acts_as_publishable.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rspec', '= 1.3.1'
   s.add_development_dependency 'sqlite3-ruby'
-  s.add_dependency 'rails', '~> 2.3'
+  s.add_dependency 'rails', '~> 3.0'
 end

data/lib/acts_as_publishable/acts_as_publishable.rb

@@ -1,8 +1,6 @@
 module ActsAsPublishable
-  def self.included(base)
-    base.extend ActsAsPublishable::ClassMethods
-  end
-  
+  extend ActiveSupport::Concern
+
   module ClassMethods
     def acts_as_publishable(options = {})
       metaclass = (class << self; self; end)
@@ -16,7 +14,7 @@ module ActsAsPublishable
       self.published_to_column = options[:published_to_column] || 'published_to'
       self.default_published_now = (options[:default_published_now] == true)
       
-      named_scope :published, :conditions => ["#{publish_now_column} = :published OR (#{published_from_column} <= :published_from AND #{published_to_column} >= :published_to)", {:published => true, :published_from => Time.now.utc, :published_to => Time.now.utc}]
+      scope :published, where(["#{publish_now_column} = :published OR (#{published_from_column} <= :published_from AND #{published_to_column} >= :published_to)", {:published => true, :published_from => Time.now, :published_to => Time.now}])
       
       before_save { |publishable| publishable[publish_now_column.to_sym] = default_published_now if publishable[publish_now_column.to_sym].nil?; true }
       
@@ -28,7 +26,7 @@ module ActsAsPublishable
     def validate_chronology
       validates_each published_to_column do |publishable, attribute, value|
         unless value.blank? || publishable[published_from_column.to_sym].blank?
-          publishable.errors.add(attribute, :earlier_than_published_from, :default => "cannot be set earlier than #{published_from_column.to_s.humanize}") unless publishable[published_from_column.to_sym] < value
+          publishable.errors.add(attribute, :earlier_than_published_from, :message => "cannot be set earlier than #{published_from_column.to_s.humanize}") unless publishable[published_from_column.to_sym] < value
         end
       end
     end
@@ -36,7 +34,7 @@ module ActsAsPublishable
   
   module InstanceMethods
     def published?
-      now = Time.now.utc
+      now = Time.now
       @from ||= self[self.class.published_from_column.to_sym]
       @to ||= self[self.class.published_to_column.to_sym]
       is_published_now = self[self.class.publish_now_column.to_sym]

data/lib/acts_as_publishable/version.rb

@@ -1,4 +1,4 @@
 module ActsAsPublishable
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end
 

data/spec/acts_as_publishable_spec.rb

@@ -75,7 +75,7 @@ describe "Publishable with default columns" do
     a_day_ago = Time.parse 'Fri Jun 18 17:03:03 +0200 2010'
     @post.published_from = a_day_ago
     @post.published_to = tomorrow
-    @post.save_without_validation
+    @post.save(:validate => false)
     Post.find(@post.id).published_from.should eql(a_day_ago)
     Post.find(@post.id).published_to.should eql(tomorrow)
    end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_publishable
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.2.3
+  hash: 19
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Rasmus Bang Grouleff
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 +02:00
+date: 2011-01-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +26,11 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
         version: 1.3.1
   type: :development
   version_requirements: *id001
@@ -32,6 +42,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -43,7 +56,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.3"
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   type: :runtime
   version_requirements: *id003
 description: Rails gem that adds functionality to make Active Record models publishable
@@ -83,17 +100,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: acts_as_publishable
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Rails gem that adds functionality to make Active Record models publishable