gamifier 1.0.6 → 1.0.7

data/lib/gamifier/models/activity_definition.rb

@@ -2,15 +2,29 @@ require 'gamifier/model'
 
 module Gamifier
   class ActivityDefinition < Model
-    def limit_per_day(times_per_day)
+
+    def limit(n_times, over_time)
       self.enable_rate_limiting = true
-      self.bucket_max_capacity = times_per_day
-      self.bucket_drain_rate = times_per_day/24.0
+      self.bucket_max_capacity = n_times
+      self.bucket_drain_rate = n_times.to_f / over_time.to_f
+      self
+    end
+
+    def limit_per_day(times_per_day)
+      limit(times_per_day, 24.0)
+    end
+
+    def limit_per_week(times_per_week)
+      limit(times_per_week, 24.0 * 7.0)
     end
 
     def limit_once_per_day
       limit_per_day 1
     end
 
+    def limit_once_per_week
+      limit_per_week 1
+    end
+
   end
-end
+end

data/lib/gamifier/version.rb

@@ -1,3 +1,3 @@
 module Gamifier
-  VERSION = "1.0.6" unless defined?(Gamifier::VERSION)
+  VERSION = "1.0.7" unless defined?(Gamifier::VERSION)
 end

data/spec/integration/collection_integration_spec.rb

@@ -17,4 +17,4 @@ describe "managing collections" do
     ENGINE.activity_definitions.all(:site => "ibadgedyou.dev").length.should == 0
   end
 
-end
+end

data/spec/unit/models/activity_definition_spec.rb

@@ -1,24 +1,59 @@
 require 'spec_helper'
 
 describe Gamifier::Player do
+
   before do
     @engine = mock(Gamifier::Engine)
   end
-  describe "limit_per_day" do
-    it "should set rate limits" do
-      a = Gamifier::ActivityDefinition.new
 
-      a.limit_per_day(1)
-      a.attributes.should include({:enable_rate_limiting => true, :bucket_max_capacity => 1})
+  describe ".limit" do
+
+    subject { Gamifier::ActivityDefinition.new.limit(1, 24.0) }
+
+    it { subject.enable_rate_limiting.should be_true }
+    it { subject.bucket_max_capacity.should == 1 }
+    it { subject.bucket_drain_rate.should == 1 / 24.0 }
+
+  end
+
+  describe ".limit_per_day" do
+
+    subject { Gamifier::ActivityDefinition.new.limit_per_day(1) }
+
+    it { subject.enable_rate_limiting.should be_true }
+    it { subject.bucket_max_capacity.should == 1 }
+    it { subject.bucket_drain_rate.should == 1 / 24.0 }
+
+  end
+
+  describe ".limit_per_week" do
+
+    subject { Gamifier::ActivityDefinition.new.limit_per_week(1) }
+
+    it { subject.enable_rate_limiting.should be_true }
+    it { subject.bucket_max_capacity.should == 1 }
+    it { subject.bucket_drain_rate.should == 1 / (24.0 * 7.0) }
 
-    end
   end
 
-    describe "limit_once_per_day" do
-    it "should set rate limits" do
-      a = Gamifier::ActivityDefinition.new
-      a.should_receive(:limit_per_day).with(1)
-      a.limit_once_per_day
-    end
+  describe ".limit_once_per_day" do
+
+    subject { Gamifier::ActivityDefinition.new.limit_once_per_day }
+
+    it { subject.enable_rate_limiting.should be_true }
+    it { subject.bucket_max_capacity.should == 1 }
+    it { subject.bucket_drain_rate.should == 1 / 24.0 }
+
   end
+
+  describe ".limit_once_per_week" do
+
+    subject { Gamifier::ActivityDefinition.new.limit_once_per_week }
+
+    it { subject.enable_rate_limiting.should be_true }
+    it { subject.bucket_max_capacity.should == 1 }
+    it { subject.bucket_drain_rate.should == 1 / (24.0 * 7.0) }
+
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gamifier
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Cyril Rohr
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-24 00:00:00 Z
+date: 2012-09-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: faraday