shopify-sinatra-app 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 053fdbd162a95abe2d22b6240a079f43643a88a4fcbddf7bb3e2e83a48596d88
-  data.tar.gz: 8737bdff0e820844c1b1e5cf07db63333e9dfc13d6368b9204046b9a901a62fe
+  metadata.gz: ace215ee071106c2951a8dd56261221309c1660bb1fa8895dfeec5c765b5a750
+  data.tar.gz: 493dc41a6aee4cead57e017f9dec5740c79ef6b453990c5f22443ae1734fed5a
 SHA512:
-  metadata.gz: 6f53afc8ccf52753ed917a589df57c6a0a251c19c9f76b1b117837a21a8ed8e9bd224ef8f64d61ee1e7b77c2c092af302b37648a8f1d9293cb32b8d1760a8b68
-  data.tar.gz: ea6f0a145386d5c4d4d21173241e43b7c76c77786958c70e8f919fda3413310d355464ef45b19d64ff517c3aebfd8e9f4659c67bcdd3689f7a18297a5ec3c33a
+  metadata.gz: ce73f628ac172a2f6f9f96c534a443dd8154c23a816f9a3e18a18ae0c99a004569b545d5e2e36f9e70d7b015de854cbe60f4ac7dbe721d0fd864027fd3d15bcb
+  data.tar.gz: cdac82b2797ec0d8e75fe85459a0efefc49c1faf9fd6bbad625eba74201000d7c4fca7b0b9589c3a14ddf90cd4a79408e2af0d69f5bcf102ef14fc4c820c3fc4

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 
 rvm:
-  - 2.3.3
+  - 2.5.0
 
 gemfile: example/Gemfile
 

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.4.0
+-----
+* update to sinatra 2.0.1
+* update to attr_encrypted 3.1.0
+* remove SHOPIFY_REDIRECT_URI param
+
 0.3.4
 -----
 * rename lib to src in the example/template

data/Gemfile.lock

@@ -1,51 +1,52 @@
 PATH
   remote: .
   specs:
-    shopify-sinatra-app (0.3.3)
-      activesupport (~> 4.1.1)
-      attr_encrypted (~> 1.3.2)
-      omniauth-shopify-oauth2 (~> 1.1.11)
+    shopify-sinatra-app (0.4.0)
+      activesupport
+      attr_encrypted (~> 3.1.0)
+      omniauth-shopify-oauth2
       rack-flash3 (~> 1.0.5)
-      resque (~> 1.25.2)
-      shopify_api (~> 4.9.0)
-      sinatra (~> 1.4.6)
+      resque
+      shopify_api
+      sinatra (~> 2.0.1)
       sinatra-activerecord (~> 2.0.9)
       sinatra-redis (~> 0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.1.16)
-      activesupport (= 4.1.16)
+    activemodel (5.1.5)
+      activesupport (= 5.1.5)
+    activemodel-serializers-xml (1.0.2)
+      activemodel (> 5.x)
+      activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (4.1.16)
-      activemodel (= 4.1.16)
-      activesupport (= 4.1.16)
-      arel (~> 5.0.0)
-    activeresource (4.1.0)
-      activemodel (~> 4.0)
-      activesupport (~> 4.0)
-      rails-observers (~> 0.1.2)
-    activesupport (4.1.16)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
+    activerecord (5.1.5)
+      activemodel (= 5.1.5)
+      activesupport (= 5.1.5)
+      arel (~> 8.0)
+    activeresource (5.0.0)
+      activemodel (>= 5.0, < 6)
+      activemodel-serializers-xml (~> 1.0)
+      activesupport (>= 5.0, < 6)
+    activesupport (5.1.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
-    attr_encrypted (1.3.5)
-      encryptor (~> 1.3.0)
+    arel (8.0.0)
+    attr_encrypted (3.1.0)
+      encryptor (~> 3.0.0)
     builder (3.2.3)
     concurrent-ruby (1.0.5)
-    encryptor (1.3.0)
+    encryptor (3.0.0)
     fakeweb (1.3.0)
-    faraday (0.9.2)
+    faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
     hashie (3.5.7)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    json (1.8.6)
-    jwt (1.5.1)
+    jwt (1.5.6)
     metaclass (0.0.4)
     minitest (5.11.3)
     mocha (1.3.0)
@@ -54,9 +55,10 @@ GEM
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    oauth2 (1.1.0)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0, < 1.5.2)
+    mustermann (1.0.2)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
@@ -66,35 +68,33 @@ GEM
     omniauth-oauth2 (1.5.0)
       oauth2 (~> 1.1)
       omniauth (~> 1.2)
-    omniauth-shopify-oauth2 (1.1.17)
-      oauth2 (~> 1.1.0)
-      omniauth-oauth2 (~> 1.2)
-    rack (1.6.9)
+    omniauth-shopify-oauth2 (1.2.1)
+      omniauth-oauth2 (~> 1.5.0)
+    rack (2.0.4)
     rack-flash3 (1.0.5)
       rack
-    rack-protection (1.5.5)
+    rack-protection (2.0.1)
       rack
     rack-test (0.8.3)
       rack (>= 1.0, < 3)
-    rails-observers (0.1.5)
-      activemodel (>= 4.0)
     rake (12.3.0)
     redis (4.0.1)
     redis-namespace (1.6.0)
       redis (>= 3.0.4)
-    resque (1.25.2)
+    resque (1.27.4)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.3)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    shopify_api (4.9.1)
+    shopify_api (4.10.0)
       activeresource (>= 3.0.0)
       rack
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
+    sinatra (2.0.1)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.1)
+      tilt (~> 2.0)
     sinatra-activerecord (2.0.13)
       activerecord (>= 3.2)
       sinatra (>= 1.0)

data/bin/shopify-sinatra-app-generator

@@ -40,7 +40,6 @@ class Generator
     file = File.open(app_dir + '/.env', 'w')
     file.write("SHOPIFY_API_KEY=your_api_key\n")
     file.write("SHOPIFY_SHARED_SECRET=your_shared_secret\n")
-    file.write("SHOPIFY_REDIRECT_URI=your_redirect_uri\n")
     file.write("SECRET=random_string_to_encrypt_credentials_with\n")
     file.close
   end

data/example/Gemfile.lock

@@ -1,55 +1,56 @@
 PATH
   remote: ..
   specs:
-    shopify-sinatra-app (0.3.3)
-      activesupport (~> 4.1.1)
-      attr_encrypted (~> 1.3.2)
-      omniauth-shopify-oauth2 (~> 1.1.11)
+    shopify-sinatra-app (0.4.0)
+      activesupport
+      attr_encrypted (~> 3.1.0)
+      omniauth-shopify-oauth2
       rack-flash3 (~> 1.0.5)
-      resque (~> 1.25.2)
-      shopify_api (~> 4.9.0)
-      sinatra (~> 1.4.6)
+      resque
+      shopify_api
+      sinatra (~> 2.0.1)
       sinatra-activerecord (~> 2.0.9)
       sinatra-redis (~> 0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.1.16)
-      activesupport (= 4.1.16)
+    activemodel (5.1.5)
+      activesupport (= 5.1.5)
+    activemodel-serializers-xml (1.0.2)
+      activemodel (> 5.x)
+      activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (4.1.16)
-      activemodel (= 4.1.16)
-      activesupport (= 4.1.16)
-      arel (~> 5.0.0)
-    activeresource (4.1.0)
-      activemodel (~> 4.0)
-      activesupport (~> 4.0)
-      rails-observers (~> 0.1.2)
-    activesupport (4.1.16)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
+    activerecord (5.1.5)
+      activemodel (= 5.1.5)
+      activesupport (= 5.1.5)
+      arel (~> 8.0)
+    activeresource (5.0.0)
+      activemodel (>= 5.0, < 6)
+      activemodel-serializers-xml (~> 1.0)
+      activesupport (>= 5.0, < 6)
+    activesupport (5.1.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
-    attr_encrypted (1.3.5)
-      encryptor (~> 1.3.0)
+    arel (8.0.0)
+    attr_encrypted (3.1.0)
+      encryptor (~> 3.0.0)
     builder (3.2.3)
     byebug (10.0.0)
     concurrent-ruby (1.0.5)
     dotenv (2.2.1)
-    encryptor (1.3.0)
+    encryptor (3.0.0)
     fakeweb (1.3.0)
-    faraday (0.9.2)
+    faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
     foreman (0.84.0)
       thor (~> 0.19.1)
     hashie (3.5.7)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    json (1.8.6)
-    jwt (1.5.1)
+    jwt (1.5.6)
     metaclass (0.0.4)
     minitest (5.11.3)
     mocha (1.3.0)
@@ -58,9 +59,10 @@ GEM
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    oauth2 (1.1.0)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0, < 1.5.2)
+    mustermann (1.0.2)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
@@ -70,36 +72,34 @@ GEM
     omniauth-oauth2 (1.5.0)
       oauth2 (~> 1.1)
       omniauth (~> 1.2)
-    omniauth-shopify-oauth2 (1.1.17)
-      oauth2 (~> 1.1.0)
-      omniauth-oauth2 (~> 1.2)
+    omniauth-shopify-oauth2 (1.2.1)
+      omniauth-oauth2 (~> 1.5.0)
     pg (1.0.0)
-    rack (1.6.9)
+    rack (2.0.4)
     rack-flash3 (1.0.5)
       rack
-    rack-protection (1.5.5)
+    rack-protection (2.0.1)
       rack
     rack-test (0.8.3)
       rack (>= 1.0, < 3)
-    rails-observers (0.1.5)
-      activemodel (>= 4.0)
     rake (12.3.0)
     redis (4.0.1)
     redis-namespace (1.6.0)
       redis (>= 3.0.4)
-    resque (1.25.2)
+    resque (1.27.4)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.3)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    shopify_api (4.9.1)
+    shopify_api (4.10.0)
       activeresource (>= 3.0.0)
       rack
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
+    sinatra (2.0.1)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.1)
+      tilt (~> 2.0)
     sinatra-activerecord (2.0.13)
       activerecord (>= 3.2)
       sinatra (>= 1.0)

data/example/db/migrate/20140413221328_create_shops.rb

@@ -1,4 +1,4 @@
-class CreateShops < ActiveRecord::Migration
+class CreateShops < ActiveRecord::Migration[5.1]
   def self.up
     create_table :shops do |t|
       t.string :name

data/example/db/migrate/20140414042317_add_index_to_shops.rb

@@ -1,4 +1,4 @@
-class AddIndexToShops < ActiveRecord::Migration
+class AddIndexToShops < ActiveRecord::Migration[5.1]
   def self.up
     add_index :shops, :name
   end

data/example/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -13,11 +12,10 @@
 
 ActiveRecord::Schema.define(version: 20140414042317) do
 
-  create_table "shops", force: true do |t|
+  create_table "shops", force: :cascade do |t|
     t.string "name"
     t.string "token_encrypted"
+    t.index ["name"], name: "index_shops_on_name"
   end
 
-  add_index "shops", ["name"], name: "index_shops_on_name"
-
 end

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

@@ -183,7 +183,6 @@ module Sinatra
 
       app.set :api_key, ENV['SHOPIFY_API_KEY']
       app.set :shared_secret, ENV['SHOPIFY_SHARED_SECRET']
-      app.set :redirect_uri, ENV['SHOPIFY_REDIRECT_URI']
       app.set :secret, ENV['SECRET']
 
       app.use Rack::Flash, sweep: true
@@ -265,7 +264,13 @@ class Shop < ActiveRecord::Base
     @secret ||= ENV['SECRET']
   end
 
-  attr_encrypted :token, key: secret, attribute: 'token_encrypted'
+  attr_encrypted :token,
+    key: secret,
+    attribute: 'token_encrypted',
+    mode: :single_iv_and_salt,
+    algorithm: 'aes-256-cbc',
+    insecure_mode: true
+
   validates_presence_of :name
   validates_presence_of :token, on: :create
 end

data/shopify-sinatra-app.gemspec

@@ -1,29 +1,29 @@
 Gem::Specification.new do |s|
   s.name = 'shopify-sinatra-app'
-  s.version = '0.3.4'
+  s.version = '0.4.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'
 
   s.authors = ['Kevin Hughes']
-  s.email = 'kevin.hughes@shopify.com'
-  s.homepage = 'https://github.com/pickle27/shopify-sinatra-app/'
+  s.email = 'kevinhughes27@gmail.com'
+  s.homepage = 'https://github.com/kevinhughes27/shopify-sinatra-app/'
   s.license = 'MIT'
 
   s.files = `git ls-files`.split("\n")
   s.executables << 'shopify-sinatra-app-generator'
 
-  s.add_runtime_dependency 'sinatra', '~> 1.4.6'
+  s.add_runtime_dependency 'sinatra', '~> 2.0.1'
   s.add_runtime_dependency 'sinatra-redis', '~> 0.3.0'
   s.add_runtime_dependency 'sinatra-activerecord', '~> 2.0.9'
   s.add_runtime_dependency 'rack-flash3', '~> 1.0.5'
-  s.add_runtime_dependency 'activesupport', '~> 4.1.1'
-  s.add_runtime_dependency 'attr_encrypted', '~> 1.3.2'
+  s.add_runtime_dependency 'activesupport'
+  s.add_runtime_dependency 'attr_encrypted', '~> 3.1.0'
 
-  s.add_runtime_dependency 'resque', '~> 1.25.2'
+  s.add_runtime_dependency 'resque'
 
-  s.add_runtime_dependency 'shopify_api', '~> 4.9.0'
-  s.add_runtime_dependency 'omniauth-shopify-oauth2', '~> 1.1.11'
+  s.add_runtime_dependency 'shopify_api'
+  s.add_runtime_dependency 'omniauth-shopify-oauth2'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'sqlite3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopify-sinatra-app
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Kevin Hughes
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: sinatra-redis
   requirement: !ruby/object:Gem::Requirement
@@ -70,72 +70,72 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: attr_encrypted
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.25.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.25.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shopify_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.9.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.9.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: omniauth-shopify-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.11
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.11
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +222,7 @@ dependencies:
         version: '0'
 description: A Sinatra extension for building Shopify Apps. Akin to the shopify_app
   gem but for Sinatra
-email: kevin.hughes@shopify.com
+email: kevinhughes27@gmail.com
 executables:
 - shopify-sinatra-app-generator
 extensions: []
@@ -261,7 +261,7 @@ files:
 - lib/sinatra/shopify-sinatra-app.rb
 - shopify-sinatra-app.gemspec
 - test.sh
-homepage: https://github.com/pickle27/shopify-sinatra-app/
+homepage: https://github.com/kevinhughes27/shopify-sinatra-app/
 licenses:
 - MIT
 metadata: {}