Rewards und Quests können ausgelöst werden

Gemfile

@@ -29,12 +29,16 @@ gem 'turbolinks'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 1.2'
 
+# Pagination Plugin
+gem 'kaminari'
+
 group :doc do
   # bundle exec rake doc:rails generates the API under doc/api.
   gem 'sdoc', require: false
 end
 
 group :development do
+  gem 'database_cleaner'
   gem 'rails-erd'
   gem 'ffaker'
   gem 'factory_girl_rails', :require => false

Gemfile.lock

@@ -56,6 +56,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.7.0)
+    database_cleaner (1.2.0)
     devise (3.2.2)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
@@ -88,6 +89,9 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
+    kaminari (0.15.1)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
     libv8 (3.16.14.3)
     listen (2.5.0)
       celluloid (>= 0.15.2)
@@ -199,6 +203,7 @@ PLATFORMS
 DEPENDENCIES
   bootstrap-sass
   coffee-rails (~> 4.0.0)
+  database_cleaner
   devise
   factory_girl_rails
   ffaker
@@ -207,6 +212,7 @@ DEPENDENCIES
   guard-rspec
   jbuilder (~> 1.2)
   jquery-rails
+  kaminari
   rails (= 4.0.2)
   rails-erd
   rspec-rails

Guardfile

 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
+#
 
+notification(:tmux , {
+})
 guard(
  :rspec 
 ) do
@@ -24,3 +27,9 @@ guard(
   watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
 end
 
+
+guard :bundler do
+  watch('Gemfile')
+  # Uncomment next line if your Gemfile contains the `gemspec' command.
+  # watch(/^.+\.gemspec/)
+end

app/controllers/chronicles_controller.rb

@@ -12,7 +12,11 @@ class ChroniclesController < ApplicationController
 
   def set_chronicle
     @chronicle = (Earning.all + Redemption.all).sort do |a,b|
-      a.created_at <=> b.created_at
+      b.created_at <=> a.created_at
     end
+
+    @chronicle = Kaminari.paginate_array(
+      @chronicle
+    ).page(params[:page]).per(20)
   end
 end

app/controllers/earnings_controller.rb

@@ -6,7 +6,9 @@ class EarningsController < ApplicationController
 
   # TODO user should be set
   def cancel
-    @earning.cancel!(current_hacker)
+    if @earning.cancel!(current_hacker)
+      flash[:warning] = "#{@earning.points} storniert"
+    end
     redirect_to :back
   end
 

app/controllers/hackers_controller.rb

@@ -42,7 +42,7 @@ class HackersController < ApplicationController
 
   def set_chronicle
     @chronicle = (@hacker.earnings.all + @hacker.redemptions.all).sort do |a,b|
-      a.created_at <=> b.created_at
+      b.created_at <=> a.created_at
     end
   end
 end

app/controllers/quests_controller.rb

@@ -12,7 +12,12 @@ class QuestsController < ApplicationController
   ######################
 
   def solve
-    @quest.solve(hacker, current_user)
+    if @quest.solve(@hacker, current_hacker)
+      flash[:success] = 'Quest abgeschloßen'
+    else
+      flash[:error]   = 'Quest konnte nicht abgeschloßen werden'
+    end
+    redirect_to :back
   end
 
 
@@ -23,11 +28,12 @@ class QuestsController < ApplicationController
   protected
 
   def set_quest
-    @quest = Quest.find(params[:id])
+    @quest = Quest.find(params[:quest])
   end # #set_quest
 
+  # Da Nested wird der Hacker hier mit ID übermittelt
   def set_hacker
-    @hacker = Hacker.find(params[:hacker_id])
+    @hacker = Hacker.find(params[:id])
   end # #set_hacker
 
 end

app/controllers/redemptions_controller.rb

@@ -3,7 +3,9 @@ class RedemptionsController < ApplicationController
   before_filter :set_redemption, :only => [:cancel]
 
   def cancel
-    @redemption.cancel!
+    if @redemption.cancel!
+      flash[:warning] = "#{@redemption.points} storniert"
+    end
 
     redirect_to :back
   end

app/controllers/rewards_controller.rb

+# encoding: UTF-8
+#
+class RewardsController < ApplicationController
+
+
+  before_filter :set_hacker, :only => [:earn]
+  before_filter :set_reward, :only => [:earn]
+
+
+  ######################
+  ##  Member Methods  ##
+  ######################
+
+  def earn
+    redemption = @reward.earn(@hacker, current_hacker)
+    if redemption.valid?
+      flash[:success] = 'Reward eingelöst'
+    else
+      flash[:error]   = "Reward konnte nicht eingelöst werden\n"
+      flash[:error]   << redemption.errors.full_messages * "\n"
+    end
+    redirect_to :back
+  end
+
+  #########################
+  ##  Protected Methods  ##
+  #########################
+
+  protected
+
+  def set_reward
+    @reward = Reward.find(params[:reward])
+  end # #set_quest
+
+  # Da Nested wird der Hacker hier mit ID übermittelt
+  def set_hacker
+    @hacker = Hacker.find(params[:id])
+  end # #set_hacker
+end

app/helpers/application_helper.rb

@@ -6,11 +6,15 @@ module ApplicationHelper
     "http://gravatar.com/avatar/#{hash}?s=#{size}"
   end
 
-  def login_or_username
+  def li_login_or_userpanel
     if current_hacker.blank?
-      link_to 'Einloggen', new_hacker_session_path 
+      content_tag(:li, link_to('Einloggen', new_hacker_session_path))
     else
-      link_to current_hacker.nickname, current_hacker
+      concat(
+        content_tag(:li, link_to(current_hacker.nickname, current_hacker))
+      )
+
+      content_tag(:li, link_to('Ausloggen', destroy_hacker_session_path, :method => :delete))
     end
   end
 end

app/models/hacker.rb

@@ -9,28 +9,50 @@ class Hacker < ActiveRecord::Base
   has_many :earnings,    :foreign_key => :hacker_id
   has_many :redemptions, :foreign_key => :hacker_id
 
+  has_many :earning_cancels,    :through => :earnings,    :source => :cancel
+  has_many :redemption_cancels, :through => :redemptions, :source => :cancel
 
   ######################
   ## Instance Methods ##
   ######################
+  #
+  
+  def redemptions_without_cancel
+    return redemptions.
+      where(
+        Redemption.arel_table[:id].not_in(
+          self.redemption_cancels.map(&:subject_id)
+        )
+      )
+  end
 
   # Summe aller jemals eingelösten Punkte
   def all_redeemed_points
-    return redemptions.where("id not in (select subject_id from cancels where subject_type = 'Redemption')").sum('points')
+    return redemptions_without_cancel.sum('points')
   end
 
-  # Summe aller in den letzten 90 Tagen verdienten Punkte
-  def recent_earned_points
-    return earnings.where("id not in (select subject_id from cancels where subject_type = 'Earning')").
-        where('created_at >= ?', Date.today - 90).sum('points')
+  def earnings_without_cancel
+    return earnings.
+      where(
+        Earning.arel_table[:id].not_in(
+          self.earning_cancels.map(&:subject_id)
+        )
+      )
   end
 
   # Summe aller jemals verdienten Punkte, 
   # unabhängig davon, ob diese bereits 
   # eingelöst wurden oder nicht
   def all_earned_points
-    return earnings.sum('points')
+    return earnings_without_cancel.sum('points')
   end
+
+  # Summe aller in den letzten 90 Tagen verdienten Punkte
+  def recent_earned_points
+    return earnings_without_cancel.
+        where('created_at >= ?', Date.today - 90).sum('points')
+  end
+
   
   # Verbleibendes Guthaben, d.h. alle jemals verdienten Punkte
   # abzüglich aller jemals eingelösten Punkte,

app/models/quest.rb

@@ -12,7 +12,7 @@ class Quest < ActiveRecord::Base
     hacker.earnings.create({
       :user => user,
       :points => self.points,
-      :chronicle_text => self.description
+      :chronicle_text => self.title
     })
   end # #solve
 end

app/models/reward.rb

@@ -7,4 +7,13 @@ class Reward < ActiveRecord::Base
   validates :points, :title, :presence => true
 
   validates :points, :numericality => {:greater_than => 0}
+
+  def earn(hacker, user = nil)
+    hacker.redemptions.create({
+      :user   => user,
+      :points => self.points,
+      :chronicle_text => self.title,
+      :reward => self
+    })
+  end
 end

app/views/chronicles/_earning.html.erb

 <div class="list-group-item row list-group-item-success">
+  <span class="col-md-1">
+    <%= image_tag gravatar_url_for(entry.hacker.email, 24) %>
+  </span>
   <span class="col-md-2">
     +<%= entry.points %>
   </span>

app/views/chronicles/_redemption.html.erb

 <div class="list-group-item list-group-item-warning row">
+  <span class="col-md-1">
+    <%= image_tag gravatar_url_for(entry.hacker.email, 24) %>
+  </span>
   <span class="col-md-1 col-md-offset-1">
     +<%= entry.points %>
   </span>

app/views/chronicles/show.html.erb

+<%= paginate @chronicle %>
 <%= render :partial => 'hackers/chronicle', :locals => {:chronicle => @chronicle} %>
-
+<%= paginate @chronicle %>

app/views/hackers/_quests.html.erb

@@ -3,7 +3,8 @@
     <%= render({
       :partial    => 'hackers/quests/show', 
       :collection => grouped_quests.compact, 
-      :as         => :quest
+      :as         => :quest,
+      :locals     => {:hacker => hacker}
     }) %>
   </div>
 <% end %>

app/views/hackers/_rewards.html.erb

@@ -3,7 +3,8 @@
     <%= render({
     :partial    => 'hackers/rewards/show',
     :collection => grouped_rewards.compact,
-    :as         => :reward
+    :as         => :reward,
+    :locals     => {:hacker => hacker}
     }) %>
   </div>
 <% end %>

app/views/hackers/chronicle/_earning_cancel.html.erb

 <div class="list-group-item list-group-item-danger row">
+  <span class="col-md-1">
+  </span>
   <span class="col-md-2">
     <%= entry.points %>
   </span>

app/views/hackers/chronicle/_redemption_cancel.html.erb

 <div class="list-group-item list-group-item-danger row">
+  <span class="col-md-1">
+  </span>
   <span class="col-md-1 col-md-offset-1">
     <%= entry.points %>
   </span>