triumph 0.1.1 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.3

data/lib/achievements.rb

@@ -8,12 +8,12 @@ module Achievements
   
   def grant_achievement(achievement)
     unless self.has_achievement?(achievement)
-      CompletedAchievement.create!(:achievemnt_id => achievement.id, :user_id => self.id)
+      CompletedAchievement.create!(:achievement_id => achievement.id, :user_id => self.id)
     end
   end
   
   def has_achievement?(achievement)
-    CompletedAchievements.where("achievement_id = ?", achievement.id).count >= 1     
+    CompletedAchievement.where("achievement_id = ?", achievement.id).count >= 1     
   end
   
 end

data/lib/app/models/achievement.rb

@@ -5,13 +5,13 @@ class Achievement < ActiveRecord::Base
   def self.check_achievements_for(object)
     
     user = object.user
-    object_class = object.class.underscore.downcase
+    object_class = object.class.to_s.underscore.downcase
     potential_achievements = Achievement.where("observe_class = ?", object_class)    
     
     potential_achievements.each do |achievement|
-      total = user.send(object.class.to_s.pluralize.underscore.to_sym).where(achievement.conditions)
-      if total > achievment.quantity
-        user.grant_achievment(achievement)
+      total = user.send(object.class.to_s.pluralize.underscore.to_sym).where(achievement.conditions).count
+      if total >= achievement.quantity
+        user.grant_achievement(achievement)
       end
     end
   end

data/lib/db/migrate/20110711040135_create_achievements.rb

@@ -5,7 +5,7 @@ class CreateAchievements < ActiveRecord::Migration
       t.text    :description
       t.string  :observe_class
       t.string  :conditions
-      t.int     :quantity
+      t.integer     :quantity
       
       t.timestamps
     end

data/lib/db/migrate/20110712025245_create_completed_achievements.rb

@@ -1,7 +1,7 @@
 class CreateCompletedAchievements < ActiveRecord::Migration
   def self.up
     create_table :completed_achievements do |t|
-      t.int     :achievement_id
+      t.integer     :achievement_id
       t.integer :user_id      
       
       t.timestamps

data/lib/db/migrate/20110712033351_create_achievement_conditions.rb

@@ -1,7 +1,7 @@
 class CreateAchievementConditions < ActiveRecord::Migration
   def self.up
     create_table :achievement_conditions do |t|
-      t.int     :achievement_id
+      t.integer :achievement_id
       t.string  :comparison_attribute
       t.string  :comparison_operator
       t.string  :comparison_value

data/lib/generators/achievement_observer/achievement_observer_generator.rb

@@ -1,10 +1,12 @@
+require 'rails/generators'
+
 class AchievementObserverGenerator < Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
   
   argument :model_name, :type => :string, :description => "The name of the model to observe."
   
   def generate
-    empty_directory "app/models/triumph"
+    empty_directory "app/models"
     template "achievement_observer.rb", "app/models/triumph/#{model_name.underscore}_observer.rb"
   end
   

data/lib/generators/triumph/triumph_generator.rb

@@ -1,10 +1,12 @@
+require 'rails/generators'
+
 class TriumphGenerator < Rails::Generators::Base
   
-  source_root File.expand_path('../../lib/db/migrate', __FILE__)
+  source_root File.expand_path('../../../../lib/db/migrate', __FILE__)
   
   def generate
     copy_file "20110711040135_create_achievements.rb", "db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S")}_create_achievements.rb"
-    copy_file "20110712025245_create_completed_achievements.rb", "db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S")}_create_completed_achievements.rb"
-    copy_file "20110712033351_create_achievement_conditions.rb", "db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S")}_create_achievement_conditions.rb"
+    copy_file "20110712025245_create_completed_achievements.rb", "db/migrate/#{(Time.now + 1.minute).utc.strftime("%Y%m%d%H%M%S")}_create_completed_achievements.rb"
+    copy_file "20110712033351_create_achievement_conditions.rb", "db/migrate/#{(Time.now + 2.minutes).utc.strftime("%Y%m%d%H%M%S")}_create_achievement_conditions.rb"
   end
 end

data/triumph.gemspec

@@ -0,0 +1,90 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{triumph}
+  s.version = "0.1.3"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = [%q{Adam Bray}]
+  s.date = %q{2011-07-15}
+  s.description = %q{Triumph makes it easy to add achievements to your app, even dynamically at runtime.}
+  s.email = %q{adam.bray@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".DS_Store",
+    ".document",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/.DS_Store",
+    "lib/achievements.rb",
+    "lib/app/controllers/achievements_controller.rb",
+    "lib/app/models/achievement.rb",
+    "lib/app/models/completed_achievement.rb",
+    "lib/app/views/achievements/index.html.erb",
+    "lib/app/views/achievements/new.html.erb",
+    "lib/db/.DS_Store",
+    "lib/db/migrate/20110711040135_create_achievements.rb",
+    "lib/db/migrate/20110712025245_create_completed_achievements.rb",
+    "lib/db/migrate/20110712033351_create_achievement_conditions.rb",
+    "lib/generators/.DS_Store",
+    "lib/generators/achievement_observer/achievement_observer_generator.rb",
+    "lib/generators/achievement_observer/templates/achievement_observer.rb",
+    "lib/generators/triumph/.DS_Store",
+    "lib/generators/triumph/triumph_generator.rb",
+    "lib/tasks/triumph_tasks.rake",
+    "lib/triumph.rb",
+    "rails/init.rb",
+    "test/helper.rb",
+    "test/test_triumph.rb",
+    "triumph.gemspec"
+  ]
+  s.homepage = %q{http://github.com/adambray/triumph}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.5}
+  s.summary = %q{Trimuph helps you add achievements to your app}
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<rails3-generators>, [">= 0"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
+      s.add_development_dependency(%q<rails>, [">= 3.0.0"])
+    else
+      s.add_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_dependency(%q<rails3-generators>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
+      s.add_dependency(%q<rails>, [">= 3.0.0"])
+    end
+  else
+    s.add_dependency(%q<rails>, [">= 3.0.0"])
+    s.add_dependency(%q<rails3-generators>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
+    s.add_dependency(%q<rails>, [">= 3.0.0"])
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: triumph
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Adam Bray
@@ -157,8 +157,11 @@ files:
 - VERSION
 - lib/.DS_Store
 - lib/achievements.rb
+- lib/app/controllers/achievements_controller.rb
 - lib/app/models/achievement.rb
 - lib/app/models/completed_achievement.rb
+- lib/app/views/achievements/index.html.erb
+- lib/app/views/achievements/new.html.erb
 - lib/db/.DS_Store
 - lib/db/migrate/20110711040135_create_achievements.rb
 - lib/db/migrate/20110712025245_create_completed_achievements.rb
@@ -173,6 +176,7 @@ files:
 - rails/init.rb
 - test/helper.rb
 - test/test_triumph.rb
+- triumph.gemspec
 homepage: http://github.com/adambray/triumph
 licenses: 
 - MIT