merit 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7d2cd9366ca515998303997aa8b9f30d7ab3e9f
-  data.tar.gz: 7be13cb7255f3d90760360827f07f6d57a2b1376
+  metadata.gz: e3ba1793a99e686187f57a5a9c55c4244ac12593
+  data.tar.gz: efec89f69825fc1a398ab865fd013af76aff760a
 SHA512:
-  metadata.gz: d1ee7dde0226e826d7244c5370ceb9edc8d9bd2d6340a36ba2219c229ea2103e2e891f4fef00708afd9e024bc4b6352fb1a07ba6825a7fc5168385ba18b1abab
-  data.tar.gz: 150e480cb899d7f88ad9ff85f4f7fe4bd19ce2936823454717d27b50ed286809e2a7e6b92b2f0f3fd81600132189f381c8e79ad95aa6e39279537182e392b919
+  metadata.gz: da93660057b6c2fe71593df135de01f7bc724cd8951ca7e4a189447123493ebf1de48a45c25e7a0ccddfed12bac919c83020c1975ab5050e72d261b436f1c8cd
+  data.tar.gz: ff2b6c3f86e9f8d3a14044570f1dc5e002884e80fd8d1b7fb83e0033f60eb6ff8cbe085feab88dab06938aae576cdd75538337e3aa0b32380a24d53ac2c29db0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.3.1
+
+- [#204] Sash creation bugfix on certain conditions
+- [733da49] Improve examples and docs for points `on` option
+
 ## 2.3.0
 
 - [#206] Allow Rule to find Badge by `badge_id`

data/Gemfile

@@ -29,7 +29,7 @@ end
 
 group :development, :test do
   gem 'activerecord-jdbcsqlite3-adapter', :platforms => [:jruby]
-  gem 'sqlite3', '1.3.8', :platforms => [:ruby, :mswin, :mingw]
+  gem 'sqlite3', '~> 1.3.8', :platforms => [:ruby, :mswin, :mingw]
 end
 
 platforms :rbx do

data/README.md

@@ -125,7 +125,7 @@ current_user.rm_badge(badge.id)
 
 ```ruby
 # Get related entries of a given badge
-Badge.find(1).users
+Merit::Badge.find(1).users
 ```
 
 ## Displaying Badges
@@ -156,7 +156,7 @@ action user or to the method(s) defined in the `:to` option. Define rules on
   * `Integer`
   * `Proc`, or any object that accepts `call` which takes one argument, where
     the target_object is passed in and the return value is used as the score.
-* `:on` action as string or array of strings (similar to Rails routes)
+* `:on` action as string or array of strings (like `controller#action`, similar to Rails routes)
 * `:to` method(s) to send to the target_object (who should be scored?)
 * `:model_name` (optional) to specify the model name if it cannot be guessed
   from the controller. (e.g. `model_name: 'User'` for `RegistrationsController`,

data/app/models/merit/action.rb

@@ -20,7 +20,7 @@ module Merit
 
     # Check rules defined for a merit_action
     def check_all_rules
-      processed!
+      mark_as_processed!
       return if had_errors
 
       check_rules rules_matcher.select_from(AppBadgeRules), :badges
@@ -36,8 +36,7 @@ module Merit
       end
     end
 
-    # Mark merit_action as processed
-    def processed!
+    def mark_as_processed!
       self.processed = true
       save
     end

data/lib/generators/merit/templates/merit_point_rules.rb

@@ -13,8 +13,8 @@ module Merit
     include Merit::PointRulesMethods
 
     def initialize
-      # score 10, :on => 'users#update' do
-      #   user.name.present?
+      # score 10, :on => 'users#create' do |user|
+      #   user.bio.present?
       # end
       #
       # score 15, :on => 'reviews#create', :to => [:reviewer, :reviewed]
@@ -23,6 +23,8 @@ module Merit
       #   'comments#create',
       #   'photos#create'
       # ]
+      #
+      # score -10, :on => 'comments#destroy'
     end
   end
 end

data/lib/merit/model_additions.rb

@@ -49,7 +49,8 @@ module Merit
     # http://blog.hasmanythrough.com/2012/1/20/modularized-association-methods-in-rails-3-2
     def _merit_sash_initializer
       define_method(:_sash) do
-        sash || update_attributes(sash: Sash.create)
+        # TODO: reload.sash is not regression tested
+        sash || reload.sash || update_attributes(sash: Sash.create)
         sash
       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.3.0'
+  s.version     = '2.3.1'
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Tute Costa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
@@ -280,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: General reputation Rails engine.