merit 0.9.2 → 0.9.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    merit (0.9.2)
+    merit (0.9.3)
       ambry (~> 0.3.0)
 
 GEM

data/README.md

@@ -13,7 +13,7 @@
 
 1. Add `gem 'merit'` to your `Gemfile`
 2. Run `rails g merit:install`
-3. Run `rails g merit MODEL_NAME`
+3. Run `rails g merit MODEL_NAME` (e.g. `user`)
 4. Depending on your ORM
   * ActiveRecord: Run `rake db:migrate`
   * Mongoid: Set `config.orm = :mongoid` in `config/initializers/merit.rb`
@@ -61,10 +61,10 @@ end
 
 ## Grant manually
 
-You may also grant badges "by hand":
+You may also grant badges "by hand" (optionally multiple times):
 
 ```ruby
-Badge.find(3).grant_to(current_user)
+Badge.find(3).grant_to(current_user, :allow_multiple => true)
 ```
 
 ---

data/lib/generators/active_record/install_generator.rb

@@ -0,0 +1,26 @@
+require 'rails/generators/active_record'
+
+module ActiveRecord
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      include Rails::Generators::Migration
+      source_root File.expand_path('../templates', __FILE__)
+      desc "add active_record merit migrations for the root objects"
+
+      def self.next_migration_number(path)
+        unless @prev_migration_nr
+          @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
+        else
+          @prev_migration_nr += 1
+        end
+        @prev_migration_nr.to_s
+      end
+
+      def copy_migrations_and_model
+        migration_template 'create_merit_actions.rb', 'db/migrate/create_merit_actions.rb'
+        migration_template 'create_sashes.rb', 'db/migrate/create_sashes.rb'
+        migration_template 'create_badges_sashes.rb', 'db/migrate/create_badges_sashes.rb'
+      end
+    end
+  end
+end

data/lib/generators/active_record/merit_generator.rb

@@ -17,9 +17,6 @@ module ActiveRecord
       end
 
       def copy_migrations_and_model
-        migration_template 'create_merit_actions.rb', 'db/migrate/create_merit_actions.rb'
-        migration_template 'create_sashes.rb', 'db/migrate/create_sashes.rb'
-        migration_template 'create_badges_sashes.rb', 'db/migrate/create_badges_sashes.rb'
         migration_template "add_fields_to_model.rb", "db/migrate/add_fields_to_#{table_name}"
       end
     end

data/lib/generators/merit/install_generator.rb

@@ -2,6 +2,8 @@ module Merit
   module Generators
     class InstallGenerator < Rails::Generators::Base
       source_root File.expand_path('../templates', __FILE__)
+      hook_for :orm
+
       desc "Copy config and rules files"
       def copy_migrations_and_model
         template 'merit.rb', 'config/initializers/merit.rb'

data/lib/generators/merit/merit_generator.rb

@@ -4,6 +4,12 @@ module Merit
       source_root File.expand_path("../templates", __FILE__)
       hook_for :orm
 
+      def inject_merit_content
+        inject_into_class(model_path, class_name, "  has_merit\n\n") if model_exists?
+      end
+
+      private
+
       def model_exists?
         File.exists?(File.join(destination_root, model_path))
       end
@@ -12,9 +18,6 @@ module Merit
         @model_path ||= File.join("app", "models", "#{file_path}.rb")
       end
 
-      def inject_merit_content
-        inject_into_class(model_path, class_name, "  has_merit\n\n") if model_exists?
-      end
     end
   end
-end
+end

data/lib/merit.rb

@@ -20,6 +20,8 @@ module Merit
   end
 
   class Engine < Rails::Engine
+    config.app_generators.orm Merit.orm
+
     initializer 'merit.controller' do |app|
       if Merit.orm == :active_record
         require "merit/models/#{Merit.orm}/sash"

data/merit.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.description = "Manage badges, points and rankings (reputation) of resources in a Rails application."
   s.homepage    = "http://github.com/tute/merit"
   s.files       = `git ls-files`.split("\n").reject{|f| f =~ /^\./ }
-  s.version     = "0.9.2"
+  s.version     = "0.9.3"
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
   s.add_dependency 'ambry',  '~> 0.3.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-16 00:00:00.000000000 Z
+date: 2012-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
@@ -156,6 +156,7 @@ files:
 - app/models/badge.rb
 - app/models/merit_action.rb
 - config/locales/en.yml
+- lib/generators/active_record/install_generator.rb
 - lib/generators/active_record/merit_generator.rb
 - lib/generators/active_record/templates/add_fields_to_model.rb
 - lib/generators/active_record/templates/create_badges_sashes.rb