merit 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62f239d505d3f998184052a8cc62602609fcc06d
-  data.tar.gz: c1d5bdba54829b26022f9b68322025574e0078df
+  metadata.gz: fffa4a71100476ce7342d95ec21d9841dcdba506
+  data.tar.gz: 366af39f2fe07ec2eb644a5e7e2710a6fb95abcf
 SHA512:
-  metadata.gz: e58ae9a432d4d9a74cf5fed778acee101d39d17cef09a3d8e8fcdd994589d5ce1d091fda10f103d45e3e2a0bfe22b83ae42e536040717badf6586baea0c2cefe
-  data.tar.gz: b1d067b943eb541adf433b6e775d8bd9ba01d606897ccec084f57aff26c055ffa9c248f3c444356fc1f3b576fd9e17e0e9372b1d046a16f74e794a3eeb77270a
+  metadata.gz: 766d06b7c33496656d497f3b06a522e9e29f3d4322e500168cfbfcb0deae4ec0502e1ac754108e6545e61c2e16d7f4538cae24d29e65b8bc1fd4789ffae6e646
+  data.tar.gz: 09a1a3dbdc6d61b0acdebb4458fbc043eebcb487f95455bdc913120b97420bee7a4301ae8d34632045b9eb754377ee514fb720cd8a1022b9e6c829bcf7c1fb1d

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.1.1
+
+- [#158] Migrations bug fix.
+
 ## 2.1.0
 
 - [#148] Mongoid support

data/lib/generators/active_record/merit_generator.rb

@@ -14,7 +14,7 @@ module ActiveRecord
 
       def copy_migrations_and_model
         migration_template 'add_fields_to_model.rb',
-                           "db/migrate/add_fields_to_#{table_name}"
+                           "db/migrate/add_fields_to_#{table_name}.rb"
       end
     end
   end

data/lib/generators/active_record/remove_generator.rb

@@ -17,7 +17,7 @@ module ActiveRecord
                            'db/migrate/remove_merit_tables.rb'
 
         migration_template 'remove_fields_from_model.rb',
-                           "db/migrate/remove_fields_from_#{table_name}"
+                           "db/migrate/remove_fields_from_#{table_name}.rb"
       end
     end
   end

data/lib/generators/merit/merit_generator.rb

@@ -13,7 +13,7 @@ module Merit
       private
 
       def model_exists?
-        File.exists?(File.join(destination_root, model_path))
+        File.exist? File.join(destination_root, model_path)
       end
 
       def model_path

data/lib/generators/merit/remove_generator.rb

@@ -7,7 +7,7 @@ module Merit
       private
 
       def model_exists?
-        File.exists?(File.join(destination_root, model_path))
+        File.exist? File.join(destination_root, model_path)
       end
 
       def model_path

data/lib/merit.rb

@@ -36,7 +36,8 @@ module Merit
 
   # Define current_user_method
   def self.current_user_method
-    @config.current_user_method || "current_#{@config.user_model_name.downcase}".to_sym
+    @config.current_user_method ||
+      "current_#{@config.user_model_name.downcase}".to_sym
   end
 
   def self.observers

data/lib/merit/controller_extensions.rb

@@ -36,9 +36,10 @@ module Merit
     def target_object
       target_obj = instance_variable_get(:"@#{controller_name.singularize}")
       if target_obj.nil?
-        str = '[merit] No object found, maybe you need a ' +
-          "'@#{controller_name.singularize}' variable in " +
-          "'#{controller_path}_controller'?"
+        str = '[merit] No object found, you might need a ' \
+          "'@#{controller_name.singularize}' variable in " \
+          "'#{controller_path}_controller' if no reputation is applied. " \
+          'If you are using `model_name` option in the rule this is ok.'
         Rails.logger.warn str
       end
       target_obj

data/lib/merit/reputation_change_observer.rb

@@ -1,13 +1,19 @@
 module Merit
   class ReputationChangeObserver
     def update(changed_data)
-      # TODO: sometimes we recieved true in changed_data[:merit_object]
-      # it should be nil or merit object with activity_logs relation
       ActivityLog.create(
         description:    changed_data[:description],
-        related_change: (changed_data[:merit_object] if changed_data[:merit_object].respond_to?(:activity_logs)),
+        related_change: related_change(changed_data),
         action_id:      changed_data[:merit_action_id]
       )
     end
+
+    private
+
+    def related_change(data)
+      if data[:merit_object].respond_to?(:activity_logs)
+        data[:merit_object]
+      end
+    end
   end
 end

data/merit.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.homepage    = "http://github.com/tute/merit"
   s.files       = `git ls-files`.split("\n").reject{|f| f =~ /^\./ }
   s.license     = 'MIT'
-  s.version     = '2.1.0'
+  s.version     = '2.1.1'
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
 

data/test/dummy/app/models/merit/point_rules.rb

@@ -7,7 +7,9 @@ module Merit
     include Merit::PointRulesMethods
 
     def initialize
-      # Thanks for voting point
+      # Thanks for voting point. Tests that both rules are called when both
+      # apply.
+      score 1, on: 'comments#vote'
       score 1, on: 'comments#vote'
 
       # All user's comments earn points

data/test/integration/navigation_test.rb

@@ -195,8 +195,10 @@ class NavigationTest < ActiveSupport::IntegrationCase
 
     visit "/comments/#{Comment.last.id}/vote/4"
     user = User.first
-    assert_equal 46, user.points, 'Voting comments should grant 5 points for voted, and 1 point for voting'
-    assert_equal 5, user.points(category: 'vote'), 'Voting comments should grant 5 points for voted in vote category'
+    assert_equal 47, user.points, 'Voting comments should grant 5 points for
+      voted, and 1 point for voting twice (repeated rule)'
+    assert_equal 5, user.points(category: 'vote'), 'Voting comments should
+      grant 5 points for voted in vote category'
 
     visit '/comments/new'
     fill_in 'Name', with: 'Hi'
@@ -205,7 +207,8 @@ class NavigationTest < ActiveSupport::IntegrationCase
     click_button('Create Comment')
 
     user = User.where(name: 'a').first
-    assert_equal 50, user.points, 'Commenting should grant the integer in comment points if comment is an integer'
+    assert_equal 51, user.points, 'Commenting should grant the integer in
+      comment points if comment is an integer'
   end
 
   test 'user workflow should grant levels at some times' do
@@ -246,14 +249,15 @@ class NavigationTest < ActiveSupport::IntegrationCase
   end
 
   test 'assigning points to a group of records' do
-    DummyObserver.any_instance.expects(:update).times 4
+    DummyObserver.any_instance.expects(:update).times 5
     commenter = User.create(name: 'commenter')
     comment_1 = commenter.comments.create(name: 'comment_1', comment: 'a')
     comment_2 = commenter.comments.create(name: 'comment_2', comment: 'b')
 
     visit comments_path
     # Thanks for voting point, to voted user and it's comments
-    assert_difference('Merit::ActivityLog.count', 4) do
+    # (repeated rule, called twice)
+    assert_difference('Merit::ActivityLog.count', 5) do
       within "tr#c_#{comment_2.id}" do
         click_link '1'
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Tute Costa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
@@ -288,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: General reputation Rails engine.