radiant-shop-extension 0.93.3 → 0.94.0

data/VERSION

@@ -1 +1 @@
-0.93.3
+0.94.0

data/app/models/shop_category.rb

@@ -23,7 +23,7 @@ class ShopCategory < ActiveRecord::Base
   def url; page.url; end
   
   # Returns the url of the page formatted as an sku
-  def handle; ShopProduct.to_sku(page.url); end
+  def handle; ShopProduct.to_sku(slug); end
   
   # Returns the content of the product's page's description part
   def description

data/app/models/shop_product.rb

@@ -22,7 +22,7 @@ class ShopProduct < ActiveRecord::Base
   def name; page.title; end
   
   # Returns the url of the page formatted as an sku
-  def sku; self.class.to_sku(url) end
+  def sku; ShopProduct.to_sku(slug); end
   
   # Returns the url of the product's page
   def url; page.url; end

data/lib/shop/controllers/site_controller.rb

@@ -4,7 +4,7 @@ module Shop
       
       def self.included(base)
         base.class_eval do
-          before_filter :current_shop_order
+          #before_filter :current_shop_order
         end
       end  
     end

data/lib/shop/tags/helpers.rb

@@ -145,20 +145,23 @@ module Shop
         
         def current_order(tag)
           result = nil
+          begin
+            if tag.attr['key'] and tag.attr['value']
+              result  = ShopOrder.first(:conditions => { tag.attr['key'].downcase.to_sym => tag.attr['value'] })
           
-          if tag.attr['key'] and tag.attr['value']
-            result  = ShopOrder.first(:conditions => { tag.attr['key'].downcase.to_sym => tag.attr['value'] })
-          
-          elsif tag.locals.shop_order.present?
-            result  = tag.locals.shop_order
+            elsif tag.locals.shop_order.present?
+              result  = tag.locals.shop_order
             
-          elsif tag.locals.page.request.session[:shop_order].present?
-            session = tag.locals.page.request.session[:shop_order]
-            result  = ShopOrder.find(session)
+            elsif tag.locals.page.request.session[:shop_order].present?
+              session = tag.locals.page.request.session[:shop_order]
+              result  = ShopOrder.find(session)
           
-          elsif tag.locals.response.present? and tag.locals.response.result[:checkout].present?
-            result  = ShopOrder.find(tag.locals.response.result[:checkout][:order])
+            elsif tag.locals.response.present? and tag.locals.response.result[:checkout].present?
+              result  = ShopOrder.find(tag.locals.response.result[:checkout][:order])
           
+            end
+          rescue
+            result = nil
           end
           
           result

data/radiant-shop-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-shop-extension}
-  s.version = "0.93.3"
+  s.version = "0.94.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dirk Kelly", "John Barker", "Darcy Laycock"]
-  s.date = %q{2011-01-07}
+  s.date = %q{2011-01-11}
   s.description = %q{Radiant Shop is an attempt at a simple but complete store. It includes Products, Categories, Orders and Credit Card Payments}
   s.email = %q{dk@dirkkelly.com}
   s.extra_rdoc_files = [

data/spec/models/shop_category_spec.rb

@@ -57,7 +57,7 @@ describe ShopCategory do
     
     context '#handle' do
       it 'should return a handle formatted url' do
-        @category.handle.should === ShopProduct.to_sku(@category.page.url)
+        @category.handle.should === ShopProduct.to_sku(@category.page.slug)
       end
     end
     

data/spec/models/shop_product_spec.rb

@@ -78,7 +78,7 @@ describe ShopProduct do
     
     context '#sku' do
       it 'should return a handle formatted url' do
-        @product.sku.should === ShopProduct.to_sku(@product.page.url)
+        @product.sku.should === ShopProduct.to_sku(@product.page.slug)
       end
     end
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-shop-extension
 version: !ruby/object:Gem::Version 
-  hash: 365
+  hash: 359
   prerelease: 
   segments: 
   - 0
-  - 93
-  - 3
-  version: 0.93.3
+  - 94
+  - 0
+  version: 0.94.0
 platform: ruby
 authors: 
 - Dirk Kelly
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-07 00:00:00 +08:00
+date: 2011-01-11 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency