simplificator-withings 0.6.10 → 0.7.0

data/lib/withings/connection.rb

@@ -1,86 +1,83 @@
-# A convenience class for making get requests to WBS API.
-# It verifies the response and raises ApiError if a call failed.
-class Withings::Connection
-  include HTTParty
-  if ENV.has_key?('http_proxy')
-    uri = URI.parse(ENV['http_proxy'])
-    http_proxy uri.host, uri.port
-  end
-
-  base_uri 'wbsapi.withings.net'
-  format :json
-
-  def initialize(user)
-    @user = user
-  end
-
-  def self.get_request(path, token, secret, params)
-    signature = Withings::Connection.sign(base_uri + path, params, token, secret)
-    params.merge!({:oauth_signature => signature})
-    
-    response = self.get(path, :query => params)
-    verify_response!(response, path, params)
-  end
-
-
-  def get_request(path, params)
-    params.merge!({:userid => @user.user_id})
-    self.class.get_request(path, @user.oauth_token, @user.oauth_token_secret, params)
-  end
-  
-  protected
-  
-  def self.sign(url, params, token, secret)
-    params.merge!({
-      :oauth_consumer_key => Withings.consumer_key,
-      :oauth_nonce => oauth_nonce,
-      :oauth_signature_method => oauth_signature_method,
-      :oauth_timestamp => oauth_timestamp,
-      :oauth_version => oauth_version,
-      :oauth_token => token
-    })
-    calculate_oauth_signature('GET', url, params, secret)
-  end
-  
-  
-  def self.oauth_timestamp
-    Time.now.to_i
-  end
-  
-  def self.oauth_version
-    '1.0'
-  end
-  
-  def self.oauth_signature_method
-    'HMAC-SHA1'
-  end
-  
-  def self.oauth_nonce
-    rand(10 ** 30).to_s(16)
-  end
-  
-  def self.calculate_oauth_signature(method, url, params, oauth_token_secret)
-    # oauth signing is picky with sorting (based on a digest)
-    params = params.to_a.map() do |item| 
-      [item.first.to_s, CGI.escape(item.last.to_s)]
-    end.sort
-    
-    param_string = params.map() {|key, value| "#{key}=#{value}"}.join('&')
-    base_string = [method, CGI.escape(url), CGI.escape(param_string)].join('&')
-    
-    secret = [Withings.consumer_secret, oauth_token_secret].join('&')
-    
-    digest = OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha1'), secret, base_string)
-    Base64.encode64(digest).chomp.gsub( /\n/, '' )
-  end
-  
-  
-  # Verifies the status code in the JSON response and returns either the body element or raises ApiError
-  def self.verify_response!(response, path, params)
-    if response['status'] == 0
-      response['body'] || response['status']
-    else
-      raise Withings::ApiError.new(response['status'], path, params)
-    end
-  end
-end
+# A convenience class for making get requests to WBS API.
+# It verifies the response and raises ApiError if a call failed.
+class Withings::Connection
+  include HTTParty
+  if ENV.has_key?('http_proxy')
+    uri = URI.parse(ENV['http_proxy'])
+    http_proxy uri.host, uri.port
+  end
+
+  base_uri 'wbsapi.withings.net'
+  format :json
+
+  def initialize(user)
+    @user = user
+  end
+
+  def self.get_request(path, token, secret, params)
+    signature = Withings::Connection.sign(base_uri + path, params, token, secret)
+    params.merge!({:oauth_signature => signature})
+
+    response = self.get(path, :query => params)
+    verify_response!(response, path, params)
+  end
+
+  def get_request(path, params)
+    params.merge!({:userid => @user.user_id})
+    self.class.get_request(path, @user.oauth_token, @user.oauth_token_secret, params)
+  end
+
+  protected
+
+  def self.sign(url, params, token, secret)
+    params.merge!({
+      :oauth_consumer_key => Withings.consumer_key,
+      :oauth_nonce => oauth_nonce,
+      :oauth_signature_method => oauth_signature_method,
+      :oauth_timestamp => oauth_timestamp,
+      :oauth_version => oauth_version,
+      :oauth_token => token
+    })
+    calculate_oauth_signature('GET', url, params, secret)
+  end
+
+  def self.oauth_timestamp
+    Time.now.to_i
+  end
+
+  def self.oauth_version
+    '1.0'
+  end
+
+  def self.oauth_signature_method
+    'HMAC-SHA1'
+  end
+
+  def self.oauth_nonce
+    rand(10 ** 30).to_s(16)
+  end
+
+  def self.calculate_oauth_signature(method, url, params, oauth_token_secret)
+    # oauth signing is picky with sorting (based on a digest)
+    params = params.to_a.map() do |item|
+      [item.first.to_s, CGI.escape(item.last.to_s)]
+    end.sort
+
+    param_string = params.map() {|key, value| "#{key}=#{value}"}.join('&')
+    base_string = [method, CGI.escape(url), CGI.escape(param_string)].join('&')
+
+    secret = [Withings.consumer_secret, oauth_token_secret].join('&')
+
+    digest = OpenSSL::HMAC.digest(OpenSSL::Digest.new('sha1'), secret, base_string)
+    Base64.encode64(digest).chomp.gsub( /\n/, '' )
+  end
+
+  # Verifies the status code in the JSON response and returns either the body element or raises ApiError
+  def self.verify_response!(response, path, params)
+    if response['status'] == 0
+      response['body'] || response['status']
+    else
+      raise Withings::ApiError.new(response['status'], path, params)
+    end
+  end
+end

data/lib/withings/user.rb

@@ -1,103 +1,111 @@
-class Withings::User
-  attr_reader :short_name, :user_id, :birthdate, :fat_method, :first_name, :last_name, :gender, :oauth_token, :oauth_token_secret
-
-  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.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
-
-  # If you create a user yourself, then the only attributes of interest (required for calls to the API) are 'user_id' and 'oauth_token' and 'oauth_token_secret'
-  def initialize(params)
-    params = params.stringify_keys
-    @short_name = params['shortname']
-    @first_name = params['firstname']
-    @last_name = params['lastname']
-    @user_id = params['id']                         || params['user_id']
-    @birthdate = Time.at(params['birthdate']) if params['birthdate']
-    @gender = params['gender'] == 0 ? :male : params['gender'] == 1 ? :female : nil
-    @fat_method = params['fatmethod']
-    @oauth_token = params['oauth_token']
-    @oauth_token_secret = params['oauth_token_secret']
-  end
-
-  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 = Withings::SCALE)
-    connection.get_request('/notify', :action => :revoke, :callbackurl => callback_url, :appli => device)
-  end
-
-  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 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|
-      Withings::NotificationDescription.new(item)
-    end
-  end
-
-
-  # List the activity metrics.
-  # Params:
-  # - :date
-  # - :startdateymd
-  # - :enddateymd
-  # Either date OR startdateymd AND enddate need to be supplied.
-  def get_activities(params = {})
-    connection.get_request('/v2/measure', params.merge(:action => :getactivity))
-  end
-
-
-  # list measurement groups
-  # The limit and offset parameters are converted to will_paginate style parameters (:per_page, :page)
-  # - :per_page           (default: 100)
-  # - :page               (default: 1)
-  # - :category           (default: empty)
-  # - :measurement_type   (default: empty)
-  # - :start_at           (default: empty)
-  # - :end_at             (default: empty)
-  # - :last_udpated_at    (default: empty)
-  # - :device             (default: empty)
-  # Parameters are described in WBS api
-  def measurement_groups(params = {})
-    params = params.stringify_keys
-    options = {:limit => 100, :offset => 0}
-    options[:limit] =  params['per_page'] if params.has_key?('per_page')
-    options[:offset] = ((params['page'] || 1) - 1) * options[:limit]
-    options[:category] = params['category'] if params.has_key?('category')
-    options[:meastype] = params['measurement_type'] if params.has_key?('measurement_type')
-    options[:startdate] = params['start_at'].to_i if params['start_at']
-    options[:enddate] = params['end_at'].to_i if params['end_at']
-    options[:lastupdate] = params['last_updated_at'].to_i if params['last_updated_at']
-    options[:devtype] = params['device'] if params['device']
-    response = connection.get_request('/measure', options.merge(:action => :getmeas))
-    response['measuregrps'].map do |group|
-      Withings::MeasurementGroup.new(group)
-    end
-  end
-
-  def to_s
-    "[User #{short_name} / #{:user_id}]"
-  end
-
-
-  protected
-
-  def devices_bitmask(*devices)
-    devices = [Withings::SCALE, Withings::BLOOD_PRESSURE_MONITOR] if Array(devices).empty?
-    devices.inject('|'.to_sym)
-  end
-
-  def connection
-    @connection ||= Withings::Connection.new(self)
-  end
-
-end
+class Withings::User
+  attr_reader :short_name, :user_id, :birthdate, :fat_method, :first_name, :last_name, :gender, :oauth_token, :oauth_token_secret
+
+  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.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
+
+  # If you create a user yourself, then the only attributes of interest (required for calls to the API) are 'user_id' and 'oauth_token' and 'oauth_token_secret'
+  def initialize(params)
+    params = params.stringify_keys
+    @short_name = params['shortname']
+    @first_name = params['firstname']
+    @last_name = params['lastname']
+    @user_id = params['id']                         || params['user_id']
+    @birthdate = Time.at(params['birthdate']) if params['birthdate']
+    @gender = params['gender'] == 0 ? :male : params['gender'] == 1 ? :female : nil
+    @fat_method = params['fatmethod']
+    @oauth_token = params['oauth_token']
+    @oauth_token_secret = params['oauth_token_secret']
+  end
+
+  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 = Withings::SCALE)
+    connection.get_request('/notify', :action => :revoke, :callbackurl => callback_url, :appli => device)
+  end
+
+  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 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|
+      Withings::NotificationDescription.new(item)
+    end
+  end
+
+
+  # List the activity metrics.
+  # Params:
+  # - :date
+  # - :startdateymd
+  # - :enddateymd
+  # Either date OR startdateymd AND enddate need to be supplied.
+  def get_activities(params = {})
+    connection.get_request('/v2/measure', params.merge(:action => :getactivity))
+  end
+
+  # List the sleep metrics
+  # Params:
+  # - :startdate
+  # - :enddate
+  def get_sleeps(params = {})
+    connection.get_request('/v2/sleep', params.merge(:action => :get))
+  end
+
+
+  # list measurement groups
+  # The limit and offset parameters are converted to will_paginate style parameters (:per_page, :page)
+  # - :per_page           (default: 100)
+  # - :page               (default: 1)
+  # - :category           (default: empty)
+  # - :measurement_type   (default: empty)
+  # - :start_at           (default: empty)
+  # - :end_at             (default: empty)
+  # - :last_udpated_at    (default: empty)
+  # - :device             (default: empty)
+  # Parameters are described in WBS api
+  def measurement_groups(params = {})
+    params = params.stringify_keys
+    options = {:limit => 100, :offset => 0}
+    options[:limit] =  params['per_page'] if params.has_key?('per_page')
+    options[:offset] = ((params['page'] || 1) - 1) * options[:limit]
+    options[:category] = params['category'] if params.has_key?('category')
+    options[:meastype] = params['measurement_type'] if params.has_key?('measurement_type')
+    options[:startdate] = params['start_at'].to_i if params['start_at']
+    options[:enddate] = params['end_at'].to_i if params['end_at']
+    options[:lastupdate] = params['last_updated_at'].to_i if params['last_updated_at']
+    options[:devtype] = params['device'] if params['device']
+    response = connection.get_request('/measure', options.merge(:action => :getmeas))
+    response['measuregrps'].map do |group|
+      Withings::MeasurementGroup.new(group)
+    end
+  end
+
+  def to_s
+    "[User #{short_name} / #{:user_id}]"
+  end
+
+
+  protected
+
+  def devices_bitmask(*devices)
+    devices = [Withings::SCALE, Withings::BLOOD_PRESSURE_MONITOR] if Array(devices).empty?
+    devices.inject('|'.to_sym)
+  end
+
+  def connection
+    @connection ||= Withings::Connection.new(self)
+  end
+
+end

data/simplificator-withings.gemspec

@@ -1,59 +1,28 @@
 # -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
-  s.name = %q{simplificator-withings}
-  s.version = "0.6.10"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["simplificator", "jmaddi", '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}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "lib/withings.rb",
-     "lib/withings/base.rb",
-     "lib/withings/connection.rb",
-     "lib/withings/error.rb",
-     "lib/withings/measurement_group.rb",
-     "lib/withings/notification_description.rb",
-     "lib/withings/user.rb",
-     "simplificator-withings.gemspec",
-  ]
-  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.8}
-  s.summary = %q{API implementation for withings.com}
-  s.test_files = [
-    "test/helper.rb",
-     "test/users_test.rb",
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, [">= 0"])
-      s.add_runtime_dependency(%q<httparty>, [">= 0"])
-    else
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<mocha>, [">= 0"])
-      s.add_dependency(%q<httparty>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<mocha>, [">= 0"])
-    s.add_dependency(%q<httparty>, [">= 0"])
-  end
+Gem::Specification.new do |spec|
+  spec.name = %q{simplificator-withings}
+  spec.version = "0.7.0"
+  spec.authors = ["simplificator", "jmaddi", 'invernizzi']
+  spec.date = %q{2011-04-18}
+  spec.description = %q{A withings API implementation in ruby. Created for the evita project at evita.ch}
+  spec.summary = %q{API implementation for withings.com}
+  spec.email = %q{info@simplificator.com}
+
+  spec.homepage = %q{http://github.com/simplificator/simplificator-withings}
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+  spec.license = "Sea LICENSE"
+  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "rake", "~> 10.3"
+  spec.add_development_dependency "minitest", "~> 5.4"
+
+  spec.add_development_dependency "mocha", "~> 1.1"
+
+
+  spec.add_dependency 'httparty', "~> 0.13"
 end
 
+