fitbyte 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e21658fcc86e8fea16b6de219039f1cdbd4a022
-  data.tar.gz: 54ed78187bf46a6dfcbbeab65537227d704c2aca
+  metadata.gz: 2288b2aa276802af1ee13b8203f7f95bb58c871d
+  data.tar.gz: 15e907b187d26a2faaeb8132506edc32830ca9ab
 SHA512:
-  metadata.gz: ca64fab63f6ee50794649ac29a9d64741769c281724505a650eefcefe8012757d4f92bf61fe08068ff0297cbd82e5772b13042d635f98d24665514cd9a31c1b8
-  data.tar.gz: 830fed104faba746e6c341470d4e23b8add1dba28d8a97c8c6d66c30573b959e508188144bf7144aefb21506cbaeb9a6790621c9c6b548e83d440df09cae3da9
+  metadata.gz: c5c642754e899b14be4b0ffc9e5013920e35d5903e47e5f10c5d5b063daf53c8f53e50f9d2353ec1c77c2f51fca25f74bce70c8f04b150d2802e706189012dd4
+  data.tar.gz: 490c4ce5f77788c5f011d683f16dd8afdc36394186987233d185e2f3efd1332caf5bf4c95a772f178381edfe9bdf943ee101c57140b1cfc48baa788c868ea676

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.2.5
+-----
+- Responses now return FitStruct objects (inherit from OpenStruct).
+
+- Ability to set default data return format by setting `raw_response` on Fitbyte::Client instance (defaults to using FitStruct objects). Can be overridden on each API call by specifying the `raw` boolean option.
+
 0.2.4
 -----
 - Default result format for `get` calls now return OpenStruct objects, allowing for more convenient method-like attribute access. Specifying `raw: true` returns original JSON.

data/README.md

@@ -47,10 +47,10 @@ You're now authenticated and can make calls to Fitbit's API:
 
 ```ruby
 client.food_logs Date.today
-# => #<OpenStruct foods=[#<OpenStruct isFavorite=true, logDate="2015-06-26", logId=1820, loggedFood=#<OpenStruct accessLevel="PUBLIC", amount=132.57, brand="", calories=752, ...]
+# => #<Fitbyte::FitStruct foods=[#<Fitbyte::FitStruct isFavorite=true, logDate="2015-06-26", logId=1820, loggedFood=#<Fitbyte::FitStruct accessLevel="PUBLIC", amount=132.57, brand="", calories=752, ...]
 ```
 
-If your available JSON library allows, the default format for resulting data returns OpenStruct objects, allowing for more convenient method-like attribute access.
+If your JSON library allows, the default format for resulting data returns OpenStruct-based FitStruct objects, allowing for more convenient method-like attribute access.
 
 To return the original JSON, `raw: true` can be specified as an option:
 

data/lib/fitbyte.rb

@@ -1,5 +1,6 @@
 require "oauth2"
 require "date"
+require "ostruct"
 require "fitbyte/version"
 require "fitbyte/client"
 

data/lib/fitbyte/client.rb

@@ -1,3 +1,4 @@
+require "fitbyte/fitstruct"
 require "fitbyte/helpers"
 require "fitbyte/activities"
 require "fitbyte/alarms"
@@ -11,25 +12,28 @@ require "fitbyte/water"
 
 module Fitbyte
   class Client
-    attr_accessor :api_version, :unit_system, :locale, :scope
+    attr_accessor :api_version, :unit_system, :locale, :scope, :raw_response
 
     def initialize(opts)
       missing_args = [:client_id, :client_secret, :redirect_uri] - opts.keys
-
       raise ArgumentError, "Required arguments: #{missing.join(', ')}" if missing_args.size > 0
 
+      opts = defaults.merge(opts)
+
       @client_id = opts[:client_id]
       @client_secret = opts[:client_secret]
 
       @redirect_uri = opts[:redirect_uri]
-      @site_url = opts[:site_url] || defaults[:site_url]
-      @authorize_url = opts[:authorize_url] || defaults[:authorize_url]
-      @token_url = opts[:token_url] || defaults[:token_url]
+      @site_url = opts[:site_url]
+      @authorize_url = opts[:authorize_url]
+      @token_url = opts[:token_url]
+
+      @unit_system = opts[:unit_system]
+      @locale = opts[:locale]
+      @scope = format_scope(opts[:scope])
 
-      @scope = format_scope(opts[:scope]) || defaults[:scope]
-      @unit_system = opts[:unit_system] || defaults[:unit_system]
-      @locale = opts[:locale] || defaults[:locale]
-      @api_version = "1"
+      @api_version = opts[:api_version]
+      @raw_response = opts[:raw_response]
 
       @client = OAuth2::Client.new(@client_id, @client_secret, site: @site_url,
                                    authorize_url: @authorize_url, token_url: @token_url)
@@ -66,8 +70,9 @@ module Fitbyte
     end
 
     def get(path, opts={})
+      raw = opts[:raw].nil? ? @raw_response : opts[:raw]
       MultiJson.load(token.get(("#{@api_version}/" + path), headers: request_headers).response.body,
-                     symbolize_keys: true, object_class: (OpenStruct unless opts[:raw]))
+                     symbolize_keys: true, object_class: (FitStruct unless raw))
     end
 
     def defaults
@@ -77,7 +82,9 @@ module Fitbyte
         token_url: "https://api.fitbit.com/oauth2/token",
         scope: "activity nutrition profile settings sleep social weight",
         unit_system: "en_US",
-        locale: "en_US"
+        locale: "en_US",
+        api_version: "1",
+        raw_response: false
       }
     end
   end

data/lib/fitbyte/fitstruct.rb

@@ -0,0 +1,3 @@
+module Fitbyte
+  class FitStruct < OpenStruct; end
+end

data/lib/fitbyte/version.rb

@@ -1,4 +1,4 @@
 module Fitbyte
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
   REPO_URL = "https://github.com/zokioki/fitbyte"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fitbyte
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Zoran Pesic
@@ -90,6 +90,7 @@ files:
 - lib/fitbyte/body.rb
 - lib/fitbyte/client.rb
 - lib/fitbyte/devices.rb
+- lib/fitbyte/fitstruct.rb
 - lib/fitbyte/food.rb
 - lib/fitbyte/friends.rb
 - lib/fitbyte/helpers.rb