fitgem 0.3.2 → 0.3.3

data/fitgem.gemspec

@@ -2,9 +2,11 @@
 $:.push File.expand_path("../lib", __FILE__)
 $:.push File.join(File.dirname(__FILE__), '.', 'lib')
 
+require 'fitgem/version'
+
 Gem::Specification.new do |s|
   s.name        = "fitgem"
-  s.version     = "0.3.2"
+  s.version     = Fitgem::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Zachery Moneypenny"]
   s.email       = ["fitgem@whazzmaster.com"]
@@ -20,8 +22,36 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rb-fsevent"
   s.add_development_dependency "growl"
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.files         = [
+    '.gitignore',
+    '.rvmrc',
+    'Gemfile',
+    'Guardfile',
+    'LICENSE',
+    'README.md',
+    'Rakefile',
+    'fitgem.gemspec',
+    'lib/fitgem.rb',
+    'lib/fitgem/activities.rb',
+    'lib/fitgem/body_measurements.rb',
+    'lib/fitgem/client.rb',
+    'lib/fitgem/devices.rb',
+    'lib/fitgem/errors.rb',
+    'lib/fitgem/foods.rb',
+    'lib/fitgem/friends.rb',
+    'lib/fitgem/helpers.rb',
+    'lib/fitgem/notifications.rb',
+    'lib/fitgem/sleep.rb',
+    'lib/fitgem/time_range.rb',
+    'lib/fitgem/units.rb',
+    'lib/fitgem/users.rb',
+    'lib/fitgem/water.rb',
+    'spec/fitgem_spec.rb',
+    'spec/spec_helper.rb'
+  ]
+  s.test_files   = [
+    'spec/fitgem_spec.rb',
+    'spec/spec_helper.rb'
+  ]
   s.require_paths = ["lib"]
 end

data/lib/fitgem.rb

@@ -4,5 +4,4 @@ require 'oauth'
 require 'fitgem/client'
 
 module Fitgem
-  VERSION = "0.3.2"
 end

data/lib/fitgem/client.rb

@@ -75,21 +75,25 @@ module Fitgem
         headers.merge!("User-Agent" => "fitgem gem v#{Fitgem::VERSION}", "Accept-Language" => @api_unit_system)
         uri = "/#{@api_version}#{path}"
         oauth_response = access_token.get(uri, headers)
-        JSON.parse(oauth_response.body)
+        process_response oauth_response
       end
 
       def post(path, body='', headers={})
         headers.merge!("User-Agent" => "fitgem gem v#{Fitgem::VERSION}", "Accept-Language" => @api_unit_system)
         uri = "/#{@api_version}#{path}"
         oauth_response = access_token.post(uri, body, headers)
-        JSON.parse(oauth_response.body)
+        process_response oauth_response
       end
 
       def delete(path, headers={})
         headers.merge!("User-Agent" => "fitgem gem v#{Fitgem::VERSION}", "Accept-Language" => @api_unit_system)
         uri = "/#{@api_version}#{path}"
         oauth_response = access_token.delete(uri, headers)
-        JSON.parse(oauth_response.body)
+        process_response oauth_response
+      end
+
+      def process_response(resp)
+        resp.nil? || resp.body.nil? ? {} : JSON.parse(resp.body)
       end
   end
-end
+end

data/lib/fitgem/notifications.rb

@@ -20,12 +20,7 @@ module Fitgem
       url = finalize_subscription_url(base_url, options)
       headers = {}
       headers['X-Fitgem-Subscriber-Id'] = options[:subscriber_id] if options[:subscriber_id]
-      begin
-        delete(url, headers)
-      rescue TypeError
-        # Deleting a subscription returns a nil response, which causes a TypeError
-        # when the oauth library tries to parse it.
-      end
+      delete(url, headers)
     end
     
     protected
@@ -49,4 +44,4 @@ module Fitgem
     end
     
   end
-end
+end

data/lib/fitgem/water.rb

@@ -28,11 +28,7 @@ module Fitgem
     # ==========================================
 
     def delete_water_log(log_id)
-      begin
-        delete("/user/-/foods/log/water/#{log_id}.json")
-      rescue TypeError
-        # OAuth library responds badly to nil responses by fitbit's delete methods
-      end
+      delete("/user/-/foods/log/water/#{log_id}.json")
     end
   end
-end
+end

metadata

@@ -2,7 +2,7 @@
 name: fitgem
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Zachery Moneypenny
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-19 00:00:00 -05:00
+date: 2011-08-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency