radiant-shop-extension 0.92.2 → 0.92.3

data/VERSION

@@ -1 +1 @@
-0.92.2
+0.92.3

data/app/models/form_address.rb

@@ -67,10 +67,15 @@ class FormAddress
         
       end
     else
-      if @order.shipping.nil?
-        @shipping = ShopShipping.new(@billing.attributes) 
-        if @shipping.save
-          @order.update_attribute(:shipping, @shipping)
+      if @order.shipping.present?
+        @shipping = @order.shipping
+        
+      else
+        if @order.shipping.nil?
+          @shipping = ShopShipping.new(@billing.attributes) 
+          if @shipping.save
+            @order.update_attribute(:shipping, @shipping)
+          end
         end
       end
       

data/db/migrate/20101214023052_fix_addressable_column_type.rb

@@ -5,13 +5,20 @@ class FixAddressableColumnType < ActiveRecord::Migration
     ShopAddress.find_each do |address|
       address.update_attribute(:addressable_integer, :addressable_id)
     end
-    remove_column :shop_addresses, :addressable_id
     
-    add_column :shop_addresses, :addressable_id, :integer
-    ShopAddress.reset_column_information
-    ShopAddress.find_each do |address|
-      address.update_attribute(:addressable_id, :addressable_integer)
-    end  
+    begin
+      remove_column :shop_addresses, :addressable_id
+      add_column :shop_addresses, :addressable_id, :integer
+      ShopAddress.reset_column_information
+      ShopAddress.find_each do |address|
+        address.update_attribute(:addressable_id, :addressable_integer)
+      end  
+      
+      remove_column :shop_addresses, :addressable_integer
+    rescue
+      # Yay sqlite
+    end
+    
   end
 
   def self.down

data/lib/shop/tags/category.rb

@@ -56,7 +56,24 @@ module Shop
         
       end
       
-      [:id, :name, :handle, :slug].each do |symbol|
+      tag 'shop:category:unless_current' do |tag|
+        
+        if tag.locals.page.shop_product.present?
+          # A product page
+          if tag.locals.page.shop_product.category != tag.locals.shop_category
+            # Where the products category is this category
+            tag.expand
+          end
+          
+        elsif tag.locals.page.shop_category != tag.locals.shop_category
+          # Looking at the shop_category generated page
+          tag.expand
+          
+        end
+        
+      end
+      
+      [:id, :name, :handle, :slug, :url].each do |symbol|
         desc %{ outputs the #{symbol} of the current shop category }
         tag "shop:category:#{symbol}" do |tag|
           tag.locals.shop_category.send(symbol)

data/lib/shop/tags/product.rb

@@ -37,6 +37,24 @@ module Shop
         tag.expand if tag.locals.shop_product.present?
       end
       
+      tag 'shop:product:page' do |tag|
+        tag.locals.page = tag.locals.shop_product.page
+        
+        tag.expand
+      end
+      
+      tag 'shop:product:if_current' do |tag|
+        if tag.locals.page.shop_product == tag.locals.shop_product
+          tag.expand
+        end
+      end
+      
+      tag 'shop:product:unless_current' do |tag|
+        if tag.locals.page.shop_product != tag.locals.shop_product
+          tag.expand
+        end
+      end
+      
       [:id, :name, :sku, :slug].each do |symbol|
         desc %{ outputs the #{symbol} of the current shop product }
         tag "shop:product:#{symbol}" do |tag|

data/radiant-shop-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-shop-extension}
-  s.version = "0.92.2"
+  s.version = "0.92.3"
 
   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-17}
+  s.date = %q{2010-12-21}
   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/lib/shop/tags/category_spec.rb

@@ -15,7 +15,9 @@ describe Shop::Tags::Category do
       'shop:category:handle',
       'shop:category:id',
       'shop:category:if_current',
+      'shop:category:unless_current',
       'shop:category:link',
+      'shop:category:url',
       'shop:category:name',
       'shop:category:slug',
       'shop:category:images'].sort
@@ -119,6 +121,36 @@ describe Shop::Tags::Category do
     end
   end
   
+  describe '<r:shop:category:unless_current>' do
+    before :each do
+      mock(Shop::Tags::Helpers).current_category(anything) { @category }
+    end
+    context 'this categories page' do
+      it 'should not expand' do
+        tag = %{<r:shop:category:unless_current>failure</r:shop:category:unless_current>}
+        exp =  %{}
+        
+        @category.page.should render(tag).as(exp)
+      end
+    end
+    context 'categories product page' do
+      it 'should not expand' do
+        tag = %{<r:shop:category:unless_current>failure</r:shop:category:unless_current>}
+        exp =  %{}
+        
+        @category.products.first.page.should render(tag).as(exp)
+      end
+    end
+    context 'failure' do
+      it 'should expand' do
+        tag = %{<r:shop:category:unless_current>success</r:shop:category:unless_current>}
+        exp =  %{success}
+        
+        @page.should render(tag).as(exp)
+      end
+    end
+  end
+  
   describe 'simple attributes' do
     before :each do
       mock(Shop::Tags::Helpers).current_category(anything) { @category }
@@ -147,6 +179,12 @@ describe Shop::Tags::Category do
       
       @page.should render(tag).as(exp)
     end
+    it 'should render <r:url />' do
+      tag = %{<r:shop:category:url />}
+      exp = @category.url
+      
+      @page.should render(tag).as(exp)
+    end
     describe '<r:description />' do
       it 'should render a textile filtered result' do
         tag = %{<r:shop:category:description />}

data/spec/lib/shop/tags/product_spec.rb

@@ -11,6 +11,9 @@ describe Shop::Tags::Product do
       'shop:products:unless_products',      
       'shop:products:each',
       'shop:product',
+      'shop:product:if_current',
+      'shop:product:unless_current',
+      'shop:product:page',
       'shop:product:id',
       'shop:product:name',
       'shop:product:price',
@@ -164,6 +167,54 @@ describe Shop::Tags::Product do
       end
     end
     
+    context '<r:shop:product:page>' do
+      before :each do
+        mock(Shop::Tags::Helpers).current_product(anything) { @product }
+      end
+      
+      it 'should set the page context from the product' do
+        tag = %{<r:shop:product:page><r:title/></r:shop:product:page>}
+        exp = @product.page.title.to_s
+        @page.should render(tag).as(exp)        
+      end
+    end
+    
+    context '<r:shop:product:if_current>' do
+      before :each do
+        mock(Shop::Tags::Helpers).current_product(anything) { @product }
+      end
+      
+      it 'should render if the page belongs to the product' do
+        tag = %{<r:shop:product:if_current>success</r:shop:product:if_current>}
+        exp = %{success}
+        @product.page.should render(tag).as(exp)        
+      end
+      
+      it 'should not render if the page does not belong to the product' do
+        tag = %{<r:shop:product:if_current>failure</r:shop:product:if_current>}
+        exp = %{}
+        @page.should render(tag).as(exp)        
+      end
+    end
+    
+    context '<r:shop:product:unless_current>' do
+      before :each do
+        mock(Shop::Tags::Helpers).current_product(anything) { @product }
+      end
+      
+      it 'should render if the page does not belong to the product' do
+        tag = %{<r:shop:product:unless_current>success</r:shop:product:unless_current>}
+        exp = %{success}
+        @page.should render(tag).as(exp)        
+      end
+      
+      it 'should not render if the page belongs to the product' do
+        tag = %{<r:shop:product:unless_current>failure</r:shop:product:unless_current>}
+        exp = %{}
+        @product.page.should render(tag).as(exp)        
+      end
+    end
+    
     context '#attributes' do
       before :each do
         mock(Shop::Tags::Helpers).current_product(anything) { @product }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-shop-extension
 version: !ruby/object:Gem::Version 
-  hash: 363
+  hash: 361
   prerelease: false
   segments: 
   - 0
   - 92
-  - 2
-  version: 0.92.2
+  - 3
+  version: 0.92.3
 platform: ruby
 authors: 
 - Dirk Kelly
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-17 00:00:00 +08:00
+date: 2010-12-21 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency