shopify-sinatra-app 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fae906100926e37440e36e3c32b544491d343bf
-  data.tar.gz: 40e0db9fd66ea7bb3486e8409ebfde06583beda8
+  metadata.gz: 72cdd06c5ebe172600536e29a0043fd0ddbf02b5
+  data.tar.gz: 86216e56a91dcd10c944b1892e6cb63fb4aa08dc
 SHA512:
-  metadata.gz: 5cde198192ce18527f0726cc1500939decf625303167e8c125d6a8298660f6c42bf8a3c5b7d67962bb55ed4b2c974bc15d3c5e6a2ad64c6b27270f857e28ed09
-  data.tar.gz: 7ed43029dc45fbf1b1e25c217575722fb1d960158be508ed15e485009665816f0e000f30807b6251482540b28ca7a674cc7c75ebb55d1d265504ab24c70d4028
+  metadata.gz: 8c2501035a0d5668e4931384214c8f147f732abe352ce2cae22e6271ae270688364e320958aeef0251553a00ee7d9cbaa8fd130d01550bfa70b769c0056e0e2d
+  data.tar.gz: 4ff8f7249009cd3fbe8d55d5ad6be65892a70cf2c725d85f48bd4c692db4b9e9bd68566c5e90b86d641833bec72a36c6190703952a31516b9eb71ba226a5ac89

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+
+rvm:
+  - 2.1.5
+
+gemfile:
+  - Gemfile
+
+script: "./test.sh"

data/CHANGELOG

@@ -0,0 +1,7 @@
+0.2.0
+-----
+* added a SHOPIFY_REDIRECT_URI env param for setting the redirect_uri (was breifly HOSTNAME)
+* add versions to gemfile
+* refactored the generator
+* Changed install method to after_shopify_auth. Implementations of this method must now be idempotent as this will be called anytime the app is auth'd which may be due to just a lost session and not necessarily an install.
+* Always redo the full auth rather than trying to keep track of first time install state vs re-auth

data/Gemfile

@@ -1,30 +1,2 @@
 source 'https://rubygems.org'
-ruby '2.1.5'
-
-gem 'sinatra'
-gem 'sinatra-redis'
-gem 'sinatra-activerecord'
-gem 'sinatra-twitter-bootstrap', require: 'sinatra/twitter-bootstrap'
-gem 'rack-flash3', require: 'rack-flash'
-gem 'activesupport'
-gem 'attr_encrypted'
-gem 'foreman'
-gem 'rake'
-
-gem 'resque', '~> 1.22.0'
-
-gem 'omniauth-shopify-oauth2', '~> 1.1.8'
-gem 'shopify_api', '~> 4.0.2'
-
-group :production do
-  gem 'pg'
-end
-
-group :development do
-  gem 'sqlite3'
-  gem 'rack-test'
-  gem 'minitest'
-  gem 'fakeweb'
-  gem 'mocha', require: false
-  gem 'byebug'
-end
+gemspec

data/Gemfile.lock

@@ -1,52 +1,59 @@
+PATH
+  remote: .
+  specs:
+    shopify-sinatra-app (0.1.5)
+      activesupport (~> 4.1.1)
+      attr_encrypted (~> 1.3.2)
+      omniauth-shopify-oauth2 (~> 1.1.11)
+      rack-flash3 (~> 1.0.5)
+      resque (~> 1.25.2)
+      shopify_api (~> 4.0.2)
+      sinatra (~> 1.4.6)
+      sinatra-activerecord (~> 2.0.9)
+      sinatra-redis (~> 0.3.0)
+      sinatra-twitter-bootstrap (~> 2.3.3)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.1.1)
-      activesupport (= 4.1.1)
+    activemodel (4.1.14)
+      activesupport (= 4.1.14)
       builder (~> 3.1)
-    activerecord (4.1.1)
-      activemodel (= 4.1.1)
-      activesupport (= 4.1.1)
+    activerecord (4.1.14)
+      activemodel (= 4.1.14)
+      activesupport (= 4.1.14)
       arel (~> 5.0.0)
     activeresource (4.0.0)
       activemodel (~> 4.0)
       activesupport (~> 4.0)
       rails-observers (~> 0.1.1)
-    activesupport (4.1.1)
+    activesupport (4.1.14)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     arel (5.0.1.20140414130214)
-    attr_encrypted (1.3.2)
+    attr_encrypted (1.3.4)
       encryptor (>= 1.3.0)
     builder (3.2.2)
-    byebug (3.1.2)
-      columnize (~> 0.8)
-      debugger-linecache (~> 1.2)
-    columnize (0.8.9)
-    debugger-linecache (1.2.0)
-    dotenv (0.7.0)
     encryptor (1.3.0)
     fakeweb (1.3.0)
-    faraday (0.9.1)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    foreman (0.64.0)
-      dotenv (~> 0.7.0)
-      thor (>= 0.13.6)
-    hashie (3.4.1)
-    i18n (0.6.9)
-    json (1.8.1)
-    jwt (1.5.0)
+    hashie (3.4.3)
+    i18n (0.7.0)
+    json (1.8.3)
+    jwt (1.5.2)
     metaclass (0.0.4)
-    minitest (5.3.4)
+    minitest (5.8.3)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.10.1)
+    mono_logger (1.1.0)
+    multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    oauth2 (0.9.4)
+    oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
       multi_json (~> 1.3)
@@ -55,14 +62,11 @@ GEM
     omniauth (1.2.2)
       hashie (>= 1.2, < 4)
       rack (~> 1.0)
-    omniauth-oauth2 (1.1.2)
-      faraday (>= 0.8, < 0.10)
-      multi_json (~> 1.3)
-      oauth2 (~> 0.9.3)
+    omniauth-oauth2 (1.4.0)
+      oauth2 (~> 1.0)
       omniauth (~> 1.2)
-    omniauth-shopify-oauth2 (1.1.8)
-      omniauth-oauth2 (~> 1.1.1)
-    pg (0.17.1)
+    omniauth-shopify-oauth2 (1.1.11)
+      omniauth-oauth2 (~> 1.2)
     rack (1.5.2)
     rack-flash3 (1.0.5)
       rack
@@ -73,32 +77,33 @@ GEM
     rails-observers (0.1.2)
       activemodel (~> 4.0)
     rake (10.3.2)
-    redis (3.0.7)
-    redis-namespace (1.4.1)
-      redis (~> 3.0.4)
-    resque (1.22.0)
+    redis (3.2.2)
+    redis-namespace (1.5.2)
+      redis (~> 3.0, >= 3.0.4)
+    resque (1.25.2)
+      mono_logger (~> 1.0)
       multi_json (~> 1.0)
-      redis-namespace (~> 1.0)
+      redis-namespace (~> 1.3)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    shopify_api (4.0.2)
+    shopify_api (4.0.7)
       activeresource
-    sinatra (1.4.5)
+      rack
+    sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    sinatra-activerecord (2.0.2)
+      tilt (>= 1.3, < 3)
+    sinatra-activerecord (2.0.9)
       activerecord (>= 3.2)
       sinatra (~> 1.0)
     sinatra-redis (0.3.0)
       redis
       sinatra (>= 0.9.4)
-    sinatra-twitter-bootstrap (2.3.3)
-    sqlite3 (1.3.9)
-    thor (0.18.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
-    tzinfo (1.2.1)
+    sinatra-twitter-bootstrap (2.3.4)
+    sqlite3 (1.3.11)
+    thread_safe (0.3.5)
+    tilt (2.0.1)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
     vegas (0.1.11)
       rack (>= 1.0.0)
@@ -107,22 +112,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport
-  attr_encrypted
-  byebug
   fakeweb
-  foreman
   minitest
   mocha
-  omniauth-shopify-oauth2 (~> 1.1.8)
-  pg
-  rack-flash3
   rack-test
   rake
-  resque (~> 1.22.0)
-  shopify_api (~> 4.0.2)
-  sinatra
-  sinatra-activerecord
-  sinatra-redis
-  sinatra-twitter-bootstrap
+  shopify-sinatra-app!
   sqlite3
+
+BUNDLED WITH
+   1.10.6

data/README.md

@@ -1,4 +1,4 @@
-shopify-sinatra-app
+shopify-sinatra-app [![Build Status](https://travis-ci.org/kevinhughes27/shopify-tax-receipts.svg)](https://travis-ci.org/kevinhughes27/shopify-sinatra-app)
 ===================
 
 "A classy shopify app"
@@ -57,7 +57,7 @@ This will create a new skeleton shopify-sinatra-app. The generator will create s
 
 ### Setting the app to use your Shopify API credentials
 
-You'll need to create a Shopify Partner Account and a new application. You can make an account [here](http://www.shopify.ca/partners) and see this [tutorial](http://docs.shopify.com/api/the-basics/getting-started) for creating a new application.
+You'll need to create a Shopify Partner Account and a new application. You can make an account [here](http://www.shopify.ca/partners) and see this [tutorial](http://docs.shopify.com/api/the-basics/getting-started) for creating a new application. This app uses the default redirect_uri from omniauth `<your domain>/auth/shopify/callback` so set it accordingly when creating your app.
 
 Note - The shopify-sinatra-app creates an embedded app! You need change the embedded setting to `enabled` in the [Shopify Partner area](https://app.shopify.com/services/partners/api_clients) for your app. If you don't want your app to be embedded then remove the related code in `layout/application.erb` and delete the `layout/_top_bar.erb` file and the references to it in the other views.
 
@@ -66,6 +66,7 @@ After creating your new application you need to edit the `.env` file and add the
 ```
 SHOPIFY_API_KEY=<your api key>
 SHOPIFY_SHARED_SECRET=<your shared secret>
+SHOPIFY_REDIRECT_URI="<your redirect_uri>"
 SECRET=<generate a random string to encrypt credentials with>
 ```
 
@@ -111,7 +112,7 @@ class OrderWebhookJob
 end
 ```
 
-**install** - This is a private method provided with the framework that gets called when the app is authorized for the first time. You should fill this method in with anything you need to initialize on install, for example webhooks and services on Shopify or any other database models you have created specific to a shop.
+**after_shopify_auth** - This is a private method provided with the framework that gets called whenever the app is authorized. You should fill this method in with anything you need to initialize, for example webhooks and services on Shopify or any other database models you have created specific to a shop. Note that this method will be called anytime the auth flow is completed so this method should be idempotent (running it twice has the same effect as running it once).
 
 **logout** - This method clears the current session
 
@@ -125,7 +126,7 @@ end
 
 shopify-sinatra-app includes sinatra/activerecord for creating models that can be persisted in the database. You might want to read more about sinatra/activerecord and the methods it makes available to you: [https://github.com/janko-m/sinatra-activerecord](https://github.com/janko-m/sinatra-activerecord)
 
-shopify-sinatra-app also includes `rack-flash3` and the flash messages are forwarded to the Shopify Embedded App SDK (see the code in `views/layouts/application.erb`). Flash messages are useful for signalling to your users that a request was successful without changing the page. The following is an example of how to use a flash message in a route:
+shopify-sinatra-app also includes `rack-flash3` and the flash messages are forwarded to the Shopify Embedded App SDK (see the code in `views/layouts/application.erb`). Flash messages are useful for signaling to your users that a request was successful without changing the page. The following is an example of how to use a flash message in a route:
 
 ```
 post '/flash_message' do
@@ -158,7 +159,7 @@ While running the app locally you'll be able to test the install and other route
 ./ngrok 4567
 ```
 
-Ngrok will report what address your app is available at, leave Ngrok running and then create your webhook to point to the ngrok url plus your route e.g. `<ngrok url>/webhook_test.json`. Now trigger the webhook you are testing and it will get forwarded through ngrok to your local web application allowing you to use debuggers and repls to complete your code.
+Ngrok will report what address your app is available at, leave Ngrok running and then create your webhook to point to the ngrok url plus your route e.g. `<ngrok url>/webhook_test.json`. Now trigger the webhook you are testing and it will get forwarded through ngrok to your local web application allowing you to use debuggers and REPLs to complete your code.
 
 Testing
 -------

data/bin/shopify-sinatra-app-generator

@@ -1,60 +1,83 @@
 #!/usr/bin/env ruby
 require 'fileutils'
 
-working_dir = Dir.pwd
+class Generator
+  attr_reader :spec, :app_dir, :example_dir
 
-spec = Gem::Specification.find_by_name('shopify-sinatra-app')
-gem_root = spec.gem_dir
-gem_lib = gem_root + '/lib'
+  def initialize(app_name)
+    @spec = Gem::Specification.find_by_name('shopify-sinatra-app')
+    gem_root = spec.gem_dir
+    @example_dir = gem_root + '/example'
 
-generator_dir = gem_lib + '/generator'
+    working_dir = Dir.pwd
+    @app_dir = working_dir + '/' + app_name
 
-if ARGV.length < 2
-  puts "Usage:\n./shopify-sinatra-app new <app_name>"
-else
-  app_name = ARGV[1]
-  app_dir = working_dir + '/' + app_name
+    log "Generating new app: #{app_name}"
+    log "fullpath: #{app_dir}"
+  end
 
-  puts "Generating new app: #{app_name}"
-  puts "fullpath: #{app_dir}"
+  def run
+    if Dir.exists? app_dir
+      log 'App directory alread exists, pick a new app name or delete the existing folder'
+      return
+    end
 
-  begin
-    Dir.mkdir(app_dir)
+    copy_example_app
+    create_dot_env
+    sub_latest_version
+    bundle_install
+    migrate_database
+  end
 
-    FileUtils.cp_r(generator_dir + '/config',     app_dir + '/config')
-    FileUtils.cp_r(generator_dir + '/db',         app_dir + '/db')
-    FileUtils.cp_r(generator_dir + '/lib',        app_dir + '/lib')
-    FileUtils.cp_r(generator_dir + '/public',     app_dir + '/public')
-    FileUtils.cp_r(generator_dir + '/views',      app_dir + '/views')
-    FileUtils.cp_r(generator_dir + '/test',       app_dir + '/test')
+  private
 
-    FileUtils.cp(generator_dir   + '/.gitignore', app_dir + '/.gitignore')
-    FileUtils.cp(generator_dir   + '/config.ru',  app_dir + '/config.ru')
-    FileUtils.cp(generator_dir   + '/Procfile',   app_dir + '/Procfile')
-    FileUtils.cp(generator_dir   + '/Rakefile',   app_dir + '/Rakefile')
-    FileUtils.cp(generator_dir   + '/Gemfile',    app_dir + '/Gemfile')
-    FileUtils.cp(generator_dir   + '/README.md',  app_dir + '/README.md')
+  def copy_example_app
+    FileUtils.cp_r(example_dir, app_dir)
+  end
 
+  def create_dot_env
     FileUtils.touch(app_dir + '/.env')
     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
+
+  def sub_latest_version
+    file_name = "#{app_dir}/Gemfile"
+    text = File.read(file_name)
+    new_contents = text.gsub("gem 'shopify-sinatra-app', github: 'kevinhughes27/shopify-sinatra-app'", "gem 'shopify-sinatra-app', '~> #{spec.version}'")
+    File.open(file_name, "w") {|file| file.puts new_contents }
+  end
 
+  def bundle_install
     Dir.chdir(app_dir)
 
     pipe = IO.popen('bundle install')
     while (line = pipe.gets)
       print line
     end
+  end
+
+  def migrate_database
+    Dir.chdir(app_dir)
 
     pipe = IO.popen('bundle exec rake db:migrate')
     while (line = pipe.gets)
       print line
     end
+  end
 
-  rescue Errno::EEXIST => e
-    puts 'App directory alread exists, pick a new app name or delete the existing folder'
+  def log(msg)
+    puts msg
   end
 end
+
+if ARGV.length < 2
+  puts "Usage:\nshopify-sinatra-app-generator new <app_name>"
+else
+  app_name = ARGV[1]
+  Generator.new(app_name).run
+end

data/{lib/generator → example}/Gemfile

@@ -1,32 +1,29 @@
 source 'https://rubygems.org'
-ruby '2.0.0'
+ruby "2.1.5"
 
-gem 'sinatra'
-gem 'sinatra-redis'
+gem 'shopify-sinatra-app', github: 'kevinhughes27/shopify-sinatra-app', branch: 'master'
 gem 'sinatra-activerecord'
 gem 'sinatra-twitter-bootstrap', require: 'sinatra/twitter-bootstrap'
 gem 'rack-flash3', require: 'rack-flash'
-gem 'activesupport'
-gem 'attr_encrypted'
-gem 'foreman'
-gem 'rake'
-
-gem 'resque', '~> 1.22.0'
-
-gem 'shopify-sinatra-app'
-gem 'omniauth-shopify-oauth2'
-gem 'shopify_api'
 
 group :production do
   gem 'pg'
 end
 
-group :development do
+group :development, :test do
   gem 'sqlite3'
-  gem 'rack-test'
-  gem 'minitest'
-  gem 'fakeweb'
-  gem 'mocha', require: false
   gem 'byebug'
+end
+
+group :development do
+  gem 'rake'
+  gem 'foreman'
   gem 'dotenv'
 end
+
+group :test do
+  gem 'mocha', require: false
+  gem 'minitest'
+  gem 'rack-test'
+  gem 'fakeweb'
+end

data/{lib/generator → example}/Gemfile.lock

@@ -1,25 +1,42 @@
+GIT
+  remote: git://github.com/kevinhughes27/shopify-sinatra-app.git
+  revision: fbc7e6e51ad48cf68fa4434ab34d80ec59e90b52
+  branch: master
+  specs:
+    shopify-sinatra-app (0.2.0)
+      activesupport (~> 4.1.1)
+      attr_encrypted (~> 1.3.2)
+      omniauth-shopify-oauth2 (~> 1.1.11)
+      rack-flash3 (~> 1.0.5)
+      resque (~> 1.25.2)
+      shopify_api (~> 4.0.2)
+      sinatra (~> 1.4.6)
+      sinatra-activerecord (~> 2.0.9)
+      sinatra-redis (~> 0.3.0)
+      sinatra-twitter-bootstrap (~> 2.3.3)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.1.2)
-      activesupport (= 4.1.2)
+    activemodel (4.1.14)
+      activesupport (= 4.1.14)
       builder (~> 3.1)
-    activerecord (4.1.2)
-      activemodel (= 4.1.2)
-      activesupport (= 4.1.2)
+    activerecord (4.1.14)
+      activemodel (= 4.1.14)
+      activesupport (= 4.1.14)
       arel (~> 5.0.0)
     activeresource (4.0.0)
       activemodel (~> 4.0)
       activesupport (~> 4.0)
       rails-observers (~> 0.1.1)
-    activesupport (4.1.2)
+    activesupport (4.1.14)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     arel (5.0.1.20140414130214)
-    attr_encrypted (1.3.2)
+    attr_encrypted (1.3.4)
       encryptor (>= 1.3.0)
     builder (3.2.2)
     byebug (3.1.2)
@@ -30,87 +47,76 @@ GEM
     dotenv (0.7.0)
     encryptor (1.3.0)
     fakeweb (1.3.0)
-    faraday (0.9.0)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     foreman (0.64.0)
       dotenv (~> 0.7.0)
       thor (>= 0.13.6)
-    hashie (2.1.2)
-    i18n (0.6.11)
-    json (1.8.1)
-    jwt (1.0.0)
+    hashie (3.4.3)
+    i18n (0.7.0)
+    json (1.8.3)
+    jwt (1.5.2)
     metaclass (0.0.4)
-    minitest (5.4.0)
+    minitest (5.8.3)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.10.1)
+    mono_logger (1.1.0)
+    multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    oauth2 (0.9.4)
+    oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    omniauth (1.2.1)
-      hashie (>= 1.2, < 3)
+    omniauth (1.2.2)
+      hashie (>= 1.2, < 4)
       rack (~> 1.0)
-    omniauth-oauth2 (1.1.2)
-      faraday (>= 0.8, < 0.10)
-      multi_json (~> 1.3)
-      oauth2 (~> 0.9.3)
+    omniauth-oauth2 (1.4.0)
+      oauth2 (~> 1.0)
       omniauth (~> 1.2)
-    omniauth-shopify-oauth2 (1.1.7)
-      omniauth-oauth2 (~> 1.1.1)
+    omniauth-shopify-oauth2 (1.1.11)
+      omniauth-oauth2 (~> 1.2)
     pg (0.17.1)
-    rack (1.5.2)
+    rack (1.6.4)
     rack-flash3 (1.0.5)
       rack
     rack-protection (1.5.3)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rails-observers (0.1.2)
       activemodel (~> 4.0)
     rake (10.3.2)
-    redis (3.1.0)
-    redis-namespace (1.5.0)
+    redis (3.2.2)
+    redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
-    resque (1.22.0)
+    resque (1.25.2)
+      mono_logger (~> 1.0)
       multi_json (~> 1.0)
-      redis-namespace (~> 1.0)
+      redis-namespace (~> 1.3)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    shopify-sinatra-app (0.1.0)
-      activesupport
-      attr_encrypted
-      omniauth-shopify-oauth2
-      rack-flash3
-      resque (~> 1.22.0)
-      shopify_api
-      sinatra
-      sinatra-activerecord
-      sinatra-redis
-      sinatra-twitter-bootstrap
-    shopify_api (3.2.1)
-      activeresource (>= 3.0.0)
-      thor (>= 0.14.4)
-    sinatra (1.4.5)
+    shopify_api (4.0.7)
+      activeresource
+      rack
+    sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    sinatra-activerecord (2.0.2)
+      tilt (>= 1.3, < 3)
+    sinatra-activerecord (2.0.9)
       activerecord (>= 3.2)
       sinatra (~> 1.0)
     sinatra-redis (0.3.0)
       redis
       sinatra (>= 0.9.4)
-    sinatra-twitter-bootstrap (2.3.3)
+    sinatra-twitter-bootstrap (2.3.4)
     sqlite3 (1.3.9)
     thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
-    tzinfo (1.2.1)
+    thread_safe (0.3.5)
+    tilt (2.0.1)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
     vegas (0.1.11)
       rack (>= 1.0.0)
@@ -119,23 +125,20 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport
-  attr_encrypted
   byebug
+  dotenv
   fakeweb
   foreman
   minitest
   mocha
-  omniauth-shopify-oauth2
   pg
   rack-flash3
   rack-test
   rake
-  resque (~> 1.22.0)
-  shopify-sinatra-app
-  shopify_api
-  sinatra
+  shopify-sinatra-app!
   sinatra-activerecord
-  sinatra-redis
   sinatra-twitter-bootstrap
   sqlite3
+
+BUNDLED WITH
+   1.10.6

data/{lib/generator → example}/Rakefile

@@ -1,5 +1,4 @@
 require 'sinatra/activerecord/rake'
-require 'resque/tasks'
 require 'rake/testtask'
 require './lib/app'
 

data/{lib/generator → example}/config/database.yml

@@ -1,8 +1,11 @@
 development:
   adapter: sqlite3
-  database: db/shopify_app.sqlite3
+  database: db/development.sqlite3
   pool: 5
 
+production:
+  url: <%= ENV['DATABASE_URL'] %>
+
 test:
   adapter: sqlite3
   database: "db/test.sqlite3"

data/{lib/generator → example}/lib/app.rb

@@ -31,20 +31,23 @@ class SinatraApp < Sinatra::Base
   # This method gets called when your app is installed.
   # setup any webhooks or services you need on Shopify
   # inside here.
-  def install
-    shopify_session do
+  def after_shopify_auth
+    # shopify_session do
       # create an uninstall webhook, this webhook gets sent
       # when your app is uninstalled from a shop. It is good
       # practice to clean up any data from a shop when they
-      # uninstall your app.
-      uninstall_webhook = ShopifyAPI::Webhook.new(
-        topic: 'app/uninstalled',
-        address: "#{base_url}/uninstall",
-        format: 'json'
-      )
-      uninstall_webhook.save
-    end
+      # uninstall your app:
 
-    redirect '/'
+      # uninstall_webhook = ShopifyAPI::Webhook.new(
+      #   topic: 'app/uninstalled',
+      #   address: "#{base_url}/uninstall",
+      #   format: 'json'
+      # )
+      # begin
+      #   uninstall_webhook.save!
+      # rescue => e
+      #   raise unless uninstall_webhook.persisted?
+      # end
+    # end
   end
 end

data/{lib/generator → example}/test/test_helper.rb

@@ -1,4 +1,5 @@
 ENV['RACK_ENV'] = 'test'
+ENV['SHOPIFY_REDIRECT_URI'] = 'http://localhost:4567'
 ENV['SECRET'] = 'secret'
 
 require 'minitest/autorun'

data/{lib/generator/views/_top_bar.erb → example/views/_flash_messages.erb}

@@ -1,10 +1,5 @@
 <script type="text/javascript">
-
   ShopifyApp.ready(function(){
-    ShopifyApp.Bar.initialize({
-      icon: '<%= "#{base_url}/icon.png" %>'
-    });
-
     <% if flash[:notice] %>
       ShopifyApp.flashNotice("<%= flash[:notice] %>");
     <% end %>
@@ -12,6 +7,5 @@
     <% if flash[:error] %>
       ShopifyApp.flashError("<%= flash[:error] %>");
     <% end %>
-
   });
 </script>

data/example/views/_top_bar.erb

@@ -0,0 +1,7 @@
+<script type="text/javascript">
+  ShopifyApp.ready(function(){
+    ShopifyApp.Bar.initialize({
+      icon: '<%= "#{base_url}/icon.png" %>'
+    });
+  });
+</script>

data/example/views/home.erb

@@ -0,0 +1,9 @@
+<h3>Shopify Sinatra App</h3>
+<p>Welcome!</p>
+
+<h3>Products</h3>
+<ul>
+  <% @products.each do |product| %>
+    <li><a href=<%="#{current_shop_url}/admin/products/#{product.id}"%> target="_blank"> <%= product.id %> </a></li>
+  <% end %>
+</ul>

data/{lib/generator → example}/views/layouts/application.erb

@@ -15,6 +15,8 @@
 
 <body>
   <div class="container">
+    <%= erb :'_top_bar', layout: false, locals: locals %>
+    <%= erb :'_flash_messages', layout: false, locals: locals %>
     <%= yield %>
   </div>
 </body>

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

@@ -14,8 +14,9 @@ require 'omniauth-shopify-oauth2'
 module Sinatra
   module Shopify
     module Methods
-      def install
-        fail NotImplementedError
+
+      # designed to be overriden
+      def after_shopify_auth
       end
 
       def logout
@@ -23,7 +24,7 @@ module Sinatra
       end
 
       def base_url
-        @base_url ||= "https://#{request.env['HTTP_HOST']}"
+        @base_url ||= "#{request_protocol}://#{request.env['HTTP_HOST']}"
       end
 
       def current_shop
@@ -40,11 +41,13 @@ module Sinatra
       end
 
       def shopify_session(&blk)
+        return_to = request.env['sinatra.route'].split(' ').last
+
         if !session.key?(:shopify)
-          get_session
+          authenticate(return_to)
         elsif params[:shop].present? && session[:shopify][:shop] != sanitize_shop_param(params)
           logout
-          get_session
+          authenticate(return_to)
         else
           shop_name = session[:shopify][:shop]
           token = session[:shopify][:token]
@@ -80,20 +83,8 @@ module Sinatra
 
       private
 
-      def get_session
-        shop_name = sanitize_shop_param(params)
-        shop = Shop.find_by(name: shop_name)
-
-        return_to = request.env['sinatra.route'].split(' ').last
-
-        if shop.present? && shop.token.present?
-          session[:shopify] ||= {}
-          session[:shopify][:shop] = shop.name
-          session[:shopify][:token] = shop.token
-          redirect return_to
-        else
-          authenticate(return_to)
-        end
+      def request_protocol
+        request.secure? ? 'https' : 'http'
       end
 
       def authenticate(return_to = '/')
@@ -168,6 +159,7 @@ 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
@@ -189,6 +181,7 @@ module Sinatra
         provider :shopify,
                  app.settings.api_key,
                  app.settings.shared_secret,
+                 redirect_uri: app.settings.redirect_uri,
 
                  scope: app.settings.scope,
 
@@ -219,18 +212,16 @@ module Sinatra
         shop_name = params['shop']
         token = request.env['omniauth.auth']['credentials']['token']
 
-        session[:shopify] ||= {}
-        session[:shopify][:shop] = shop_name
-        session[:shopify][:token] = token
+        shop = Shop.find_or_initialize_by(name: shop_name)
+        shop.token = token
+        shop.save!
 
-        shop = Shop.find_by(name: shop_name)
+        session[:shopify] = {
+          shop: shop_name,
+          token: token
+        }
 
-        if shop.nil?
-          Shop.create(name: shop_name, token: token)
-          install
-        elsif
-          shop.update_attributes(token: token)
-        end
+        after_shopify_auth()
 
         return_to = env['omniauth.params']['return_to']
         redirect return_to

data/shopify-sinatra-app.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'shopify-sinatra-app'
-  s.version = '0.1.5'
+  s.version = '0.2.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'
@@ -13,21 +13,22 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
   s.executables << 'shopify-sinatra-app-generator'
 
-  s.add_runtime_dependency 'sinatra'
-  s.add_runtime_dependency 'sinatra-redis'
-  s.add_runtime_dependency 'sinatra-activerecord'
-  s.add_runtime_dependency 'sinatra-twitter-bootstrap'
-  s.add_runtime_dependency 'rack-flash3'
-  s.add_runtime_dependency 'activesupport'
-  s.add_runtime_dependency 'attr_encrypted'
+  s.add_runtime_dependency 'sinatra', '~> 1.4.6'
+  s.add_runtime_dependency 'sinatra-redis', '~> 0.3.0'
+  s.add_runtime_dependency 'sinatra-activerecord', '~> 2.0.9'
+  s.add_runtime_dependency 'sinatra-twitter-bootstrap', '~> 2.3.3'
+  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 'resque', '~> 1.22.0'
+  s.add_runtime_dependency 'resque', '~> 1.25.2'
 
-  s.add_runtime_dependency 'shopify_api'
-  s.add_runtime_dependency 'omniauth-shopify-oauth2'
+  s.add_runtime_dependency 'shopify_api', '~> 4.0.2'
+  s.add_runtime_dependency 'omniauth-shopify-oauth2', '~> 1.1.11'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'minitest'
   s.add_development_dependency 'rack-test'
   s.add_development_dependency 'fakeweb'
   s.add_development_dependency 'mocha'

data/test.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
 
-cd lib/generator/test
+cd example
 
+bundle install
+bundle exec rake db:migrate
 bundle exec rake test:prepare
 bundle exec rake test
 

metadata

@@ -1,149 +1,163 @@
 --- !ruby/object:Gem::Specification
 name: shopify-sinatra-app
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Kevin Hughes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-28 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.6
 - !ruby/object:Gem::Dependency
   name: sinatra-redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: sinatra-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.9
 - !ruby/object:Gem::Dependency
   name: sinatra-twitter-bootstrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.3
 - !ruby/object:Gem::Dependency
   name: rack-flash3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: attr_encrypted
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 1.25.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 1.25.2
 - !ruby/object:Gem::Dependency
   name: shopify_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.2
 - !ruby/object:Gem::Dependency
   name: omniauth-shopify-oauth2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.11
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.11
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -151,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -229,33 +243,36 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
+- CHANGELOG
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - bin/shopify-sinatra-app-generator
-- lib/generator/.gitignore
-- lib/generator/Gemfile
-- lib/generator/Gemfile.lock
-- lib/generator/Procfile
-- lib/generator/README.md
-- lib/generator/Rakefile
-- lib/generator/config.ru
-- lib/generator/config/database.yml
-- lib/generator/db/.keep
-- lib/generator/db/migrate/20140413221328_create_shops.rb
-- lib/generator/db/migrate/20140414042317_add_index_to_shops.rb
-- lib/generator/db/schema.rb
-- lib/generator/db/seeds.rb
-- lib/generator/lib/app.rb
-- lib/generator/public/icon.png
-- lib/generator/public/legend.gif
-- lib/generator/test/app_test.rb
-- lib/generator/test/test_helper.rb
-- lib/generator/views/_top_bar.erb
-- lib/generator/views/home.erb
-- lib/generator/views/install.erb
-- lib/generator/views/layouts/application.erb
+- example/.gitignore
+- example/Gemfile
+- example/Gemfile.lock
+- example/Procfile
+- example/README.md
+- example/Rakefile
+- example/config.ru
+- example/config/database.yml
+- example/db/.keep
+- example/db/migrate/20140413221328_create_shops.rb
+- example/db/migrate/20140414042317_add_index_to_shops.rb
+- example/db/schema.rb
+- example/db/seeds.rb
+- example/lib/app.rb
+- example/public/icon.png
+- example/public/legend.gif
+- example/test/app_test.rb
+- example/test/test_helper.rb
+- example/views/_flash_messages.erb
+- example/views/_top_bar.erb
+- example/views/home.erb
+- example/views/install.erb
+- example/views/layouts/application.erb
 - lib/sinatra/shopify-sinatra-app.rb
 - shopify-sinatra-app.gemspec
 - test.sh

data/lib/generator/views/home.erb

@@ -1,17 +0,0 @@
-<%= erb :'_top_bar', layout: false, locals: locals %>
-
-<h3>Shopify Sinatra App</h3>
-<p>Welcome!</p>
-
-<h3>Products</h3>
-<table class="table table-striped table-hover">
-  <tbody>
-    <% @products.each do |product| %>
-      <tr>
-        <td>
-          <a href=<%="#{current_shop_url}/admin/products/#{product.id}"%> target="_blank"> <%= product.id %> </a>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>