publishing_logic 0.1.3 → 0.2.0

data/.gitignore

@@ -19,4 +19,5 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
-publishing_logic.gemspec
+spec/support/test_publishing_logic.db
+test.log

data/README.rdoc

@@ -4,12 +4,14 @@ Publishing logic for ActiveRecord models
 * Generates a migration with fields required for publishing
   logic. Fields are:
   * publishing_enabled:boolean
-  * publish_from_datetime:datetime
-  * publish_until_datetime:datetime
+  * published_at:datetime
+  * published_until:datetime (optional)
 * Defines logic on models that include PublishingLogic::ModelLogic
   * published named scope
   * published? method
-  * ordering by publish_from_date
+  * ordering by published_at
+
+The source for this gem can be found on http://github.com/unboxed/publishing_logic
 
 == Note on Patches/Pull Requests
  
@@ -24,4 +26,4 @@ Publishing logic for ActiveRecord models
 
 == Copyright
 
-Copyright (c) 2009 Unboxed Consulting. See LICENSE for details.
+Copyright (c) 2009 Unboxed Consulting and Channel 5 Broadcasting Ltd. See LICENSE for details.

data/Rakefile

@@ -12,6 +12,12 @@ begin
     gem.authors = ["Unboxed Consulting"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_development_dependency "cucumber", ">= 0"
+    gem.add_development_dependency 'rspec-rails', ">= 1.3.0"
+    gem.add_development_dependency 'factory_girl', ">= 1.2.0"
+    gem.add_development_dependency 'activesupport', ">= 2.3.0"
+    gem.add_development_dependency 'activerecord', ">= 2.3.0"
+    gem.add_development_dependency 'database_cleaner', ">= 0.5.0"
+    
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -33,17 +39,6 @@ end
 
 task :spec => :check_dependencies
 
-begin
-  require 'cucumber/rake/task'
-  Cucumber::Rake::Task.new(:features)
-
-  task :features => :check_dependencies
-rescue LoadError
-  task :features do
-    abort "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
-  end
-end
-
 task :default => :spec
 
 require 'rake/rdoctask'

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/lib/model_logic.rb

@@ -1,41 +1,82 @@
 module PublishingLogic
   module ModelLogic
 
-    def published?
-      return false if published_at && Time.now < published_at
-      return false if published_until && Time.now > published_until
-      publishing_enabled?
-    end
-
     def self.included(base)
-      base.extend(ClassMethods)
-      base.instance_eval do
-        named_scope :published, lambda {{ :conditions => ["#{base.table_name}.publishing_enabled = true AND \
-                                          (#{base.table_name}.published_until is null or #{base.table_name}.published_until > ?) AND \
-                                          (#{base.table_name}.published_at is null or #{base.table_name}.published_at < ?)",
-                                          Time.now.utc, Time.now.utc] }} do
-
-          # TODO Not using table name with the following methods so in danger of getting ambiguous column names
-          def newest
-            find(:first, :order => "published_at DESC")
-          end
-
-          def oldest
-            find(:last, :order => "published_at DESC")
-          end
-        end
-
+      module_to_include = if base.column_names.include?('published_until')
+                            WithPublishedUntilField
+                          else
+                            WithoutPublishedUntilField
+                          end
+      base.class_eval do
         # If objects have identical published_at values, order by created_at. If these are
         # identical as well, then order by id. This is done to ensure there is a unique
         # ordering of objects, ordering by newest and oldest should result in arrays that are
         # the inverse of the other.
-        named_scope :by_date_oldest_first, :order => "#{base.table_name}.published_at ASC, #{base.table_name}.created_at ASC, #{base.table_name}.id ASC"
-        named_scope :by_date_newest_first, :order => "#{base.table_name}.published_at DESC, #{base.table_name}.created_at DESC, #{base.table_name}.id DESC"
+        named_scope :by_publication_date_oldest_first, :order => "#{base.table_name}.published_at ASC, #{base.table_name}.created_at ASC, #{base.table_name}.id ASC"
+        named_scope :by_publication_date_newest_first, :order => "#{base.table_name}.published_at DESC, #{base.table_name}.created_at DESC, #{base.table_name}.id DESC"
+
+        include module_to_include
+
+        class << self
+          def by_date_oldest_first
+            ::ActiveSupport::Deprecation.warn("by_date_oldest_first is deprecated and will be removed in the next version of this gem (use by_publication_date_oldest_first instead, it's more intention revealing).", caller)
+            by_publication_date_oldest_first
+          end
+
+          def by_date_newest_first
+            ::ActiveSupport::Deprecation.warn("by_date_newest_first is deprecated and will be removed in the next version of this gem (use by_publication_date_newest_first instead, it's more intention revealing).", caller)
+            by_publication_date_newest_first
+          end
+        end
       end
     end
 
-    module ClassMethods
+    module WithoutPublishedUntilField
+      def self.included(base)
+        base.class_eval do
+          named_scope :published, lambda {{ :conditions => ["#{base.table_name}.publishing_enabled = ? AND \
+                                            (#{base.table_name}.published_at is null or #{base.table_name}.published_at < ?)",
+                                            true, Time.now.utc] }} do
+            def newest
+              find(:first, :order => "#{proxy_scope.table_name}.published_at DESC")
+            end
+
+            def oldest
+              find(:last, :order => "#{proxy_scope.table_name}.published_at DESC")
+            end
+          end
+
+          def published?
+            return false if published_at && Time.now < published_at
+            publishing_enabled?
+          end
+        end
+      end
     end
 
+    module WithPublishedUntilField
+      def self.included(base)
+        base.class_eval do
+          named_scope :published, lambda {{ :conditions => ["#{base.table_name}.publishing_enabled = ? AND \
+                                            (#{base.table_name}.published_until is null or #{base.table_name}.published_until > ?) AND \
+                                            (#{base.table_name}.published_at is null or #{base.table_name}.published_at < ?)",
+                                            true, Time.now.utc, Time.now.utc] }} do
+            def newest
+              find(:first, :order => "#{proxy_scope.table_name}.published_at DESC")
+            end
+
+            def oldest
+              find(:last, :order => "#{proxy_scope.table_name}.published_at DESC")
+            end
+          end
+
+          def published?
+            return false if published_at && Time.now < published_at
+            return false if published_until && Time.now > published_until
+            publishing_enabled?
+          end
+        end
+      end
+    end
   end
 end

data/rails_generators/publishing_logic_fields/publishing_logic_fields_generator.rb

@@ -1,4 +1,6 @@
 class PublishingLogicFieldsGenerator < Rails::Generator::NamedBase
+  default_options :use_published_until_field => true, :skip_admin_form => false
+
   def initialize(args, options)
     super(args, options)
   end
@@ -7,9 +9,26 @@ class PublishingLogicFieldsGenerator < Rails::Generator::NamedBase
     record do |m|
       class_name.camelize.constantize # Raise an error if model does not yet exist
       m.migration_template 'db/migrate/add_publishing_logic_fields.rb.erb', 'db/migrate', :assigns => {
-        :migration_name => "AddPublishingLogicFieldsTo#{class_name.pluralize.gsub(/::/, '')}"
+        :migration_name => "AddPublishingLogicFieldsTo#{class_name.pluralize.gsub(/::/, '')}",
+        :use_published_until_field => options[:use_published_until_field]
       }, :migration_file_name => "add_publishing_logic_fields_to_#{file_path.gsub(/\//, '_').pluralize}"
-      m.template 'app/views/publishing_logic_fields.html.erb', File.join('app', 'views', 'admin', plural_name, "_publishing_logic_fields.html.erb")
+      unless options[:skip_admin_form]
+        m.template 'app/views/publishing_logic_fields.html.erb',
+                   File.join('app', 'views', 'admin', plural_name, "_publishing_logic_fields.html.erb"),
+                   :assigns => {
+                     :use_published_until_field => options[:use_published_until_field]
+                   }
+      end
     end
   end
+
+  protected
+    def add_options!(opt)
+      opt.separator ''
+      opt.separator 'Options:'
+      opt.on("--no-published-until",
+             "Don't add the published_until field to this model") { |v| options[:use_published_until_field] = false }
+      opt.on("--skip-admin-form",
+             "Don't generate the admin form partial for this model") { |v| options[:skip_admin_form] = true }
+    end
 end

data/rails_generators/publishing_logic_fields/templates/app/views/publishing_logic_fields.html.erb

@@ -2,10 +2,10 @@
   <%%= form.label :published_at %><br />
   <%%= form.datetime_select :published_at %>
 </p>
-<p>
+<% if use_published_until_field %><p>
   <%%= form.label :published_until %><br />
   <%%= form.datetime_select :published_until %>
-</p>
+</p><% end %>
 <p>
   <%%= form.label :publishing_enabled %>
   <%%= form.check_box :publishing_enabled %>

data/rails_generators/publishing_logic_fields/templates/db/migrate/add_publishing_logic_fields.rb.erb

@@ -2,18 +2,17 @@
 
 class <%= migration_name %> < ActiveRecord::Migration
   def self.up
-    add_column :<%= table_name %>, :publishing_enabled, :boolean
-    add_column :<%= table_name %>, :published_at, :datetime
-    add_column :<%= table_name %>, :published_until, :datetime
-
-    add_index :<%= table_name %>, [:published_at, :publishing_enabled, :published_until], :name => :index_<%= table_name %>_on_publishing_logic_fields
+    change_table :<%= table_name %> do |t|
+      t.boolean :publishing_enabled
+      t.datetime :published_at<% if use_published_until_field %>, :published_until<% end %>
+      t.index [:published_at, :publishing_enabled<% if use_published_until_field %>, :published_until<% end %>], :name => 'index_<%= table_name %>_on_publishing_logic_fields'
+    end
   end
 
   def self.down
-    remove_column :<%= table_name %>, :publishing_enabled
-    remove_column :<%= table_name %>, :published_at
-    remove_column :<%= table_name %>, :published_until
-
-    remove_index :<%= table_name %>, :name => :index_<%= table_name %>_on_publishing_logic_fields
+    change_table :<%= table_name %> do |t|
+      t.remove :publishing_enabled, :published_at<% if use_published_until_field %>, :published_until<% end %>
+      t.remove_index :name => 'index_<%= table_name %>_on_publishing_logic_fields'
+    end
   end
 end

data/spec/general_model_logic.rb

@@ -0,0 +1,93 @@
+shared_examples_for 'a model with publish logic' do
+  def create_objects_with_different_published_at_dates(for_class)
+    factory_name = for_class.name.underscore.to_sym
+    @object2 = Factory.create(factory_name, :publishing_enabled => true, :published_at => 2.days.ago)
+    @object1 = Factory.create(factory_name, :publishing_enabled => true, :published_at => 1.days.ago)
+    @object3 = Factory.create(factory_name, :publishing_enabled => true, :published_at => 3.days.ago)
+  end
+
+  describe "ordering by published_at" do
+    describe "from the published scope" do
+      before do
+        create_objects_with_different_published_at_dates(@class)
+      end
+
+      describe "newest first" do
+        it "should be the most recently published object" do
+          @class.published.newest.should == @object1
+        end
+      end
+
+      describe "oldest first" do
+        it "should be the object published the longest ago" do
+          @class.published.oldest.should == @object3
+        end
+      end
+    end
+
+    describe "by publication date oldest first" do
+      before do
+        create_objects_with_different_published_at_dates(@class)
+      end
+
+      it "should return the items, oldest first" do
+        @class.by_publication_date_oldest_first.map(&:id).should == [@object3,
+                                                                     @object2,
+                                                                     @object1].map(&:id)
+      end
+
+      it "should order by created_at date if published_ats are equal" do
+        @object2b = Factory.create(@class.name.underscore.to_sym,
+                                   :publishing_enabled => true,
+                                   :published_at => @object2.published_at,
+                                   :created_at => 3.days.ago)
+        @class.by_publication_date_oldest_first.map(&:id).should == [@object3,
+                                                                     @object2b,
+                                                                     @object2,
+                                                                     @object1].map(&:id)
+      end
+
+      it 'should have deprecated by_date_oldest_first' do
+        assert_deprecated do
+          @class.by_date_oldest_first
+        end
+      end
+    end
+
+    describe "by publication date newest first" do
+      before do
+        create_objects_with_different_published_at_dates(@class)
+      end
+
+      it "should return the items, newest first" do
+        @class.by_publication_date_newest_first.map(&:id).should == [@object1,
+                                                                     @object2,
+                                                                     @object3].map(&:id)
+      end
+
+      it "should order by created_at date if published_ats are equal" do
+        @object2b = Factory.create(@class.name.underscore.to_sym,
+                                   :publishing_enabled => true,
+                                   :published_at => @object2.published_at,
+                                   :created_at => 3.days.from_now)
+        @class.by_publication_date_newest_first.map(&:id).should == [@object1,
+                                                                     @object2b,
+                                                                     @object2,
+                                                                     @object3].map(&:id)
+      end
+
+      it 'should have deprecated by_date_newest_first' do
+        assert_deprecated do
+          @class.by_date_newest_first
+        end
+      end
+    end
+
+    it "should have a newest first ordering that is the reverse of the oldest first ordering for identical objects" do
+      creation_time = 2.days.ago
+      publish_time = 1.days.ago
+      5.times { Factory.create(@class.name.underscore.to_sym, :created_at => creation_time, :published_at => publish_time) }
+      @class.by_publication_date_newest_first.map(&:id).should == @class.by_publication_date_oldest_first.map(&:id).reverse
+    end
+  end
+end

data/spec/models_with_all_fields_spec.rb

@@ -0,0 +1,85 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'general_model_logic'
+
+describe 'Using publishing logic on models with all fields' do
+  describe "published?" do
+    describe "with publishing enabled" do
+      it "should be published by default" do
+        Factory.create(:programme,
+                       :publishing_enabled => true,
+                       :published_at => nil,
+                       :published_until => nil).should be_published
+      end
+
+      it "should not be published if the published_at datetime is in the future" do
+        Factory.create(:programme,
+                       :publishing_enabled => true,
+                       :published_at => 5.seconds.from_now,
+                       :published_until => nil).should_not be_published
+      end
+
+      it "should not be published if the published_until datetime is in the past" do
+        Factory.create(:programme,
+                       :publishing_enabled => true,
+                       :published_at => nil,
+                       :published_until => 5.seconds.ago).should_not be_published
+      end
+    end
+    describe "with publishing disabled" do
+      it "should not be published" do
+        Factory.create(:programme,
+                       :publishing_enabled => false,
+                       :published_at => 1.days.ago,
+                       :published_until => 10.days.from_now).should_not be_published
+      end
+    end
+  end
+
+  describe "published named scope" do
+    it "should include published objects" do
+      programme = Factory.create(:programme, :publishing_enabled => true)
+      Programme.published.should == [programme]
+    end
+
+    it "should not include any unpublished objects" do
+      Factory.create(:programme, :publishing_enabled => false)
+      Programme.published.should be_empty
+    end
+
+    it "should not include objects with a published_until in the past" do
+      Factory.create(:programme,
+                     :publishing_enabled => true,
+                     :published_until => 5.seconds.ago)
+      Programme.published.should be_empty
+    end
+
+    it "should not include objects with a published_at in the future" do
+      Factory.create(:programme,
+                     :publishing_enabled => true,
+                     :published_at => 5.seconds.from_now)
+      Programme.published.should be_empty
+    end
+
+    it "should get a new Time.now for each invocation of the named scope" do
+      mock_now = mock('now', :utc => 20.days.from_now, :to_f => 0)
+      Time.stub(:now).and_return mock_now
+      Programme.published
+    end
+
+    it "should use the utc of the current time" do
+      # Make sure utc is used, which is hard to test as a behaviour
+      mock_now = mock('now')
+      Time.stub(:now).and_return mock_now
+      mock_now.should_receive(:utc).twice
+      Programme.published
+    end
+  end
+
+  describe 'generally' do
+    before do
+      @class = Programme
+    end
+
+    it_should_behave_like 'a model with publish logic'
+  end
+end

data/spec/models_with_no_published_until_field_spec.rb

@@ -0,0 +1,68 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'general_model_logic'
+
+describe 'Using publishing logic on models with no published until field' do
+  describe "published?" do
+    describe "with publishing enabled" do
+      it "should be published by default" do
+        Factory.create(:article,
+                       :publishing_enabled => true,
+                       :published_at => nil).should be_published
+      end
+
+      it "should not be published if the published_at datetime is in the future" do
+        Factory.create(:article,
+                       :publishing_enabled => true,
+                       :published_at => 5.seconds.from_now).should_not be_published
+      end
+    end
+    describe "with publishing disabled" do
+      it "should not be published" do
+        Factory.create(:article,
+                       :publishing_enabled => false,
+                       :published_at => 1.days.ago).should_not be_published
+      end
+    end
+  end
+
+  describe "published named scope" do
+    it "should include published objects" do
+      article = Factory.create(:article, :publishing_enabled => true)
+      Article.published.should == [article]
+    end
+
+    it "should not include any unpublished objects" do
+      Factory.create(:article, :publishing_enabled => false)
+      Article.published.should be_empty
+    end
+
+    it "should not include objects with a published_at in the future" do
+      Factory.create(:article,
+                     :publishing_enabled => true,
+                     :published_at => 5.seconds.from_now)
+      Article.published.should be_empty
+    end
+
+    it "should get a new Time.now for each invocation of the named scope" do
+      mock_now = mock('now', :utc => 20.days.from_now, :to_f => 0)
+      Time.stub(:now).and_return mock_now
+      Article.published
+    end
+
+    it "should use the utc of the current time" do
+      # Make sure utc is used, which is hard to test as a behaviour
+      mock_now = mock('now')
+      Time.stub(:now).and_return mock_now
+      mock_now.should_receive(:utc).once
+      Article.published
+    end
+  end
+
+  describe 'generally' do
+    before do
+      @class = Article
+    end
+
+    it_should_behave_like 'a model with publish logic'
+  end
+end

data/spec/spec_helper.rb

@@ -1,18 +1,55 @@
-# $LOAD_PATH.unshift(File.dirname(__FILE__))
-# $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-ENV["RAILS_ENV"] ||= "test"
-require File.expand_path(File.join(File.dirname(__FILE__), "../../../../config/environment"))
-require 'spec/rails'
+require 'rubygems'
+gem 'rspec'
+gem 'rspec-rails'
+gem 'factory_girl'
+gem 'activesupport'
+gem 'activerecord'
+gem 'database_cleaner'
 
 require 'factory_girl'
+require 'active_support'
+require 'active_record'
+
+# We don't need all of spec/rails - just the bits that're to do with ActiveRecord
+
+require 'active_support/test_case'
+require 'active_record/fixtures' if defined?(ActiveRecord::Base)
+
+require 'spec/test/unit'
+
+require "spec/rails/example/model_example_group"
+require 'spec/rails/extensions/spec/matchers/have'
+
+require 'spec/rails/matchers/ar_be_valid'
+require 'spec/rails/matchers/change'
+
+require 'spec/rails/mocks'
+
+require 'spec/rails/extensions/active_support/test_case'
+require 'spec/rails/extensions/active_record/base'
+
+require 'spec/rails/interop/testcase'
+
+Spec::Example::ExampleGroupFactory.default(ActiveSupport::TestCase)
+
+require 'publishing_logic'
+
+require 'logger'
+ActiveRecord::Base.logger = Logger.new("test.log")
+
+# Time zone setup Publishing Logic assumes that you've properly set up your timezones.
+Time.zone_default = Time.send(:get_zone, 'UTC')
+ActiveRecord::Base.time_zone_aware_attributes = true
+ActiveRecord::Base.default_timezone = :utc
+
+Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
 
 # require 'publishing_logic'
 # require 'spec'
 # require 'spec/autorun'
 
-class Programme < ActiveRecord::Base
-end
+require 'database_cleaner'
+DatabaseCleaner.strategy = :truncation
 
 Spec::Runner.configure do |config|
-  
 end

data/spec/support/database_cleanliness.rb

@@ -0,0 +1,14 @@
+Spec::Runner.configure do |config|
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :transaction
+    DatabaseCleaner.clean_with(:truncation)
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.start
+  end
+
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
+end

data/spec/support/database_connection.rb

@@ -0,0 +1,4 @@
+ActiveRecord::Base.establish_connection(
+  :adapter => "sqlite3",
+  :database => "#{File.join(File.dirname(__FILE__),'test_publishing_logic.db')}"
+)

data/spec/support/database_migrations.rb

@@ -0,0 +1,56 @@
+module PublishingLogic
+  module Migrations
+    class AddProgrammes < ActiveRecord::Migration
+      def self.up
+        create_table :programmes do |t|
+          t.boolean :publishing_enabled
+          t.datetime :published_at
+          t.datetime :published_until
+          t.timestamps
+        end
+
+        add_index :programmes, [:published_at, :publishing_enabled, :published_until], :name => 'index_programmes_on_publishing_logic_fields'
+      end
+
+      def self.down
+        remove_index :programmes, :name => 'index_programmes_on_publishing_logic_fields'
+      end
+    end
+
+    class AddArticles < ActiveRecord::Migration
+      def self.up
+        create_table :articles do |t|
+          t.boolean :publishing_enabled
+          t.datetime :published_at
+          t.timestamps
+        end
+
+        add_index :programmes, [:published_at, :publishing_enabled], :name => 'index_articles_on_publishing_logic_fields'
+      end
+
+      def self.down
+        remove_index :articles, :name => 'index_articles_on_publishing_logic_fields'
+      end
+    end
+  end
+end
+
+if ActiveRecord::Migrator.current_version != 2
+  migrator = ActiveRecord::Migrator.new(:up, '', 2)
+  migrator.instance_eval {
+    migration_1 = ActiveRecord::MigrationProxy.new
+    migration_1.instance_eval {
+      @name = 'add_programmes'
+      @version = 1
+      @migration = PublishingLogic::Migrations::AddProgrammes
+    }
+    migration_2 = ActiveRecord::MigrationProxy.new
+    migration_2.instance_eval {
+      @name = 'add_articles'
+      @version = 2
+      @migration = PublishingLogic::Migrations::AddArticles
+    }
+    @migrations = [ migration_1, migration_2 ]
+  }
+  migrator.migrate
+end

data/spec/support/factories.rb

@@ -0,0 +1,10 @@
+Factory.define :programme do |p|
+  p.publishing_enabled { true }
+  p.published_at { Date.yesterday }
+  p.published_until { Date.tomorrow }
+end
+
+Factory.define :article do |p|
+  p.publishing_enabled { true }
+  p.published_at { Date.yesterday }
+end

data/spec/support/logging.rb

@@ -0,0 +1,2 @@
+require 'logger'
+ActiveRecord::Base.logger = Logger.new("test.log")

data/spec/support/models/article.rb

@@ -0,0 +1,3 @@
+class Article < ActiveRecord::Base
+  include PublishingLogic::ModelLogic
+end

data/spec/support/models/programme.rb

@@ -0,0 +1,3 @@
+class Programme < ActiveRecord::Base
+  include PublishingLogic::ModelLogic
+end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: publishing_logic
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  hash: 23
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Unboxed Consulting
@@ -9,29 +15,119 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-17 00:00:00 +00:00
+date: 2010-08-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: factory_girl
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 2
+        - 0
+        version: 1.2.0
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
+        version: 2.3.0
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
+        version: 2.3.0
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: database_cleaner
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 5
+        - 0
+        version: 0.5.0
+  type: :development
+  version_requirements: *id007
 description: Publishing logic for ActiveRecord models
 email: enquiries@unboxedconsulting.com
 executables: []
@@ -49,19 +145,24 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- features/publishing_logic.feature
-- features/step_definitions/publishing_logic_steps.rb
-- features/support/env.rb
 - lib/model_logic.rb
 - lib/publishing_logic.rb
 - rails_generators/publishing_logic_fields/USAGE
 - rails_generators/publishing_logic_fields/publishing_logic_fields_generator.rb
 - rails_generators/publishing_logic_fields/templates/app/views/publishing_logic_fields.html.erb
 - rails_generators/publishing_logic_fields/templates/db/migrate/add_publishing_logic_fields.rb.erb
-- spec/lib/model_logic_spec.rb
-- spec/publishing_logic_spec.rb
+- spec/general_model_logic.rb
+- spec/models_with_all_fields_spec.rb
+- spec/models_with_no_published_until_field_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/support/database_cleanliness.rb
+- spec/support/database_connection.rb
+- spec/support/database_migrations.rb
+- spec/support/factories.rb
+- spec/support/logging.rb
+- spec/support/models/article.rb
+- spec/support/models/programme.rb
 has_rdoc: true
 homepage: http://github.com/unboxed/publishing_logic
 licenses: []
@@ -72,25 +173,39 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Publishing logic for ActiveRecord models
 test_files: 
-- spec/lib/model_logic_spec.rb
-- spec/publishing_logic_spec.rb
+- spec/general_model_logic.rb
+- spec/models_with_all_fields_spec.rb
+- spec/models_with_no_published_until_field_spec.rb
 - spec/spec_helper.rb
+- spec/support/database_cleanliness.rb
+- spec/support/database_connection.rb
+- spec/support/database_migrations.rb
+- spec/support/factories.rb
+- spec/support/logging.rb
+- spec/support/models/article.rb
+- spec/support/models/programme.rb

data/features/publishing_logic.feature

@@ -1,9 +0,0 @@
-Feature: something something
-  In order to something something
-  A user something something
-  something something something
-
-  Scenario: something something
-    Given inspiration
-    When I create a sweet new gem
-    Then everyone should see how awesome I am

data/features/support/env.rb

@@ -1,4 +0,0 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
-require 'publishing_logic'
-
-require 'spec/expectations'

data/spec/lib/model_logic_spec.rb

@@ -1,158 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../spec_helper'))
-require File.expand_path(File.join(File.dirname(__FILE__), "../../../../../spec/factories"))
-require 'model_logic'
-
-describe PublishingLogic::ModelLogic do
-  def create_objects_with_different_published_at_dates
-    @object2 = Factory.create(:programme, :publishing_enabled => true, :published_at => 2.days.ago)
-    @object1 = Factory.create(:programme, :publishing_enabled => true, :published_at => 1.days.ago)
-    @object3 = Factory.create(:programme, :publishing_enabled => true, :published_at => 3.days.ago)
-  end
-
-  describe "published?" do
-    describe "with publishing enabled" do
-      it "should be published by default" do
-        Factory.create(:programme,
-                       :publishing_enabled => true,
-                       :published_at => nil,
-                       :published_until => nil).should be_published
-      end
-
-      it "should not be published if the published_at datetime is in the future" do
-        Factory.create(:programme,
-                       :publishing_enabled => true,
-                       :published_at => 5.seconds.from_now,
-                       :published_until => nil).should_not be_published
-      end
-
-      it "should not be published if the published_until datetime is in the past" do
-        Factory.create(:programme,
-                       :publishing_enabled => true,
-                       :published_at => nil,
-                       :published_until => 5.seconds.ago).should_not be_published
-      end
-    end
-    describe "with publishing disabled" do
-      it "should not be published" do
-        Factory.create(:programme,
-                       :publishing_enabled => false,
-                       :published_at => 1.days.ago,
-                       :published_until => 10.days.from_now).should_not be_published
-      end
-    end
-  end
-
-  describe "published named scope" do
-    it "should include published objects" do
-      programme = Factory.create(:programme, :publishing_enabled => true)
-      Programme.published.should == [programme]
-    end
-
-    it "should not include any unpublished objects" do
-      Factory.create(:programme, :publishing_enabled => false)
-      Programme.published.should be_empty
-    end
-
-    # it "should not expose a published episode published an hour ago" do
-    #   article = Factory.create(:episode, :is_hidden => false, :published_at => 1.hour.from_now, :published_until => nil)
-    #   Episode.published.should == []
-    # end
-
-    it "should not include objects with a published_until in the past" do
-      Factory.create(:programme,
-                     :publishing_enabled => true,
-                     :published_until => 5.seconds.ago)
-      Programme.published.should be_empty
-    end
-
-    it "should not include objects with a published_at in the future" do
-      Factory.create(:programme,
-                     :publishing_enabled => true,
-                     :published_at => 5.seconds.from_now)
-      Programme.published.should be_empty
-    end
-
-    it "should get a new Time.now for each invocation of the named scope" do
-      item = Factory.create(:programme,
-                            :publishing_enabled => true,
-                            :published_until => 10.days.from_now)
-      mock_now = mock('now', :utc => 20.days.from_now, :to_f => 0)
-      Time.stub(:now).and_return mock_now
-      Programme.published.should be_empty
-    end
-
-    it "should use the utc of the current time" do
-      # Make sure utc is used, which is hard to test as a behaviour
-      mock_now = mock('now')
-      Time.stub(:now).and_return mock_now
-      mock_now.should_receive(:utc).twice
-      Programme.published
-    end
-
-    describe "newest" do
-      before do
-        create_objects_with_different_published_at_dates
-      end
-
-      it "should be the most recently published object" do
-        Programme.published.newest.should == @object1
-      end
-    end
-    describe "oldest" do
-      it "should be the object published the longest ago" do
-        Programme.published.oldest.should == @object3
-      end
-    end
-  end
-
-  describe "ordering by published_at" do
-    describe "by date oldest first" do
-      it "should return the items, oldest first" do
-        create_objects_with_different_published_at_dates
-        Programme.by_date_oldest_first.map(&:id).should == [@object3,
-                                                          @object2,
-                                                          @object1].map(&:id)
-      end
-
-      it "should order by created_at date if published_ats are equal" do
-        create_objects_with_different_published_at_dates
-        @object2b = Factory.create(:programme,
-                                   :publishing_enabled => true,
-                                   :published_at => @object2.published_at,
-                                   :created_at => 3.days.ago)
-        Programme.by_date_oldest_first.map(&:id).should == [@object3,
-                                                          @object2b,
-                                                          @object2,
-                                                          @object1].map(&:id)
-      end
-    end
-
-    describe "by date newest first" do
-      it "should return the items, oldest first" do
-        create_objects_with_different_published_at_dates
-        Programme.by_date_newest_first.map(&:id).should == [@object1,
-                                                          @object2,
-                                                          @object3].map(&:id)
-      end
-
-      it "should order by created_at date if published_ats are equal" do
-        create_objects_with_different_published_at_dates
-        @object2b = Factory.create(:programme,
-                                   :publishing_enabled => true,
-                                   :published_at => @object2.published_at,
-                                   :created_at => 3.days.from_now)
-        Programme.by_date_newest_first.map(&:id).should == [@object1,
-                                                          @object2b,
-                                                          @object2,
-                                                          @object3].map(&:id)
-      end
-    end
-
-    it "should have a newest first ordering that is the reverse of the oldest first ordering for identical objects" do
-      creation_time = 2.days.ago
-      publish_time = 1.days.ago
-      5.times { Factory.create(:programme, :created_at => creation_time, :published_at => publish_time) }
-      Programme.by_date_newest_first.map(&:id).should == Programme.by_date_oldest_first.map(&:id).reverse
-    end
-  end
-end

data/spec/publishing_logic_spec.rb

@@ -1,4 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "PublishingLogic" do
-end