shopqi-app 0.2.6 → 0.2.7

data/app/models/shop.rb

@@ -2,7 +2,13 @@ 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
+    shop_data = data.extra.raw_info.shop
+    shop = where(shop_id: shop_data.id).first_or_create! name: shop_data.name, shopqi_domain: shop_data.shopqi_domain
+    shop.access_token = data.credentials.token
+    shop.tap(&:save)
+  end
+
+  def use_shopkit
+    Shopkit.setup url: self.shopqi_domain, access_token: self.access_token
   end
 end

data/lib/generators/shopqi_app/templates/app/assets/stylesheets/application.css.less.erb

@@ -63,3 +63,9 @@ body {
   background: #F9F9F9;
   .accordion-inner {
     padding: 20px; }}
+
+.footer {
+  color: #333;
+  text-align: center;
+  margin-top: 45px;
+  padding: 35px 0 36px; }

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

@@ -3,7 +3,7 @@ class HomeController < ApplicationController
 
   def index
     if signed_in?
-      Shopkit.setup url: current_shop.shopqi_domain, access_token: current_shop.access_token # set in shopqi-app sessions controller
+      current_shop.use_shopkit
       @orders = Shopkit.orders per_page: 3
       @products = Shopkit.products per_page: 5
     else

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

@@ -1,7 +1,7 @@
 !!!
 %html
   %head
-    %title ShopQi App Example
+    %title=SecretSetting.app_name
     = stylesheet_link_tag    "application"
     = javascript_include_tag "application"
     = csrf_meta_tags
@@ -9,12 +9,12 @@
     .navbar.navbar-fixed-top
       .navbar-inner
         .container
-          %a.brand(href="/") ShopQi App Example
+          %a.brand(href="/")=SecretSetting.app_name
           -if current_shop
             %ul.nav.pull-right
               %li.dropdown
                 =link_to shop_url, class: 'dropdown-toggle', data: { toggle: :dropdown } do
-                  =current_shop['shopqi_domain']
+                  =current_shop['name']
                   %b.caret
                 %ul.dropdown-menu
                   %li
@@ -31,5 +31,13 @@
                       %i.icon-off
                       退出
 
-    #main.container
-      = yield
+    .container
+      #main
+        = yield
+      #footer.footer
+        %p
+          ==Copyright©#{Date.today.year}
+          =link_to SecretSetting.app_name, '/'
+          版权所有
+          |
+          =SecretSetting.domain.record

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

@@ -1,12 +1,14 @@
 defaults: &defaults
+  app_name: ShopQi App Example
   oauth:
     client_id: <%= client_id %>
     secret: <%= client_secret %>
     scope: 'read_products read_orders'
     callback_path: '/callback'
   domain:
-    host: 'lvh.me:3000'
     record: 粤ICP备11089804号
+  shopqi_domain:
+    protocol: 'http://'
 
 development:
   <<: *defaults
@@ -22,5 +24,6 @@ production:
     scope: 'read_products read_orders'
     callback_path: '/callback'
   domain:
-    host: 'example.shopqiapp.com'
     record: 粤ICP备11089804号
+  shopqi_domain:
+    protocol: 'https://'

data/lib/shopqi_app/version.rb

@@ -1,3 +1,3 @@
 module ShopQiApp
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopqi-app
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -205,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -350681073
+      hash: -277092943
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -350681073
+      hash: -277092943
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24