shopify_app 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2180fbad771bc170d57ca9e9d84264db64adc578
-  data.tar.gz: 028708ad9fc92ce756fbf815468d586e2e0302ed
+  metadata.gz: 29d6e51ca55be46503ae5c1852d423d44f7f5949
+  data.tar.gz: 050e64759df2bb9aca2cb7d40faab876a3cb0b85
 SHA512:
-  metadata.gz: d07a8720342f16795447fd929d4fb9d5933ba7cbbe27b085f8c00663548ef3ff5bd5ef826ec5062e30e00d476ac2bea7818e1eefa61b4e06f0831027f4ce309a
-  data.tar.gz: 5c17a5290b05876ecd0bc321dc9477612d7f1d8c87689ff506d6e5ac21f0df4b2c936b1e9d28945d7d2fea0c25eacbf93fc129555fe7f47cc63400e4f80db87c
+  metadata.gz: cf160257914859df8d18439adcc242b7963cdc862e24145bd24f119cdce1d154555ca9fa3ff65f1a2556b00466be85db79cc5edb3b6d8458fd96956bd904e910
+  data.tar.gz: b28d43f8edb5e377969051cc799635c3db7117a0095c7b593d280f974142ecfbf411b298d4f9f53a097bebcebe57b77e0ac43752943dd2fe637d56b15fd92d45

data/lib/shopify_app/configuration.rb

@@ -13,12 +13,16 @@ module ShopifyApp
     # use the built in session routes?
     attr_accessor :routes
 
+    # configure myshopify domain for local shopify development
+    attr_accessor :myshopify_domain
+
     def routes_enabled?
       @routes
     end
 
     def initialize
       @routes = true
+      @myshopify_domain = 'myshopify.com'
     end
   end
 

data/lib/shopify_app/sessions_controller.rb

@@ -47,18 +47,18 @@ module ShopifyApp
       @sanitized_shop_name ||= sanitize_shop_param(params)
     end
 
-  def sanitize_shop_param(params)
-    return unless params[:shop].present?
+    def sanitize_shop_param(params)
+      return unless params[:shop].present?
 
-    name = params[:shop].to_s.strip
-    name += ".myshopify.com" if !name.include?("myshopify.com") && !name.include?(".")
-    name.sub!(%r|https?://|, '')
+      name = params[:shop].to_s.strip
+      name += ".#{ShopifyApp.configuration.myshopify_domain}" if !name.include?("#{ShopifyApp.configuration.myshopify_domain}") && !name.include?(".")
+      name.sub!(%r|https?://|, '')
 
-    u = URI("http://#{name}")
-    u.host && u.host.ends_with?(".myshopify.com") ? u.host : nil
-  rescue URI::InvalidURIError
-    nil
-  end
+      u = URI("http://#{name}")
+      u.host && u.host.ends_with?(".#{ShopifyApp.configuration.myshopify_domain}") ? u.host : nil
+    rescue URI::InvalidURIError
+      nil
+    end
 
   end
 end

data/lib/shopify_app/version.rb

@@ -1,3 +1,3 @@
 module ShopifyApp
-  VERSION = "6.0.0"
+  VERSION = "6.0.1"
 end

data/test/controllers/sessions_controller_test.rb

@@ -4,22 +4,25 @@ class SessionsControllerTest < ActionController::TestCase
 
   setup do
     ShopifyApp::SessionRepository.storage = InMemorySessionStore
+    ShopifyApp.configuration = nil
   end
 
   test "#new should authenticate the shop if the shop param exists" do
+    ShopifyApp.configuration.embedded_app = true
     auth_url = '/auth/shopify?shop=my-shop.myshopify.com'
     get :new, shop: 'my-shop'
     assert response.body.match(/window\.top\.location\.href = "#{Regexp.escape(auth_url)}"/)
   end
 
   test "#new should authenticate the shop if the shop param exists non embedded" do
-    ShopifyApp.configuration.stubs(:embedded_app?).returns(false)
+    ShopifyApp.configuration.embedded_app = false
     auth_url = '/auth/shopify?shop=my-shop.myshopify.com'
     get :new, shop: 'my-shop'
     assert_match "http://test.host/auth/shopify?shop=my-shop.myshopify.com", response.body
   end
 
   test "#new should trust the shop param over the current session" do
+    ShopifyApp.configuration.embedded_app = true
     previously_logged_in_shop_id = 1
     session[:shopify] = previously_logged_in_shop_id
     new_shop_domain = "new-shop.myshopify.com"
@@ -36,12 +39,23 @@ class SessionsControllerTest < ActionController::TestCase
 
   ['my-shop', 'my-shop.myshopify.com', 'https://my-shop.myshopify.com', 'http://my-shop.myshopify.com'].each do |good_url|
     test "#create should authenticate the shop for the URL (#{good_url})" do
+      ShopifyApp.configuration.embedded_app = true
       auth_url = '/auth/shopify?shop=my-shop.myshopify.com'
       post :create, shop: good_url
       assert response.body.match(/window\.top\.location\.href = "#{Regexp.escape(auth_url)}"/)
     end
   end
 
+  ['my-shop', 'my-shop.myshopify.io', 'https://my-shop.myshopify.io', 'http://my-shop.myshopify.io'].each do |good_url|
+    test "#create should authenticate the shop for the URL (#{good_url}) with custom myshopify_domain" do
+      ShopifyApp.configuration.embedded_app = true
+      ShopifyApp.configuration.myshopify_domain = 'myshopify.io'
+      auth_url = '/auth/shopify?shop=my-shop.myshopify.io'
+      post :create, shop: good_url
+      assert response.body.match(/window\.top\.location\.href = "#{Regexp.escape(auth_url)}"/)
+    end
+  end
+
   ['myshop.com', 'myshopify.com', 'shopify.com', 'two words', 'store.myshopify.com.evil.com', '/foo/bar'].each do |bad_url|
     test "#create should return an error for a non-myshopify URL (#{bad_url})" do
       post :create, shop: bad_url

data/test/shopify_app/configuration_test.rb

@@ -2,6 +2,10 @@ require 'test_helper'
 
 class ConfigurationTest < ActiveSupport::TestCase
 
+  setup do
+    ShopifyApp.configuration = nil
+  end
+
   test "configure" do
     ShopifyApp.configure do |config|
       config.embedded_app = true
@@ -10,8 +14,28 @@ class ConfigurationTest < ActiveSupport::TestCase
     assert_equal true, ShopifyApp.configuration.embedded_app
   end
 
- test "routes enabled" do
+  test "routes enabled" do
     assert_equal true, ShopifyApp.configuration.routes_enabled?
   end
 
+  test "disable routes" do
+    ShopifyApp.configure do |config|
+      config.routes = false
+    end
+
+    assert_equal false, ShopifyApp.configuration.routes_enabled?
+  end
+
+  test "defaults to myshopify_domain" do
+    assert_equal "myshopify.com", ShopifyApp.configuration.myshopify_domain
+  end
+
+  test "can set myshopify_domain" do
+    ShopifyApp.configure do |config|
+      config.myshopify_domain = 'myshopify.io'
+    end
+
+    assert_equal "myshopify.io", ShopifyApp.configuration.myshopify_domain
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopify_app
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Shopify