shopify-sinatra-app 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d68ae760210303ac3bd0ad7bf20c70c1d8110b4f21029d92acc7c9ecc161a134
-  data.tar.gz: 0f487172fdc9ad42578bdb62874700030638b30afdc3f5d4bce9e4129a338b24
+  metadata.gz: 06c208a5e6a5d5b7f496276e1aedea79466f8d7abc6082afdb7cff0b88223d49
+  data.tar.gz: 18439bd6c8f38719b02b7afdd1ec7559bf1b016f97fcca41d473739c85708042
 SHA512:
-  metadata.gz: ff866c8290a9e1eab32318b57c23993407719c5b1ebf55d6ce1b71fab46131fbf1bf3c6dac9dca44c7b47db4a07c670bfdcaeb93e76515f6805f1591d466b8a7
-  data.tar.gz: b6aed2da7b46c490596f615790607576e55556adbb7d33ca299a5a1a2cea021b47ee4073ca39de835ac7084e5e55886b22538896bd979b425dfb6ef16b17b43c
+  metadata.gz: fbd6555480c19155bb742b423e27df1f53aacdb3779134fdc8b18294926611f863f43abed6a2393e4994247381cc21653c64a4171786063da5f022b1aef52f2d
+  data.tar.gz: bae80dff8e96cc0dd29febed95b8a2336a944cab4b397803f9ad816b4c93f6996e7cc094e605bb5e3d88a12fbbbb2cf1e516d81f7575cfc7eec68dd50ea8afe1

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 
 rvm:
-  - 2.5.3
+  - 2.6.3
 
 gemfile: example/Gemfile
 

data/CHANGELOG

@@ -1,3 +1,10 @@
+0.11.0
+----------
+* remove rack-flash3 use sinatra-flash instead
+* remove a duplicate config of sessions that was breaking the same_site fix
+* remove a runtime dependency that didn't end up being used for the same_site fix but was added anyways
+* update ruby and rake versions
+
 0.10.0
 ------
 * Add the api_version to settings and update to 2019-07

data/README.md

@@ -128,7 +128,7 @@ note - a flash must be followed by a redirect or it won't work!
 
 Developing
 ----------
-The embedded app sdk won't load non https content so you'll need to use a forwarding service like [ngrok](https://ngrok.com/) or [forwardhq](https://forwardhq.com/). Set your application url in the [Shopify Partner area](https://app.shopify.com/services/partners/api_clients) to your forwarded url. However The redirect_uri should still be `http://localhost:4567/auth/shopify/callback` which will allow you to install your app on a live shop while running it locally.
+The embedded app sdk won't load non https content so you'll need to use a forwarding service like [ngrok](https://ngrok.com/) or [forwardhq](https://forwardhq.com/). Set your application url in the [Shopify Partner area](https://app.shopify.com/services/partners/api_clients) to your forwarded url and set the redirect_uri to your forwarded url + `/auth/shopify/callback` which will allow you to install your app on a live shop while running it locally.
 
 To run the app locally we use `foreman` which comes with the [Heroku Toolbelt](https://devcenter.heroku.com/articles/quickstart). Foreman handles running our application and setting our credentials as environment variables. To run the application type:
 

data/example/Gemfile

@@ -1,9 +1,9 @@
 source 'https://rubygems.org'
-ruby '2.5.3'
+ruby '2.6.3'
 
 gem 'shopify-sinatra-app', path: '../'
 gem 'sinatra-activerecord'
-gem 'rack-flash3', require: 'rack-flash'
+gem 'sinatra-flash'
 
 group :production do
   gem 'pg'
@@ -15,7 +15,7 @@ group :development, :test do
 end
 
 group :development do
-  gem 'rake'
+  gem 'rake', '>= 12.3.3'
   gem 'foreman'
   gem 'dotenv'
 end

data/example/db/schema.rb

@@ -2,11 +2,11 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `rails
+# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 

data/example/src/app.rb

@@ -1,7 +1,9 @@
 require 'sinatra/shopify-sinatra-app'
+require 'sinatra/flash'
 
 class SinatraApp < Sinatra::Base
   register Sinatra::Shopify
+  register Sinatra::Flash
 
   # set the scope that your app needs, read more here:
   # http://docs.shopify.com/api/tutorials/oauth

data/lib/sinatra/shopify-sinatra-app.rb

@@ -1,7 +1,6 @@
 require 'sinatra/base'
 require 'sinatra/activerecord'
 
-require 'rack-flash'
 require 'attr_encrypted'
 require 'active_support/all'
 
@@ -157,6 +156,7 @@ module Sinatra
     def self.registered(app)
       app.helpers Shopify::Methods
       app.register Sinatra::ActiveRecordExtension
+      app.enable :inline_templates
 
       app.set :database_file, File.expand_path('config/database.yml')
       app.set :views, File.expand_path('views')
@@ -164,9 +164,6 @@ module Sinatra
       app.set :erb, layout: :'layouts/application'
       app.set :protection, except: :frame_options
 
-      app.enable :sessions
-      app.enable :inline_templates
-
       app.set :api_version, '2019-07'
       app.set :scope, 'read_products, read_orders'
 
@@ -174,7 +171,6 @@ module Sinatra
       app.set :shared_secret, ENV['SHOPIFY_SHARED_SECRET']
       app.set :secret, ENV['SECRET']
 
-      app.use Rack::Flash, sweep: true
       app.use Rack::MethodOverride
       app.use Rack::Session::Cookie, key: 'rack.session',
                                      path: '/',

data/shopify-sinatra-app.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'shopify-sinatra-app'
-  s.version = '0.10.0'
+  s.version = '0.11.0'
 
   s.summary     = 'A classy shopify app'
   s.description = 'A Sinatra extension for building Shopify Apps. Akin to the shopify_app gem but for Sinatra'
@@ -15,15 +15,13 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'sinatra', '~> 2.0.2'
   s.add_runtime_dependency 'sinatra-activerecord', '~> 2.0.9'
-  s.add_runtime_dependency 'rack-flash3', '~> 1.0.5'
   s.add_runtime_dependency 'activesupport'
   s.add_runtime_dependency 'attr_encrypted', '~> 3.1.0'
 
   s.add_runtime_dependency 'shopify_api', '>= 7.0.1', '< 9.1.0'
   s.add_runtime_dependency 'omniauth-shopify-oauth2'
-  s.add_runtime_dependency 'browser_sniffer', '~> 1.1.3'
 
-  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rake', '>= 12.3.3'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'rack-test'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-sinatra-app
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Kevin Hughes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-06 00:00:00.000000000 Z
+date: 2020-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.9
-- !ruby/object:Gem::Dependency
-  name: rack-flash3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -114,34 +100,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: browser_sniffer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement