shopify_app 7.0.2 → 7.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0198555206848af2793096285ea0e4f2d5e2abd
-  data.tar.gz: 9780f636ad16abdf01152955c80ed6601729b43a
+  metadata.gz: 24adcdf60d551e803f895d21e59cc2a8d1e3568c
+  data.tar.gz: b06241bf4f3ab38210efec82139536297009eb94
 SHA512:
-  metadata.gz: 6477ba3a45b15895b4ef6dbb4385ae8cad74d7b2513906049ea5da4b9813dfe736693a541f792ae9c552ad3649eefc9e5f64451032ec99c20dafc61ae5bfbdb1
-  data.tar.gz: b28fd5aa1a9384f0713a154f460bfa25465b524a8c45698e8756669ef4bbf94d69ea9d2af315b97e3885a1cddc45e05512cd266855794f5811676615f3203fd4
+  metadata.gz: 01fb498f9ec1a9d5c379dfb9c13b6739c31acf4ea5358e9dfcfbfc4632731f321d967838b59763c6202ca32aa82fe570a7e49e9edb4e8d4373c36f01306af317
+  data.tar.gz: b911f97a9d859fc2fa1b4bf58a97b870e66d74780a5b622795f930acb4e7c004a3c87468e4691ad386ca0534923bae9f74e7e5cd1b033dce0f86649f5aa48064

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 
 rvm:
-  - 2.0.0
+  - 2.2.4
 
 gemfile:
   - Gemfile

data/CHANGELOG

@@ -1,3 +1,13 @@
+7.0.4
+-----
+
+* Bump required shopify_api version to 4.x.
+
+7.0.3
+-----
+
+* Bump required Rails version to >= 4.2.6 since we are now using ActiveSupport::SecurityUtils:Module
+
 7.0.2
 -----
 

data/lib/shopify_app/scripttags_manager.rb

@@ -2,12 +2,8 @@ module ShopifyApp
   class ScripttagsManager
     class CreationFailed < StandardError; end
 
-    def self.queue(shop_name, token)
-      ShopifyApp::ScripttagsManagerJob.perform_later(shop_name: shop_name, token: token)
-    end
-
-    def initialize(shop_name, token)
-      @shop_name, @token = shop_name, token
+    def self.queue(shop_domain, shop_token)
+      ShopifyApp::ScripttagsManagerJob.perform_later(shop_domain: shop_domain, shop_token: shop_token)
     end
 
     def recreate_scripttags!
@@ -18,19 +14,16 @@ module ShopifyApp
     def create_scripttags
       return unless required_scripttags.present?
 
-      with_shopify_session do
-        required_scripttags.each do |scripttag|
-          create_scripttag(scripttag) unless scripttag_exists?(scripttag[:src])
-        end
+      required_scripttags.each do |scripttag|
+        create_scripttag(scripttag) unless scripttag_exists?(scripttag[:src])
       end
     end
 
     def destroy_scripttags
-      with_shopify_session do
-        ShopifyAPI::ScriptTag.all.each do |scripttag|
-          ShopifyAPI::ScriptTag.delete(scripttag.id) if is_required_scripttag?(scripttag)
-        end
+      ShopifyAPI::ScriptTag.all.each do |scripttag|
+        ShopifyAPI::ScriptTag.delete(scripttag.id) if is_required_scripttag?(scripttag)
       end
+
       @current_scripttags = nil
     end
 
@@ -44,12 +37,6 @@ module ShopifyApp
       required_scripttags.map{ |w| w[:src] }.include? scripttag.src
     end
 
-    def with_shopify_session
-      ShopifyAPI::Session.temp(@shop_name, @token) do
-        yield
-      end
-    end
-
     def create_scripttag(attributes)
       attributes.reverse_merge!(format: 'json')
       scripttag = ShopifyAPI::ScriptTag.create(attributes)

data/lib/shopify_app/scripttags_manager_job.rb

@@ -1,11 +1,10 @@
 module ShopifyApp
   class ScripttagsManagerJob < ActiveJob::Base
-    def perform(params = {})
-      shop_name = params.fetch(:shop_name)
-      token = params.fetch(:token)
-
-      manager = ScripttagsManager.new(shop_name, token)
-      manager.create_scripttags
+    def perform(shop_domain:, shop_token:)
+      ShopifyAPI::Session.temp(shop_domain, shop_token) do
+        manager = ScripttagsManager.new
+        manager.create_scripttags
+      end
     end
   end
 end

data/lib/shopify_app/version.rb

@@ -1,3 +1,3 @@
 module ShopifyApp
-  VERSION = '7.0.2'
+  VERSION = '7.0.4'
 end

data/lib/shopify_app/webhooks_manager.rb

@@ -2,12 +2,8 @@ module ShopifyApp
   class WebhooksManager
     class CreationFailed < StandardError; end
 
-    def self.queue(shop_name, token)
-      ShopifyApp::WebhooksManagerJob.perform_later(shop_name: shop_name, token: token)
-    end
-
-    def initialize(shop_name, token)
-      @shop_name, @token = shop_name, token
+    def self.queue(shop_domain, shop_token)
+      ShopifyApp::WebhooksManagerJob.perform_later(shop_domain: shop_domain, shop_token: shop_token)
     end
 
     def recreate_webhooks!
@@ -18,19 +14,16 @@ module ShopifyApp
     def create_webhooks
       return unless required_webhooks.present?
 
-      with_shopify_session do
-        required_webhooks.each do |webhook|
-          create_webhook(webhook) unless webhook_exists?(webhook[:topic])
-        end
+      required_webhooks.each do |webhook|
+        create_webhook(webhook) unless webhook_exists?(webhook[:topic])
       end
     end
 
     def destroy_webhooks
-      with_shopify_session do
-        ShopifyAPI::Webhook.all.each do |webhook|
-          ShopifyAPI::Webhook.delete(webhook.id) if is_required_webhook?(webhook)
-        end
+      ShopifyAPI::Webhook.all.each do |webhook|
+        ShopifyAPI::Webhook.delete(webhook.id) if is_required_webhook?(webhook)
       end
+
       @current_webhooks = nil
     end
 
@@ -44,12 +37,6 @@ module ShopifyApp
       required_webhooks.map{ |w| w[:address] }.include? webhook.address
     end
 
-    def with_shopify_session
-      ShopifyAPI::Session.temp(@shop_name, @token) do
-        yield
-      end
-    end
-
     def create_webhook(attributes)
       attributes.reverse_merge!(format: 'json')
       webhook = ShopifyAPI::Webhook.create(attributes)

data/lib/shopify_app/webhooks_manager_job.rb

@@ -1,11 +1,10 @@
 module ShopifyApp
   class WebhooksManagerJob < ActiveJob::Base
-    def perform(params = {})
-      shop_name = params.fetch(:shop_name)
-      token = params.fetch(:token)
-
-      manager = WebhooksManager.new(shop_name, token)
-      manager.create_webhooks
+    def perform(shop_domain:, shop_token:)
+      ShopifyAPI::Session.temp(shop_domain, shop_token) do
+        manager = WebhooksManager.new
+        manager.create_webhooks
+      end
     end
   end
 end

data/shopify_app.gemspec

@@ -8,9 +8,9 @@ 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', '< 5.0')
+  s.add_dependency('rails', '>= 4.2.6', '< 5.0')
 
-  s.add_runtime_dependency('shopify_api', '~> 4.0.2')
+  s.add_runtime_dependency('shopify_api', '~> 4.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.2
+  version: 7.0.4
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 4.2.6
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 4.2.6
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: omniauth-shopify-oauth2
   requirement: !ruby/object:Gem::Requirement