shopify_app 6.0.6 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa3c2e95ba729a7e13c6db591e5034800bd13e22
-  data.tar.gz: 9b322e1fae0cd56fe577df5b754ab58158e2b1ef
+  metadata.gz: 75b41ef7f4d4ae9853a762bfb050494599f5c26a
+  data.tar.gz: ff8d4b05b617c4ea2118121859541afa1af867f0
 SHA512:
-  metadata.gz: 7be84e1af14c4c44f350857d5098455df023f4e18a32abba4e839afbb4cecbbf876fb5315cdd791a5e98b0841372fc5a63813b1687b586c2181cca4300c9a417
-  data.tar.gz: 63ab0d6e674c004e687e0d9893d3a51bcc9106938214fec5ce71e0685a492ccb0bc75f913e45d7ee9d997cdd409ebdc755774bf382180bdb8af1c59715f1de53
+  metadata.gz: f879ca0a0bcadbc8966ee68d70e7b2bf6f66c642259d5623d9a0913b9c016acc936b0244a3e5fda574e57fe1b848516c00e3ece21cfec108d67f53dc63a5fc3e
+  data.tar.gz: e7d0b4717e650a1c6adc802c502d474252c1e71e25c0a46471def03f3b79d2b8da7765468cfe441fbd580f6f3d6a26e54a7de8ca81af2d9645dac15d86db9d73

data/config/routes.rb

@@ -1,10 +1,8 @@
-if ShopifyApp.configuration.routes_enabled?
-  ShopifyApp::Engine.routes.draw do
-    controller :sessions do
-      get 'login' => :new, :as => :login
-      post 'login' => :create, :as => :authenticate
-      get 'auth/shopify/callback' => :callback
-      get 'logout' => :destroy, :as => :logout
-    end
+ShopifyApp::Engine.routes.draw do
+  controller :sessions do
+    get 'login' => :new, :as => :login
+    post 'login' => :create, :as => :authenticate
+    get 'auth/shopify/callback' => :callback
+    get 'logout' => :destroy, :as => :logout
   end
 end

data/lib/generators/shopify_app/install/install_generator.rb

@@ -11,9 +11,19 @@ module ShopifyApp
       def initialize(args, *options)
         @opts = Hash[options.first.join(' ').scan(/--?([^=\s]+)(?:=(\S+))?/)]
         @opts = @opts.with_indifferent_access
+        @opts.reverse_merge!(defaults)
         super(args, *options)
       end
 
+      def defaults
+        {
+          api_key: '<api_key>',
+          secret: '<secret>',
+          scope: 'read_orders, read_products',
+          embedded: 'true'
+        }
+      end
+
       def create_shopify_app_initializer
         template 'shopify_app.rb', 'config/initializers/shopify_app.rb'
       end
@@ -70,6 +80,7 @@ module ShopifyApp
       end
 
       def add_home_index_route
+        route "mount ShopifyApp::Engine, at: '/'"
         route "root :to => 'home#index'"
       end
 

data/lib/generators/shopify_app/install/templates/home_controller.rb

@@ -1,4 +1,5 @@
 class HomeController < ApplicationController
+  before_action :login_again_if_different_shop
   around_filter :shopify_session
 <% if embedded_app? -%>
   layout 'embedded_app'

data/lib/generators/shopify_app/install/templates/shopify_app.rb

@@ -1,6 +1,6 @@
 ShopifyApp.configure do |config|
-  config.api_key = "<%= opts[:api_key] || '<api_key>' %>"
-  config.secret = "<%= opts[:secret] || '<secret>' %>"
-  config.scope = "<%= opts[:scope] || 'read_orders, read_products' %>"
-  config.embedded_app = <%= opts[:embedded_app] || true %>
+  config.api_key = "<%= opts[:api_key] %>"
+  config.secret = "<%= opts[:secret] %>"
+  config.scope = "<%= opts[:scope] %>"
+  config.embedded_app = <%= embedded_app? %>
 end

data/lib/generators/shopify_app/routes/routes_generator.rb

@@ -10,10 +10,10 @@ module ShopifyApp
       end
 
       def disable_engine_routes
-        inject_into_file(
-          'config/initializers/shopify_app.rb',
-          "  config.routes = false\n",
-          before: 'end'
+        gsub_file(
+          'config/routes.rb',
+          "mount ShopifyApp::Engine, at: '/'",
+          ''
         )
       end
 

data/lib/shopify_app/configuration.rb

@@ -10,18 +10,10 @@ module ShopifyApp
     attr_accessor :embedded_app
     alias_method  :embedded_app?, :embedded_app
 
-    # 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/engine.rb

@@ -1,5 +1,5 @@
 module ShopifyApp
   class Engine < Rails::Engine
-    isolate_namespace ShopifyApp
+    engine_name 'shopify_app'
   end
 end

data/lib/shopify_app/login_protection.rb

@@ -42,5 +42,11 @@ module ShopifyApp
       redirect_to login_path
     end
 
+    def login_path(params = {})
+      main_app.login_path(params)
+    rescue NoMethodError => e
+      shopify_app.login_path(params)
+    end
+
   end
 end

data/lib/shopify_app/sessions_controller.rb

@@ -18,7 +18,7 @@ module ShopifyApp
         redirect_to return_address
       else
         flash[:error] = "Could not log in to Shopify store."
-        redirect_to :action => 'new'
+        redirect_to action: 'new'
       end
     end
 
@@ -26,7 +26,7 @@ module ShopifyApp
       session[:shopify] = nil
       flash[:notice] = "Successfully logged out."
 
-      redirect_to :action => 'new'
+      redirect_to action: 'new'
     end
 
     protected
@@ -40,7 +40,7 @@ module ShopifyApp
     end
 
     def return_address
-      session[:return_to] || root_url
+      session[:return_to] || main_app.root_url
     end
 
     def sanitized_shop_name

data/lib/shopify_app/version.rb

@@ -1,3 +1,3 @@
 module ShopifyApp
-  VERSION = "6.0.6"
+  VERSION = "6.1.0"
 end

data/test/app_templates/config/routes.rb

@@ -1,3 +1,4 @@
 Rails.application.routes.draw do
+  mount ShopifyApp::Engine, at: '/'
   root to: "application#show"
 end

data/test/controllers/sessions_routes_test.rb

@@ -0,0 +1,27 @@
+require 'test_helper'
+
+class SessionsRoutesTest < ActionController::TestCase
+
+  setup do
+    @routes = ShopifyApp::Engine.routes
+    ShopifyApp::SessionRepository.storage = InMemorySessionStore
+    ShopifyApp.configuration = nil
+  end
+
+  test "login routes to sessions#new" do
+    assert_routing '/login', { controller: "sessions", action: "new" }
+  end
+
+  test "post login routes to sessions#create" do
+    assert_routing({method: 'post', path: '/login'}, { controller: "sessions", action: "create" })
+  end
+
+  test "auth_shopify_callback routes to sessions#callback" do
+    assert_routing '/auth/shopify/callback', { controller: "sessions", action: "callback" }
+  end
+
+  test "logout routes to sessions#destroy" do
+    assert_routing '/logout', { controller: "sessions", action: "destroy" }
+  end
+
+end

data/test/dummy/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Rails.application.load_tasks

data/test/generators/install_generator_test.rb

@@ -22,6 +22,15 @@ class InstallGeneratorTest < Rails::Generators::TestCase
     end
   end
 
+  test "creates the ShopifyApp initializer for non embedded app" do
+    stub_embedded_false
+    run_generator
+
+    assert_file "config/initializers/shopify_app.rb" do |shopify_app|
+      assert_match "config.embedded_app = false", shopify_app
+    end
+  end
+
   test "creats and injects into omniauth initializer" do
     run_generator
     assert_file "config/initializers/omniauth.rb" do |omniauth|
@@ -85,9 +94,10 @@ class InstallGeneratorTest < Rails::Generators::TestCase
     end
   end
 
-  test "adds home route to routes" do
+  test "adds engine and home route to routes" do
     run_generator
     assert_file "config/routes.rb" do |routes|
+      assert_match "mount ShopifyApp::Engine, at: '/'", routes
       assert_match "root :to => 'home#index'", routes
     end
   end

data/test/generators/routes_generator_test.rb

@@ -19,14 +19,7 @@ class ControllerGeneratorTest < Rails::Generators::TestCase
       assert_match "post 'login' => :create, :as => :authenticate", routes
       assert_match "get 'auth/shopify/callback' => :callback", routes
       assert_match "get 'logout' => :destroy, :as => :logout", routes
-    end
-  end
-
-  test "adds routes false to ShopifyApp initializer" do
-    run_generator
-
-    assert_file "config/initializers/shopify_app.rb" do |initializer|
-      assert_match "config.routes = false", initializer
+      refute_match "mount ShopifyApp::Engine, at: '/'", routes
     end
   end
 

data/test/shopify_app/configuration_test.rb

@@ -14,18 +14,6 @@ class ConfigurationTest < ActiveSupport::TestCase
     assert_equal true, ShopifyApp.configuration.embedded_app
   end
 
-  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

metadata

@@ -1,36 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify_app
 version: !ruby/object:Gem::Version
-  version: 6.0.6
+  version: 6.1.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MQ8wDQYDVQQDDAZhZG1p
-  bnMxFzAVBgoJkiaJk/IsZAEZFgdzaG9waWZ5MRMwEQYKCZImiZPyLGQBGRYDY29t
-  MB4XDTE0MDUxNTIwMzM0OFoXDTE1MDUxNTIwMzM0OFowPzEPMA0GA1UEAwwGYWRt
-  aW5zMRcwFQYKCZImiZPyLGQBGRYHc2hvcGlmeTETMBEGCgmSJomT8ixkARkWA2Nv
-  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL0/81O3e1vh5smcwp2G
-  MpLQ6q0kejQLa65bPYPxdzWA1SYOKyGfw+yR9LdFzsuKpwWzKq6zX35lj1IckWS4
-  bNBEQzxmufUxU0XPM02haFB8fOfDJzdXsWte9Ge4IFwahwn68gpMqN+BvxL+KMYz
-  Iut9YmN44d4LZdsENEIO5vmybuG2vYDz7R56qB0PA+Q2P2CdhymsBad2DQs69FBo
-  uico9V6VMYYctL9lCYdzu9IXrOYNTt88suKIVzzAlHOKeN0Ng5qdztFoTR8sfxDr
-  Ydg3KHl5n47wlpgd8R0f/4b5gGxW+v9pyJCgQnLlRu7DedVSvv7+GMtj3g9r3nhJ
-  KqECAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFI/o
-  maf34HXbUOQsdoLHacEKQgunMB0GA1UdEQQWMBSBEmFkbWluc0BzaG9waWZ5LmNv
-  bTAdBgNVHRIEFjAUgRJhZG1pbnNAc2hvcGlmeS5jb20wDQYJKoZIhvcNAQEFBQAD
-  ggEBADkK9aj5T0HPExsov4EoMWFnO+G7RQ28C30VAfKxnL2UxG6i4XMHVs6Xi94h
-  qXFw1ec9Y2eDUqaolT3bviOk9BB197+A8Vz/k7MC6ci2NE+yDDB7HAC8zU6LAx8Y
-  Iqvw7B/PSZ/pz4bUVFlTATif4mi1vO3lidRkdHRtM7UePSn2rUpOi0gtXBP3bLu5
-  YjHJN7wx5cugMEyroKITG5gL0Nxtu21qtOlHX4Hc4KdE2JqzCPOsS4zsZGhgwhPs
-  fl3hbtVFTqbOlwL9vy1fudXcolIE/ZTcxQ+er07ZFZdKCXayR9PPs64heamfn0fp
-  TConQSX2BnZdhIEYW+cKzEC/bLc=
-  -----END CERTIFICATE-----
-date: 2015-05-14 00:00:00.000000000 Z
+cert_chain: []
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -204,6 +182,8 @@ files:
 - test/app_templates/config/initializers/shopify_app.rb
 - test/app_templates/config/routes.rb
 - test/controllers/sessions_controller_test.rb
+- test/controllers/sessions_routes_test.rb
+- test/dummy/Rakefile
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/home_controller.rb
 - test/dummy/config.ru

checksums.yaml.gz.sig

@@ -1,2 +0,0 @@
-5xlq�e�]̓K
-a*Z����:�}t�����Y�.������a���u~�`�e��KO�{vp�Nǣ:@\V��:YCp��Цd��d?���C��7���
pb!F:zve��'���]�R�ni�X��$������?#�飤�^��6N�6Z>��o1Q�̀��X1��ńj�8�ۂO��!(I�0��ߏY�;��)KcZ��

data.tar.gz.sig

@@ -1,2 +0,0 @@
-��~N��NS
"��*
�P9`rNw�O�B�Q�g�*���*)�QA.~����x�!��7�Y���<�Ya�S�@����^�rݟ�^[��8���˾����ƭ"��U�;�W�=4�5T&��.��hN�1į����
-�$���l`�5��E��)��_�J��8hh�%�ή=��FC�Y���4ܸYYJN�}Q(��;���ҥLZ%?�p		2��a����ZJh;9��w�Kq�O������ryq�}��Pf"m4\��