simplificator-withings 0.6.6 → 0.6.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 147bfa6804b84781eac7a30dfbdd240008aab378
+  data.tar.gz: dcc0e0dbcb32340918f6f30257c62390273f1b8f
+SHA512:
+  metadata.gz: a3e7d6d8bf35d6bb557dafd028982664764a497e89a96930409bb1670a9108d7c613584a8fbf12686f4a164157c11a03d2011161cc457ad353afa73688c02170
+  data.tar.gz: 2168a3cb270e6cc1a6a52893211a53847b897695706f2f20d9427909881745ed71ee462c850c1988e874b04e7b3487904b86ee670441fb59cfa55685a1670cae

data/README.rdoc

@@ -4,6 +4,15 @@ This is a ruby implementation for the Withings API. Description of the API can b
 
 == Versions ==
 
+=== 0.6.8 ===
+
+* updated README (thanks to jmaddi)
+
+=== 0.6.7 ===
+
+* Swap ruby-hmac for openssl
+* Allow string userid in User.authenticate
+
 === 0.6.6 ===
 
 Added list_notifications method to user.
@@ -33,7 +42,7 @@ Note that this release breaks the API of previous releases:
 === User.authenticate ===
 
   User.authenticate() has been replaced by User.userlist
-  
+
 There is no description available and no guarantee on the order that users are returned by the API (and yes, there can be many users for a single Account)
 so it seems best to leave the decision to the users of the API.
 
@@ -42,7 +51,7 @@ The old method is still there but please update your code. It will be removed in
 === MeasurementGroup ===
 
   MeasurementGroup#createt_at has been replaced by MeasurementGroup#taken_on
-  
+
 Created at is usually the timestamp at which a record was created. But MeasurementGroup#created_at was the timestamp when you actually took the measurement. You can also take measurements (via the Web UI on withings.com) which are for a past date. The record is created today, but the measurement
 was taken on 2 weeks ago.
 
@@ -95,7 +104,7 @@ Require the API implementation
 
 All classes are name-spaced, if your other code allows you can include Withings
   include Withings
-  
+
 Setup
   Withings.consumer_secret = '1234'
   Withings.consumer_key = 'abcd'
@@ -107,9 +116,9 @@ A user can be authenticated using user id and oauth token/secret
 
 You can handle subscriptions through the API (all devices currently known => Scale + Blood Pressure Monitor)
   user.subscribe_notification('http://foo.bar.com', 'test subscription')
-Specify what devices you are interested  
+Specify what devices you are interested
   user.subscribe_notification('http://foo.bar.com', 'test subscription', Withings::SCALE, Withings::BLOOD_PRESSURE_MONITOR)
-  
+
   user.describe_notification('http://foo.bar.com')
   user.revoke_notification('http://foo.bar.com')
 
@@ -123,7 +132,7 @@ And finally you can get measurements, after all this is what it's for
   user.measurement_groups(:start_at => Time.at(12345), :end_at => Time.at(67890))
   user.measurement_groups(:measurement_type => MeasurementGroup::TYPE_FAT)
   user.measurement_groups(:device => Withings::SCALE)
-  
+
 
 == Note on keys in hashes
 

data/Rakefile

@@ -10,7 +10,7 @@ end
 
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/lib/withings/connection.rb

@@ -74,7 +74,7 @@ class Withings::Connection
     
     secret = [Withings.consumer_secret, oauth_token_secret].join('&')
     
-    digest = HMAC::SHA1.digest(secret, base_string)
+    digest = OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha1'), secret, base_string)
     Base64.encode64(digest).chomp.gsub( /\n/, '' )
   end
   

data/lib/withings/user.rb

@@ -3,7 +3,7 @@ class Withings::User
 
   def self.authenticate(user_id, oauth_token, oauth_token_secret)
     response = Withings::Connection.get_request('/user', oauth_token, oauth_token_secret, :action => :getbyuserid, :userid => user_id)
-    user_data = response['users'].detect { |item| item['id'] == user_id }
+    user_data = response['users'].detect { |item| item['id'] == user_id.to_i }
     raise Withings::ApiError.new(2555, 'No user found', '') unless user_data
     Withings::User.new(user_data.merge({:oauth_token => oauth_token, :oauth_token_secret => oauth_token_secret}))
   end
@@ -22,21 +22,21 @@ class Withings::User
     @oauth_token_secret = params['oauth_token_secret']
   end
   
-  def subscribe_notification(callback_url, description, device = SCALE)
+  def subscribe_notification(callback_url, description, device = Withings::SCALE)
     connection.get_request('/notify', :action => :subscribe, :callbackurl => callback_url, :comment => description, :appli => device)
   end
 
-  def revoke_notification(callback_url, device = SCALE)
+  def revoke_notification(callback_url, device = Withings::SCALE)
     connection.get_request('/notify', :action => :revoke, :callbackurl => callback_url, :appli => device)
   end
 
-  def describe_notification(callback_url, device = SCALE)
+  def describe_notification(callback_url, device = Withings::SCALE)
     response = connection.get_request('/notify', :action => :get, :callbackurl => callback_url, :appli => device)
     Withings::NotificationDescription.new(response.merge(:callbackurl => callback_url))
   end
 
-  # List the notifications for a device (defaults to SCALE), pass nil to list all devices.
-  def list_notifications(device = SCALE)
+  # List the notifications for a device (defaults to Withings::SCALE), pass nil to list all devices.
+  def list_notifications(device = Withings::SCALE)
     options = (device.nil? ? {} : {:appli => device})
     response = connection.get_request('/notify', options.merge({:action => :list}))
     response['profiles'].map do |item|
@@ -89,4 +89,4 @@ class Withings::User
     @connection ||= Withings::Connection.new(self)
   end
   
-end
+end

data/lib/withings.rb

@@ -1,7 +1,6 @@
 require 'httparty'
 require 'cgi'
-require 'hmac-sha1'
 
 %w(base notification_description connection measurement_group error user).each do |part|
   require File.join(File.dirname(__FILE__), 'withings', part)
-end
+end

data/simplificator-withings.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name = %q{simplificator-withings}
-  s.version = "0.6.6"
+  s.version = "0.6.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["pascalbetz"]
+  s.authors = ["pascalbetz", 'invernizzi']
   s.date = %q{2011-04-18}
   s.description = %q{A withings API implementation in ruby. Created for the evita project at evita.ch}
   s.email = %q{info@simplificator.com}
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/simplificator/simplificator-withings}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.8}
   s.summary = %q{API implementation for withings.com}
   s.test_files = [
     "test/helper.rb",
@@ -45,19 +45,15 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
-      s.add_runtime_dependency(%q<ruby-hmac>, [">= 0"])
-      
     else
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<httparty>, [">= 0"])
-      s.add_dependency(%q<ruby-hmac>, [">= 0"])
     end
   else
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<httparty>, [">= 0"])
-    s.add_dependency(%q<ruby-hmac>, [">= 0"])
   end
 end
 

data/test/users_test.rb

@@ -83,4 +83,42 @@ class UsersTest < Test::Unit::TestCase
     end
 
   end
+
+  context 'authenticate' do
+    context 'integer userid' do
+      should 'return user' do
+        Withings::Connection.stubs(:get_request).with('/user', anything(), anything(), anything()).returns({
+          'users' => [
+            {
+              'id' => 29,
+              'firstname' => 'John',
+              'lastname' => 'Doe'
+            }
+          ]
+        })
+        user = User.authenticate(29, 'deadbeef', 'cafebabe')
+        assert_equal 29, user.user_id
+      end
+    end
+
+
+    context 'string userid' do
+      should 'return user' do
+        Withings::Connection.stubs(:get_request).with('/user', anything(), anything(), anything()).returns({
+          'users' => [
+            {
+              'id' => 29,
+              'firstname' => 'John',
+              'lastname' => 'Doe'
+            }
+          ]
+        })
+        assert_nothing_raised do
+          user = User.authenticate('29', 'deadbeef', 'cafebabe')
+          assert_equal 29, user.user_id
+        end
+      end
+    end
+
+  end
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: simplificator-withings
 version: !ruby/object:Gem::Version
-  version: 0.6.6
-  prerelease: 
+  version: 0.6.8
 platform: ruby
 authors:
 - pascalbetz
+- invernizzi
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -14,65 +14,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-hmac
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A withings API implementation in ruby. Created for the evita project
@@ -100,30 +78,28 @@ files:
 - test/users_test.rb
 homepage: http://github.com/simplificator/simplificator-withings
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 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: 1.8.21
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 3
 summary: API implementation for withings.com
 test_files:
 - test/helper.rb
 - test/users_test.rb
-has_rdoc: