omniauth-shopify-oauth2 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f24fe6681c6f7153279737aa891bb2a400e8ae9c
-  data.tar.gz: fb0c659e1ed149565bfde4ec52018b2d65f84f28
+  metadata.gz: c392a50f6fa891ac174ac7c7e7958ecdf5ee0d01
+  data.tar.gz: df0450c540e19b197281921adae1a073ac1b5d3e
 SHA512:
-  metadata.gz: 1a2ac60edb571aabc8551c922298eacf213ff39906172c5bcfbde361896cb78ca757e2bccb1f826d84c143d68103417509dde3533d310e78ea35e1ff7c044921
-  data.tar.gz: 2aec89d6c7778ecc9bdbf71cf9a44afd325b02ef6d65231a4d6a9facb80c5da94e03ddbe615de3a9541f42fc78f6b4ec92abdc5ab2c4df559ee7e01fc08b67dd
+  metadata.gz: bf6d6f10356702d2aecf8e79ea67ff7a59d64deb4ed71b62e88051c6d0f9579ad01438ab1eb4077e859a7b3cf6c6d578eabe35eaffd11a9e75140cd06d1a8855
+  data.tar.gz: 3faf0377495c9abf3bb35164127800cbbe3cdc28e64d9aeb12c32436ad80fe888c8789d2f1c92ef5bf5245594817214b0114d5eb0c28b47008baa7bcb84310af

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    omniauth-shopify-oauth2 (1.1.3)
+    omniauth-shopify-oauth2 (1.1.4)
       omniauth-oauth2 (~> 1.1.1)
 
 GEM
@@ -10,10 +10,10 @@ GEM
     diff-lcs (1.1.3)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    hashie (2.0.5)
+    hashie (2.1.1)
     jwt (0.1.11)
       multi_json (>= 1.5)
-    multi_json (1.9.0)
+    multi_json (1.9.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     oauth2 (0.9.3)

data/README.md

@@ -14,7 +14,7 @@ Then `bundle install`.
 
 ## Usage
 
-`OmniAuth::Strategies::Shopify` is simply a Rack middleware. Read the OmniAuth 1.0 docs for detailed instructions: https://github.com/intridea/omniauth.
+`OmniAuth::Strategies::Shopify` is simply a Rack middleware. Read [the OmniAuth 1.0 docs](https://github.com/intridea/omniauth) for detailed instructions.
 
 Here's a quick example, adding the middleware to a Rails app in `config/initializers/omniauth.rb`:
 
@@ -28,9 +28,9 @@ end
 
 You can configure the scope, which you pass in to the `provider` method via a `Hash`:
 
-* `scope`: A comma-separated list of permissions you want to request from the user. See the Shopify API docs for a full list of available permissions: http://api.shopify.com.
+* `scope`: A comma-separated list of permissions you want to request from the user. See [the Shopify API docs](http://docs.shopify.com/api/tutorials/oauth) for a full list of available permissions.
 
-* `setup`: A lambda which dynamically sets the `site`. You must initiate the omniauth process by passing in a shop query parameter of the shop you're requesting permissions for. Ex. http://myapp.com/auth/shopify?shop=example.myshopify.com
+* `setup`: A lambda which dynamically sets the `site`. You must initiate the OmniAuth process by passing in a `shop` query parameter of the shop you're requesting permissions for. Ex. http://myapp.com/auth/shopify?shop=example.myshopify.com
 
 For example, to request `read_products`, `read_orders` and `write_content` permissions and display the authentication page:
 

data/lib/omniauth/shopify/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Shopify
-    VERSION = "1.1.3"
+    VERSION = "1.1.4"
   end
 end

data/lib/omniauth/strategies/shopify.rb

@@ -15,11 +15,12 @@ module OmniAuth
       option :callback_url
       
       option :provider_ignores_state, true
+      option :myshopify_domain, 'myshopify.com'
 
       uid { URI.parse(options[:client_options][:site]).host }
 
       def valid_site?
-        return /\A(https|http)\:\/\/[a-zA-Z0-9][a-zA-Z0-9\-]*\.myshopify\.com[\/]?\z/ =~ options[:client_options][:site]
+        !!(/\A(https|http)\:\/\/[a-zA-Z0-9][a-zA-Z0-9\-]*\.#{Regexp.quote(options[:myshopify_domain])}[\/]?\z/ =~ options[:client_options][:site])
       end
 
       def fix_https

data/spec/omniauth/strategies/shopify_spec.rb

@@ -112,4 +112,26 @@ describe OmniAuth::Strategies::Shopify do
     end
 
   end
+
+  describe '#valid_site?' do
+    it 'returns true if the site contains .myshopify.com' do
+      @options = {:client_options => {:site => 'http://foo.myshopify.com/'}}
+      subject.valid_site?.should eq(true)
+    end
+
+    it 'returns false if the site does not contain .myshopify.com' do
+      @options = {:client_options => {:site => 'http://foo.example.com/'}}
+      subject.valid_site?.should eq(false)
+    end
+
+    it 'uses configurable option for myshopify_domain' do
+      @options = {:client_options => {:site => 'http://foo.example.com/'}, :myshopify_domain => 'example.com'}
+      subject.valid_site?.should eq(true)
+    end
+
+    it 'allows custom port for myshopify_domain' do
+      @options = {:client_options => {:site => 'http://foo.example.com:3456/'}, :myshopify_domain => 'example.com:3456'}
+      subject.valid_site?.should eq(true)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-shopify-oauth2
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Denis Odorcic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Shopify strategy for OmniAuth