mongoid-publishable 0.3.1 → 0.3.2

data/lib/mongoid/publishable/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Publishable
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

data/lib/mongoid/publishable.rb

@@ -83,6 +83,8 @@ module Mongoid
             # mark as just published
             run_after_publish_callbacks
           end
+          # always return true
+          true
         end
       end
 
@@ -91,11 +93,6 @@ module Mongoid
       def publish_via!(publisher)
         publish_via(publisher) && save
       end
-
-      # returns boolean of whether this instance has been published
-      def published?
-        persisted? && has_publisher_id? && meets_custom_publishing_conditions?
-      end
       
       # returns boolean of whether this instance has been published
       # regardless of whether it's been persisted yet
@@ -103,9 +100,14 @@ module Mongoid
         has_publisher_id? && meets_custom_publishing_conditions?
       end
 
+      # returns boolean of whether this instance has been published
+      def published?
+        persisted? && pre_published?
+      end
+
       # returns whether this instance needs publishing (persisted, not published)
       def requires_publishing?
-        persisted? && (!has_publisher_id? || !meets_custom_publishing_conditions?)
+        persisted? && !pre_published?
       end
       
       # returns whether or not the publisher is present

data/spec/mongoid/publishable_spec.rb

@@ -48,6 +48,10 @@ describe Mongoid::Publishable do
   describe "an instance of a class that includes the module" do
     subject { PublishableObject.new }
     
+    after(:each) do
+      subject.class.instance_variable_set(:"@publishing_conditions", nil)
+    end
+    
     describe "#publisher_column" do
       it "should return :user_id by default" do
         expect(subject.publisher_column).to eq :user_id
@@ -116,6 +120,20 @@ describe Mongoid::Publishable do
           subject.stub(:save).and_return(true)
         end
         
+        context "but with unmet custom publishing conditions" do
+          before(:each) do
+            subject.class.publishing_conditions do |object|
+              false
+            end
+          end
+          
+          it "should raise an exception" do
+            expect {
+              subject.persist_and_publish!(nil)
+            }.to raise_error(Mongoid::Publishable::UnpublishedError)
+          end
+        end
+        
         context "but not published" do
           it "should raise an exception" do
             expect {
@@ -195,7 +213,19 @@ describe Mongoid::Publishable do
         end
       end
       
-      context "with custom publishing conditions" do
+      context "with met custom publishing conditions" do
+        before(:each) do
+          subject.class.publishing_conditions do |object|
+            true
+          end
+        end
+        
+        it "should return true" do
+          expect(subject.meets_custom_publishing_conditions?).to be_true
+        end
+      end
+      
+      context "with unmet custom publishing conditions" do
         before(:each) do
           subject.class.publishing_conditions do |object|
             !!object.user_id

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-publishable
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2012-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -183,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4223141326906407503
+      hash: -1259240533369859954
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4223141326906407503
+      hash: -1259240533369859954
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24