merit 0.6.2 → 0.6.3

data/Gemfile.lock

@@ -1,42 +1,43 @@
 PATH
   remote: .
   specs:
-    merit (0.6.2)
+    merit (0.6.3)
       ambry
 
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.12)
-      actionpack (= 3.0.12)
-      mail (~> 2.2.19)
-    actionpack (3.0.12)
-      activemodel (= 3.0.12)
-      activesupport (= 3.0.12)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.5)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.12)
-      activesupport (= 3.0.12)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.12)
-      activemodel (= 3.0.12)
-      activesupport (= 3.0.12)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.12)
-      activemodel (= 3.0.12)
-      activesupport (= 3.0.12)
-    activesupport (3.0.12)
+    actionmailer (3.2.3)
+      actionpack (= 3.2.3)
+      mail (~> 2.4.4)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    addressable (2.2.7)
     ambry (0.3.0)
-    arel (2.0.10)
-    builder (2.1.2)
+    arel (3.0.2)
+    builder (3.0.0)
     capybara (1.1.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -44,57 +45,68 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.3.1)
+    childprocess (0.3.2)
       ffi (~> 1.0.6)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
+    erubis (2.7.0)
     ffi (1.0.11)
     haml (3.1.4)
-    i18n (0.5.0)
-    json (1.6.5)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
+    hike (1.2.1)
+    i18n (0.6.0)
+    journey (1.0.3)
+    json (1.7.0)
+    libwebsocket (0.1.3)
+      addressable
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.18)
-    multi_json (1.1.0)
+    multi_json (1.3.2)
     nokogiri (1.5.2)
     polyglot (0.3.3)
-    rack (1.2.5)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.0.12)
-      actionmailer (= 3.0.12)
-      actionpack (= 3.0.12)
-      activerecord (= 3.0.12)
-      activeresource (= 3.0.12)
-      activesupport (= 3.0.12)
+    rails (3.2.3)
+      actionmailer (= 3.2.3)
+      actionpack (= 3.2.3)
+      activerecord (= 3.2.3)
+      activeresource (= 3.2.3)
+      activesupport (= 3.2.3)
       bundler (~> 1.0)
-      railties (= 3.0.12)
-    railties (3.0.12)
-      actionpack (= 3.0.12)
-      activesupport (= 3.0.12)
+      railties (= 3.2.3)
+    railties (3.2.3)
+      actionpack (= 3.2.3)
+      activesupport (= 3.2.3)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.4)
+      thor (~> 0.14.6)
     rake (0.9.3.beta.1)
     rdoc (3.12)
       json (~> 1.4)
-    rubyzip (0.9.6.1)
-    selenium-webdriver (2.20.0)
+    rubyzip (0.9.8)
+    selenium-webdriver (2.21.2)
       childprocess (>= 0.2.5)
       ffi (~> 1.0)
+      libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
-    sqlite3 (1.3.5)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.6)
     thor (0.14.6)
+    tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.32)
+    tzinfo (0.3.33)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -105,5 +117,5 @@ DEPENDENCIES
   capybara
   haml
   merit!
-  rails (~> 3.0.10)
+  rails (~> 3.2.3)
   sqlite3

data/README.md

@@ -114,6 +114,7 @@ Check for rules on a rake task executed in background like:
 
 # To-do list
 
+* rails g merit MODEL_NAME shouldn't create general migrations again.
 * Abstract User (rule.rb#51 for instance) into a Merit option.
 * Should namespace app/models into Merit module.
 * rescue ActiveRecord::... should depend on ORM used (MongoMapper?)

data/lib/merit/models/active_record/sash.rb

@@ -6,7 +6,10 @@ class Sash < ActiveRecord::Base
   end
 
   def add_badge(badge_id)
-    BadgesSash.create(sash_id: self.id, badge_id: badge_id)
+    bs = BadgesSash.new
+    bs.sash_id = self.id
+    bs.badge_id = badge_id
+    bs.save
   end
   def rm_badge(badge_id)
     badges_sashes = BadgesSash.where(:badge_id => badge_id, :sash_id => self.id)

data/merit.gemspec

@@ -4,11 +4,11 @@ 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.6.2"
+  s.version     = "0.6.3"
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
   s.add_dependency 'ambry'
-  s.add_development_dependency 'rails', '~> 3.0.10'
+  s.add_development_dependency 'rails', '~> 3.2.3'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'haml'
   s.add_development_dependency 'capybara'

data/test/dummy/app/models/comment.rb

@@ -1,4 +1,7 @@
 class Comment < ActiveRecord::Base
   belongs_to :user
+
+  attr_accessible :name, :comment, :user_id, :votes
+
   validates :name, :comment, :user_id, :presence => true
 end

data/test/dummy/app/models/user.rb

@@ -3,6 +3,8 @@ class User < ActiveRecord::Base
 
   has_many :comments
 
+  attr_accessible :name
+
   def show_badges
     badges.collect{|b| "#{b.name.capitalize} (#{b.level})" }.join(', ')
   end

data/test/dummy/config/application.rb

@@ -14,6 +14,7 @@ module Dummy
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
+    config.active_record.whitelist_attributes = true
 
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"

data/test/dummy/config/environments/development.rb

@@ -11,7 +11,6 @@ Dummy::Application.configure do
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send

data/test/dummy/db/schema.rb

@@ -29,8 +29,8 @@ ActiveRecord::Schema.define(:version => 20120318022220) do
     t.text     "comment"
     t.integer  "user_id"
     t.integer  "votes",      :default => 0
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
   end
 
   create_table "merit_actions", :force => true do |t|
@@ -42,19 +42,19 @@ ActiveRecord::Schema.define(:version => 20120318022220) do
     t.integer  "target_id"
     t.boolean  "processed",     :default => false
     t.string   "log"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
   end
 
   create_table "sashes", :force => true do |t|
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   create_table "users", :force => true do |t|
     t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
     t.integer  "sash_id"
     t.integer  "points",     :default => 0
     t.integer  "level",      :default => 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-27 00:00:00.000000000 Z
+date: 2012-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
-  requirement: &70358151847140 !ruby/object:Gem::Requirement
+  requirement: &70291939751160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70358151847140
+  version_requirements: *70291939751160
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70358151846620 !ruby/object:Gem::Requirement
+  requirement: &70291939744340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.10
+        version: 3.2.3
   type: :development
   prerelease: false
-  version_requirements: *70358151846620
+  version_requirements: *70291939744340
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70358151846180 !ruby/object:Gem::Requirement
+  requirement: &70291939743780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70358151846180
+  version_requirements: *70291939743780
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70358151841500 !ruby/object:Gem::Requirement
+  requirement: &70291939743320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70358151841500
+  version_requirements: *70291939743320
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70358151841060 !ruby/object:Gem::Requirement
+  requirement: &70291939742900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70358151841060
+  version_requirements: *70291939742900
 description: Manage badges, points and rankings (reputation) of resources in a Rails
   application.
 email: tutecosta@gmail.com