radiant-shop-extension 0.90.4 → 0.91.2

data/db/migrate/20101208045754_address_changes.rb

@@ -0,0 +1,32 @@
+class AddressChanges < ActiveRecord::Migration
+  def self.up
+    add_column :shop_addresses, :phone, :string
+    add_column :shop_addresses, :street_1, :string
+    add_column :shop_addresses, :street_2, :string
+    add_column :shop_addresses, :of_type, :string
+    add_column :shop_addresses, :addressable_id, :id
+    add_column :shop_addresses, :addressable_type, :string
+    
+    ShopAddress.find_each do |a|
+      a.update_attribute(:street_1, a.street)
+    end
+    
+    # remove_column :shop_addresses, :street
+  end
+  
+  def self.down
+    add_column :shop_addresses, :street, :string
+    
+    ShopAddress.find_each do |a|
+      a.update_attribute(:street, a.street_1)
+    end
+    
+    # remove_column :shop_addresses, :phone
+    # remove_column :shop_addresses, :street_1
+    # remove_column :shop_addresses, :street_2
+    # remove_column :shop_addresses, :of_type
+    # remove_column :shop_addresses, :shop_addressable_id
+    # remove_column :shop_addresses, :shop_addressable_type
+  end
+  
+end

data/lib/shop/controllers/application_controller.rb

@@ -4,6 +4,8 @@ module Shop
       
       def self.included(base)
         base.class_eval do
+          filter_parameter_logging :password, :password_confirmation, :credit
+          
           def current_shop_order
             return @current_shop_order if defined?(@current_shop_order)
             @current_shop_order = find_or_create_shop_order if request.session[:shop_order]

data/lib/shop/models/user.rb

@@ -4,9 +4,9 @@ module Shop
     
       def self.included(base)
         base.class_eval do
-          has_many  :orders,    :class_name => 'ShopOrder', :foreign_key => :customer_id
-          has_many  :billings,  :through    => :orders
-          has_many  :shippings, :through    => :orders
+          has_one    :billing,  :class_name => 'ShopBilling',   :as => :addressable
+          has_one    :shipping, :class_name => 'ShopShipping',  :as => :addressable
+          has_many   :orders,   :class_name => 'ShopOrder',     :foreign_key => :customer_id
           
           accepts_nested_attributes_for :orders, :allow_destroy => true
         end

data/lib/shop/tags/address.rb

@@ -9,30 +9,29 @@ module Shop
         
         @type@ = (billing)|(shipping)
       }
-      tag 'shop:cart:address' do |tag|
-        Forms::Tags::Helpers.require!(tag,'shop:cart:address','type')
+      [:billing,:shipping].each do |of_type|
+        tag "shop:cart:#{of_type}" do |tag|
+          tag.locals.send(of_type, Shop::Tags::Helpers.current_address(tag,of_type))
+          
+          tag.expand
+        end
         
-        tag.locals.address = Shop::Tags::Helpers.current_address(tag)
-        tag.locals.address_type = tag.attr['type']
+        # Expand if an address has been assigned to the order
+        desc %{ Expand if an address has been assigned to the order }
+        tag "shop:cart:#{of_type}:if_#{of_type}" do |tag|
+          tag.expand if tag.locals.send(of_type).present?
+        end
         
-        tag.expand
-      end
-      
-      # Expand if an address has been assigned to the order
-      desc %{ Expand if an address has been assigned to the order }
-      tag 'shop:cart:address:if_address' do |tag|
-        tag.expand if tag.locals.address.name.present? rescue nil
-      end
-      
-      # Expand if an address has not been assigned to the order
-      desc %{ Expand if an address has not been assigned to the order }
-      tag 'shop:cart:address:unless_address' do |tag|
-        tag.expand unless tag.locals.address.name.present? rescue nil
-      end
+        # Expand if an address has not been assigned to the order
+        desc %{ Expand if an address has not been assigned to the order }
+        tag "shop:cart:#{of_type}:unless_#{of_type}" do |tag|
+          tag.expand unless tag.locals.send(of_type).present?
+        end
       
-      [:id, :name, :email, :unit, :street, :city, :state, :country, :postcode].each do |method|
-        tag "shop:cart:address:#{method}" do |tag|
-          tag.locals.address.send(method) rescue nil
+        [:id, :name, :phone, :email, :unit, :street_1, :street_2, :city, :state, :country, :postcode].each do |method|
+          tag "shop:cart:#{of_type}:#{method}" do |tag|
+            tag.locals.send(of_type).send(method) rescue nil # Rescue is so we can have null inputs if no address exists
+          end
         end
       end
       

data/lib/shop/tags/card.rb

@@ -18,7 +18,7 @@ module Shop
       # Outputs a list of credit card types
       desc %{ Outputs a list of credit card types }
       tag 'form:card:type' do |tag|
-        content = %{<select name="card[type]" id="card_type">\n}
+        content = %{<select name="credit_card[type]" id="credit_card_type">\n}
         cards = {}
         cards.merge! CARD_TYPES
         
@@ -34,7 +34,7 @@ module Shop
       # Outputs a list of months for credit cards
       desc %{ Outputs a list of months for credit cards }
       tag 'form:card:month' do |tag|
-        content = %{<select name="card[month]" id="card_month">\n}
+        content = %{<select name="credit_card[month]" id="credit_card_month">\n}
           Date::MONTHNAMES[1,12].each_with_index do |name,index|
             month = sprintf('%02d', index+1)
             content << %{<option value="#{month}">#{month} - #{name}</option>\n}
@@ -45,7 +45,7 @@ module Shop
       # Ouputs a list of years for credit cards
       desc %{ Ouputs a list of years for credit cards }
       tag 'form:card:year' do |tag|
-        content = %{<select name="card[year]" id="card_year">\n}
+        content = %{<select name="credit_card[year]" id="credit_card_year">\n}
           (Time.new.year ... Time.new.year + 15).each do |year|
             content << %{<option value="#{year}">#{year}</option>\n}
           end

data/lib/shop/tags/helpers.rb

@@ -191,26 +191,32 @@ module Shop
         end
         
         # Return the current address for the current order
-        # @tag['attr]['type'] = the address type (billing|shippin)
-        def current_address(tag)
-          result = nil
-          
-          if tag.locals.address.present? and tag.locals.address_type == tag.attr['type']
-            result = tag.locals.address
+        # of_type = the address type (billing|shipping)
+        def current_address(tag,of_type = 'billing')
+          if tag.locals.send(of_type).present?
+            return tag.locals.send(of_type)
+          end
             
-          elsif tag.locals.shop_order.present?
+          if tag.locals.shop_order.present?
             begin
-              address = tag.locals.shop_order.send(tag.attr['type']) # Get the address type (order.billing)
-              if address.present? # If that address exists
-                result = address # The result is that address
-              end
+              # Get the address type (order.billing)
+              address = tag.locals.shop_order.send(of_type)
+              return address unless address.nil?
             rescue
-              result = nil # Will catch an incorrect address type being send
+              nil
             end
-            
           end
           
-          result
+          if tag.locals.user.present?
+            begin
+              address = tag.locals.user.send(of_type)
+              return address unless address.nil?
+            rescue
+              nil
+            end
+          end
+          
+          nil
         end
         
         def currency(number,attr = {})

data/radiant-shop-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-shop-extension}
-  s.version = "0.90.4"
+  s.version = "0.91.2"
 
   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-11-24}
+  s.date = %q{2010-12-08}
   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 = [
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "app/models/form_checkout.rb",
     "app/models/form_line_item.rb",
     "app/models/shop_address.rb",
+    "app/models/shop_billing.rb",
     "app/models/shop_category.rb",
     "app/models/shop_category_page.rb",
     "app/models/shop_customer.rb",
@@ -44,6 +45,7 @@ Gem::Specification.new do |s|
     "app/models/shop_product.rb",
     "app/models/shop_product_attachment.rb",
     "app/models/shop_product_page.rb",
+    "app/models/shop_shipping.rb",
     "app/views/.DS_Store",
     "app/views/admin/.DS_Store",
     "app/views/admin/shop/categories/edit.html.haml",
@@ -138,6 +140,7 @@ Gem::Specification.new do |s|
     "config/locales/en.yml",
     "config/routes.rb",
     "db/migrate/20101011063133_setup_shop.rb",
+    "db/migrate/20101208045754_address_changes.rb",
     "db/seed.rb",
     "db/seeds/forms.rb",
     "db/seeds/layouts.rb",
@@ -210,6 +213,7 @@ Gem::Specification.new do |s|
     "spec/models/form_address_spec.rb",
     "spec/models/form_checkout_spec.rb",
     "spec/models/shop_address_spec.rb",
+    "spec/models/shop_billing_spec.rb",
     "spec/models/shop_category_page_spec.rb",
     "spec/models/shop_category_spec.rb",
     "spec/models/shop_customer_spec.rb",
@@ -219,6 +223,7 @@ Gem::Specification.new do |s|
     "spec/models/shop_product_attachment_spec.rb",
     "spec/models/shop_product_page_spec.rb",
     "spec/models/shop_product_spec.rb",
+    "spec/models/shop_shipping_spec.rb",
     "spec/spec.opts",
     "spec/spec_helper.rb"
   ]
@@ -261,6 +266,7 @@ Gem::Specification.new do |s|
     "spec/models/form_address_spec.rb",
     "spec/models/form_checkout_spec.rb",
     "spec/models/shop_address_spec.rb",
+    "spec/models/shop_billing_spec.rb",
     "spec/models/shop_category_page_spec.rb",
     "spec/models/shop_category_spec.rb",
     "spec/models/shop_customer_spec.rb",
@@ -270,6 +276,7 @@ Gem::Specification.new do |s|
     "spec/models/shop_product_attachment_spec.rb",
     "spec/models/shop_product_page_spec.rb",
     "spec/models/shop_product_spec.rb",
+    "spec/models/shop_shipping_spec.rb",
     "spec/spec_helper.rb"
   ]
 

data/spec/controllers/admin/shop/orders_controller_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + "/../../../spec_helper"
 
 describe Admin::Shop::OrdersController do
   
-  dataset :shop_orders, :users
+  dataset :shop_orders, :shop_addresses, :users
   
   before(:each) do
     login_as  :admin

data/spec/datasets/forms.rb

@@ -21,7 +21,7 @@ class FormsDataset < Dataset::Base
       </li>
       <li>
         <r:label for='billing[unit]'>Address</r:label>
-        <r:text name='billing[unit]' /> <r:text name='billing[street]' /> <r:text name='billing[suburb]' />
+        <r:text name='billing[unit]' /> <r:text name='billing[street_1]' /> <r:text name='billing[suburb]' />
       </li>
       <li>
         <r:label for='billing[state]'>State and Country</r:label>
@@ -33,14 +33,14 @@ class FormsDataset < Dataset::Base
       </li>
     </ol>
   </div>
-  <ol class="card">
+  <ol class="credit_card">
     <li>
-      <r:label for='card[name]'>Name on Card</r:label>
-      <r:text name='card[name]' />
+      <r:label for='credit_card[name]'>Name on Card</r:label>
+      <r:text name='credit_card[name]' />
     </li>
     <li>
-      <r:label for='card[number]'>Card</r:label>
-      <r:card:type /> <r:text name='card[number]' /> <r:text name='card[verification]' length='4' />
+      <r:label for='credit_card[number]'>Card</r:label>
+      <r:card:type /> <r:text name='credit_card[number]' /> <r:text name='credit_card[verification]' length='4' />
       <r:card:month /> <r:card:year />
     </li>
   </ol>
@@ -109,7 +109,7 @@ CONFIG
       }
       
       @data = {
-        :card => { 
+        :credit_card => { 
           :number       => '1',
           :name         => 'Mr. Joe Bloggs',
           :verification => '123',
@@ -141,24 +141,26 @@ CONFIG
       
       @data = {
         :billing => {
-          :id           => shop_addresses(:billing).id,
-          :name         => shop_addresses(:billing).name,
-          :email        => shop_addresses(:billing).email,
-          :street       => shop_addresses(:billing).street,
-          :city         => shop_addresses(:billing).city,
-          :state        => shop_addresses(:billing).state,
-          :country      => shop_addresses(:billing).country,
-          :postcode     => shop_addresses(:billing).postcode
+          :id           => shop_billings(:order_billing).id,
+          :name         => shop_billings(:order_billing).name,
+          :phone        => shop_billings(:order_billing).phone,
+          :email        => shop_billings(:order_billing).email,
+          :street_1     => shop_billings(:order_billing).street_1,
+          :city         => shop_billings(:order_billing).city,
+          :state        => shop_billings(:order_billing).state,
+          :country      => shop_billings(:order_billing).country,
+          :postcode     => shop_billings(:order_billing).postcode
         },
         :shipping => {
-          :id           => shop_addresses(:shipping).id,
-          :name         => shop_addresses(:shipping).name,
-          :email        => shop_addresses(:shipping).email,
-          :street       => shop_addresses(:shipping).street,
-          :city         => shop_addresses(:shipping).city,
-          :state        => shop_addresses(:shipping).state,
-          :country      => shop_addresses(:shipping).country,
-          :postcode     => shop_addresses(:shipping).postcode
+          :id           => shop_shippings(:order_shipping).id,
+          :name         => shop_shippings(:order_shipping).name,
+          :phone        => shop_shippings(:order_shipping).phone,
+          :email        => shop_shippings(:order_shipping).email,
+          :street_1     => shop_shippings(:order_shipping).street_1,
+          :city         => shop_shippings(:order_shipping).city,
+          :state        => shop_shippings(:order_shipping).state,
+          :country      => shop_shippings(:order_shipping).country,
+          :postcode     => shop_shippings(:order_shipping).postcode
         }
       }
 

data/spec/datasets/shop_addresses.rb

@@ -1,24 +1,36 @@
 class ShopAddressesDataset < Dataset::Base
+  
+  uses :shop_orders
+  
   def load
-    # TODO Investigate why inflectors are breaking here
-    create_record :shop_addresss, :billing,
-      :name   => 'Billing Address',
-      :email  => 'billing@address.com',
-      :unit   => 'a',
-      :street => '1 Bill Street',
-      :city   => 'Billvilles',
-      :state  => 'BI',
-      :country=> 'Billington',
-      :postcode=> '1234'
+    create_record :shop_billing, :order_billing,
+      :name             => 'Billing Address',
+      :phone            => '1800 000 000',
+      :email            => 'billing@billing.com',
+      :unit             => 'a',
+      :street_1         => '1 Bill Street',
+      :street_2         => 'Street Bill 1',
+      :city             => 'Billvilles',
+      :state            => 'BI',
+      :country          => 'Billington',
+      :of_type          => 'billing',
+      :postcode         => '1234',
+      :addressable_id   => shop_orders(:several_items).id,
+      :addressable_type => 'ShopOrder'
       
-    create_record :shop_addresss, :shipping,
-      :name   => 'Shipping Address',
-      :email  => 'shipping@address.com',
-      :unit   => 'b',
-      :street => '2 Ship Street',
-      :city   => 'Shipvilles',
-      :state  => 'SH',
-      :country=> 'Shippington',
-      :postcode=> '1234'
+    create_record :shop_shipping, :order_shipping,
+      :name             => 'Shipping Address',
+      :phone            => '1800 000 000',
+      :email            => 'shipping@shipping.com',
+      :unit             => 'b',
+      :street_1         => '2 Ship Street',
+      :street_2         => 'Street Ship 2',
+      :city             => 'Shipvilles',
+      :state            => 'SH',
+      :country          => 'Shippington',
+      :of_type          => 'shipping',
+      :postcode         => '1234',
+      :addressable_id   => shop_orders(:several_items).id,
+      :addressable_type => 'ShopOrder'
   end
 end

data/spec/datasets/shop_orders.rb

@@ -1,16 +1,14 @@
 class ShopOrdersDataset < Dataset::Base
   
-  uses :shop_products, :shop_customers, :shop_addresses
+  uses :shop_products, :shop_customers
   
   def load
     create_record :shop_order, :empty
     
     create_record :shop_order, :one_item,
-      :customer   => shop_customers(:customer)
+      :customer => shop_customers(:customer)
           
     create_record :shop_order, :several_items,
-      :customer   => shop_customers(:customer), 
-      :billing    => shop_addresses(:billing),
-      :shipping   => shop_addresses(:shipping)
+      :customer => shop_customers(:customer)
   end
 end

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

@@ -9,18 +9,34 @@ describe Shop::Tags::Address do
   
   it 'should describe these tags' do
     Shop::Tags::Address.tags.sort.should == [
-      'shop:cart:address',
-      'shop:cart:address:if_address',
-      'shop:cart:address:unless_address',
-      'shop:cart:address:id',
-      'shop:cart:address:name',
-      'shop:cart:address:email',
-      'shop:cart:address:unit',
-      'shop:cart:address:street',
-      'shop:cart:address:city',
-      'shop:cart:address:state',
-      'shop:cart:address:country',
-      'shop:cart:address:postcode',
+      'shop:cart:billing',
+      'shop:cart:billing:if_billing',
+      'shop:cart:billing:unless_billing',
+      'shop:cart:billing:id',
+      'shop:cart:billing:name',
+      'shop:cart:billing:phone',
+      'shop:cart:billing:email',
+      'shop:cart:billing:unit',
+      'shop:cart:billing:street_1',
+      'shop:cart:billing:street_2',
+      'shop:cart:billing:city',
+      'shop:cart:billing:state',
+      'shop:cart:billing:country',
+      'shop:cart:billing:postcode',
+      'shop:cart:shipping',
+      'shop:cart:shipping:if_shipping',
+      'shop:cart:shipping:unless_shipping',
+      'shop:cart:shipping:id',
+      'shop:cart:shipping:name',
+      'shop:cart:shipping:phone',
+      'shop:cart:shipping:email',
+      'shop:cart:shipping:unit',
+      'shop:cart:shipping:street_1',
+      'shop:cart:shipping:street_2',
+      'shop:cart:shipping:city',
+      'shop:cart:shipping:state',
+      'shop:cart:shipping:country',
+      'shop:cart:shipping:postcode',
     ].sort
   end
   
@@ -31,28 +47,47 @@ describe Shop::Tags::Address do
     
     before :each do
       @order = shop_orders(:several_items)
-      @billing = shop_addresses(:billing)
+      @billing = shop_billings(:order_billing)
       mock(Shop::Tags::Helpers).current_order(anything) { @order }
     end
   
-    describe 'shop:cart:address:if_address' do
+    describe 'shop:cart:billing:if_billing' do
       context 'success' do
+        it 'should expand' do
+          tag = %{<r:shop:cart:billing:if_billing>success</r:shop:cart:billing:if_billing>}
+          exp = %{success}
+        
+          @page.should render(tag).as(exp)
+        end
+      end
+      context 'failure' do
         before :each do
-          mock(Shop::Tags::Helpers).current_address(anything) { @billing }
+          mock(@order).billing { nil }
         end
+        it 'should not expand' do
+          tag = %{<r:shop:cart:billing:if_billing>failure</r:shop:cart:billing:if_billing>}
+          exp = %{}
+        
+          @page.should render(tag).as(exp)        
+        end
+      end
+    end
+    
+    describe 'shop:cart:shipping:if_shipping' do
+      context 'success' do
         it 'should expand' do
-          tag = %{<r:shop:cart:address type='billing'><r:if_address>success</r:if_address></r:shop:cart:address>}
+          tag = %{<r:shop:cart:shipping:if_shipping>success</r:shop:cart:shipping:if_shipping>}
           exp = %{success}
         
           @page.should render(tag).as(exp)
         end
       end
-      context 'failure' do
+      context 'failure' do      
         before :each do
-          mock(Shop::Tags::Helpers).current_address(anything) { nil }
+          mock(@order).shipping { nil }
         end
         it 'should not expand' do
-          tag = %{<r:shop:cart:address type='billing'><r:if_address>failure</r:if_address></r:shop:cart:address>}
+          tag = %{<r:shop:cart:shipping:if_shipping>failure</r:shop:cart:shipping:if_shipping>}
           exp = %{}
         
           @page.should render(tag).as(exp)        
@@ -60,28 +95,43 @@ describe Shop::Tags::Address do
       end
     end
   
-    describe 'shop:cart:address:unless_address' do
+    describe 'shop:cart:billing:unless_billing' do
       context 'success' do
         before :each do
-          mock(Shop::Tags::Helpers).current_address(anything) { @billing }
+          mock(@order).shipping { nil }
         end
         it 'should expand' do
-          stub(@order).billing { @billing }
-        
-          tag = %{<r:shop:cart:address type='billing'><r:unless_address>failure</r:unless_address></r:shop:cart:address>}
-          exp = %{}
+          tag = %{<r:shop:cart:shipping:unless_shipping>success</r:shop:cart:shipping:unless_shipping>}
+          exp = %{success}
         
           @page.should render(tag).as(exp)
         end
       end
       context 'failure' do
+        it 'should not expand' do
+          tag = %{<r:shop:cart:shipping:unless_shipping>failure</r:shop:cart:shipping:unless_shipping>}
+          exp = %{}
+        
+          @page.should render(tag).as(exp)        
+        end
+      end
+    end
+    
+    describe 'shop:cart:shipping:unless_shipping' do
+      context 'success' do
         before :each do
-          mock(Shop::Tags::Helpers).current_address(anything) { nil }
+          mock(@order).shipping { nil }
         end
-        it 'should not expand' do
-          stub(@order).billing { nil }
+        it 'should expand' do
+          tag = %{<r:shop:cart:shipping:unless_shipping>success</r:shop:cart:shipping:unless_shipping>}
+          exp = %{success}
         
-          tag = %{<r:shop:cart:address type='billing'><r:unless_address>failure</r:unless_address></r:shop:cart:address>}
+          @page.should render(tag).as(exp)
+        end
+      end
+      context 'failure' do
+        it 'should not expand' do
+          tag = %{<r:shop:cart:shipping:unless_shipping>failure</r:shop:cart:shipping:unless_shipping>}
           exp = %{}
         
           @page.should render(tag).as(exp)        
@@ -89,24 +139,21 @@ describe Shop::Tags::Address do
       end
     end
 
-    describe 'shop:address' do
-      context 'no address' do
+    describe 'shop:billing' do
+      context 'billing doesnt exist' do
         before :each do
-          mock(Shop::Tags::Helpers).current_address(anything) { @billing }
+          mock(@order).billing { nil }
         end
         it 'should expand' do
-          tag = %{<r:shop:cart:address type='billing'>success</r:shop:cart:address>}
+          tag = %{<r:shop:cart:billing>success</r:shop:cart:billing>}
           exp = %{success}
       
           @page.should render(tag).as(exp)
         end
       end
-      context 'address' do
-        before :each do
-          mock(Shop::Tags::Helpers).current_address(anything) { nil }
-        end
+      context 'billing exists' do
         it 'should expand' do
-          tag = %{<r:shop:cart:address type='billing'>success</r:shop:cart:address>}
+          tag = %{<r:shop:cart:billing>success</r:shop:cart:billing>}
           exp = %{success}
       
           @page.should render(tag).as(exp)
@@ -115,76 +162,89 @@ describe Shop::Tags::Address do
     end
   
     describe 'attributes' do
-      before :each do
-        mock(Shop::Tags::Helpers).current_address(anything) { @billing }
-      end
-      context 'shop:cart:address:id' do
+      context 'shop:cart:billing:id' do
         it 'should return the id' do
-          tag = %{<r:shop:cart:address type='billing'><r:id /></r:shop:cart:address>}
+          tag = %{<r:shop:cart:billing><r:id /></r:shop:cart:billing>}
           exp = @billing.id.to_s
         
           @page.should render(tag).as(exp)
         end
       end
-      context 'shop:cart:address:name' do
+      context 'shop:cart:billing:name' do
         it 'should return the name' do
-          tag = %{<r:shop:cart:address type='billing'><r:name /></r:shop:cart:address>}
+          tag = %{<r:shop:cart:billing><r:name /></r:shop:cart:billing>}
           exp = @billing.name
         
           @page.should render(tag).as(exp)
         end
       end
-      context 'shop:cart:address:email' do
+      context 'shop:cart:billing:phone' do
+        it 'should return the phone' do
+          tag = %{<r:shop:cart:billing><r:phone /></r:shop:cart:billing>}
+          exp = @billing.phone
+        
+          @page.should render(tag).as(exp)
+        end
+      end
+      context 'shop:cart:billing:email' do
         it 'should return the email' do
-          tag = %{<r:shop:cart:address type='billing'><r:email /></r:shop:cart:address>}
+          tag = %{<r:shop:cart:billing><r:email /></r:shop:cart:billing>}
           exp = @billing.email
         
           @page.should render(tag).as(exp)
         end
       end
-      context 'shop:cart:address:unit' do
+      context 'shop:cart:billing:unit' do
         it 'should return the unit' do
-          tag = %{<r:shop:cart:address type='billing'><r:unit /></r:shop:cart:address>}
+          tag = %{<r:shop:cart:billing><r:unit /></r:shop:cart:billing>}
           exp = @billing.unit
         
           @page.should render(tag).as(exp)
         end
       end
-      context 'shop:cart:address:street' do
+      context 'shop:cart:billing:street_1' do
+        it 'should return the street' do
+          tag = %{<r:shop:cart:billing><r:street_1 /></r:shop:cart:billing>}
+          exp = @billing.street_1
+        
+          @page.should render(tag).as(exp)
+        end
+      end
+      context 'shop:cart:billing:street_2' do
         it 'should return the street' do
-          tag = %{<r:shop:cart:address type='billing'><r:street /></r:shop:cart:address>}
-          exp = @billing.street
+          tag = %{<r:shop:cart:billing><r:street_2 /></r:shop:cart:billing>}
+          exp = @billing.street_2
         
           @page.should render(tag).as(exp)
         end
       end
-      context 'shop:cart:address:city' do
+      context 'shop:cart:billing:city' do
         it 'should return the city' do
-          tag = %{<r:shop:cart:address type='billing'><r:city /></r:shop:cart:address>}
+          tag = %{<r:shop:cart:billing><r:city /></r:shop:cart:billing>}
           exp = @billing.city
         
           @page.should render(tag).as(exp)
         end
       end
-      context 'shop:cart:address:state' do
+      context 'shop:cart:billing:state' do
         it 'should return the city' do
-          tag = %{<r:shop:cart:address type='billing'><r:state /></r:shop:cart:address>}
+          tag = %{<r:shop:cart:billing><r:state /></r:shop:cart:billing>}
           exp = @billing.state
         
           @page.should render(tag).as(exp)
         end
       end
-      context 'shop:cart:address:country' do
+      context 'shop:cart:billing:country' do
         it 'should return the country' do
-          tag = %{<r:shop:cart:address type='billing'><r:country /></r:shop:cart:address>}
+          tag = %{<r:shop:cart:billing><r:country /></r:shop:cart:billing>}
           exp = @billing.country
         
           @page.should render(tag).as(exp)
         end
       end
-      context 'shop:cart:address:postcode' do
+      context 'shop:cart:billing:postcode' do
         it 'should return the postcode' do
-          tag = %{<r:shop:cart:address type='billing'><r:postcode /></r:shop:cart:address>}
+          tag = %{<r:shop:cart:billing><r:postcode /></r:shop:cart:billing>}
           exp = @billing.postcode
         
           @page.should render(tag).as(exp)