radiant-shop-extension 0.92.9 → 0.92.10

data/VERSION

@@ -1 +1 @@
-0.92.9
+0.92.10

data/lib/shop/tags/helpers.rb

@@ -7,17 +7,17 @@ module Shop
         def current_categories(tag)
           result = []
           
-          # Returns the current categories if they exist
-          if tag.locals.shop_categories.present?
-            result = tag.locals.shop_categories
-            
           # Returns categories based on the slug of their categories parent page
-          elsif tag.attr['parent']
+          if tag.attr['parent']
             result = ShopCategory.all(
                        :joins      => 'JOIN pages AS page ON page.id = shop_categories.page_id JOIN pages AS parent ON page.parent_id = parent.id',
                        :conditions => [ 'parent.slug = ?', tag.attr['parent'] ]
                      )
-                  
+          
+          # Returns the current categories if they exist
+          elsif tag.locals.shop_categories.present?
+            result = tag.locals.shop_categories
+          
           # Page params are protected, send is used to overcome this  
           # elsif tag.locals.page.send(:params).has_key? 'query'
           #   result = ShopCategory.search(tag.locals.page.send(:params)['query'])
@@ -34,12 +34,8 @@ module Shop
         def current_category(tag)
           result = nil
           
-          # Returns the current shop_category    
-          if tag.locals.shop_category.present?
-            result = tag.locals.shop_category
-           
           # Returns a category based on its name (page title)  
-          elsif tag.attr['name']
+          if tag.attr['name']
             result = ShopCategory.first(
                        :joins      => :page,
                        :conditions => [ "pages.title = ?", tag.attr['name'] ]
@@ -51,6 +47,10 @@ module Shop
                        :joins      => :page,
                        :conditions => [ "pages.slug = ?", tag.attr['handle'] ]
                      )
+          
+          # Returns the current shop_category    
+          elsif tag.locals.shop_category.present?
+            result = tag.locals.shop_category
            
           # Returns the category of the current shop_product
           elsif tag.locals.shop_product.present?
@@ -70,14 +70,14 @@ module Shop
         def current_products(tag)
           result = nil
           
-          if tag.locals.shop_products.present?
-            result = tag.locals.shop_products
-          
-          elsif tag.attr['category']
+          if tag.attr['category']
             result = ShopCategory.first(
                        :joins      => :page,
                        :conditions => [ 'page.slug = ?', tag.attr['category'] ]
                      ).products
+          
+          elsif tag.locals.shop_products.present?
+            result = tag.locals.shop_products
             
           elsif tag.locals.shop_category.present?
             result = tag.locals.shop_category.products
@@ -96,11 +96,8 @@ module Shop
         def current_product(tag)
           result = nil
           
-          if tag.locals.shop_product.present?
-            result = tag.locals.shop_product
-          
           # Returns a product based on its name (page title)  
-          elsif tag.attr['name']
+          if tag.attr['name']
             result = ShopProduct.first(
                        :joins      => :page,
                        :conditions => [ "pages.title = ?", tag.attr['name'] ]
@@ -112,6 +109,9 @@ module Shop
                        :joins      => :page,
                        :conditions => [ "pages.slug = ?", tag.attr['sku'] ]
                      )
+          
+          elsif tag.locals.shop_product.present?
+            result = tag.locals.shop_product
                      
           elsif tag.attr['position']
             children = tag.locals.shop_category.page.children
@@ -132,11 +132,11 @@ module Shop
         def current_image(tag)
           result = nil
           
-          if tag.locals.image.present?
-            result = tag.locals.image.image rescue tag.locals.image
-            
-          elsif tag.attr['position']
+          if tag.attr['position']
             result = tag.locals.images.find_by_position(tag.attr['position'].to_i)
+          
+          elsif tag.locals.image.present?
+            result = tag.locals.image.image rescue tag.locals.image
             
           end
           
@@ -146,11 +146,11 @@ module Shop
         def current_order(tag)
           result = nil
           
-          if tag.locals.shop_order.present?
-            result  = tag.locals.shop_order
-            
-          elsif tag.attr['key'] and 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.page.request.session[:shop_order].present?
             session = tag.locals.page.request.session[:shop_order]

data/radiant-shop-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-shop-extension}
-  s.version = "0.92.9"
+  s.version = "0.92.10"
 
   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{2010-12-22}
+  s.date = %q{2010-12-23}
   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 = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-shop-extension
 version: !ruby/object:Gem::Version 
-  hash: 381
+  hash: 379
   prerelease: false
   segments: 
   - 0
   - 92
-  - 9
-  version: 0.92.9
+  - 10
+  version: 0.92.10
 platform: ruby
 authors: 
 - Dirk Kelly
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-22 00:00:00 +08:00
+date: 2010-12-23 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency