shopqi-app 0.2.4 → 0.2.5

data/app/helpers/shopqi_app/application_helper.rb

@@ -5,11 +5,11 @@ module ShopQiApp
     end
 
     def signed_in?
-      !cookies.signed[:shop_id].blank?
+      !current_shop.nil?
     end
 
     def current_shop
-      @current_shop ||= (signed_in? && Shop.find(cookies.signed[:shop_id]))
+      @current_shop ||= (!cookies.signed[:shop_id].blank? && Shop.find_by_id(cookies.signed[:shop_id]))
     end
 
     def shop_url

data/app/models/shop.rb

@@ -0,0 +1,8 @@
+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/models/shop.rb

@@ -1,9 +1,4 @@
-class Shop < ActiveRecord::Base
+require "#{ShopQiApp::Engine.models_dir}/shop"
+class Shop
   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/shopqi_app/engine.rb

@@ -3,6 +3,10 @@ module ShopQiApp
     isolate_namespace ShopQiApp
     engine_name 'shopqi_app'
 
+    def models_dir
+      root.join 'app', 'models'
+    end
+
     config.generators do |g|                                                               
       g.template_engine :haml
       g.test_framework :rspec, :views => false

data/lib/shopqi_app/version.rb

@@ -1,3 +1,3 @@
 module ShopQiApp
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopqi-app
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2012-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -151,6 +151,7 @@ files:
 - app/controllers/shopqi_app/omniauth_callbacks_controller.rb
 - app/controllers/shopqi_app/sessions_controller.rb
 - app/models/secret_setting.rb
+- app/models/shop.rb
 - app/views/shopqi_app/sessions/new.html.haml
 - lib/generators/shopqi_app/templates/db/migrate/create_shops.rb
 - lib/generators/shopqi_app/templates/app/helpers/home_helper.rb
@@ -188,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -226147441
+      hash: -895272655
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -197,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -226147441
+      hash: -895272655
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24