fitbit-omni-api 0.0.1 → 0.0.2

data/README.md

@@ -52,7 +52,7 @@ Fitbit::Api.new({}).api_call(
 )
 ```
 
-OmniAuth Fitbit supports the Fitbit Resource Access API and the Fitbit Subscriptions API.
+This gem supports the Fitbit Resource Access API and the Fitbit Subscriptions API.
 
 To access the Resource Access API, consult the API docs and provide the required parameters. For example,
 the API-Search-Foods method requires 'api-version', 'query' and 'response-format'. There's also an optional

data/lib/api/fitbit_api.rb

@@ -1,3 +1,5 @@
+require 'omniauth-fitbit'
+
 module Fitbit
   class Api < OmniAuth::Strategies::Fitbit
     
@@ -44,7 +46,7 @@ module Fitbit
 
     def missing_url_parameters? required, supplied
       url_parameters = get_url_parameters(required, supplied)
-      required and supplied & url_parameters != url_parameters
+      url_parameters and url_parameters & supplied != url_parameters
     end
 
     def get_url_parameters required, supplied
@@ -56,9 +58,7 @@ module Fitbit
     end
 
     def get_dynamic_url_parameters required, supplied
-      required.keys.each do |x| 
-        return required[x] if supplied.include? x 
-      end
+      required.keys.each { |k| return required[k] if supplied.include? k }
     end
 
     def missing_post_parameters? required, supplied
@@ -95,7 +95,7 @@ module Fitbit
       required.keys.each_with_index do |x,i|
         error << "(#{i+1}) #{required[x]} "
       end
-      error
+      error << "You supplied: #{supplied}"
     end
 
     def post_parameters_error required, supplied

data/lib/fitbit-omni-api.rb

@@ -1,3 +1,2 @@
 require 'fitbit-omni-api/version'
-require 'omniauth/strategies/fitbit'
 require 'api/fitbit_api'

data/lib/fitbit-omni-api/version.rb

@@ -1,7 +1,7 @@
 module OmniAuth
   module Fitbit
     module Api
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
   end
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: fitbit-omni-api
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
+  prerelease: 
 platform: ruby
 authors:
 - TK Gospodinov
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2013-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: omniauth-oauth
+  name: omniauth-fitbit
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -21,28 +23,15 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: multi_xml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: OmniAuth strategy for Fitbit, plus api wrapper
+description: Fitbit OmniAuth strategy + API wrapper
 email:
 - tk@gospodinov.net
-- Scott McGrat
+- acid64k@yahoo.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -50,32 +39,32 @@ files:
 - lib/api/fitbit_api.rb
 - lib/fitbit-omni-api/version.rb
 - lib/fitbit-omni-api.rb
-- lib/omniauth/strategies/fitbit.rb
 - LICENSE.md
 - Rakefile
 - README.md
 homepage: http://github.com/scrawlon/fitbit-omni-api
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
-summary: OmniAuth strategy for Fitbit, plus api wrapper
+specification_version: 3
+summary: Fitbit OmniAuth strategy + API wrapper
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 3bb58a076555dbaeef38610a7e7cc2035542d1f5
-  data.tar.gz: 1295e14ef5ce64bb429779109eac458c318f524d
-SHA512:
-  metadata.gz: 0dbc41a2b02902432761fd992bda76de1cb5885cdf4d231bb851c235ee57d7be5a12ad21c4c33504fc79c7ba390f8ff8808643499b523549988550d945b07127
-  data.tar.gz: 8fc3c5c81be51e371f440f75c3fd033412c9dcf2dce1da073704123313c75946d804bbde0fe2df524061c01fe7b83029db331782a819b2079479355b2c8bec6a

data/lib/omniauth/strategies/fitbit.rb

@@ -1,49 +0,0 @@
-require 'omniauth'
-require 'omniauth/strategies/oauth'
-
-module OmniAuth
-  module Strategies
-    class Fitbit < OmniAuth::Strategies::OAuth
-
-      option :name, "fitbit"
-
-      option :client_options, {
-          :site               => 'http://api.fitbit.com',
-          :request_token_path => '/oauth/request_token',
-          :access_token_path  => '/oauth/access_token',
-          :authorize_path     => '/oauth/authorize'
-      }
-
-      uid do
-        access_token.params['encoded_user_id']
-      end
-
-      info do
-        {
-            :full_name    => raw_info['user']['fullName'],
-            :display_name => raw_info['user']['displayName'],
-            :nickname     => raw_info['user']['nickname'],
-            :gender       => raw_info['user']['gender'],
-            :about_me     => raw_info['user']['aboutMe'],
-            :city         => raw_info['user']['city'],
-            :state        => raw_info['user']['state'],
-            :country      => raw_info['user']['country'],
-            :dob          => !raw_info['user']['dateOfBirth'].empty? ? Date.strptime(raw_info['user']['dateOfBirth'], '%Y-%m-%d'):nil,
-            :member_since => Date.strptime(raw_info['user']['memberSince'], '%Y-%m-%d'),
-            :locale       => raw_info['user']['locale'],
-            :timezone     => raw_info['user']['timezone']
-        }
-      end
-
-      extra do
-        { 
-            :raw_info => raw_info
-        }
-      end
-
-      def raw_info
-        @raw_info ||= MultiJson.load(access_token.get('http://api.fitbit.com/1/user/-/profile.json').body)
-      end
-    end
-  end
-end