shopqi-app 0.2.1 → 0.2.2

data/README.md

@@ -11,7 +11,7 @@
 
     $ rails g shopqi_app client_id client_secret
 
-`client_id`, `client_secret` 在注册 Application 后显示，注册时 `REDIRECT URI` 填写 localhost:3000/app/callback
+`client_id`, `client_secret` 在注册 Application 后显示，注册时 `REDIRECT URI` 填写 localhost:3000/callback
 
 ## 配置
 
@@ -22,7 +22,7 @@
         client_id: 'dffd069fa92096022628a1f7eb174bc85d90278b8c90ec7ebadfbd94924bd2b8'
         secret: 'e1805141c81c496e4779371f41263c9f74ac2ffd3728302296b8af10b64d9c9b'
         scope: 'read_products read_orders'
-        redirect_uri: 'http://localhost:3000/app/callback'
+        redirect_uri: 'http://localhost:3000/callback'
 
 ## 最后
 

data/app/controllers/shopqi_app/omniauth_callbacks_controller.rb

@@ -0,0 +1,25 @@
+module ShopQiApp
+  class OmniauthCallbacksController < ApplicationController
+    skip_before_filter :authenticate_shop!, only: :shopqi
+    before_filter :assert_omniauth_auth
+
+    def shopqi
+      shop = Shop.find_for_shopqi_oauth(request.env["omniauth.auth"])
+      sign_in_and_redirect shop
+    end
+
+    protected
+    def assert_omniauth_auth
+      unless request.env['omniauth.auth']
+        flash[:error] = "Could not log in to store."
+        redirect_to main_app.login_path
+      end
+    end
+
+    def sign_in_and_redirect(shop)
+      cookies.permanent.signed[:shop_id] = shop.id
+      redirect_to main_app.root_path
+    end
+
+  end
+end

data/app/controllers/shopqi_app/sessions_controller.rb

@@ -1,6 +1,6 @@
 module ShopQiApp
   class SessionsController < ApplicationController
-    skip_before_filter :authenticate_shop!, only: [:new, :create, :shopqi_login]
+    skip_before_filter :authenticate_shop!, only: [:new, :shopqi_login]
 
     def new
       if params[:shop].present?
@@ -8,32 +8,17 @@ module ShopQiApp
       end
     end
 
-    def create
-      if data = request.env['omniauth.auth']
-        session[:shopqi] = { 
-          url: params[:shop],
-          access_token: data['credentials']['token'],
-          shop: data['extra']['raw_info']['shop']
-        }
-        redirect_to main_app.root_path
-      else
-        flash[:error] = "Could not log in to store."
-        redirect_to login_path
-      end
-    end
-
     def shopqi_login
       if signed_in?
         redirect_to main_app.root_path
       else
-        redirect_to login_path(shop: params[:shop])
+        redirect_to main_app.login_path(shop: params[:shop])
       end
     end
 
     def destroy
-      session[:shopqi] = nil
+      cookies.delete(:shop_id)
       redirect_to main_app.root_path
     end
-
   end
 end

data/app/helpers/shopqi_app/application_helper.rb

@@ -5,15 +5,15 @@ module ShopQiApp
     end
 
     def signed_in?
-      session[:shopqi]
+      !cookies.signed[:shop_id].blank?
     end
 
     def current_shop
-      session[:shopqi] && session[:shopqi][:shop]
+      @current_shop ||= (signed_in? && Shop.find(cookies.signed[:shop_id]))
     end
 
     def shop_url
-      "http://#{current_shop['shopqi_domain']}"
+      "http://#{current_shop.shopqi_domain}"
     end
   end
 end

data/app/views/shopqi_app/sessions/new.html.haml

@@ -3,6 +3,6 @@
     %h1
       安装应用
       %small 请输入商店 URL 地址
-  = form_tag login_path, :class => 'form-search' do
+  = form_tag main_app.login_path, :class => 'form-search' do
     = text_field_tag 'shop', nil, :placeholder => '商店 URL 地址', :class => 'btn-large', :id => 'shop'
     = submit_tag '安装', :class => 'btn btn-primary btn-large'

data/lib/generators/shopqi_app/USAGE

@@ -18,3 +18,4 @@ Example:
         app/views/home/
         app/views/layouts/application.html.haml
         config/app_secret_config.yml
+        db/migrate/create_shops.rb

data/lib/generators/shopqi_app/shopqi_app_generator.rb

@@ -1,4 +1,7 @@
+require 'rails/generators/active_record'
+
 class ShopQiAppGenerator < Rails::Generators::Base
+  include Rails::Generators::Migration
   namespace 'shopqi_app'
   source_root File.expand_path('../templates', __FILE__)
 
@@ -10,6 +13,10 @@ class ShopQiAppGenerator < Rails::Generators::Base
     template 'config/app_secret_config.yml.erb', 'config/app_secret_config.yml'
   end
 
+  def install_migration
+    migration_template 'db/migrate/create_shops.rb', 'db/migrate/create_shops.rb'
+  end
+
   def remove_files
     remove_file 'public/index.html'
     remove_file 'app/assets/javascripts/application.js'
@@ -18,11 +25,15 @@ class ShopQiAppGenerator < Rails::Generators::Base
   end
 
   def add_routes
-    route "mount ShopQiApp::Engine => '/app'"
+    route "use_shopqi"
     route "root :to => 'home#index'"
   end
 
   def show
     readme "README"
   end
+
+  def self.next_migration_number(dirname)
+    ActiveRecord::Generators::Base.next_migration_number(dirname)
+  end
 end

data/lib/generators/shopqi_app/templates/README

@@ -2,10 +2,6 @@
 
 There is something that you need to do before you use shopqi-app.
 
-Step 0.
-If you DO NOT use database, you MUST comment the line below in config/application.rb
-  # require "active_record/railtie"
-
 Step 1.
 UNCOMMENT the line below in Gemfile
   gem 'therubyracer', :platforms => :ruby

data/lib/generators/shopqi_app/templates/app/controllers/home_controller.rb

@@ -7,7 +7,7 @@ class HomeController < ApplicationController
       @orders = Shopkit.orders per_page: 3
       @products = Shopkit.products per_page: 5
     else
-      redirect_to shopqi_app.login_path
+      redirect_to login_path
     end
   end
 end

data/lib/generators/shopqi_app/templates/app/models/shop.rb

@@ -0,0 +1,9 @@
+class Shop < ActiveRecord::Base
+  attr_accessible :shop_id, :name, :shopqi_domain, :access_token
+
+  def self.find_for_shopqi_oauth(data)
+    shop = data.extra.raw_info.shop
+    where(shop_id: shop.id).first_or_create! name: shop.name, shopqi_domain: shop.shopqi_domain, access_token: data.credentials.token
+  end
+
+end

data/lib/generators/shopqi_app/templates/app/views/layouts/application.html.haml

@@ -27,7 +27,7 @@
                       商店后台
                   %li.divider
                   %li
-                    =link_to shopqi_app.sign_out_path do
+                    =link_to sign_out_path do
                       %i.icon-off
                       退出
 

data/lib/generators/shopqi_app/templates/config/app_secret_config.yml.erb

@@ -3,7 +3,7 @@ defaults: &defaults
     client_id: <%= client_id %>
     secret: <%= client_secret %>
     scope: 'read_products read_orders'
-    redirect_uri: 'http://localhost:3000/app/callback'
+    callback_path: '/callback'
 
 development:
   <<: *defaults
@@ -17,4 +17,4 @@ production:
     client_id: <%= client_id %>
     client_secret: <%= client_secret %>
     scope: 'read_products read_orders'
-    redirect_uri: 'http://localhost:3000/app/callback'
+    callback_path: '/callback'

data/lib/generators/shopqi_app/templates/db/migrate/create_shops.rb

@@ -0,0 +1,11 @@
+class CreateShops < ActiveRecord::Migration
+  def change
+    create_table :shops do |t|
+      t.integer :shop_id     , unique: true, null: false
+      t.string :name         , limit: 32   , null: false
+      t.string :shopqi_domain, limit: 64   , null: false
+      t.string :access_token , limit: 64
+    end
+    add_index :shops, :shop_id, :unique => true
+  end
+end

data/lib/shopqi-app.rb

@@ -8,4 +8,8 @@ require 'shopkit'
 
 module ShopQiApp
   autoload :Helpers, "shopqi_app/helpers"
+
+  module Rails
+    autoload :Routes, "shopqi_app/rails/routes"
+  end
 end

data/lib/shopqi_app/engine.rb

@@ -9,6 +9,10 @@ module ShopQiApp
       g.integration_tool :rspec
     end
 
+    initializer "shopqi_app.routes" do
+      ShopQiApp::Rails::Routes.install
+    end
+
     initializer "shopqi_app.acronym" do
       ActiveSupport::Inflector.inflections do |inflect|
         inflect.acronym 'ShopQi'
@@ -20,6 +24,23 @@ module ShopQiApp
         include ShopQiApp::Helpers
       end
     end
-  end
 
+    initializer "shopqi_app.omniauth" do |app|
+      app.middleware.use OmniAuth::Builder do
+        provider :shopqi,
+          (SecretSetting.oauth.client_id rescue nil), # 调用 generator 时还没有 app_secret_config.yml 文件
+          (SecretSetting.oauth.secret rescue nil),
+          :scope => (SecretSetting.oauth.scope rescue nil),
+          :callback_path => (SecretSetting.oauth.callback_path rescue nil),
+          :setup => lambda {|env|
+            params = Rack::Utils.parse_query(env['QUERY_STRING'])
+            #site_url = "https://#{params['shop']}"
+            site_url = "http://#{params['shop']}"
+            env['omniauth.strategy'].options[:client_options][:site] = site_url
+          }
+      end
+
+      OmniAuth.config.on_failure{|env| raise env['omniauth.error']}
+    end
+  end
 end

data/lib/shopqi_app/rails/routes.rb

@@ -0,0 +1,19 @@
+module ShopQiApp
+  module Rails
+    class Routes
+      module Helper
+        def use_shopqi(options = {}, &block)
+          options.reverse_merge! callbacks: 'shopqi_app/omniauth_callbacks'
+          self.match 'login' => "shopqi_app/sessions#new"
+          self.get 'callback_login' => "shopqi_app/sessions#shopqi_login" # 从 ShopQi 后台管理点击应用直接登录
+          self.get 'callback' => "#{options[:callbacks]}#shopqi"
+          self.get 'sign_out' => "shopqi_app/sessions#destroy"
+        end
+      end
+
+      def self.install
+        ActionDispatch::Routing::Mapper.send :include, ShopQiApp::Rails::Routes::Helper
+      end
+    end
+  end
+end

data/lib/shopqi_app/version.rb

@@ -1,3 +1,3 @@
 module ShopQiApp
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopqi-app
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2012-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -148,14 +148,15 @@ extra_rdoc_files: []
 files:
 - app/helpers/shopqi_app/application_helper.rb
 - app/controllers/shopqi_app/application_controller.rb
+- app/controllers/shopqi_app/omniauth_callbacks_controller.rb
 - app/controllers/shopqi_app/sessions_controller.rb
 - app/models/secret_setting.rb
 - app/views/shopqi_app/sessions/new.html.haml
-- config/initializers/omniauth.rb
-- config/routes.rb
+- lib/generators/shopqi_app/templates/db/migrate/create_shops.rb
 - lib/generators/shopqi_app/templates/app/helpers/home_helper.rb
 - lib/generators/shopqi_app/templates/app/controllers/application_controller.rb
 - lib/generators/shopqi_app/templates/app/controllers/home_controller.rb
+- lib/generators/shopqi_app/templates/app/models/shop.rb
 - lib/generators/shopqi_app/templates/app/assets/javascripts/application.js.coffee
 - lib/generators/shopqi_app/templates/app/assets/stylesheets/application.css.less.erb
 - lib/generators/shopqi_app/templates/app/views/layouts/application.html.haml
@@ -166,6 +167,7 @@ files:
 - lib/generators/shopqi_app/shopqi_app_generator.rb
 - lib/shopqi-app.rb
 - lib/shopqi_app/version.rb
+- lib/shopqi_app/rails/routes.rb
 - lib/shopqi_app/engine.rb
 - lib/shopqi_app/helpers.rb
 - lib/tasks/shopqi_app_tasks.rake
@@ -186,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 62860785
+      hash: 557789341
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -195,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 62860785
+      hash: 557789341
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/config/initializers/omniauth.rb

@@ -1,16 +0,0 @@
-Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :shopqi, 
-    (SecretSetting.oauth.client_id rescue nil), # 调用 generator 时还没有 app_secret_config.yml 文件
-    (SecretSetting.oauth.secret rescue nil),
-    :scope => (SecretSetting.oauth.scope rescue nil),
-    :callback_path => '/app/callback',
-    :setup => lambda {|env| 
-      params = Rack::Utils.parse_query(env['QUERY_STRING'])
-      #site_url = "https://#{params['shop']}"
-      site_url = "http://#{params['shop']}"
-      Rails.logger.info(env['omniauth.strategy'])
-      env['omniauth.strategy'].options[:client_options][:site] = site_url
-    }
-end
-
-OmniAuth.config.on_failure{|env| raise env['omniauth.error']}

data/config/routes.rb

@@ -1,6 +0,0 @@
-ShopQiApp::Engine.routes.draw do
-  match 'login'        => 'sessions#new'
-  get 'callback_login' => 'sessions#shopqi_login'  # 从 ShopQi 后台管理点击应用直接登录
-  get 'callback'       => 'sessions#create'
-  get 'sign_out'       => 'sessions#destroy'
-end