shopify_app 6.1.1 → 6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1517b43ed58cca94e285f75dfee44f7d7c8da5e0
-  data.tar.gz: e3ac5ee6de58727a096360eed00a69aaed41fb26
+  metadata.gz: edd2018df13585de884dcef3250e27251cba681c
+  data.tar.gz: 0297fb447782e9268f3af28fdede9d30b777f0a5
 SHA512:
-  metadata.gz: 39b517aff20a5c0841b8b0f059ed2ee712e4d037f2decaf02564ae517170fcd392c079d69215635315e817654750820d6f42c94bb498fbbf07c9ddc4710b82f2
-  data.tar.gz: 8bf95bf4467f65cc0c6db5563ecd0e4636223bd79b00db733054c9cb5b42f8dd742e04a5459f66c820bc94ac6040047fcc998dea773c6661967aaddfcfaf9223
+  metadata.gz: b52906367f75755913a17b5659d6cb782850386f7e4b23c601a24afb50bddab5e0132f5af93ba8c2a79d052d65cf403fcf228f84873b8ca7b7d475d0aae1328b
+  data.tar.gz: 5be95c420bb9a8585e764ced63d38048401a922b2cd1c436d5b0f272318a3ab90a2f1c8caca5e3b70167b1146cc1290fdbb35216d88c9c66c3122ed6b9557e0a

data/README.md

@@ -11,6 +11,14 @@ This gem includes some common code and generators for writing Rails applications
 *Note: It's recommended to use this on a new Rails project, so that the generator won't overwrite/delete some of your files.*
 
 
+Quickstart
+----------
+
+Check out this screencast on how to create and deploy a new Shopify App to Heroku in 5 minutes:
+
+[https://vimeo.com/130247240](https://vimeo.com/130247240)
+
+
 Becoming a Shopify App Developer
 --------------------------------
 If you don't have a Shopify Partner account yet head over to http://shopify.com/partners to create one, you'll need it before you can start developing apps.
@@ -143,6 +151,12 @@ ShopifyApp::SessionRepository.storage = 'Shop'
 If you run the `shop_model` generator it will create the required code to use the generated Shop model as the SessionRepository and update the initializer.
 
 
+AuthenticatedController
+-----------------------
+
+The engine includes a controller called `AuthenticatedController` which inherits from `ApplicationController`. It adds some before_filters which ensure the user is authenticated and will redirect to the login page if not. It is best practice to have all controllers that belong to the Shopify part of your app inherit from this controller. The HomeController that is generated already inherits from AuthenticatedController.
+
+
 Questions or problems?
 ----------------------
 http://api.shopify.com <= Read up on the possible API calls!

data/app/controllers/authenticated_controller.rb

@@ -0,0 +1,5 @@
+class AuthenticatedController < ApplicationController
+  before_action :login_again_if_different_shop
+  around_filter :shopify_session
+  layout ShopifyApp.configuration.embedded_app? ? 'embedded_app' : 'application'
+end

data/app/views/sessions/new.html.erb

@@ -10,7 +10,7 @@
   <form method="GET" action="login">
     <label>Type shop name:</label>
     <input type="text" name="shop" placeholder="blabla.myshopify.com"/>
-    <button type='submit'>Install</buttom>
+    <button type='submit'>Install</button>
   </form>
 
 </body>

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

@@ -1,12 +1,5 @@
-class HomeController < ApplicationController
-  before_action :login_again_if_different_shop
-  around_filter :shopify_session
-<% if embedded_app? -%>
-  layout 'embedded_app'
-<% end -%>
-
+class HomeController < AuthenticatedController
   def index
     @products = ShopifyAPI::Product.find(:all, :params => {:limit => 10})
   end
-
 end

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

@@ -2,10 +2,4 @@
     ShopifyApp.configuration.api_key,
     ShopifyApp.configuration.secret,
 
-    :scope => ShopifyApp.configuration.scope,
-
-    :setup => lambda {|env|
-       params = Rack::Utils.parse_query(env['QUERY_STRING'])
-       site_url = "https://#{params['shop']}"
-       env['omniauth.strategy'].options[:client_options][:site] = site_url
-    }
+    :scope => ShopifyApp.configuration.scope

data/lib/shopify_app/sessions_controller.rb

@@ -12,8 +12,10 @@ module ShopifyApp
 
     def callback
       if response = request.env['omniauth.auth']
-        sess = ShopifyAPI::Session.new(params[:shop], response['credentials']['token'])
+        shop_name = response.uid
+        sess = ShopifyAPI::Session.new(shop_name, response['credentials']['token'])
         session[:shopify] = ShopifyApp::SessionRepository.store(sess)
+        session[:shopify_domain] = shop_name
         flash[:notice] = "Logged in"
         redirect_to return_address
       else
@@ -24,8 +26,8 @@ module ShopifyApp
 
     def destroy
       session[:shopify] = nil
+      session[:shopify_domain] = nil
       flash[:notice] = "Successfully logged out."
-
       redirect_to action: 'new'
     end
 

data/lib/shopify_app/version.rb

@@ -1,3 +1,3 @@
 module ShopifyApp
-  VERSION = "6.1.1"
+  VERSION = "6.1.2"
 end

data/test/controllers/sessions_controller_test.rb

@@ -73,14 +73,18 @@ class SessionsControllerTest < ActionController::TestCase
 
     get :callback, shop: 'shop'
     assert_not_nil session[:shopify]
+    assert_equal 'shop.myshopify.com', session[:shopify_domain]
   end
 
   test "#destroy should clear shopify from session and redirect to login with notice" do
     shop_id = 1
     session[:shopify] = shop_id
+    session[:shopify_domain] = 'shop1.myshopify.com'
 
     get :destroy
+
     assert_nil session[:shopify]
+    assert_nil session[:shopify_domain]
     assert_redirected_to login_path
     refute flash[:notice].empty?
   end
@@ -88,7 +92,7 @@ class SessionsControllerTest < ActionController::TestCase
   private
 
   def mock_shopify_omniauth
-    OmniAuth.config.add_mock(:shopify, provider: :shopify, credentials: {token: '1234'})
+    OmniAuth.config.add_mock(:shopify, provider: :shopify, uid: 'shop.myshopify.com', credentials: {token: '1234'})
     request.env['omniauth.auth'] = OmniAuth.config.mock_auth[:shopify] if request
     request.env['omniauth.params'] = { shop: 'shop.myshopify.com' } if request
   end

data/test/generators/controllers_generator_test.rb

@@ -0,0 +1,16 @@
+require 'test_helper'
+require 'generators/shopify_app/controllers/controllers_generator'
+
+class ControllersGeneratorTest < Rails::Generators::TestCase
+  tests ShopifyApp::Generators::ControllersGenerator
+  destination File.expand_path("../tmp", File.dirname(__FILE__))
+  setup :prepare_destination
+
+  test "copies ShopifyApp controllers to the host application" do
+    run_generator
+    assert_directory "app/controllers"
+    assert_file "app/controllers/sessions_controller.rb"
+    assert_file "app/controllers/authenticated_controller.rb"
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify_app
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.1.2
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -142,6 +142,7 @@ files:
 - README.md
 - RELEASING
 - Rakefile
+- app/controllers/authenticated_controller.rb
 - app/controllers/sessions_controller.rb
 - app/views/sessions/new.html.erb
 - config/routes.rb
@@ -195,6 +196,7 @@ files:
 - test/dummy/config/initializers/shopify_app.rb
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
+- test/generators/controllers_generator_test.rb
 - test/generators/install_generator_test.rb
 - test/generators/routes_generator_test.rb
 - test/generators/shop_model_generator_test.rb