omniauth-square 0.9 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fbc8b1e3899fde29413ae907a92edafe6e9abc9
-  data.tar.gz: 3048aa68a28366aed6b7b7c4556c6f9c405b4799
+  metadata.gz: 3015d7085ea4b62fe7acaef16418425309a78865
+  data.tar.gz: 32af0a620290db597ebaff90e77418973db34e63
 SHA512:
-  metadata.gz: 8cb2528181d44ea921c1d4ce7f0aacdfc6ab62c5f7c4ec4909d9f3c8b67571f8d5c550ff8a3664c174e975ebe8bcb3cb87270767851c9afc21cec812fde5c003
-  data.tar.gz: ff69b8212bb7a13ed19d2923684e6188bd4aee22d1f064a7fdd01e1e016ab5262a158d8b9d0b29c3a12f754277a835cb336560e5294e6abec3265402e6180b6f
+  metadata.gz: 9fad2731c3b71badf29ecb68c4a8575c4a77d1a007f18ad7f6c34bf36618fceb2779c899dded3fdd9f2cd99a1a0c7240d0eee07380880d606571b16bedd5c29c
+  data.tar.gz: 4123f50f54c0d9f80cbb239a58628a338d6000ce6a7a5a92e90d0e5656723150b6da9bb2a15627537f3bd1f1e1f01091fd62b029be09707eb9e839ea2b105558

data/README.md

@@ -8,16 +8,19 @@ Square uses the OAuth2 flow, you can read about it here: http://connect.squareup
 
 So let's say you're using Rails, you need to add the strategy to your `Gemfile`:
 
-    gem 'omniauth-square'
+    gem 'omniauth-square', '~> 1.0'
 
-You can pull them in directly from github e.g.:
+You can pull it in directly from github (if you really want to) e.g.:
 
     gem 'omniauth-square', :git => 'https://github.com/danieljacobarcher/omniauth-square.git'
 
 Once these are in, you need to add the following to your `config/initializers/omniauth.rb`:
 
     Rails.application.config.middleware.use OmniAuth::Builder do
-      provider :square, "consumer_key", "consumer_secret" 
+      provider :square, "consumer_key", "consumer_secret",
+      	{
+      		:connect_site  => 'https://connect.squareup.com'
+      	}
     end
 
 You will obviously have to put in your key and secret, which you get when you register your app with Square (they call them Application Key and Secret Key). 

data/lib/omniauth-square/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Square
-    VERSION = "0.9"
+    VERSION = "1.0"
   end
 end

data/lib/omniauth/strategies/square.rb

@@ -6,6 +6,7 @@ module OmniAuth
 
       option :client_options, {
         :site          => 'https://squareup.com/',
+        :connect_site  => 'https://connect.squareup.com',
         :authorize_url => '/oauth2/authorize',
         :token_url     => '/oauth2/token'
       }
@@ -26,7 +27,7 @@ module OmniAuth
       end
 
       def raw_info
-        @raw_info ||= access_token.get('https://connect.squareup.com/v1/me').parsed
+        @raw_info ||= access_token.get('/v1/me').parsed
       end
 
       protected
@@ -37,7 +38,9 @@ module OmniAuth
         parsed_response['expires_at'] = Time.parse(parsed_response['expires_at']).to_i
         parsed_response.merge!(deep_symbolize(options.auth_token_params))
 
-        ::OAuth2::AccessToken.from_hash(client, parsed_response)
+        connect_client = client.dup
+        connect_client.site = options.client_options.connect_site
+        ::OAuth2::AccessToken.from_hash(connect_client, parsed_response)
       end
 
       private

data/spec/omniauth/strategies/square_spec.rb

@@ -131,11 +131,22 @@ describe OmniAuth::Strategies::Square do
   end
 
   describe '#build_access_token' do
+    let(:token_hash) do
+      {'expires_at' => Time.now.iso8601, 'access_token' => '1111111'}
+    end
+
+    before do
+      subject.stub(:fetch_access_token).and_return(token_hash.dup)
+      @token = subject.send :build_access_token
+    end
+
     it 'converts iso8601 expires_at to an integer' do
-      now = Time.now
-      subject.stub(:fetch_access_token).and_return({'expires_at' => now.iso8601})
-      token = subject.send(:build_access_token)
-      expect(token.expires_at).to eq(now.to_i)
+      expires = Time.parse(token_hash['expires_at']).to_i
+      expect(@token.expires_at).to eq(expires)
+    end
+
+    it 'changes the clients site' do
+      expect(@token.client.site).to eq('https://connect.squareup.com')
     end
   end
 

data/spec/support/shared_examples.rb

@@ -0,0 +1,23 @@
+# NOTE it would be useful if this lived in omniauth-oauth2 eventually
+shared_examples 'an oauth2 strategy' do
+  describe '#client' do
+    it 'should be initialized with symbolized client_options' do
+      @options = { :client_options => { 'authorize_url' => 'https://example.com' } }
+      subject.client.options[:authorize_url].should == 'https://example.com'
+    end
+  end
+
+  describe '#token_params' do
+    it 'should include any authorize params passed in the :authorize_params option' do
+      @options = { :token_params => { :foo => 'bar', :baz => 'zip' } }
+      subject.token_params['foo'].should eq('bar')
+      subject.token_params['baz'].should eq('zip')
+    end
+
+    it 'should include top-level options that are marked as :authorize_options' do
+      @options = { :token_options => [:scope, :foo], :scope => 'bar', :foo => 'baz' }
+      subject.token_params['scope'].should eq('bar')
+      subject.token_params['foo'].should eq('baz')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-square
 version: !ruby/object:Gem::Version
-  version: '0.9'
+  version: '1.0'
 platform: ruby
 authors:
 - Daniel Archer
@@ -11,76 +11,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Square OAuth strategy for OmniAuth
@@ -93,7 +93,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - README.md
 - Rakefile
@@ -103,6 +103,7 @@ files:
 - omniauth-square.gemspec
 - spec/omniauth/strategies/square_spec.rb
 - spec/spec_helper.rb
+- spec/support/shared_examples.rb
 homepage: https://github.com/danieljacobarcher/omniauth-square
 licenses:
 - MIT
@@ -113,20 +114,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: omniauth-square
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Square OAuth strategy for OmniAuth
 test_files:
 - spec/omniauth/strategies/square_spec.rb
 - spec/spec_helper.rb
+- spec/support/shared_examples.rb