parole 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6ee830289243ba04c8d108f5d7f5735be8306e9
-  data.tar.gz: 8faf15de5fceaaa33ce9098bfe68a4e8c32c6a99
+  metadata.gz: def12cc4e8ebdfb3f39c397a95eef9443af3822f
+  data.tar.gz: a7addb2a86084f9267e34de818f1f9f20d59745c
 SHA512:
-  metadata.gz: 57bba72cecc135f0aaa16e5830761cef234ba6b81b30d5a69bab063523f4043642e7f501c444b6031b00175d84c7b458d52dbf00b14105af5dc4e54cf00c2a45
-  data.tar.gz: 0fc0fc9d30fce89c01a0fbb04a961ce79e715c172a2b80b8b89a0f80102472623a665d5f6bb488796982ee61d400a6fbf8799e0f94512c631112d82f808daa49
+  metadata.gz: 3d9e9c53c499ace305e53f61f1e2c2f0f6deebeff566bd1b4f7849e774f1ba8373e29ed3e3c52fe0e958863b6eeeb3b4c51c96874ff3e6e3b24a6d1378d32bfc
+  data.tar.gz: cf0aea744c44063f9f4c15a35f9805e243071dc93433174026bd9d1bed125e106830c9bc3c3d695adde127b56198cd8af6730b9b07e3c5a74312f22902b033dd

data/LICENSE.md

@@ -0,0 +1,26 @@
+Copyright (c) 2013, Mirego
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+- Neither the name of the Mirego nor the names of its contributors may
+  be used to endorse or promote products derived from this software without
+  specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.

data/lib/parole/comment.rb

@@ -12,11 +12,11 @@ module Parole
       after_destroy :update_cache_counters
 
       # Validations
-      validate :ensure_valid_role_for_commentable
+      validate :ensure_valid_role_for_commentable, if: lambda { commentable.present? && commentable.commentable? }
       validate :ensure_valid_commentable
-      validate :commenter, presence: true
-      validate :commentable, presence: true
-      validate :comment, presence: true
+      validates :commenter, presence: true
+      validates :commentable, presence: true
+      validates :comment, presence: true
     end
 
   protected
@@ -57,8 +57,7 @@ module Parole
     # Make sure that the record we're commenting on is an instance
     # of a commentable model.
     def ensure_valid_commentable
-      klass = commentable.class
-      errors.add(:commentable, :invalid) unless klass.respond_to?(:acts_as_commentable?) && klass.acts_as_commentable?
+      errors.add(:commentable, :invalid) unless commentable.respond_to?(:commentable?) && commentable.commentable?
     end
   end
 end

data/lib/parole/commentable.rb

@@ -11,8 +11,7 @@ module Parole
 
       # Role-specific comments for the record
       commentable_options.fetch(:roles).each do |role|
-        options = association_options.merge before_add: lambda { |_, comment| comment.role = role }
-        has_many :"#{role}_comments", lambda { where(role: role) }, options
+        has_many :"#{role}_comments", lambda { where(role: role) }, association_options
       end
     end
   end

data/lib/parole/version.rb

@@ -1,3 +1,3 @@
 module Parole
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/parole.rb

@@ -10,8 +10,8 @@ class ActiveRecord::Base
   def self.acts_as_commentable(options = {})
     Parole.commentable_classes << self
 
-    class_attribute :commentable_options, :acts_as_commentable
-    self.acts_as_commentable = true
+    class_attribute :commentable_options, :actually_acts_as_commentable
+    self.actually_acts_as_commentable = true
     self.commentable_options = options.reverse_merge(roles: [])
     self.commentable_options[:roles] = commentable_options[:roles].map(&:to_s)
 
@@ -19,12 +19,16 @@ class ActiveRecord::Base
   end
 
   def self.acts_as_commentable?
-    !!self.acts_as_commentable
+    self.respond_to?(:actually_acts_as_commentable) && self.actually_acts_as_commentable
   end
 
   def self.acts_as_comment(*args)
     include Parole::Comment
   end
+
+  def commentable?
+    self.class.acts_as_commentable?
+  end
 end
 
 module Parole

data/spec/parole/comment_spec.rb

@@ -1,6 +1,44 @@
 require 'spec_helper'
 
 describe Parole::Comment do
+  describe :Validations do
+    before do
+      spawn_comment_model
+      spawn_commenter_model 'User'
+      spawn_commentable_model 'Article'
+
+      run_migration do
+        create_table(:users, force: true)
+        create_table(:articles, force: true)
+      end
+    end
+
+    let(:errors) do
+      subject.valid?
+      subject.errors.full_messages
+    end
+
+    describe :validates_comment do
+      subject { Comment.new }
+      it { expect(errors).to include("Comment can't be blank") }
+    end
+
+    describe :validates_commenter_presence do
+      subject { Comment.new }
+      it { expect(errors).to include("Commenter can't be blank") }
+    end
+
+    describe :validates_commentable_presence do
+      subject { Comment.new }
+      it { expect(errors).to include("Commentable can't be blank") }
+    end
+
+    describe :validates_commentable do
+      subject { Comment.new(commentable: User.new) }
+      it { expect(errors).to include("Commentable is invalid") }
+    end
+  end
+
   describe :ClassMethods do
     describe :create do
       context 'through general `comments` association' do
@@ -110,4 +148,23 @@ describe Parole::Comment do
       it { expect { create_comment! }.to change { commentable.reload.comments_count }.from(0).to(1) }
     end
   end
+
+  describe :ensure_valid_role_for_commentable do
+    before do
+      spawn_comment_model
+      spawn_commenter_model 'User'
+
+      run_migration do
+        create_table(:users, force: true)
+      end
+    end
+
+    let(:commenter) { User.create }
+
+    context 'without associated commentable' do
+      let(:comment) { Comment.new(commenter: commenter, comment: 'Booya') }
+
+      it { expect { comment.valid? }.to_not raise_error }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parole
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,6 +105,7 @@ files:
 - .rspec
 - .travis.yml
 - Gemfile
+- LICENSE.md
 - README.md
 - Rakefile
 - gemfiles/Gemfile.activerecord-4.0