triumph 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/app/controllers/triumph/achievements_controller.rb

@@ -15,6 +15,7 @@ module Triumph
     # GET /achievements/1.xml
     def show
       @achievement = Achievement.find(params[:id])
+      @conditions = @achievement.achievement_conditions
 
       respond_to do |format|
         format.html # show.html.erb

data/app/models/triumph/achievement.rb

@@ -27,5 +27,13 @@ module Triumph
       end
     end
   
+    def to_s
+      condition = achievement_conditions.first
+    
+      return "Grant this achievement when a user has more than #{quantity} #{observe_class.pluralize} 
+      and there are #{condition.total_operator} #{condition.total_value}
+      where #{condition.comparison_attribute} is 
+      #{condition.comparison_operator} #{condition.comparison_value}"
+    end
   end
 end

data/app/views/triumph/achievements/index.html.erb

@@ -4,9 +4,7 @@
   <tr>
     <th>Name</th>
     <th>Description</th>
-    <th>Observe class</th>
     <th>Conditions</th>
-    <th>Quantity</th>
     <th></th>
     <th></th>
     <th></th>
@@ -16,9 +14,7 @@
   <tr>
     <td><%= achievement.name %></td>
     <td><%= achievement.description %></td>
-    <td><%= achievement.observe_class %></td>
-    <td><%= achievement.conditions %></td>
-    <td><%= achievement.quantity %></td>
+    <td><%= achievement %></td>
     <td><%= link_to 'Show', achievement %></td>
     <td><%= link_to 'Edit', edit_triumph_achievement_path(achievement) %></td>
     <td><%= link_to 'Destroy', achievement, :confirm => 'Are you sure?', :method => :delete %></td>

data/app/views/triumph/achievements/show.html.erb

@@ -11,20 +11,8 @@
 </p>
 
 <p>
-  <b>Observe class:</b>
-  <%= @achievement.observe_class %>
+<%= @achievement %>
 </p>
 
-<p>
-  <b>Conditions:</b>
-  <%= @achievement.conditions %>
-</p>
-
-<p>
-  <b>Quantity:</b>
-  <%= @achievement.quantity %>
-</p>
-
-
 <%= link_to 'Edit', edit_triumph_achievement_path(@achievement) %> |
 <%= link_to 'Back', triumph_achievements_path %>

data/triumph.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{triumph}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Bray"]

metadata

@@ -2,7 +2,7 @@
 name: triumph
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Adam Bray
@@ -156,7 +156,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2010006227418304460
+      hash: 1793603896583687947
       segments: 
       - 0
       version: "0"