shopqi-app 0.1.1 → 0.2.1

data/Rakefile

@@ -14,7 +14,7 @@ end
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ShopqiApp'
+  rdoc.title    = 'ShopQiApp'
   rdoc.options << '--line-numbers'
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')

data/app/controllers/shopqi_app/application_controller.rb

@@ -1,4 +1,4 @@
-module ShopqiApp
+module ShopQiApp
   class ApplicationController < ActionController::Base
     include ApplicationHelper
     protect_from_forgery

data/app/controllers/shopqi_app/sessions_controller.rb

@@ -1,5 +1,6 @@
-module ShopqiApp
+module ShopQiApp
   class SessionsController < ApplicationController
+    skip_before_filter :authenticate_shop!, only: [:new, :create, :shopqi_login]
 
     def new
       if params[:shop].present?

data/app/helpers/shopqi_app/application_helper.rb

@@ -1,7 +1,7 @@
-module ShopqiApp
+module ShopQiApp
   module ApplicationHelper
     def authenticate_shop! # 必须通过认证
-      redirect_to root_path unless signed_in?
+      redirect_to main_app.root_path unless signed_in?
     end
 
     def signed_in?

data/config/routes.rb

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

data/lib/generators/shopqi_app/shopqi_app_generator.rb

@@ -1,4 +1,5 @@
-class ShopqiAppGenerator < Rails::Generators::Base
+class ShopQiAppGenerator < Rails::Generators::Base
+  namespace 'shopqi_app'
   source_root File.expand_path('../templates', __FILE__)
 
   argument :client_id    , type: :string, required: true
@@ -17,7 +18,7 @@ class ShopqiAppGenerator < Rails::Generators::Base
   end
 
   def add_routes
-    route "mount ShopqiApp::Engine => '/app'"
+    route "mount ShopQiApp::Engine => '/app'"
     route "root :to => 'home#index'"
   end
 

data/lib/generators/shopqi_app/templates/README

@@ -7,6 +7,14 @@ If you DO NOT use database, you MUST comment the line below in config/applicatio
   # require "active_record/railtie"
 
 Step 1.
+UNCOMMENT the line below in Gemfile
+  gem 'therubyracer', :platforms => :ruby
+
+Step 2.
+  $ bundle
+
+
+Step 3.
   $ rails server
 
 ===============================================================================

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

@@ -1,6 +1,4 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
-  helper ShopqiApp::ApplicationHelper
-  include ShopqiApp::ApplicationHelper
   prepend_before_filter :authenticate_shop!
 end

data/lib/shopqi-app.rb

@@ -6,6 +6,6 @@ require 'settingslogic'
 require 'omniauth-shopqi'
 require 'shopkit'
 
-module ShopqiApp
+module ShopQiApp
   autoload :Helpers, "shopqi_app/helpers"
 end

data/lib/shopqi_app/engine.rb

@@ -1,6 +1,7 @@
-module ShopqiApp
+module ShopQiApp
   class Engine < Rails::Engine
-    isolate_namespace ShopqiApp
+    isolate_namespace ShopQiApp
+    engine_name 'shopqi_app'
 
     config.generators do |g|                                                               
       g.template_engine :haml
@@ -8,10 +9,15 @@ module ShopqiApp
       g.integration_tool :rspec
     end
 
+    initializer "shopqi_app.acronym" do
+      ActiveSupport::Inflector.inflections do |inflect|
+        inflect.acronym 'ShopQi'
+      end
+    end
 
     initializer "shopqi_app.helpers" do
       ActiveSupport.on_load(:action_controller) do
-        include ShopqiApp::Helpers
+        include ShopQiApp::Helpers
       end
     end
   end

data/lib/shopqi_app/helpers.rb

@@ -1,8 +1,8 @@
-module ShopqiApp
+module ShopQiApp
   module Helpers
     def self.included(base)
-      base.send :helper, ShopqiApp::ApplicationHelper
-      base.send :include, ShopqiApp::ApplicationHelper
+      base.send :helper, ShopQiApp::ApplicationHelper
+      base.send :include, ShopQiApp::ApplicationHelper
     end
   end
 end

data/lib/shopqi_app/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopqi-app
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-03 00:00:00.000000000 Z
+date: 2012-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 3.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 3.2.6
 - !ruby/object:Gem::Dependency
   name: omniauth-shopqi
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 850028705
+      hash: 62860785
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 850028705
+      hash: 62860785
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24