radiant-shop-extension 0.11.6 → 0.90.0

data/spec/datasets/forms.rb

@@ -1,6 +1,6 @@
 class FormsDataset < Dataset::Base
   
-  uses :pages, :shop_orders, :shop_discounts
+  uses :pages, :shop_orders
   
   def load
     create_record :form, :checkout, 
@@ -84,16 +84,27 @@ CONFIG
     
     def mock_valid_form_checkout_request
       @form = forms(:checkout)
+      @form.page = pages(:home)
       @form[:extensions] = {
-        :checkout   => {
-          :test     => true,
-          :gateway  => {
-            :name   => 'Bogus'
-          },
-          :mail     => {
-            :subject=> 'new order',
-            :bcc    => 'orders@example.com'
+        :bogus_checkout   => {
+          :extension => 'checkout',
+          :test      => true,
+          :gateway   => {
+            :name    => 'Bogus'
           },
+          :extensions => {
+            :order => {
+              :extension => 'mail',
+              :subject   => 'new order',
+              :from      => 'orders@bogus.com',
+              :to        => 'orders@bogus.com'
+            },
+            :invoice => {
+              :extension => 'mail',
+              :from      => 'orders@bogus.com',
+              :subject   => 'your invoice'
+            },
+          }
         }
       }
       
@@ -119,10 +130,12 @@ CONFIG
     
     def mock_valid_form_address_request
       @form = forms(:checkout)
+      @form.page = pages(:home)
       @form[:extensions] = {
-        :address    => {
-          :billing  => true,
-          :shipping => true
+        :addresses  => {
+          :extension => 'address',
+          :billing   => true,
+          :shipping  => true
         }
       }
       
@@ -152,22 +165,6 @@ CONFIG
       @request.session = { :shop_order => @order.id }
     end
     
-    def mock_valid_form_discount_request
-      @form = forms(:checkout)
-      @form[:extensions] = {
-        :discount => {
-          :process => 'add'
-        }
-      }
-      @data = {
-       :discount => {
-         :code => shop_discounts(:ten_percent).code
-       } 
-      }
-
-      @request.session = { :shop_order => @order.id }
-    end
-    
   end
   
 end

data/spec/datasets/shop_categories.rb

@@ -1,8 +1,8 @@
 class ShopCategoriesDataset < Dataset::Base
   
-  uses :shop_variants, :pages
+  uses :pages
   
-  def load
+  def load    
     categories = [:bread, :milk, :salad]
     
     create_record :layout, :category,

data/spec/datasets/shop_config.rb

@@ -0,0 +1,24 @@
+class ShopConfigDataset < Dataset::Base
+  
+  def load
+    Radiant::Config['shop.root_page_id']        = pages(:home).id
+    
+    Radiant::Config['shop.layout_product']      = 'Product'
+    Radiant::Config['shop.layout_category']     = 'Products'
+    
+    Radiant::Config['shop.price_unit']          = '$'
+    Radiant::Config['shop.price_precision']     = 2
+    Radiant::Config['shop.price_separator']     = '.'
+    Radiant::Config['shop.price_delimiter']     = ','
+    
+    Radiant::Config['shop.tax_strategy']        = 'inclusive'
+    Radiant::Config['shop.tax_percentage']      = '10'
+    Radiant::Config['shop.tax_name']            = 'gst'
+      
+    Radiant::Config['shop.date_format']         = '%d/%m/%Y'
+    
+    # Scoped Customer Welcome Page
+    Radiant::Config['scoped.customer.redirect'] = '/cart'
+  end
+  
+end

data/spec/datasets/shop_customers.rb

@@ -1,4 +1,5 @@
 class ShopCustomersDataset < Dataset::Base
+  
   def load
     create_model :shop_customer, :customer,
       :name     => 'customer',

data/spec/datasets/shop_line_items.rb

@@ -1,10 +1,28 @@
+class ShopProductAlternative < ShopProduct; end
+
 class ShopLineItemsDataset < Dataset::Base
   
   uses :shop_products, :shop_orders
   
   def load
-    create_record :shop_line_item, :one,    :item_id => shop_products(:crusty_bread).id,  :order => shop_orders(:one_item),       :item_type => 'ShopProduct'
-    create_record :shop_line_item, :two,    :item_id => shop_products(:soft_bread).id,    :order => shop_orders(:several_items),  :item_type => 'ShopProduct',  :quantity => 2
-    create_record :shop_line_item, :three,  :item_id => shop_products(:choc_milk).id,     :order => shop_orders(:several_items),  :item_type => 'ShopProduct',  :quantity => 3
+    create_record :shop_line_item, :one,
+      :item_id    => shop_products(:crusty_bread).id,
+      :order      => shop_orders(:one_item),
+      :item_type  => 'ShopProduct',
+      :item_price => shop_products(:crusty_bread).price
+      
+    create_record :shop_line_item, :two,
+      :item_id    => shop_products(:soft_bread).id,
+      :order      => shop_orders(:several_items),
+      :item_type  => 'ShopProduct',
+      :quantity   => 2,
+      :item_price => shop_products(:soft_bread).price
+      
+    create_record :shop_line_item, :three,
+      :item_id    => shop_products(:choc_milk).id,
+      :order      => shop_orders(:several_items),
+      :item_type  => 'ShopProduct',
+      :quantity   => 3,
+      :item_price => shop_products(:choc_milk).price
   end
 end

data/spec/datasets/shop_products.rb

@@ -3,6 +3,8 @@ class ShopProductsDataset < Dataset::Base
   uses :shop_categories
 
   def load
+    Radiant::Config['shop.root_page_id'] = pages(:home).id
+    
     categories = {
       :bread => [ :soft, :crusty, :warm ],
       :milk => [ :full, :hilo, :choc ]
@@ -16,7 +18,8 @@ class ShopProductsDataset < Dataset::Base
           :breadcrumb => "#{product.to_s}_#{category.to_s}",
           :parent     => shop_categories(category).page,
           :class_name => 'ShopProductPage',
-          :layout     => layouts(:product)
+          :layout     => layouts(:product),
+          :position   => i + 1
 
         create_record :shop_product, "#{product.to_s}_#{category.to_s}".to_sym,
           :price      => i + 1 * 10,

data/spec/datasets/tags.rb

@@ -0,0 +1,19 @@
+class TagsDataset < Dataset::Base
+  
+  helpers do
+    def mock_valid_tag_for_helper
+      @tag = OpenStruct.new({
+        :attr   => {},
+        :locals => OpenStruct.new({
+          :page => OpenStruct.new({
+            :params   => {},
+            :request  => OpenStruct.new({
+              :session => {}
+            })
+          })
+        })
+      })
+    end
+  end
+  
+end

data/spec/lib/shop/models/page_spec.rb

@@ -1,7 +1,7 @@
 require 'spec/spec_helper'
 
 #
-# Tests for shop order page model extensions
+# Tests for Page extensions
 #
 describe Shop::Models::Page do
   

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

@@ -21,16 +21,42 @@ describe Shop::Tags::Card do
   end
   
   describe 'form:card:type' do
-    it 'should output the card types' do
-      tag = %{<r:form:card:type />}
-      exp = %{<select name="card[type]" id="card_type">
+    context 'all cards' do
+      it 'should output the card types' do
+        tag = %{<r:form:card:type />}
+        exp = %{<select name="card[type]" id="card_type">
 <option value="amex">American Express</option>
 <option value="diners">Diners Club</option>
 <option value="mastercard">Master Card</option>
 <option value="visa">Visa</option>
 </select>}
 
-      @page.should render(tag).as(exp)
+        @page.should render(tag).as(exp)
+      end
+    end
+    
+    context 'except amex and diners' do
+      it 'should output all except amex and diners' do
+        tag = %{<r:form:card:type except="amex,diners" />}
+        exp = %{<select name="card[type]" id="card_type">
+<option value="mastercard">Master Card</option>
+<option value="visa">Visa</option>
+</select>}
+
+        @page.should render(tag).as(exp)
+      end
+    end
+    
+    context 'only amex and diners' do
+      it 'should output all except amex' do
+        tag = %{<r:form:card:type only="amex,diners" />}
+        exp = %{<select name="card[type]" id="card_type">
+<option value="amex">American Express</option>
+<option value="diners">Diners Club</option>
+</select>}
+
+        @page.should render(tag).as(exp)
+      end
     end
   end
   

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

@@ -6,17 +6,18 @@ require 'spec/helpers/nested_tag_helper'
 #
 describe Shop::Tags::Cart do
   
-  dataset :pages, :shop_orders, :shop_payments
+  dataset :pages, :tags, :shop_config, :shop_orders, :shop_payments
   
   it 'should describe these tags' do
     Shop::Tags::Cart.tags.sort.should == [
+      'shop:cart',
+      'shop:cart:forget',
       'shop:cart:if_cart',
       'shop:cart:unless_cart',
       'shop:cart:payment',
       'shop:cart:payment:if_paid',
       'shop:cart:payment:unless_paid',
       'shop:cart:payment:date',
-      'shop:cart',
       'shop:cart:id',
       'shop:cart:status',
       'shop:cart:quantity',
@@ -24,15 +25,17 @@ describe Shop::Tags::Cart do
       'shop:cart:price'].sort
   end
   
-  before :all do
-    @page = pages(:home)
-  end
-  
-  before :each do
-    @order = shop_orders(:several_items)
-  end
-  
-  context 'cart tags' do    
+  context 'cart tags' do
+    
+    before :all do
+      @page = pages(:home)
+    end
+
+    before :each do
+      @order = shop_orders(:several_items)
+      mock_valid_tag_for_helper
+    end
+    
     describe '<r:shop:cart>' do
       context 'success' do
         it 'should render' do
@@ -42,6 +45,8 @@ describe Shop::Tags::Cart do
           expected = %{success}
           
           @page.should render(tag).as(expected)
+          
+          @tag.locals.page.request.session[:shop_order].should be_nil
         end
       end
       
@@ -55,6 +60,18 @@ describe Shop::Tags::Cart do
       end
     end
     
+    describe '<r:shop:cart:forget>' do
+      it 'should remove the cart from the session' do
+        pending 'dont know how to test this'
+        @tag.locals.page.request.session[:shop_order] = @order
+      
+        tag = %{<r:shop:cart />}
+        expected = %{}
+        
+        @page.should render(tag).as(expected)
+      end
+    end
+    
     describe '<r:shop:cart:if_cart>' do
       context 'success' do
         it 'should render' do
@@ -160,7 +177,7 @@ describe Shop::Tags::Cart do
       describe '<r:shop:cart:payment:date />' do
         it 'should return the created_at date of the payment' do          
           tag = %{<r:shop:cart:payment:date />}
-          expected = @order.payment.created_at.to_s(:long)
+          expected = @order.payment.created_at.strftime(Radiant::Config['shop.date_format'])
           @page.should render(tag).as(expected)
         end
       end

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

@@ -2,24 +2,14 @@ require 'spec/spec_helper'
 
 describe Shop::Tags::Helpers do
   
-  dataset :pages, :shop_products, :shop_product_variants, :shop_orders, :shop_addresses, :shop_line_items
+  dataset :pages, :tags, :shop_products, :shop_orders, :shop_addresses, :shop_line_items, :shop_product_attachments
   
   before :all do
     @page = pages(:home)
   end
   
   before(:each) do
-    @tag = OpenStruct.new({
-      :attr   => {},
-      :locals => OpenStruct.new({
-        :page => OpenStruct.new({
-          :params   => {},
-          :request  => OpenStruct.new({
-            :session => {}
-          })
-        })
-      })
-    })
+    mock_valid_tag_for_helper
   end
   
   describe '#current_categories' do
@@ -227,6 +217,22 @@ describe Shop::Tags::Helpers do
       end
     end
     
+    context 'position sent' do
+      before :each do
+        @tag.locals.shop_category = shop_categories(:bread)
+      end
+      it 'should return the matching product at that position' do
+        @tag.attr = { 'position' => 1 }
+        result = Shop::Tags::Helpers.current_product(@tag)
+        result.should == shop_categories(:bread).products[0]
+      end
+      it 'should return the matching product at that position or the first' do
+        @tag.attr = { 'position' => 0 }
+        result = Shop::Tags::Helpers.current_product(@tag)
+        result.should == shop_categories(:bread).products[0]
+      end
+    end
+    
     context 'line item previously set' do
       context 'for product' do
         before :each do
@@ -261,6 +267,33 @@ describe Shop::Tags::Helpers do
     
   end
   
+  describe '#current_image' do
+    before :each do 
+      @attachment = shop_products(:crusty_bread).attachments.first
+    end
+    
+    context 'image previously set' do
+      before :each do
+        @tag.locals.image = @attachment
+      end
+      it 'should return the image' do
+        result = Shop::Tags::Helpers.current_image(@tag)
+        result.should == @attachment.image
+      end
+    end
+    
+    context 'position set' do
+      before :each do
+        @tag.locals.images = shop_products(:crusty_bread).attachments
+        @tag.attr = { 'position' => 1 }
+      end
+      it 'should return the image at that position' do
+        result = Shop::Tags::Helpers.current_image(@tag)
+        result.should == shop_products(:crusty_bread).attachments[0]
+      end
+    end
+  end
+  
   describe '#current_order' do
     before :each do
       @order = shop_orders(:one_item)
@@ -321,16 +354,6 @@ describe Shop::Tags::Helpers do
       end
     end
     
-    context 'key and value sent' do
-      before :each do
-        @tag.attr = { 'key' => 'id', 'value' => @order.line_items.first.id }
-      end
-      it 'should return the matching order' do
-        result = Shop::Tags::Helpers.current_line_items(@tag)
-        result.should == [@order.line_items.first]
-      end
-    end
-    
     context 'nothing available to find the items' do
       it 'should return the current orders items' do
         result = Shop::Tags::Helpers.current_line_items(@tag)
@@ -414,48 +437,4 @@ describe Shop::Tags::Helpers do
     end
   end
   
-  describe '#current_product_variants' do
-    before :each do
-      @product = shop_products(:crusty_bread)
-    end
-    
-    context 'existing product variant' do
-      it 'should return that existing line item' do
-        @tag.locals.shop_product = @product
-        
-        result = Shop::Tags::Helpers.current_product_variants(@tag)
-        result.should == @product.variants
-      end
-    end
-    
-    context 'nothing sent or available' do
-      it 'should return nil' do
-        result = Shop::Tags::Helpers.current_product_variants(@tag)
-        result.should be_nil
-      end
-    end
-  end
-  
-  describe '#current_product_variant' do
-    before :each do
-      @variant = shop_product_variants(:mouldy_crusty_bread)
-    end
-    
-    context 'existing product variant' do
-      it 'should return that existing variant' do
-        @tag.locals.shop_product_variant = @variant
-        
-        result = Shop::Tags::Helpers.current_product_variant(@tag)
-        result.should == @variant
-      end
-    end
-    
-    context 'nothing sent or available' do
-      it 'should return nil' do
-        result = Shop::Tags::Helpers.current_product_variant(@tag)
-        result.should be_nil
-      end
-    end
-  end
-  
 end

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

@@ -6,7 +6,7 @@ require 'spec/helpers/nested_tag_helper'
 #
 describe Shop::Tags::Item do
   
-  dataset :pages, :shop_orders, :shop_line_items
+  dataset :pages, :shop_config, :shop_orders, :shop_line_items
   
   it 'should describe these tags' do
     Shop::Tags::Item.tags.sort.should == [
@@ -18,13 +18,9 @@ describe Shop::Tags::Item do
       'shop:cart:item:id',
       'shop:cart:item:quantity',
       'shop:cart:item:name',
-      'shop:cart:item:sku',
-      'shop:cart:item:link',
       'shop:cart:item:price',
-      'shop:cart:item:value',
-      'shop:cart:item:discounted',
-      'shop:cart:item:if_discounted',
-      'shop:cart:item:unless_discounted'].sort
+      'shop:cart:item:sku',
+      'shop:cart:item:link'].sort
   end
   
   context 'within a cart' do
@@ -223,12 +219,12 @@ describe Shop::Tags::Item do
           context 'standalone' do
             it 'should render an anchor element' do
               tag = %{<r:shop:cart:item:link />}
-              exp = %{<a href="#{@line_item.item.slug}">#{@line_item.item.name}</a>}
+              exp = %{<a href="#{@line_item.item.url}">#{@line_item.item.name}</a>}
               pages(:home).should render(tag).as(exp)
             end
             it 'should assign attributes' do
               tag = %{<r:shop:cart:item:link title="title" data-title="data-title"/>}
-              exp = %{<a href="#{@line_item.item.slug}" data-title="data-title" title="title">#{@line_item.item.name}</a>}
+              exp = %{<a href="#{@line_item.item.url}" data-title="data-title" title="title">#{@line_item.item.name}</a>}
               pages(:home).should render(tag).as(exp)          
             end
           end
@@ -236,7 +232,7 @@ describe Shop::Tags::Item do
           context 'wrapped' do
             it 'should render an anchor element' do
               tag = %{<r:shop:cart:item:link>title</r:shop:cart:item:link>}
-              exp = %{<a href="#{@line_item.item.slug}">title</a>}
+              exp = %{<a href="#{@line_item.item.url}">title</a>}
               pages(:home).should render(tag).as(exp)
             end
           end

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

@@ -2,7 +2,7 @@ require 'spec/spec_helper'
 
 describe Shop::Tags::Product do
   
-  dataset :pages, :shop_products, :shop_product_attachments
+  dataset :pages, :shop_config, :shop_products, :shop_product_attachments
   
   it 'should describe these tags' do
     Shop::Tags::Product.tags.sort.should == [
@@ -21,7 +21,8 @@ describe Shop::Tags::Product do
       'shop:product:images',
       'shop:product:images:if_images',
       'shop:product:images:unless_images',
-      'shop:product:images:each'].sort
+      'shop:product:images:each',
+      'shop:product:images:image'].sort
   end
   
   before :all do
@@ -346,6 +347,30 @@ describe Shop::Tags::Product do
       end
     end
     
+    describe '<r:shop:product:images:image>' do
+      before :each do
+        mock(Shop::Tags::Helpers).current_product(anything) { @product }
+      end
+      context 'image exists' do
+        it 'should expand' do
+          mock(Shop::Tags::Helpers).current_image(anything) { @product.images.first }
+          
+          tag = %{<r:shop:product:images:image>success</r:shop:product:images:image>}
+          exp = %{success}
+          @page.should render(tag).as(exp)
+        end
+      end
+      context 'image does not exist' do
+        it 'should expand' do
+          mock(Shop::Tags::Helpers).current_image(anything) { nil }
+          
+          tag = %{<r:shop:product:images:image>success</r:shop:product:images:image>}
+          exp = %{success}
+          @page.should render(tag).as(exp)
+        end
+      end
+    end
+    
   end
   
 end

data/spec/models/form_address_spec.rb

@@ -21,7 +21,7 @@ describe FormAddress do
             @data[:billing]   = { :id => shop_orders(:several_items).billing.id }
             @data[:shipping]  = { :id => shop_orders(:several_items).shipping.id }
             
-            @address = FormAddress.new(@form, @page)
+            @address = FormAddress.new(@form, @page, @form[:extensions][:addresses])
             result = @address.create
             
             shop_orders(:one_item).billing.should  === shop_addresses(:billing)
@@ -38,7 +38,7 @@ describe FormAddress do
             @data[:shipping] = {}
             @form[:extensions][:address] = { :billing => true }
             
-            @address = FormAddress.new(@form, @page)
+            @address = FormAddress.new(@form, @page, @form[:extensions][:addresses])
             result = @address.create
             
             shop_orders(:one_item).billing.should  === shop_addresses(:billing)
@@ -57,7 +57,7 @@ describe FormAddress do
         end
         context 'both billing and shipping' do
           it 'it should not assign those addresses' do
-            @address = FormAddress.new(@form, @page)
+            @address = FormAddress.new(@form, @page, @form[:extensions][:addresses])
             result = @address.create
             
             shop_orders(:one_item).billing.should  be_nil
@@ -72,11 +72,12 @@ describe FormAddress do
       context 'sending ids as a bad customer' do
         before :each do
           login_as :bad_customer
+          
           @order = shop_orders(:one_item)
           mock_valid_form_address_request
         end
         it 'should not assign those addresses' do
-          @address = FormAddress.new(@form, @page)
+          @address = FormAddress.new(@form, @page, @form[:extensions][:addresses])
           result = @address.create
           
           shop_orders(:one_item).billing.should  be_nil
@@ -97,7 +98,7 @@ describe FormAddress do
           @data[:billing]   = { :name => 'new billing' }
           @data[:shipping]  = { :name => 'new shipping' }
           
-          @address = FormAddress.new(@form, @page)
+          @address = FormAddress.new(@form, @page, @form[:extensions][:addresses])
           result = @address.create
           
           shop_addresses(:billing).name.should  === 'new billing'
@@ -120,7 +121,7 @@ describe FormAddress do
         
         context 'both billing and shipping sent' do
           it 'should create new addresses' do            
-            @address = FormAddress.new(@form, @page)
+            @address = FormAddress.new(@form, @page, @form[:extensions][:addresses])
             result = @address.create
             
             shop_orders(:one_item).billing.name.should  === @data[:billing][:name]
@@ -135,7 +136,7 @@ describe FormAddress do
           it 'should copy billing to shipping' do
             @data[:shipping] = {}
             
-            @address = FormAddress.new(@form, @page)
+            @address = FormAddress.new(@form, @page, @form[:extensions][:addresses])
             result = @address.create
             
             shop_orders(:one_item).billing.name.should  === @data[:billing][:name]
@@ -150,7 +151,7 @@ describe FormAddress do
           it 'should copy billing to shipping' do
             @data[:shipping] = @data[:billing]
             
-            @address = FormAddress.new(@form, @page)
+            @address = FormAddress.new(@form, @page, @form[:extensions][:addresses])
             result = @address.create
             
             shop_orders(:one_item).shipping.should      === shop_orders(:one_item).billing