shopify_app 4.2.3 → 4.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ddbd9741f95afe5632284e5dd5b848785dbf0bab
+  data.tar.gz: 5e072af36eb888d8f0db9b77dbab40da44ea297e
+SHA512:
+  metadata.gz: 9547655af229cd8f5a01a8864ddeec5d45d1a83ea987f1a6d0d6f9a4571d0fe40f00d547b233b0ae3d8a8b8732808ced4114754a99c96689bba513027c993968
+  data.tar.gz: 8a76f79fc656eaa394ff84dba2f79ded2c21b19bb2ca19c40d67b2e50a8271ed8689f503511e1ac78ed21666760888fcc9da862190a7a30a1f380fc8872d878a

data/lib/generators/shopify_app/templates/app/controllers/application_controller.rb

@@ -1,5 +1,8 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
+
+  # It will re-login if a user tries to access the application from a different shop
+  # before_filter :login_again_if_different_shop
   
   # Ask shop to authorize app again if additional permissions are required
   # rescue_from ActiveResource::ForbiddenAccess do

data/lib/generators/shopify_app/templates/app/controllers/sessions_controller.rb

@@ -44,7 +44,7 @@ class SessionsController < ApplicationController
     return unless params[:shop].present?
     name = params[:shop].to_s.strip
     name += '.myshopify.com' if !name.include?("myshopify.com") && !name.include?(".")
-    name.sub('https://', '').sub('http://', '')
+    name.gsub!('https://', '').sub('http://', '')
 
     u = URI("http://#{name}")
     u.host.ends_with?("myshopify.com") ? u.host : nil

data/lib/shopify_app/login_protection.rb

@@ -23,6 +23,12 @@ module ShopifyApp::LoginProtection
   def shop_session
     session[:shopify]
   end
+
+  def login_again_if_different_shop
+    if shop_session && params[:shop] && params[:shop].is_a?(String) && shop_session.url != params[:shop]
+      redirect_to login_path(shop: params[:shop]) 
+    end  
+  end
   
   protected
   

data/lib/shopify_app/railtie.rb

@@ -2,7 +2,7 @@ require 'rails'
 
 class ShopifyApp::Railtie < ::Rails::Railtie
 
-  config.before_configuration do
+  config.before_initialize do
     config.shopify = ShopifyApp.configuration
   end
   

data/lib/shopify_app/version.rb

@@ -1,3 +1,3 @@
 module ShopifyApp
-  VERSION = "4.2.3"
+  VERSION = "4.4.0"
 end

data/shopify_app.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "shopify-api"
 
   s.add_runtime_dependency('rails', '>= 3.1', '< 5.0')
-  s.add_runtime_dependency('shopify_api', '~> 3.0.0')
+  s.add_runtime_dependency('shopify_api', '~> 3.2.0')
   s.add_runtime_dependency('omniauth-shopify-oauth2', '1.1.2')
   s.add_runtime_dependency('less-rails-bootstrap', '~> 2.0')
 

metadata

@@ -1,58 +1,52 @@
 --- !ruby/object:Gem::Specification
 name: shopify_app
 version: !ruby/object:Gem::Version
-  version: 4.2.3
-  prerelease: 
+  version: 4.4.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: shopify_api
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: omniauth-shopify-oauth2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -60,7 +54,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -68,65 +61,57 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: less-rails-bootstrap
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Creates a basic sessions controller for authenticating with your Shop
@@ -139,7 +124,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -194,27 +179,26 @@ files:
 - test/test_helper.rb
 homepage: http://www.shopify.com/developers
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: shopify-api
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This gem is used to get quickly started with the Shopify API
 test_files:
 - test/config/development_config_file.yml