fitgem 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76633b7e4a93d47e6f38b05ea29bb61aa1bc99a7
-  data.tar.gz: 8c9e95113e9fae7d0ac8da7794e57e001f3a7949
+  metadata.gz: 95d4e7ae922736d2f4d8093c43988e563c2a2fae
+  data.tar.gz: 1c018275740218d4adc237efd254740cf9656153
 SHA512:
-  metadata.gz: 27d833fae2901dad5e2f44c69183c020c8685ddd1c7989c8d0c4d07e8744e123a045059dc22b8862a4c4ed19a397694abcaa3cfb26b11601cdd0a8ee41dfdcb2
-  data.tar.gz: e995db140ef78a18144ae95673fb0dfa6192392f3edb94f91a1e0f65ad14099b925f3e4d44a97c6b0df0c02ec7682b67da18aa032fe8751075f0b9112c121595
+  metadata.gz: ff191fe963d6291b1ed8cf97be3b606e0dc5a27fab0696d2927d012d7774760b61cbe7064c207194b2fcd43e7248cb9c9a8f767661e0e6d2974648d02d187f06
+  data.tar.gz: fee32faa7cfa3137dd711f71a1461d04fa1a30cc7951e03674d1da8b81adedac05be14c92f68ea45f6eba546878ee4e1362df08d4d78cc668fd584e50dca4a4d

data/README.md

@@ -1,6 +1,6 @@
 # Fitgem [![Build Status](https://secure.travis-ci.org/whazzmaster/fitgem.png)](http://travis-ci.org/whazzmaster/fitgem)
 
-This gem provides access to [fitbit.com](http://www.fitbit.com) data through [their REST API](http://dev.fitbit.com).  Fitgem can pull data with or without a valid OAUth access_token. Without an access_token you can only gather data that a user has denoted as 'public'.  However, if an access_token is provided then all exposed data can be gathered for the logged-in account.
+Provides access to [fitbit.com](http://www.fitbit.com) data through [their REST API](http://dev.fitbit.com).  Fitgem can pull data with or without a valid OAUth access_token. Without an access_token you can only gather data that a user has denoted as 'public'.  However, if an access_token is provided then all exposed data can be gathered for the logged-in account.
 
 The [Fitbit API](https://wiki.fitbit.com/display/API/Fitbit+API) is currently in BETA and is under development to extend its reach. As the API evolves and is enhanced it's a priority to mirror the functionality in the gem, and **pull requests** are appreciated if you see gaps in API support.
 

data/changelog.md

@@ -3,6 +3,14 @@
 
 # fitgem changelog
 
+## v0.10.0
+
+#### 2014-08-08 Zachery Moneypenny <fitgem@whazzmaster.com>
+
+* Updates default test framework to RSpec 3
+* Updates library to use SSL exclusively when hitting the Fitbit REST API. Fitbit is restricting access to its API via https only on November 3rd, 2014. See [issue #30](https://github.com/whazzmaster/fitgem/issues/30) for more information. This should be transparent to end users of fitgem, as the library simply ignores the :ssl option in the Client constructor and defaults to https everywhere.
+* The previously-deprecated `weekly_leaderboard` and `monthly_leaderboard` methods have now been updated to throw a `DeprecatedApiError` rather than warning about deprecation. These methods will be removed in v1.0.
+
 ## v0.9.0
 
 #### 2014-02-11 Zachery Moneypenny <fitgem@whazzmaster.com>

data/fitgem.gemspec

@@ -1,26 +1,26 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+$:.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.name        = 'fitgem'
   s.version     = Fitgem::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Zachery Moneypenny"]
-  s.email       = ["fitgem@whazzmaster.com"]
-  s.homepage    = "http://github.com/whazzmaster/fitgem"
+  s.authors     = ['Zachery Moneypenny']
+  s.email       = ['fitgem@whazzmaster.com']
+  s.homepage    = 'http://github.com/whazzmaster/fitgem'
   s.summary     = %q{OAuth client library to the data on fitbit.com}
   s.description = %q{A client library to send and retrieve workout, weight, and diet data from fitbit.com}
 
-  s.rubyforge_project = "fitgem"
+  s.rubyforge_project = 'fitgem'
 
-  s.add_dependency "oauth"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "yard"
-  s.add_development_dependency "rdiscount"
+  s.add_dependency 'oauth'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec',     '~> 3.0.0'
+  s.add_development_dependency 'yard'
+  s.add_development_dependency 'rdiscount'
 
   s.files         = [
     '.gitignore',
@@ -69,5 +69,5 @@ Gem::Specification.new do |s|
     'spec/fitgem_helper_spec.rb',
     'spec/fitgem_constructor_spec.rb'
   ]
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 end

data/lib/fitgem/client.rb

@@ -30,11 +30,6 @@ module Fitgem
     # @return [String]
     attr_accessor :api_version
 
-    # Sets or gets the ssl settings
-    # 
-    # @return [Boolean]
-    attr_accessor :ssl
-    
     # Sets or gets the api unit system to be used in API calls
     #
     # @return [String]
@@ -103,8 +98,6 @@ module Fitgem
       @consumer_key = opts[:consumer_key]
       @consumer_secret = opts[:consumer_secret]
 
-      @ssl = opts[:ssl]
-
       @token = opts[:token]
       @secret = opts[:secret]
 
@@ -182,19 +175,12 @@ module Fitgem
       consumer.options[:authorize_path] = '/oauth/authenticate'
       request_token(opts)
     end
-    
-    # The protocol to be used for the API requests
-    # 
-    # @return [String], 'http', or 'https' if ssl == true
-    def protocol
-      ssl ? "https" : "http"
-    end
 
     private
 
       def consumer
         @consumer ||= OAuth::Consumer.new(@consumer_key, @consumer_secret, {
-          :site => "#{protocol}://api.fitbit.com",
+          :site => 'https://api.fitbit.com',
           :proxy => @proxy
         })
       end

data/lib/fitgem/errors.rb

@@ -22,4 +22,7 @@ module Fitgem
 
   class ConnectionRequiredError < Exception
   end
+
+  class DeprecatedApiError < Exception
+  end
 end

data/lib/fitgem/friends.rb

@@ -25,8 +25,7 @@ module Fitgem
     #
     # @deprecated Monthly leaderboards are no longer available from Fitbit. Please update to use {#leaderboard}
     def monthly_leaderboard
-      warn '[DEPRECATED] monthly_leaderboard will be removed in v1.0. Update to using leaderboard method.'
-      leaderboard
+      raise DeprecatedApiError, 'Fitbit no longer exposes a monthly leaderboard. See https://wiki.fitbit.com/display/API/API-Get-Friends-Leaderboard for more information. Use #leaderboard() instead.'
     end
 
     # Get the leaderboard of friends' weekly activities
@@ -35,8 +34,7 @@ module Fitgem
     #
     # @deprecated Please update to use {#leaderboard}
     def weekly_leaderboard
-      warn '[DEPRECATED] weekly_leaderboard will be removed in v1.0. Update to using leaderboard method.'
-      leaderboard
+      raise DeprecatedApiError, 'Fitbit now only exposes a weekly leaderboard, Use #leaderboard() instead.'
     end
 
     # ==========================================

data/lib/fitgem/notifications.rb

@@ -16,7 +16,7 @@ module Fitgem
 
     # Creates a notification subscription
     #
-    # @note You must check the HTTP response code to check the status of the request to add a subscription.  See {https://wiki.fitbit.com/display/API/Subscriptions-API} for information about what the codes mean.
+    # @note You must check the HTTP response code to check the status of the request to add a subscription.  See {https://wiki.fitbit.com/display/API/Fitbit+Subscriptions+API} for information about what the codes mean.
     #
     # @param [Hash] opts The notification subscription data
     # @option opts [Symbol] :type The type of subscription (valid
@@ -33,7 +33,7 @@ module Fitgem
 
     # Removes a notification subscription
     #
-    # @note You must check the HTTP response code to check the status of the request to remove a subscription.  See {https://wiki.fitbit.com/display/API/Subscriptions-API} for information about what the codes mean.
+    # @note You must check the HTTP response code to check the status of the request to remove a subscription.  See {https://wiki.fitbit.com/display/API/Fitbit+Subscriptions+API} for information about what the codes mean.
     #
     # @param [Hash] opts The notification subscription data
     # @option opts [Symbol] :type The type of subscription to remove;

data/lib/fitgem/version.rb

@@ -1,3 +1,3 @@
 module Fitgem
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

data/spec/fitgem_helper_spec.rb

@@ -11,12 +11,12 @@ describe Fitgem::Client do
   describe "#construct_date_range_fragment" do
     it 'should format the correct URI fragment based on a base date and end date' do
       frag = @client.construct_date_range_fragment({:base_date => '2011-03-07', :end_date => '2011-03-14'})
-      frag.should == 'date/2011-03-07/2011-03-14'
+      expect(frag).to eq 'date/2011-03-07/2011-03-14'
     end
 
     it 'should format the correct URI fragment based on a base date and period' do
       frag = @client.construct_date_range_fragment({:base_date => '2011-03-07', :period => '7d'})
-      frag.should == 'date/2011-03-07/7d'
+      expect(frag).to eq 'date/2011-03-07/7d'
     end
 
     it 'should raise an error unless there is a base date AND either a period or an end date' do
@@ -37,28 +37,28 @@ describe Fitgem::Client do
       span_start = DateTime.new(1997, 4, 18, 9, 30, 30)
       span_end = DateTime.new(1999, 10, 3, 15, 30, 30)
       frag = @client.construct_date_range_fragment base_date: span_start, end_date: span_end
-      frag.should eq('date/1997-04-18/1999-10-03')
+      expect(frag).to eq 'date/1997-04-18/1999-10-03'
     end
   end
 
   describe "#format_date" do
     it "accepts DateTime objects" do
       date = DateTime.strptime('2011-03-19','%Y-%m-%d')
-      @client.format_date(date).should == '2011-03-19'
+      expect(@client.format_date(date)).to eq '2011-03-19'
     end
 
     it "accepts strings in YYYY-MM-DD format" do
-      @client.format_date('2011-03-19').should == '2011-03-19'
+      expect(@client.format_date('2011-03-19')).to eq '2011-03-19'
     end
 
     it "accepts the string 'today' to denote the current date" do
       today = Date.today.strftime("%Y-%m-%d")
-      @client.format_date('today').should == today
+      expect(@client.format_date('today')).to eq today
     end
 
     it "accepts the string 'yesterday' to denote the day previous to today" do
       yesterday = (Date.today-1).strftime("%Y-%m-%d")
-      @client.format_date('yesterday').should == yesterday
+      expect(@client.format_date('yesterday')).to eq yesterday
     end
 
     it "rejects strings that are not in YYY-MM-DD format" do
@@ -87,47 +87,47 @@ describe Fitgem::Client do
     context "without a timezone" do
       it "accepts DateTime objects" do
         time = DateTime.parse("3rd Feb 2001 04:05:06 PM")
-        @client.format_time(time).should == "16:05"
+        expect(@client.format_time(time)).to eq "16:05"
       end
 
       it "accepts Time objects" do
         time = Time.mktime 2012, 1, 20, 13, 33, 30
-        @client.format_time(time).should == "13:33"
+        expect(@client.format_time(time)).to eq "13:33"
       end
 
       it "accepts the string 'now' to denote the current localtime" do
         now = DateTime.now
-        @client.format_time('now').should == now.strftime("%H:%M")
+        expect(@client.format_time('now')).to eq now.strftime("%H:%M")
       end
 
       it "accepts strings in HH:mm format" do
         time = "04:20"
-        @client.format_time(time).should == "04:20"
+        expect(@client.format_time(time)).to eq "04:20"
       end
     end
 
     context "with a timezone" do
       it "accepts DateTime objects" do
         time = DateTime.parse("3rd Feb 2001 04:05:06 PM UTC")
-        @client.format_time(time, include_timezone: true).should == "16:05+00:00"
+        expect(@client.format_time(time, include_timezone: true)).to eq "16:05+00:00"
       end
 
       it "accepts Time objects" do
         time = Time.new 2012, 1, 20, 13, 33, 30, "+00:00"
-        @client.format_time(time, include_timezone: true).should == "13:33+00:00"
+        expect(@client.format_time(time, include_timezone: true)).to eq "13:33+00:00"
       end
 
       it "accepts the string 'now' to denote the current localtime" do
         now = DateTime.now
-        @client.format_time('now', include_timezone: true).should == now.strftime("%H:%M%:z")
+        expect(@client.format_time('now', include_timezone: true)).to eq now.strftime("%H:%M%:z")
       end
 
       it "accepts strings in HH:mm format" do
         datetime = DateTime.parse("26th Apr 2000 09:27:00 +08:00")
-        DateTime.stub(:now).and_return datetime
+        allow(DateTime).to receive(:now).and_return datetime
 
         time = "04:20"
-        @client.format_time(time, include_timezone: true).should == "04:20+08:00"
+        expect(@client.format_time(time, include_timezone: true)).to eq "04:20+08:00"
       end
     end
 
@@ -195,49 +195,49 @@ describe Fitgem::Client do
 
     it "returns the correct values when the unit system is Fitgem::ApiUnitSystem.US" do
       @client.api_unit_system = Fitgem::ApiUnitSystem.US
-      @client.label_for_measurement(:duration, false).should == "milliseconds"
-      @client.label_for_measurement(:distance, false).should == "miles"
-      @client.label_for_measurement(:elevation, false).should == "feet"
-      @client.label_for_measurement(:height, false).should == "inches"
-      @client.label_for_measurement(:weight, false).should == "pounds"
-      @client.label_for_measurement(:measurements, false).should == "inches"
-      @client.label_for_measurement(:liquids, false).should == "fl oz"
-      @client.label_for_measurement(:blood_glucose, false).should == "mg/dL"
+      expect(@client.label_for_measurement(:duration, false)).to eq "milliseconds"
+      expect(@client.label_for_measurement(:distance, false)).to eq "miles"
+      expect(@client.label_for_measurement(:elevation, false)).to eq "feet"
+      expect(@client.label_for_measurement(:height, false)).to eq "inches"
+      expect(@client.label_for_measurement(:weight, false)).to eq "pounds"
+      expect(@client.label_for_measurement(:measurements, false)).to eq "inches"
+      expect(@client.label_for_measurement(:liquids, false)).to eq "fl oz"
+      expect(@client.label_for_measurement(:blood_glucose, false)).to eq "mg/dL"
     end
 
     it "returns the correct values when the unit system is Fitgem::ApiUnitSystem.UK" do
       @client.api_unit_system = Fitgem::ApiUnitSystem.UK
-      @client.label_for_measurement(:duration, false).should == "milliseconds"
-      @client.label_for_measurement(:distance, false).should == "kilometers"
-      @client.label_for_measurement(:elevation, false).should == "meters"
-      @client.label_for_measurement(:height, false).should == "centimeters"
-      @client.label_for_measurement(:weight, false).should == "stone"
-      @client.label_for_measurement(:measurements, false).should == "centimeters"
-      @client.label_for_measurement(:liquids, false).should == "mL"
-      @client.label_for_measurement(:blood_glucose, false).should == "mmol/l"
+      expect(@client.label_for_measurement(:duration, false)).to eq "milliseconds"
+      expect(@client.label_for_measurement(:distance, false)).to eq "kilometers"
+      expect(@client.label_for_measurement(:elevation, false)).to eq "meters"
+      expect(@client.label_for_measurement(:height, false)).to eq "centimeters"
+      expect(@client.label_for_measurement(:weight, false)).to eq "stone"
+      expect(@client.label_for_measurement(:measurements, false)).to eq "centimeters"
+      expect(@client.label_for_measurement(:liquids, false)).to eq "mL"
+      expect(@client.label_for_measurement(:blood_glucose, false)).to eq "mmol/l"
     end
 
     it "returns the correct values when the unit system is Fitgem::ApiUnitSystem.METRIC" do
       @client.api_unit_system = Fitgem::ApiUnitSystem.METRIC
-      @client.label_for_measurement(:duration, false).should == "milliseconds"
-      @client.label_for_measurement(:distance, false).should == "kilometers"
-      @client.label_for_measurement(:elevation, false).should == "meters"
-      @client.label_for_measurement(:height, false).should == "centimeters"
-      @client.label_for_measurement(:weight, false).should == "kilograms"
-      @client.label_for_measurement(:measurements, false).should == "centimeters"
-      @client.label_for_measurement(:liquids, false).should == "mL"
-      @client.label_for_measurement(:blood_glucose, false).should == "mmol/l"
+      expect(@client.label_for_measurement(:duration, false)).to eq "milliseconds"
+      expect(@client.label_for_measurement(:distance, false)).to eq "kilometers"
+      expect(@client.label_for_measurement(:elevation, false)).to eq "meters"
+      expect(@client.label_for_measurement(:height, false)).to eq "centimeters"
+      expect(@client.label_for_measurement(:weight, false)).to eq "kilograms"
+      expect(@client.label_for_measurement(:measurements, false)).to eq "centimeters"
+      expect(@client.label_for_measurement(:liquids, false)).to eq "mL"
+      expect(@client.label_for_measurement(:blood_glucose, false)).to eq "mmol/l"
     end
 
     context "when respecting the user's unit measurement preferences" do
       before(:each) do
-        @client.stub(:connected?).and_return(true)
-        @client.stub(:user_info).and_return({"user" => {"distanceUnit"=>"en_GB", "glucoseUnit"=>"en_GB", "heightUnit"=>"en_GB", "waterUnit"=>"METRIC", "weightUnit"=>"en_GB"}})
+        allow(@client).to receive(:connected?).and_return(true)
+        allow(@client).to receive(:user_info).and_return({"user" => {"distanceUnit"=>"en_GB", "glucoseUnit"=>"en_GB", "heightUnit"=>"en_GB", "waterUnit"=>"METRIC", "weightUnit"=>"en_GB"}})
       end
 
       it "returns the correct overridden measurement label" do
         @client.api_unit_system = Fitgem::ApiUnitSystem.US
-        @client.label_for_measurement(:distance).should == "kilometers"
+        expect(@client.label_for_measurement(:distance)).to eq "kilometers"
       end
     end
   end

data/spec/fitgem_notifications_spec.rb

@@ -8,18 +8,18 @@ describe Fitgem::Client do
 
   describe "#subscriptions" do
     before(:each) do
-      @client.stub :get
+      allow(@client).to receive(:get)
     end
 
     it "calls #make_headers to create the headers for the API call" do
       opts = { :subscriber_id => "5555", :type => :all }
-      @client.should_receive(:make_headers).with({:type=>:all, :subscriber_id=>"5555"})
+      expect(@client).to receive(:make_headers).with({:type=>:all, :subscriber_id=>"5555"})
       @client.subscriptions(opts)
     end
 
     it "calls #get with the correct url and headers" do
       opts = { :subscriber_id => "5555", :type => :all }
-      @client.should_receive(:get).with("/user/-/apiSubscriptions.json", {"X-Fitbit-Subscriber-Id"=>"5555"})
+      expect(@client).to receive(:get).with("/user/-/apiSubscriptions.json", {"X-Fitbit-Subscriber-Id"=>"5555"})
       @client.subscriptions(opts)
     end
   end
@@ -27,68 +27,68 @@ describe Fitgem::Client do
   describe "#create_subscription" do
     before(:each) do
       @resp = OpenStruct.new
-      @client.stub(:raw_post).and_return(@resp)
+      allow(@client).to receive(:raw_post).and_return(@resp)
     end
 
     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"})
+      expect(@client).to receive(:make_headers).with({ :subscriber_id => "5555", :type => :all, :subscription_id => "320"})
       @client.create_subscription(opts)
     end
 
     it "calls #raw_post with the correct url and headers for :all collection type" do
       opts = { :subscriber_id => "5555", :type => :all, :subscription_id => "320", :use_subscription_id => true }
-      @client.should_receive(:raw_post).once.with("/user/-/apiSubscriptions/320.json", "", {"X-Fitbit-Subscriber-Id"=>"5555"})
+      expect(@client).to receive(:raw_post).once.with("/user/-/apiSubscriptions/320.json", "", {"X-Fitbit-Subscriber-Id"=>"5555"})
       @client.create_subscription(opts)
     end
 
     it "calls #raw_post with the correct url and headers for :sleep collection type" do
       opts = { :subscriber_id => "5555", :type => :sleep, :subscription_id => "320", :use_subscription_id => true }
-      @client.should_receive(:raw_post).once.with("/user/-/sleep/apiSubscriptions/320.json", "", {"X-Fitbit-Subscriber-Id"=>"5555"})
+      expect(@client).to receive(:raw_post).once.with("/user/-/sleep/apiSubscriptions/320.json", "", {"X-Fitbit-Subscriber-Id"=>"5555"})
       @client.create_subscription(opts)
     end
 
     it "calls #extract_response_body to get the JSON body" do
       opts = { :subscriber_id => "5555", :type => :all, :subscription_id => "320", :use_subscription_id => true }
-      @client.should_receive(:extract_response_body)
+      expect(@client).to receive(:extract_response_body)
       @client.create_subscription(opts)
     end
 
     it "returns the code and the JSON body in an array" do
       opts = { :subscriber_id => "5555", :type => :all, :subscription_id => "320", :use_subscription_id => true }
-      @resp.should_receive(:code)
-      @client.create_subscription(opts).should be_a(Array)
+      expect(@resp).to receive(:code)
+      expect(@client.create_subscription(opts)).to be_a(Array)
     end
   end
 
   describe "#remove_subscription" do
     before(:each) do
       @resp = OpenStruct.new
-      @client.stub(:raw_delete).and_return(@resp)
+      allow(@client).to receive(:raw_delete).and_return(@resp)
     end
 
     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" })
+      expect(@client).to receive(:make_headers).with({ :subscriber_id => "5555", :type => :all, :subscription_id => "320" })
       @client.remove_subscription(opts)
     end
 
     it "calls #raw_delete with the correct url and headers for :all collection type" do
       opts = { :subscriber_id => "5555", :type => :all, :subscription_id => "320", :use_subscription_id => true }
-      @client.should_receive(:raw_delete).once.with("/user/-/apiSubscriptions/320.json", {"X-Fitbit-Subscriber-Id"=>"5555"})
+      expect(@client).to receive(:raw_delete).once.with("/user/-/apiSubscriptions/320.json", {"X-Fitbit-Subscriber-Id"=>"5555"})
       @client.remove_subscription(opts)
     end
 
     it "calls #extract_response_body to get the JSON body" do
       opts = { :subscriber_id => "5555", :type => :all, :subscription_id => "320", :use_subscription_id => true }
-      @client.should_receive(:extract_response_body)
+      expect(@client).to receive(:extract_response_body)
       @client.remove_subscription(opts)
     end
 
     it "returns the code and the JSON body in an array" do
       opts = { :subscriber_id => "5555", :type => :all, :subscription_id => "320", :use_subscription_id => true }
-      @resp.should_receive(:code)
-      @client.remove_subscription(opts).should be_a(Array)
+      expect(@resp).to receive(:code)
+      expect(@client.remove_subscription(opts)).to be_a(Array)
     end
   end
 
@@ -111,40 +111,40 @@ describe Fitgem::Client do
     it "adds the subscriber id header" do
       opts = { :subscriber_id => '5555', :subscription_id => '320-activity' }
       headers = @client.send(:make_headers, opts)
-      headers.size.should == 1
-      headers['X-Fitbit-Subscriber-Id'].should == "5555"
+      expect(headers.size).to eq 1
+      expect(headers['X-Fitbit-Subscriber-Id']).to eq "5555"
     end
   end
 
   describe "#make_subscription_url" do
     it "creates the correct URL when no specific subscription id is used" do
       opts = { :subscription_id => "320", :type => :all }
-      @client.send(:make_subscription_url, opts).should == "/user/-/apiSubscriptions.json"
+      expect(@client.send(:make_subscription_url, opts)).to eq "/user/-/apiSubscriptions.json"
     end
 
     it "creates the correct URL for :all collection types" do
       opts = { :subscription_id => "320", :type => :all, :use_subscription_id => true }
-      @client.send(:make_subscription_url, opts).should == "/user/-/apiSubscriptions/320.json"
+      expect(@client.send(:make_subscription_url, opts)).to eq "/user/-/apiSubscriptions/320.json"
     end
 
     it "creates the correct URL for the :sleep collection type" do
       opts = { :subscription_id => "320", :type => :sleep, :use_subscription_id => true }
-      @client.send(:make_subscription_url, opts).should == "/user/-/sleep/apiSubscriptions/320.json"
+      expect(@client.send(:make_subscription_url, opts)).to eq "/user/-/sleep/apiSubscriptions/320.json"
     end
 
     it "creates the correct URL for the :body collection type" do
       opts = { :subscription_id => "320", :type => :body, :use_subscription_id => true }
-      @client.send(:make_subscription_url, opts).should == "/user/-/body/apiSubscriptions/320.json"
+      expect(@client.send(:make_subscription_url, opts)).to eq "/user/-/body/apiSubscriptions/320.json"
     end
 
     it "creates the correct URL for the :activities collection type" do
       opts = { :subscription_id => "320", :type => :activities, :use_subscription_id => true }
-      @client.send(:make_subscription_url, opts).should == "/user/-/activities/apiSubscriptions/320.json"
+      expect(@client.send(:make_subscription_url, opts)).to eq "/user/-/activities/apiSubscriptions/320.json"
     end
 
     it "creates the correct URL for the :foods collection type" do
       opts = { :subscription_id => "320", :type => :foods, :use_subscription_id => true }
-      @client.send(:make_subscription_url, opts).should == "/user/-/foods/apiSubscriptions/320.json"
+      expect(@client.send(:make_subscription_url, opts)).to eq "/user/-/foods/apiSubscriptions/320.json"
     end
 
     it "validates the supplied subscription type" do
@@ -155,19 +155,19 @@ describe Fitgem::Client do
       expect { @client.send(:make_subscription_url, opts) }.to raise_error Fitgem::InvalidArgumentError
 
       opts[:type] = :all
-      expect { @client.send(:make_subscription_url, opts) }.not_to raise_error Fitgem::InvalidArgumentError
+      expect { @client.send(:make_subscription_url, opts) }.not_to raise_error
 
       opts[:type] = :activities
-      expect { @client.send(:make_subscription_url, opts) }.not_to raise_error Fitgem::InvalidArgumentError
+      expect { @client.send(:make_subscription_url, opts) }.not_to raise_error
 
       opts[:type] = :sleep
-      expect { @client.send(:make_subscription_url, opts) }.not_to raise_error Fitgem::InvalidArgumentError
+      expect { @client.send(:make_subscription_url, opts) }.not_to raise_error
 
       opts[:type] = :foods
-      expect { @client.send(:make_subscription_url, opts) }.not_to raise_error Fitgem::InvalidArgumentError
+      expect { @client.send(:make_subscription_url, opts) }.not_to raise_error
 
       opts[:type] = :body
-      expect { @client.send(:make_subscription_url, opts) }.not_to raise_error Fitgem::InvalidArgumentError
+      expect { @client.send(:make_subscription_url, opts) }.not_to raise_error
     end
   end
 end

data/spec/fitgem_spec.rb

@@ -3,62 +3,34 @@ require 'spec_helper'
 describe Fitgem do
   before do
     @client = Fitgem::Client.new({
-      :consumer_key => '12345', 
+      :consumer_key => '12345',
       :consumer_secret => '67890'
     })
   end
 
   describe 'global settings' do
     it 'should expose the api_version' do
-      @client.api_version.should == "1"
+      expect(@client.api_version).to eq "1"
     end
 
     it 'should all clients to set a new api version' do
       @client.api_version = "2"
-      @client.api_version.should == "2"
+      expect(@client.api_version).to eq "2"
     end
 
     it 'should default to the US unit system' do
-      @client.api_unit_system.should == Fitgem::ApiUnitSystem.US
+      expect(@client.api_unit_system).to eq Fitgem::ApiUnitSystem.US
     end
 
     it 'should allow the unit system to be set to other types' do
       @client.api_unit_system = Fitgem::ApiUnitSystem.UK
-      @client.api_unit_system.should == Fitgem::ApiUnitSystem.UK
+      expect(@client.api_unit_system).to eq Fitgem::ApiUnitSystem.UK
       @client.api_unit_system = Fitgem::ApiUnitSystem.METRIC
-      @client.api_unit_system.should == Fitgem::ApiUnitSystem.METRIC
+      expect(@client.api_unit_system).to eq Fitgem::ApiUnitSystem.METRIC
     end
 
     it 'should default to a user id of \'-\', the currently-logged in user' do
-      @client.user_id.should == '-'
-    end
-    
-    it "returns the protocol to be used" do
-      @client.protocol.should eq "http"
-    end
-    
-    describe "ssl" do
-      it "should expose the ssl setting" do
-        @client.ssl.should eq nil
-      end
-      
-      context "when true" do
-        let(:client) { Fitgem::Client.new({
-            :consumer_key => '12345', 
-            :consumer_secret => '67890',
-            :ssl => true
-          }) }
-          
-        it "can set the ssl setting to true" do
-          client.ssl.should be_true
-        end
-        
-        it "uses https protocol" do
-          client.protocol.should eq "https"
-        end
-        
-      end
-      
+      expect(@client.user_id).to eq '-'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fitgem
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Zachery Moneypenny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
@@ -42,16 +42,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -89,8 +89,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .yardopts
 - .travis.yml
+- .yardopts
 - Gemfile
 - Guardfile
 - LICENSE
@@ -99,10 +99,10 @@ files:
 - changelog.md
 - fitgem.gemspec
 - lib/fitgem.rb
-- lib/fitgem/version.rb
 - lib/fitgem/activities.rb
 - lib/fitgem/alarms.rb
 - lib/fitgem/badges.rb
+- lib/fitgem/blood_pressure.rb
 - lib/fitgem/body_measurements.rb
 - lib/fitgem/client.rb
 - lib/fitgem/devices.rb
@@ -110,21 +110,21 @@ files:
 - lib/fitgem/food_form.rb
 - lib/fitgem/foods.rb
 - lib/fitgem/friends.rb
+- lib/fitgem/glucose.rb
+- lib/fitgem/heart_rate.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/version.rb
 - lib/fitgem/water.rb
-- lib/fitgem/blood_pressure.rb
-- lib/fitgem/glucose.rb
-- lib/fitgem/heart_rate.rb
+- spec/fitgem_constructor_spec.rb
+- spec/fitgem_helper_spec.rb
+- spec/fitgem_notifications_spec.rb
 - spec/fitgem_spec.rb
 - spec/spec_helper.rb
-- spec/fitgem_notifications_spec.rb
-- spec/fitgem_helper_spec.rb
-- spec/fitgem_constructor_spec.rb
 homepage: http://github.com/whazzmaster/fitgem
 licenses: []
 metadata: {}
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fitgem
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: OAuth client library to the data on fitbit.com