minimal_feedback 0.0.4 → 0.0.5

data/README.md

@@ -14,7 +14,7 @@ Run:
 
 ```ruby
 bundle install
-rails generate minimal_state_machine
+rails generate minimal_feedback
 rake db:migrate
 ```
 
@@ -52,7 +52,7 @@ issue.feedbacks.last.type
 => :negative
 ```
 
-Else if the condition proc returns false when the feedback validation is performed an exception is raised
+If the condition proc returns false when the give_feedback method is called an ActiveRecord invalid exception is raised.
 
 ## Contributing
 

data/lib/generators/minimal_feedback/minimal_feedback_generator.rb

@@ -14,7 +14,7 @@ class MinimalFeedbackGenerator < Rails::Generators::Base
   end
 
   def create_migration_files
-    create_migration_file_if_not_exist 'create_msm_states'
+    create_migration_file_if_not_exist 'create_mf_feedbacks'
   end
 
   private
@@ -24,4 +24,4 @@ class MinimalFeedbackGenerator < Rails::Generators::Base
       migration_template "#{file_name}.rb", "db/migrate/#{file_name}.rb"
     end
   end
-end
+end

data/lib/generators/minimal_feedback/templates/create_mf_feedbacks.rb

@@ -1,11 +1,10 @@
-class CreateMsmStates < ActiveRecord::Migration
+class CreateMfFeedbacks < ActiveRecord::Migration
   def change
     create_table :mf_feedbacks do |t|
       t.string :type
-      t.integer :rating
       t.references :user
       t.references :rateable, :polymorphic => true
       t.timestamps
     end
   end
-end
+end

data/lib/minimal_feedback.rb

@@ -1,6 +1,9 @@
 require 'minimal_feedback/version'
-require 'minimal_feedback/feedback'
 require 'active_support'
+require 'active_record'
+require 'minimal_feedback/feedback'
+require 'minimal_feedback/negative_feedback'
+require 'minimal_feedback/positive_feedback'
 
 module MinimalFeedback
   extend ActiveSupport::Concern
@@ -8,8 +11,6 @@ module MinimalFeedback
   included do
     has_many :feedbacks, :as => :rateable, :class_name => 'MinimalFeedback::Feedback'
 
-    class InvalidFeedbackError < StandardError; end
-
     cattr_accessor :feedback_condition
 
     def self.allow_feedback(options)
@@ -20,20 +21,11 @@ module MinimalFeedback
       options = args.extract_options!
       type = args.first.to_sym
 
-      feedback = Feedback.new do |f|
+      feedback = Feedback.build(:type => type) do |f|
         f.rateable = self
         f.user = options[:user]
       end
 
-      case type
-      when :positive
-        feedback.rating = 1
-      when :negative
-        feedback.rating = -1
-      else
-        raise InvalidFeedbackError
-      end
-
       feedback.save!
     end
   end

data/lib/minimal_feedback/feedback.rb

@@ -1,5 +1,3 @@
-require 'active_record'
-
 module MinimalFeedback
   class Feedback < ActiveRecord::Base
     self.table_name = 'mf_feedbacks'
@@ -7,20 +5,24 @@ module MinimalFeedback
     belongs_to :rateable, :polymorphic => true
     belongs_to :user
 
-    validates :rating, :inclusion => { :in => [1, -1] }
-
     validate do
       if rateable.class.feedback_condition && !rateable.instance_eval(&rateable.class.feedback_condition)
         errors.add(:base, 'feedback is not allowed')
       end
     end
 
-    def type
-      case rating
-      when 1
-        :positive
-      when -1
-        :negative
+    class InvalidFeedbackError < StandardError; end
+
+    def self.build(options = {}, &block)
+      options.assert_valid_keys :type
+
+      case options[:type]
+      when :positive
+        PositiveFeedback.new(&block)
+      when :negative
+        NegativeFeedback.new(&block)
+      else
+        raise InvalidFeedbackError
       end
     end
   end

data/lib/minimal_feedback/negative_feedback.rb

@@ -0,0 +1,7 @@
+module MinimalFeedback
+  class NegativeFeedback < Feedback
+    def type
+      :negative
+    end
+  end
+end

data/lib/minimal_feedback/positive_feedback.rb

@@ -0,0 +1,7 @@
+module MinimalFeedback
+  class PositiveFeedback < Feedback
+    def type
+      :positive
+    end
+  end
+end

data/lib/minimal_feedback/version.rb

@@ -1,3 +1,3 @@
 module MinimalFeedback
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minimal_feedback
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -125,6 +125,8 @@ files:
 - lib/generators/minimal_feedback/templates/create_mf_feedbacks.rb
 - lib/minimal_feedback.rb
 - lib/minimal_feedback/feedback.rb
+- lib/minimal_feedback/negative_feedback.rb
+- lib/minimal_feedback/positive_feedback.rb
 - lib/minimal_feedback/version.rb
 - minimal_feedback.gemspec
 - spec/minimal_feedback_spec.rb
@@ -143,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2275794220295144819
+      hash: -4469648509491736839
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -152,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2275794220295144819
+      hash: -4469648509491736839
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24