omniauth-shopify-oauth2 1.1.0 → 1.1.1

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source "https://rubygems.org"
 
 gemspec

data/Gemfile.lock

@@ -1,31 +1,34 @@
 PATH
   remote: .
   specs:
-    omniauth-shopify-oauth2 (1.0.0)
-      omniauth-oauth2 (~> 1.0.0)
+    omniauth-shopify-oauth2 (1.1.1)
+      omniauth-oauth2 (~> 1.1.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    addressable (2.2.6)
     diff-lcs (1.1.3)
-    faraday (0.7.6)
-      addressable (~> 2.2)
-      multipart-post (~> 1.1)
-      rack (~> 1.1)
-    hashie (1.2.0)
-    multi_json (1.0.4)
-    multipart-post (1.1.4)
-    oauth2 (0.5.2)
-      faraday (~> 0.7)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
+    hashie (2.0.5)
+    httpauth (0.2.0)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
+    multi_json (1.8.2)
+    multipart-post (1.2.0)
+    oauth2 (0.8.1)
+      faraday (~> 0.8)
+      httpauth (~> 0.1)
+      jwt (~> 0.1.4)
       multi_json (~> 1.0)
-    omniauth (1.0.2)
-      hashie (~> 1.2)
+      rack (~> 1.2)
+    omniauth (1.1.4)
+      hashie (>= 1.2, < 3)
       rack
-    omniauth-oauth2 (1.0.0)
-      oauth2 (~> 0.5.0)
+    omniauth-oauth2 (1.1.1)
+      oauth2 (~> 0.8.0)
       omniauth (~> 1.0)
-    rack (1.4.1)
+    rack (1.5.2)
     rake (0.9.2.2)
     rspec (2.7.0)
       rspec-core (~> 2.7.0)

data/lib/omniauth/shopify/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Shopify
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

data/lib/omniauth/strategies/shopify.rb

@@ -16,6 +16,8 @@ module OmniAuth
       
       option :provider_ignores_state, true
 
+      uid { URI.parse(options[:client_options][:site]).host }
+
       def authorize_params
         super.tap do |params|
           params[:scope] ||= DEFAULT_SCOPE

data/spec/omniauth/strategies/shopify_spec.rb

@@ -4,7 +4,8 @@ require 'base64'
 
 describe OmniAuth::Strategies::Shopify do
   before :each do
-    @request = double('Request')
+    @request = double('Request',
+                      :env => { })
     @request.stub(:params) { {} }
     @request.stub(:cookies) { {} }
 
@@ -17,6 +18,7 @@ describe OmniAuth::Strategies::Shopify do
     args = [@client_id, @client_secret, @options].compact
     OmniAuth::Strategies::Shopify.new(nil, *args).tap do |strategy|
       strategy.stub(:request) { @request }
+      strategy.stub(:session) { {} }
     end
   end
 
@@ -62,6 +64,12 @@ describe OmniAuth::Strategies::Shopify do
     end
   end
 
+  describe '#uid' do
+    it 'returns the shop' do
+      subject.uid.should eq('example.myshopify.com')
+    end
+  end
+
   describe '#credentials' do
     before :each do
       @access_token = double('OAuth2::AccessToken')
@@ -88,5 +96,6 @@ describe OmniAuth::Strategies::Shopify do
       @access_token.stub(:expires?) { false }
       subject.credentials['expires'].should eq(false)
     end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-shopify-oauth2
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
-  requirement: &70257176127400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70257176127400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70257176126800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70257176126800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70257176126280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70257176126280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - denis.odorcic@shopify.com
@@ -87,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Shopify strategy for OmniAuth
@@ -95,4 +110,3 @@ test_files:
 - spec/omniauth/strategies/shopify_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples.rb
-has_rdoc: