badgeville 0.0.3 → 0.0.4

data/CHANGELOG

@@ -1,5 +1,12 @@
+* 0.0.4
+
+* count activities
+* better error handling
+* add tags to rewards
+
+
 * 0.0.3
 
 * Activity.rewards includes reward objects not reward definitions
 * Reward has verb and threshold data for achievments type rewards
-* Raise non json errors
+* Raise non json errors

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/badgeville.gemspec

@@ -5,17 +5,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{badgeville}
-  s.version = "0.0.2"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gilad Buchman"]
-  s.date = %q{2011-09-06}
+  s.date = %q{2011-09-18}
   s.description = %q{Client for Badgeville's Core API v2. http://rules.badgeville.com}
   s.extra_rdoc_files = [
     "README.md"
   ]
   s.files = [
     ".document",
+    "CHANGELOG",
     "Gemfile",
     "Gemfile.lock",
     "README.md",
@@ -26,6 +27,7 @@ Gem::Specification.new do |s|
     "keys.json.example",
     "lib/badgeville.rb",
     "lib/badgeville/activity.rb",
+    "lib/badgeville/helpers.rb",
     "lib/badgeville/reward.rb",
     "spec/badgeville_spec.rb",
     "spec/reward_spec.rb",

data/examples/log_and_check_status.rb

@@ -12,7 +12,12 @@ pp badgeville.log_activity "commented"
 
 pp badgeville.log_activity "join_team", :team => "myteam"
 
+#check histoy for user
 pp badgeville.get_activities
+pp badgeville.count_activities
+pp badgeville.count_activities :verb => "commented"
+pp badgeville.count_activities :verb => "junk"
+
 pp badgeville.get_rewards #earned for user
 
 badgeville.award "Best User Ever"

data/lib/badgeville.rb

@@ -1,5 +1,6 @@
 require 'json'
 require 'rest_client'
+require 'badgeville/helpers'
 require 'badgeville/activity'
 require 'badgeville/reward'
 
@@ -11,7 +12,8 @@ module Badgeville
   class BadgevilleError < StandardError
     attr_accessor :code
 
-    def initialize (err_code=nil)
+    def initialize (err_code=nil, error_msg="")
+      super error_msg
       @code = err_code
     end
   end
@@ -42,30 +44,37 @@ module Badgeville
       Activity.new(response)
     end
 
-    def get_activities
-      response = make_call(:get, :activities)
+    def get_activities(opts={})
+      response = make_call(:get, :activities, opts)
       response["data"].map do |activity_json|
         Activity.new(activity_json)
       end
     end
 
+    def count_activities(opts={})
+      response = make_call(:get, :activities, opts)
+      response["paging"]["total_entries"].to_i
+    end
+
     def reward_definitions
       unless @reward_definitions
         response = make_call(:get, :reward_definitions)
-        @reward_definitions = response["data"].inject([]) do
-          |rewards, reward_json|
-          rewards<< Reward.new(reward_json)
-          rewards
+        @reward_definitions = response["data"].map do |reward_json|
+          Reward.new(reward_json)
         end
       end
       @reward_definitions
     end
 
     def get_rewards
-      response = make_call(:get, :rewards)
-      response["data"].inject([]) do |rewards, reward_json|
-        rewards<< Reward.new(reward_json)
-        rewards
+      begin
+        response = make_call(:get, :rewards)
+        response["data"].map do |reward_json|
+          Reward.new(reward_json)
+        end
+      rescue BadgevilleError => e
+        raise e unless e.code == 404
+        []
       end
     end
 
@@ -78,7 +87,7 @@ module Badgeville
         'reward[site_id]' => site_id,
         'reward[definition_id]' => reward.id,
       }
-      make_call(:post, :rewards, params)
+      Reward.new(make_call(:post, :rewards, params))
     end
 
     def set_player
@@ -120,10 +129,6 @@ module Badgeville
       obj.is_a?(Array) || obj.is_a?(Hash)
     end
 
-    def ensure_array(items)
-      items.is_a?(Array) ? items : [items]
-    end
-
     def session
       if @session.nil?
         base_url = "#{@protocol}://#{@host}/api/berlin/#{@private_key}"
@@ -150,9 +155,9 @@ module Badgeville
         if e.respond_to? :response
           begin
             data = JSON.parse(e.response)
-            raise BadgevilleError.new(e.code, data["error"])
+            raise BadgevilleError.new(e.http_code, data["error"])
           rescue TypeError
-            raise e
+            raise BadgevilleError.new(e.http_code, data)
           end
         else
           raise e

data/lib/badgeville/helpers.rb

@@ -0,0 +1,7 @@
+module Badgeville
+  module Helpers
+    def ensure_array(items)
+      items.is_a?(Array) ? items : [items]
+    end
+  end
+end

data/lib/badgeville/reward.rb

@@ -1,7 +1,9 @@
+
 module Badgeville
   class Reward
+    include Badgeville::Helpers
     attr_accessor :name, :hint, :image_url, :active, :earned_at, :id
-    attr_accessor :verb, :threshold
+    attr_accessor :verb, :threshold, :tags
 
 #  example: 
 #  {
@@ -55,6 +57,10 @@ module Badgeville
         @verb = json["data"]["verb"]
         @threshold = json["data"]["threshold"].to_i
       end
+      @tags = []
+      if json["tags"]
+        @tags = json["tags"].split(',').map(&:strip)
+      end
     end
   end
 end

data/spec/badgeville_spec.rb

@@ -82,6 +82,32 @@ describe Badgeville do
     end
   end
 
+  describe "#count_activities" do
+    before do
+      site = "example.com"
+      base_url = "http://#{Badgeville::HOST}/api/berlin/api_key/activities.json"
+      total_url = base_url + "?site=#{site}&user=#{@user}"
+      @total_count = 2
+      total_response = {"data" => [],
+        "paging" => {"total_entries" => @total_count}}
+      stub_http_request(:get, total_url).to_return(:body => total_response.to_json)
+      @verb_count = 1
+      verb_url = base_url + "?site=#{site}&user=#{@user}&verb=verb"
+      verb_response = {"data" => [],
+        "paging" => {"total_entries" => @verb_count}}
+      stub_http_request(:get, verb_url).
+        to_return(:body => verb_response.to_json)
+    end
+
+    it "returns total count when a verb is not specified" do
+      @badgeville.count_activities.should == @total_count
+    end
+
+    it "returns num of activities per verb when specified" do
+      @badgeville.count_activities(:verb => "verb").should == @verb_count
+    end
+  end
+
   describe "#reward_definitions" do
     before do
       @url = /http:\/\/#{Badgeville::HOST}.*reward_definitions.json.*user=#{@user}.*/
@@ -93,6 +119,7 @@ describe Badgeville do
     it "should return an array of rewards" do
       @rewards.class.should be(Array)
       @rewards.first.class.should be(Badgeville::Reward)
+      @rewards.first.name.should == "Big Bang"
     end
   end
 

data/spec/reward_spec.rb

@@ -40,11 +40,30 @@ describe Badgeville::Reward do
       @reward.image_url.should =~ /original.png/
       @reward.active.should be_true
       @reward.id.should == "4e4dfab6c47eed727b005c38"
+      @reward.tags.should == []
     end
 
     it "has an grayscale image" do
       @reward.grayscale_url.should == @reward.image_url.sub('original','grayscale')
     end
+
+    context "has one tag" do
+      before do
+        @parsed_json["tags"] = "tag"
+        @reward = Badgeville::Reward.new(@parsed_json)
+      end
+
+      it {@reward.tags.should == ["tag"]}
+    end
+
+    context "has multiple tags" do
+      before do
+        @parsed_json["tags"] = "tag1, tag2"
+        @reward = Badgeville::Reward.new(@parsed_json)
+      end
+
+      it {@reward.tags.should == ["tag1", "tag2"]}
+    end
   end
 
   context "when json is a reward earned by user" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: badgeville
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-12 00:00:00.000000000 -07:00
+date: 2011-09-18 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2160633160 !ruby/object:Gem::Requirement
+  requirement: &2157019100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160633160
+  version_requirements: *2157019100
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2160631280 !ruby/object:Gem::Requirement
+  requirement: &2157018180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160631280
+  version_requirements: *2157018180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160629440 !ruby/object:Gem::Requirement
+  requirement: &2157017140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2160629440
+  version_requirements: *2157017140
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2160627640 !ruby/object:Gem::Requirement
+  requirement: &2157016440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2160627640
+  version_requirements: *2157016440
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2160625140 !ruby/object:Gem::Requirement
+  requirement: &2157015620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2160625140
+  version_requirements: *2157015620
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2160622960 !ruby/object:Gem::Requirement
+  requirement: &2157014620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160622960
+  version_requirements: *2157014620
 description: Client for Badgeville's Core API v2. http://rules.badgeville.com
 email: 
 executables: []
@@ -97,6 +97,7 @@ files:
 - keys.json.example
 - lib/badgeville.rb
 - lib/badgeville/activity.rb
+- lib/badgeville/helpers.rb
 - lib/badgeville/reward.rb
 - spec/badgeville_spec.rb
 - spec/reward_spec.rb
@@ -117,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2793547173798113775
+      hash: -1038648532873041495
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: