shopify-sinatra-app 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1854543c09830d3f60f956339e9c7ad0b022ba9
-  data.tar.gz: 4feff63b221008e9d71dbae4117ab485a8c31fb3
+  metadata.gz: 3b9a33f60a7611ff594af3a9713c7b5ec7c29ded
+  data.tar.gz: 00f5bec8cb70a33f25294b7784aaa255e5fdd19d
 SHA512:
-  metadata.gz: 6d1e99622f237fec0c38e265589b561c8a03ed0ad0603aa52810fc559b5a55f9a60827c842f4b83c71441a8676be4a0fd5e9cc6553d0bda7414f5a2b4667d553
-  data.tar.gz: 15c4de8878a15a3e816c05f9862e56f2f2123fbd5c4fce10c2075dc1c67bfa16d623757fd96a1ab6e360baa530efb2b5e5ff88d06c3973a0af3e20879c1302eb
+  metadata.gz: 0a1e93254976452413f3b5cdc8cdb439ad00aca7689ef5510380651bb92064655ee28432dc73586a9f210db633d7ee4be8c3a111cadfd1c9e236c8dbff220426
+  data.tar.gz: 2cd4e59123200b2269f288fa73652f8dc6fb0c81f1a5bac808f747b83035be1e4b696818503e4f6a0d821ad85ca433f65c5c427bb20609ebef41776125715cfe

data/README.md

@@ -3,6 +3,7 @@ shopify-sinatra-app
 
 "A classy shopify app"
 
+shopify-sinatra-app is lightweight extension for building Shopify apps using Sinatra. It comes with the Shopify API gem for interacting with the Shopify API and uses the Shopify omniauth gem to handle authentication. The framework itself provides a handful of helper methods to make creating your app as easy as possible. The framework was designed with deployment to Heroku in mind and following the instructions below I've been able to create a new application from scratch, deploy it to Heroku and install on my live test shop in less than 5 minutes.
 
 Getting Started
 ---------------

data/bin/shopify-sinatra-app-generator

@@ -35,6 +35,11 @@ else
     FileUtils.cp(generator_dir   + "/README.md",  app_dir + "/README.md")
 
     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("SECRET=random_string_to_encrypt_credentials_with\n")
+    file.close
 
     Dir.chdir(app_dir)
 

data/lib/generator/lib/app.rb

@@ -12,8 +12,7 @@ class SinatraApp < Sinatra::Base
   # from Shopify and displays them inside your app
   get '/' do
     shopify_session do
-      @products = ShopifyAPI::Product.all
-      erb :home
+      @products = ShopifyAPI::Product.find(:all, :params => {:limit => 10})
     end
   end
 

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

@@ -49,41 +49,33 @@ module Sinatra
         else
           shop_name = session[:shopify][:shop]
           token = session[:shopify][:token]
-
-          api_session = ShopifyAPI::Session.new(shop_name, token)
-          ShopifyAPI::Base.activate_session(api_session)
-
+          activate_shopify_api(shop_name, token)
           yield
         end
+      rescue ActiveResource::UnauthorizedAccess
+        clear_session current_shop
+        redirect request.env["sinatra.route"].split(' ').last
       end
 
       def webhook_session(&blk)
         return unless verify_shopify_webhook
-
         @shop_name = request.env['HTTP_X_SHOPIFY_SHOP_DOMAIN']
         shop = Shop.find_by(:name => @shop_name)
 
         if shop.present?
           params = ActiveSupport::JSON.decode(request.body.read.to_s)
-          api_session = ShopifyAPI::Session.new(shop.name, shop.token)
-          ShopifyAPI::Base.activate_session(api_session)
-
+          activate_shopify_api(shop.name, shop.token)
           yield params
-
           status 200
         end
       end
 
       def webhook_job(jobKlass)
         return unless verify_shopify_webhook
-
         @shop_name = request.env['HTTP_X_SHOPIFY_SHOP_DOMAIN']
         shop = Shop.find_by(:name => @shop_name)
-
         params = ActiveSupport::JSON.decode(request.body.read.to_s)
-
         Resque.enqueue(jobKlass, shop.name, shop.token, params)
-
         status 200
       end
 
@@ -95,7 +87,7 @@ module Sinatra
 
         return_to = request.env["sinatra.route"].split(' ').last
 
-        if shop.present?
+        if shop.present? && shop.token.present?
           session[:shopify] ||= {}
           session[:shopify][:shop] = shop.name
           session[:shopify][:token] = shop.token
@@ -114,6 +106,17 @@ module Sinatra
         end
       end
 
+      def activate_shopify_api(shop_name, token)
+        api_session = ShopifyAPI::Session.new(shop_name, token)
+        ShopifyAPI::Base.activate_session(api_session)
+      end
+
+      def clear_session(shop)
+        logout
+        shop.token = nil
+        shop.save
+      end
+
       def fullpage_redirect_to(redirect_url)
         @fullpage_redirect_to = redirect_url
 
@@ -162,7 +165,6 @@ module Sinatra
       app.enable :sessions
       app.enable :inline_templates
 
-      #override in app when required
       app.set :scope, 'read_products, read_orders'
 
       app.set :api_key, ENV['SHOPIFY_API_KEY']
@@ -174,7 +176,7 @@ module Sinatra
       app.use Rack::Session::Cookie, :key => '#{base_url}.session',
                                      :path => '/',
                                      :secret => app.settings.secret,
-                                     :expire_after => 2592000
+                                     :expire_after => 60*30 # half an hour in seconds
 
       app.set :redis_url, ENV["REDISCLOUD_URL"] || "redis://localhost:6379/"
       redis_uri = URI.parse(app.settings.redis_url)
@@ -222,9 +224,13 @@ module Sinatra
         session[:shopify][:shop] = shop_name
         session[:shopify][:token] = token
 
-        if Shop.where(:name => shop_name).blank?
+        shop = Shop.find_by(name: shop_name)
+
+        if shop.nil?
           Shop.create(:name => shop_name, :token => token)
           install
+        elsif
+          shop.update_attributes(token: token)
         end
 
         return_to = env['omniauth.params']['return_to']
@@ -238,15 +244,17 @@ module Sinatra
     end
   end
 
-  class Shop < ActiveRecord::Base
+  register Shopify
+end
 
-    def self.secret
-      @secret ||= ENV['SECRET']
-    end
 
-    attr_encrypted :token, :key => secret, :attribute => 'token_encrypted'
-    validates_presence_of :name, :token
+class Shop < ActiveRecord::Base
+
+  def self.secret
+    @secret ||= ENV['SECRET']
   end
 
-  register Shopify
+  attr_encrypted :token, :key => secret, :attribute => 'token_encrypted'
+  validates_presence_of :name
+  validates_presence_of :token, on: :create
 end

data/shopify-sinatra-app.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'shopify-sinatra-app'
-  s.version = '0.0.8'
+  s.version = '0.1.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"

metadata

@@ -1,223 +1,223 @@
 --- !ruby/object:Gem::Specification
 name: shopify-sinatra-app
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Kevin Hughes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-28 00:00:00.000000000 Z
+date: 2014-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-twitter-bootstrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-flash3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: attr_encrypted
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.22.0
 - !ruby/object:Gem::Dependency
   name: shopify_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: omniauth-shopify-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A Sinatra extension for building Shopify Apps. Akin to the shopify_app
@@ -228,7 +228,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -262,12 +262,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []