badgeville 0.0.2 → 0.0.3

data/CHANGELOG

@@ -0,0 +1,5 @@
+* 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

data/README.md

@@ -36,6 +36,7 @@ badgeville.reward_definitions
 ```
 
 * manually award some reward
+
 ```ruby
 badgeville.award "Best User"
 ```

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/badgeville.rb

@@ -44,9 +44,8 @@ module Badgeville
 
     def get_activities
       response = make_call(:get, :activities)
-      response["data"].inject([]) do |activities, activity_json|
-        activities<< Activity.new(activity_json)
-        activities
+      response["data"].map do |activity_json|
+        Activity.new(activity_json)
       end
     end
 
@@ -94,7 +93,7 @@ module Badgeville
       rescue => e
         if e.respond_to? :response
           data = JSON.parse(e.response)
-          raise BadgevilleError.new(e.code, data["error"])
+          raise BadgevilleError.new(e.http_code, data["error"])
         else
           raise e
         end
@@ -149,8 +148,12 @@ module Badgeville
         json = JSON.parse(data)
       rescue => e
         if e.respond_to? :response
-          data = JSON.parse(e.response)
-          raise BadgevilleError.new(e.code, data["error"])
+          begin
+            data = JSON.parse(e.response)
+            raise BadgevilleError.new(e.code, data["error"])
+          rescue TypeError
+            raise e
+          end
         else
           raise e
         end

data/lib/badgeville/activity.rb

@@ -12,8 +12,8 @@ module Badgeville
         @user_id = json.delete("user_id")
         @points = json.delete("points").to_i
         @created_at = DateTime.parse(json.delete("created_at")).to_time
-        @rewards = json.delete("rewards").inject([]) do |rewards, award|
-          rewards << Reward.new(award["definition"])
+        @rewards = json.delete("rewards").map do |award|
+          Reward.new(award)
         end
         @meta = json.inject({}) do |meta, entry|
           k,v = entry

data/lib/badgeville/reward.rb

@@ -1,6 +1,7 @@
 module Badgeville
   class Reward
     attr_accessor :name, :hint, :image_url, :active, :earned_at, :id
+    attr_accessor :verb, :threshold
 
 #  example: 
 #  {
@@ -50,6 +51,10 @@ module Badgeville
       @hint = json["hint"]
       @image_url = json["image_url"]
       @id = json["_id"]
+      if json["data"] && json["type"] == "achievement"
+        @verb = json["data"]["verb"]
+        @threshold = json["data"]["threshold"].to_i
+      end
     end
   end
 end

data/spec/reward_spec.rb

@@ -63,4 +63,15 @@ describe Badgeville::Reward do
       @reward.id.should == "4e4dfab6c47eed727b005c38"
     end
   end
+
+  context "when reward is an achievement (has data with verb and threshold)" do
+    before do
+      @reward = Badgeville::Reward.new(@parsed_json)
+    end
+
+    it "has verb adn threshold accessors" do
+      @reward.verb.should == "commented"
+      @reward.threshold.should == 2
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: badgeville
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-06 00:00:00.000000000 -07:00
+date: 2011-09-12 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2156516220 !ruby/object:Gem::Requirement
+  requirement: &2160633160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156516220
+  version_requirements: *2160633160
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2156515140 !ruby/object:Gem::Requirement
+  requirement: &2160631280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156515140
+  version_requirements: *2160631280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156514580 !ruby/object:Gem::Requirement
+  requirement: &2160629440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2156514580
+  version_requirements: *2160629440
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156513980 !ruby/object:Gem::Requirement
+  requirement: &2160627640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156513980
+  version_requirements: *2160627640
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2156512980 !ruby/object:Gem::Requirement
+  requirement: &2160625140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2156512980
+  version_requirements: *2160625140
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2156511560 !ruby/object:Gem::Requirement
+  requirement: &2160622960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156511560
+  version_requirements: *2160622960
 description: Client for Badgeville's Core API v2. http://rules.badgeville.com
 email: 
 executables: []
@@ -86,6 +86,7 @@ extra_rdoc_files:
 - README.md
 files:
 - .document
+- CHANGELOG
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -116,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3222885892070570977
+      hash: -2793547173798113775
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: