shopify_app 7.0.10 → 7.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d6309c0a72b84c1a7643960b79466c21b9ab04c
-  data.tar.gz: 79097e759876a3fcff79093b51796ba8d7d47266
+  metadata.gz: 01fd54b8c417c343000ff7831af46518aae171ea
+  data.tar.gz: e090401fe863bdef0f70cb41fd2c184332565439
 SHA512:
-  metadata.gz: 405f3a3afadb611f2d160a94756061873b4bf324aadc32e0405eaf380818291d886b03455e37e28dc3295d90edb8b3dc7fe3aa1ade85429ff0d43d84df2e18dc
-  data.tar.gz: d113dc8aa5e61eef97f79ad8cbc5f7e5bb23e2bd48cd5c3dcd38e64752970013a56afe216b9feb7d334806aaa5838b70f7d0166f6ea25ce2a77afca2b68b74a3
+  metadata.gz: a857bf574d74edcf5820f253404ce863c3ca4b50d92026780e32060aedfe7b658865c86a92df0062f63f0894e21dd82f7d10a8f99987ad66ba06b1f5d62b4106
+  data.tar.gz: bdf917823af652bc3b6f340fd0c3a26c01320e12ae097f2b11e81031f606c54fc91b34a6918211e2c9027adaca11c027ac99e1d0ce306fdb2b5f6a552e30c0f0

data/.travis.yml

@@ -1,9 +1,11 @@
 language: ruby
+cache: bundler
+sudo: false
 
 rvm:
   - 2.2.4
+  - 2.3.1
 
 gemfile:
   - Gemfile
-
-script: "bundle exec rake test"
+  - Gemfile.rails50

data/CHANGELOG

@@ -1,3 +1,12 @@
+7.0.11
+------
+* Pass configured resources (like webhooks or scripttags) into the job rather than reading the config again. This allows for dynamically setting ShopifyApp config in a web request and having the job handle it correctly. This change does not affect the usage of webhooks or scripttags
+
+7.0.10
+-----
+* Loosen Rails dependency requirements to `>= 4.2.6` and allow Rails 5.0
+* Add support for App Proxies
+
 7.0.9
 -----
 

data/Gemfile.rails50

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+gemspec
+
+gem 'rails', '~> 5.0'
+gem 'activeresource', github: 'rails/activeresource'

data/README.md

@@ -214,8 +214,12 @@ The engine provides a mixin for verifying incoming HTTP requests sent via an App
     # config/routes.rb
     namespace :app_proxy do
       # simple routes without a specified controller will go to AppProxyController
+      # GET '/app_proxy/basic' will be routed to AppProxyController#basic
       get :basic
 
+      # this will route GET /app_proxy to AppProxyController#main
+      root action: :main
+
       # more complex routes will go to controllers in the AppProxy namespace
       resources :reviews
       # GET /app_proxy/reviews will now be routed to

data/lib/shopify_app/app_proxy_verification.rb

@@ -3,7 +3,7 @@ module ShopifyApp
     extend ActiveSupport::Concern
 
     included do
-      skip_before_action :verify_authenticity_token
+      skip_before_action :verify_authenticity_token, raise: false
       before_action :verify_proxy_request
     end
 

data/lib/shopify_app/scripttags_manager.rb

@@ -2,8 +2,18 @@ module ShopifyApp
   class ScripttagsManager
     class CreationFailed < StandardError; end
 
-    def self.queue(shop_domain, shop_token)
-      ShopifyApp::ScripttagsManagerJob.perform_later(shop_domain: shop_domain, shop_token: shop_token)
+    def self.queue(shop_domain, shop_token, scripttags)
+      ShopifyApp::ScripttagsManagerJob.perform_later(
+        shop_domain: shop_domain,
+        shop_token: shop_token,
+        scripttags: scripttags
+      )
+    end
+
+    attr_reader :required_scripttags
+
+    def initialize(scripttags)
+      @required_scripttags = scripttags
     end
 
     def recreate_scripttags!
@@ -29,10 +39,6 @@ module ShopifyApp
 
     private
 
-    def required_scripttags
-      ShopifyApp.configuration.scripttags
-    end
-
     def is_required_scripttag?(scripttag)
       required_scripttags.map{ |w| w[:src] }.include? scripttag.src
     end

data/lib/shopify_app/scripttags_manager_job.rb

@@ -1,8 +1,8 @@
 module ShopifyApp
   class ScripttagsManagerJob < ActiveJob::Base
-    def perform(shop_domain:, shop_token:)
+    def perform(shop_domain:, shop_token:, scripttags:)
       ShopifyAPI::Session.temp(shop_domain, shop_token) do
-        manager = ScripttagsManager.new
+        manager = ScripttagsManager.new(scripttags)
         manager.create_scripttags
       end
     end

data/lib/shopify_app/sessions_concern.rb

@@ -11,16 +11,10 @@ module ShopifyApp
     end
 
     def callback
-      if response = request.env['omniauth.auth']
-        shop_name = response.uid
-        token = response['credentials']['token']
-
-        sess = ShopifyAPI::Session.new(shop_name, token)
-        session[:shopify] = ShopifyApp::SessionRepository.store(sess)
-        session[:shopify_domain] = shop_name
-
-        WebhooksManager.queue(shop_name, token) if ShopifyApp.configuration.has_webhooks?
-        ScripttagsManager.queue(shop_name, token) if ShopifyApp.configuration.has_scripttags?
+      if auth_hash
+        login_shop
+        install_webhooks
+        install_scripttags
 
         flash[:notice] = I18n.t('.logged_in')
         redirect_to_with_fallback return_address
@@ -47,6 +41,44 @@ module ShopifyApp
       end
     end
 
+    def login_shop
+      sess = ShopifyAPI::Session.new(shop_name, token)
+      session[:shopify] = ShopifyApp::SessionRepository.store(sess)
+      session[:shopify_domain] = shop_name
+    end
+
+    def auth_hash
+      request.env['omniauth.auth']
+    end
+
+    def shop_name
+      auth_hash.uid
+    end
+
+    def token
+      auth_hash['credentials']['token']
+    end
+
+    def install_webhooks
+      return unless ShopifyApp.configuration.has_webhooks?
+
+      WebhooksManager.queue(
+        shop_name,
+        token,
+        ShopifyApp.configuration.webhooks
+      )
+    end
+
+    def install_scripttags
+      return unless ShopifyApp.configuration.has_scripttags?
+
+      ScripttagsManager.queue(
+        shop_name,
+        token,
+        ShopifyApp.configuration.scripttags
+      )
+    end
+
     def return_address
       session.delete(:return_to) || main_app.root_url
     end

data/lib/shopify_app/version.rb

@@ -1,3 +1,3 @@
 module ShopifyApp
-  VERSION = '7.0.10'
+  VERSION = '7.0.11'
 end

data/lib/shopify_app/webhook_verification.rb

@@ -3,7 +3,7 @@ module ShopifyApp
     extend ActiveSupport::Concern
 
     included do
-      skip_before_action :verify_authenticity_token
+      skip_before_action :verify_authenticity_token, raise: false
       before_action :verify_request
     end
 

data/lib/shopify_app/webhooks_manager.rb

@@ -2,8 +2,18 @@ module ShopifyApp
   class WebhooksManager
     class CreationFailed < StandardError; end
 
-    def self.queue(shop_domain, shop_token)
-      ShopifyApp::WebhooksManagerJob.perform_later(shop_domain: shop_domain, shop_token: shop_token)
+    def self.queue(shop_domain, shop_token, webhooks)
+      ShopifyApp::WebhooksManagerJob.perform_later(
+        shop_domain: shop_domain,
+        shop_token: shop_token,
+        webhooks: webhooks
+      )
+    end
+
+    attr_reader :required_webhooks
+
+    def initialize(webhooks)
+      @required_webhooks = webhooks
     end
 
     def recreate_webhooks!
@@ -29,10 +39,6 @@ module ShopifyApp
 
     private
 
-    def required_webhooks
-      ShopifyApp.configuration.webhooks
-    end
-
     def is_required_webhook?(webhook)
       required_webhooks.map{ |w| w[:address] }.include? webhook.address
     end
@@ -40,7 +46,7 @@ module ShopifyApp
     def create_webhook(attributes)
       attributes.reverse_merge!(format: 'json')
       webhook = ShopifyAPI::Webhook.create(attributes)
-      raise CreationFailed unless webhook.persisted?
+      raise CreationFailed, webhook.errors.full_messages.to_sentence unless webhook.persisted?
       webhook
     end
 

data/lib/shopify_app/webhooks_manager_job.rb

@@ -1,8 +1,8 @@
 module ShopifyApp
   class WebhooksManagerJob < ActiveJob::Base
-    def perform(shop_domain:, shop_token:)
+    def perform(shop_domain:, shop_token:, webhooks:)
       ShopifyAPI::Session.temp(shop_domain, shop_token) do
-        manager = WebhooksManager.new
+        manager = WebhooksManager.new(webhooks)
         manager.create_webhooks
       end
     end

data/shopify_app.gemspec

@@ -8,9 +8,10 @@ Gem::Specification.new do |s|
   s.author      = "Shopify"
   s.summary     = %q{This gem is used to get quickly started with the Shopify API}
 
-  s.add_dependency('rails', '>= 4.2.6')
+  s.required_ruby_version = ">= 2.2.4"
 
-  s.add_runtime_dependency('shopify_api', '~> 4.2')
+  s.add_runtime_dependency('rails', '>= 4.2.6')
+  s.add_runtime_dependency('shopify_api', '~> 4.2.2')
   s.add_runtime_dependency('omniauth-shopify-oauth2', '~> 1.1.11')
 
   s.add_development_dependency('rake')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify_app
 version: !ruby/object:Gem::Version
-  version: 7.0.10
+  version: 7.0.11
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 4.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 4.2.2
 - !ruby/object:Gem::Dependency
   name: omniauth-shopify-oauth2
   requirement: !ruby/object:Gem::Requirement
@@ -132,6 +132,7 @@ files:
 - ".travis.yml"
 - CHANGELOG
 - Gemfile
+- Gemfile.rails50
 - ISSUE_TEMPLATE.md
 - LICENSE
 - QUICKSTART.md
@@ -199,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.4
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="