nitroapi 0.0.3 → 0.0.4

data/VERSION

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

data/examples/log_and_check_status.rb

@@ -10,4 +10,5 @@ nitro.login
 nitro.log_action "Video_Watch"
 nitro.challenge_progress
 
+
 puts nitro.action_history "Video_Watch"

data/lib/nitro_api.rb

@@ -71,7 +71,8 @@ module NitroApi
       response = make_call(params)
 
       if response['challenges']
-        response['challenges']['Challenge'].inject({}) do |challenges, item|
+        items = ensure_array(response['challenges']['Challenge'])
+        items.reduce([]) do |challenges, item|
           challenge = Challenge.new
           challenge.name = item["name"]
           challenge.description = item["description"]
@@ -79,8 +80,7 @@ module NitroApi
           challenge.thumb_url = item["thumbUrl"]
           challenge.completed = item["completionCount"].to_i
 
-          challenges[challenge.name] = challenge
-          challenges
+          challenges<< challenge
         end
       end
     end
@@ -105,7 +105,8 @@ module NitroApi
       end
       response = make_call(params)
       if response['ActionHistoryRecord']
-        response['ActionHistoryRecord']['ActionHistoryItem'].inject([]) do
+        items = ensure_array(response['ActionHistoryRecord']['ActionHistoryItem'])
+        items.reduce([]) do
           |history, item|
           history<< {:tags => item['tags'],
             :ts => Time.at(item['ts'].to_i),
@@ -128,6 +129,10 @@ module NitroApi
 
     private
 
+    def ensure_array(items)
+      items.is_a?(Array) ? items : [items]
+    end
+
     def make_call(params)
       request = HOST + ACCEPT + to_query(params)
       data = Net::HTTP.get(URI.parse(request))

data/nitroapi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nitroapi}
-  s.version = "0.0.3"
+  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-08-09}
+  s.date = %q{2011-08-10}
   s.description = %q{Api client for Bunchball's Nitro. http://www.bunchball.com/nitro/}
   s.extra_rdoc_files = [
     "LICENSE.txt",

data/spec/nitro_api_spec.rb

@@ -84,7 +84,7 @@ describe NitroApi do
 
         progress = @nitro.challenge_progress
         progress.should_not be_empty
-        challenge = progress["Watch 10 Videos"]
+        challenge = progress[0]
         challenge.should_not be_nil
         challenge.description.should == "some description"
         challenge.completed.should == 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nitroapi
 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-08-09 00:00:00.000000000 -07:00
+date: 2011-08-10 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2151919720 !ruby/object:Gem::Requirement
+  requirement: &2151908000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151919720
+  version_requirements: *2151908000
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2151918760 !ruby/object:Gem::Requirement
+  requirement: &2151907060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151918760
+  version_requirements: *2151907060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151917460 !ruby/object:Gem::Requirement
+  requirement: &2151906000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2151917460
+  version_requirements: *2151906000
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2151916000 !ruby/object:Gem::Requirement
+  requirement: &2151905240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2151916000
+  version_requirements: *2151905240
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2151914100 !ruby/object:Gem::Requirement
+  requirement: &2151904000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2151914100
+  version_requirements: *2151904000
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2151913060 !ruby/object:Gem::Requirement
+  requirement: &2151901500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151913060
+  version_requirements: *2151901500
 description: Api client for Bunchball's Nitro. http://www.bunchball.com/nitro/
 email: 
 executables: []
@@ -118,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3986991512343110220
+      hash: -4027445193306641225
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: