fitgem 0.5.0 → 0.5.1

data/README.md

@@ -21,10 +21,10 @@ We've started to develop an example app using the fitgem client.  See [https://g
 
 The Fitbit API allows for you to set up notification subscription so that when values change (via automatic syncs with the fitbit device) your applications can be notified automatically.  You can set up a default subscription callback URL via the [Fitbit dev site](https://dev.fitbit.com/ 'Fitbit Developer Site') and then use the Subscriptions API to add or remove subscriptions for individual users.
 
-__Currently, notification management is experimental in this gem__.  There is currently code to add, remove, and list subscriptions (foods, activities, sleep, body, and all collections).  
+__Currently, notification management is experimental in this gem__.  There is currently code to add, remove, and list subscriptions (foods, activities, sleep, body, and all collections).
 
 
-# FAQs 
+# FAQs
 ## What About ruby-fitbit?
 
 There is a good looking gem called [ruby-fitbit](https://github.com/danmayer/ruby-fitbit "ruby-fitbit") that also aims to collect data from the site.  It was created before they released their REST API and uses screen-scraping to gather the data rather than through their API.  I looked into forking it and refactoring to use the new API but after looking through the code I felt it would be more of a total rewrite and so decided to create a new gem that I could design from scratch.
@@ -51,4 +51,4 @@ The Fitbit REST API is in BETA right now, and so it will quite likely change ove
 
 ### Copyright ###
 
-Copyright (c) 2011 Zachery Moneypenny. See LICENSE for further details.
+Copyright (c) 2011-2012 Zachery Moneypenny. See LICENSE for further details.

data/lib/fitgem/notifications.rb

@@ -27,7 +27,7 @@ module Fitgem
     #   a hash containing confirmation information for the subscription.  
     # @since v0.4.0
     def create_subscription(opts)
-      resp = raw_post make_subscription_url(opts), EMPTY_BODY, make_headers(opts.merge({:use_subscription_id => true}))
+      resp = raw_post make_subscription_url(opts.merge({:use_subscription_id => true})), EMPTY_BODY, make_headers(opts)
       [resp.code, extract_response_body(resp)]
     end
 
@@ -48,7 +48,7 @@ module Fitgem
     #   a hash containing confirmation information for the subscription.  
     # @since v0.4.0
     def remove_subscription(opts)
-      resp = raw_delete make_subscription_url(opts), make_headers(opts.merge({:use_subscription_id => true}))
+      resp = raw_delete make_subscription_url(opts.merge({:use_subscription_id => true})), make_headers(opts)
       [resp.code, extract_response_body(resp)]
     end
 
@@ -81,16 +81,10 @@ module Fitgem
     # @return [Hash] The headers has to pass to the get/post/put/delete
     #   methods
     def make_headers(opts)
-      headers = opts.dup
+      headers = {}
       if opts[:subscriber_id]
         headers['X-Fitbit-Subscriber-Id'] = opts[:subscriber_id]
-        headers.delete :subscriber_id
       end
-
-      headers.delete :subscription_id if headers[:subscription_id]
-      headers.delete :type if headers[:type]
-      headers.delete :use_subscription_id if headers[:use_subscription_id]
-
       headers
     end
 
@@ -109,10 +103,10 @@ module Fitgem
     def make_subscription_url(opts)
       validate_subscription_type opts[:type]
       path = if opts[:type] == :all
-               ""
-             else
-               "/"+opts[:type].to_s
-             end
+        ""
+      else
+        "/"+opts[:type].to_s
+      end
       url = "/user/#{@user_id}#{path}/apiSubscriptions"
       if opts[:use_subscription_id]
         unless opts[:subscription_id]

data/lib/fitgem/version.rb

@@ -1,3 +1,3 @@
 module Fitgem
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/fitgem_notifications_spec.rb

@@ -32,7 +32,7 @@ describe Fitgem::Client do
 
     it "adds the :use_subscription_id flag and calls #make_headers" do
       opts = { :subscriber_id => "5555", :type => :all, :subscription_id => "320" }
-      @client.should_receive(:make_headers).with({ :subscriber_id => "5555", :type => :all, :subscription_id => "320", :use_subscription_id => true })
+      @client.should_receive(:make_headers).with({ :subscriber_id => "5555", :type => :all, :subscription_id => "320"})
       @client.create_subscription(opts)
     end
 
@@ -69,7 +69,7 @@ describe Fitgem::Client do
 
     it "adds the :use_subscription_id flag and calls #make_headers" do
       opts = { :subscriber_id => "5555", :type => :all, :subscription_id => "320" }
-      @client.should_receive(:make_headers).with({ :subscriber_id => "5555", :type => :all, :subscription_id => "320", :use_subscription_id => true })
+      @client.should_receive(:make_headers).with({ :subscriber_id => "5555", :type => :all, :subscription_id => "320" })
       @client.remove_subscription(opts)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fitgem
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-22 00:00:00.000000000 Z
+date: 2012-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &70184430460560 !ruby/object:Gem::Requirement
+  requirement: &70336813924980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70184430460560
+  version_requirements: *70336813924980
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70184430460140 !ruby/object:Gem::Requirement
+  requirement: &70336813924560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70184430460140
+  version_requirements: *70336813924560
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70184430495900 !ruby/object:Gem::Requirement
+  requirement: &70336813960400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70184430495900
+  version_requirements: *70336813960400
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70184430494680 !ruby/object:Gem::Requirement
+  requirement: &70336813959180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70184430494680
+  version_requirements: *70336813959180
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70184430493220 !ruby/object:Gem::Requirement
+  requirement: &70336813957720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70184430493220
+  version_requirements: *70336813957720
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70184430492320 !ruby/object:Gem::Requirement
+  requirement: &70336813956900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70184430492320
+  version_requirements: *70336813956900
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70184430491460 !ruby/object:Gem::Requirement
+  requirement: &70336813956040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70184430491460
+  version_requirements: *70336813956040
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70184430490160 !ruby/object:Gem::Requirement
+  requirement: &70336813954640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70184430490160
+  version_requirements: *70336813954640
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70184430488900 !ruby/object:Gem::Requirement
+  requirement: &70336813953360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70184430488900
+  version_requirements: *70336813953360
 description: A client library to send and retrieve workout, weight, and diet data
   from fitbit.com
 email:
@@ -168,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2581731821553703730
+      hash: -4091779949925866203
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2581731821553703730
+      hash: -4091779949925866203
 requirements: []
 rubyforge_project: fitgem
 rubygems_version: 1.8.10