omniauth-netatmo 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21f3fab1c77372a64b0b3238dd1279e7acf56185
-  data.tar.gz: 2cae5689a0eb9e1a429bbad3eb22c04806a92009
+  metadata.gz: dc5e81607fe509f9c0ac24a05958d46b95f07d86
+  data.tar.gz: 290d81c586651f4f6a1cf62bfaba31380ed1dea4
 SHA512:
-  metadata.gz: fd8deab27e837bf66d69828bc70af7440e1dba224ff356b630af1db35cd3d8012b75438515ccc9c555a1d61beb05a9b77a72ac00eda57b7b648a7a6f8da62131
-  data.tar.gz: faabda16aef8ff547d4ac120f529b8d6ad6bb96b75c985eaeac1a93654c8e7aecda6ae98733d7ba3457ebf29fe67f64ee47494d1d58e5f8ca3eed73a81aa68af
+  metadata.gz: 3479227d44cf89344a836b8ef5053cd527574f35b1c6abed67291729b01dcb4097362fc0212ea0e054c2f80ae149887826dc2f107d6dbfd50fe856e271b9b5f0
+  data.tar.gz: f90013f51e20d49c153876bcfeadd9fcd1e5f93e4c9584ea7aa478ef214a155447aca9d5c61b2adf0c3631eff21a94d789d9ffc0d761367bf7a40debce943f5d

data/Rakefile

@@ -1,8 +1,8 @@
+#!/usr/bin/env rake
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 
-desc "Run specs"
 RSpec::Core::RakeTask.new
 
-desc 'Default: run specs.'
-task :default => :spec
+desc 'Run specs'
+task :default => :spec

data/lib/omniauth/netatmo/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Netatmo
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/omniauth/strategies/netatmo.rb

@@ -5,13 +5,14 @@ module OmniAuth
     class Netatmo < OmniAuth::Strategies::OAuth2
 
       option :client_options, {
-        :site => 'http://api.netatmo.com',
-        :authorize_url => 'http://api.netatmo.net/oauth2/authorize',
-        :token_url => 'http://api.netatmo.net/oauth2/token'
+        :site => 'https://api.netatmo.net/',
+        :authorize_url => 'https://api.netatmo.net/oauth2/authorize',
+        :token_url => 'https://api.netatmo.net/oauth2/token'
       }
 
       option :token_params, {
-        :parse => :query
+        :parse => :json,
+        :grant_type => 'authorization_code'
       }
 
       option :access_token_options, {
@@ -32,10 +33,10 @@ module OmniAuth
         end
       end
 
-      uid { raw_info['_id'] }
+      uid { raw_info['body']['_id'] }
 
       info do
-        { :email => raw_info['email'] }
+        { :email => raw_info['body']['mail'] }
       end
 
       extra do
@@ -43,7 +44,7 @@ module OmniAuth
       end
 
       def raw_info
-        @raw_info ||= access_token.get('/api/getuser').parsed || {}
+        @raw_info ||= access_token.get('/api/getuser', params: { access_token: access_token.token }).parsed
       end
     end
   end

data/omniauth-netatmo.gemspec

@@ -1,6 +1,5 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "omniauth/netatmo/version"
+require File.expand_path('../lib/omniauth/netatmo/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "omniauth-netatmo"
@@ -18,6 +17,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'omniauth', '~> 1.0'
   s.add_dependency 'omniauth-oauth2', '~> 1.1'
+  s.add_development_dependency 'rake', '~> 10.4.0'
   s.add_development_dependency 'rspec', '~> 2.7'
   s.add_development_dependency 'rack-test'
   s.add_development_dependency 'simplecov'

data/spec/omniauth/strategies/netatmo_spec.rb

@@ -4,6 +4,7 @@ describe OmniAuth::Strategies::Netatmo do
   let(:access_token) { stub('AccessToken', :options => {}) }
   let(:parsed_response) { stub('ParsedResponse') }
   let(:response) { stub('Response', :parsed => parsed_response) }
+  let(:token) { stub('Token') }
 
   subject do
     OmniAuth::Strategies::Netatmo.new({})
@@ -15,21 +16,22 @@ describe OmniAuth::Strategies::Netatmo do
 
   context "client options" do
     it 'should have correct site' do
-      subject.options.client_options.site.should eq("http://api.netatmo.com")
+      subject.options.client_options.site.should eq("https://api.netatmo.net/")
     end
 
     it 'should have correct authorize url' do
-      subject.options.client_options.authorize_url.should eq('http://api.netatmo.net/oauth2/authorize')
+      subject.options.client_options.authorize_url.should eq('https://api.netatmo.net/oauth2/authorize')
     end
 
     it 'should have correct token url' do
-      subject.options.client_options.token_url.should eq('http://api.netatmo.net/oauth2/token')
+      subject.options.client_options.token_url.should eq('https://api.netatmo.net/oauth2/token')
     end
   end
 
   context "#raw_info" do
     it "should use relative paths" do
-      access_token.should_receive(:get).with('/api/getuser').and_return(response)
+      access_token.should_receive(:token).and_return(token)
+      access_token.should_receive(:get).with('/api/getuser', { params: { access_token: token } }).and_return(response)
       subject.raw_info.should eq(parsed_response)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-netatmo
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Vincent Pochet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.4.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -138,4 +152,3 @@ signing_key:
 specification_version: 4
 summary: Netatmo OAuth2 Strategy for OmniAuth
 test_files: []
-has_rdoc: