radiant-shop-extension 0.94.7 → 0.94.8

data/VERSION

@@ -1 +1 @@
-0.94.7
+0.94.8

data/db/migrate/20110330042956_add_company_to_address.rb

@@ -0,0 +1,8 @@
+class AddCompanyToAddress < ActiveRecord::Migration
+  def self.up
+    add_column :shop_addresses, :business, :string
+  end
+
+  def self.down
+  end
+end

data/lib/shop/tags/address.rb

@@ -28,7 +28,7 @@ module Shop
           tag.expand unless tag.locals.send(of_type).present?
         end
       
-        [:id, :name, :phone, :email, :unit, :street_1, :street_2, :city, :state, :country, :postcode].each do |method|
+        [:id, :name, :phone, :business, :email, :unit, :street_1, :street_2, :city, :state, :country, :postcode].each do |method|
           tag "shop:cart:#{of_type}:#{method}" do |tag|
             # Rescue is so we can have null inputs if no address exists
             result = (tag.locals.send(of_type).send(method) rescue nil)

data/radiant-shop-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-shop-extension}
-  s.version = "0.94.7"
+  s.version = "0.94.8"
 
   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-02-21}
+  s.date = %q{2011-03-30}
   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 = [
@@ -143,6 +143,7 @@ Gem::Specification.new do |s|
     "db/migrate/20101208121105_move_to_page_attachments.rb",
     "db/migrate/20101214023052_fix_addressable_column_type.rb",
     "db/migrate/20110119095350_add_position_to_shop_category.rb",
+    "db/migrate/20110330042956_add_company_to_address.rb",
     "db/seed.rb",
     "db/seeds/forms.rb",
     "db/seeds/layouts.rb",
@@ -228,7 +229,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/squaretalent/radiant-shop-extension}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
+  s.rubygems_version = %q{1.5.3}
   s.summary = %q{Shop Extension for Radiant CMS}
   s.test_files = [
     "spec/controllers/admin/shop/categories_controller_spec.rb",

data/spec/datasets/shop_addresses.rb

@@ -6,6 +6,7 @@ class ShopAddressesDataset < Dataset::Base
     create_record :shop_billing, :order_billing,
       :name             => 'Billing Address',
       :phone            => '1800 000 000',
+      :business         => 'The Business',
       :email            => 'billing@billing.com',
       :unit             => 'a',
       :street_1         => '1 Bill Street',
@@ -22,6 +23,7 @@ class ShopAddressesDataset < Dataset::Base
       :name             => 'Shipping Address',
       :phone            => '1800 000 000',
       :email            => 'shipping@shipping.com',
+      :business         => 'The Business',
       :unit             => 'b',
       :street_1         => '2 Ship Street',
       :street_2         => 'Street Ship 2',

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

@@ -16,6 +16,7 @@ describe Shop::Tags::Address do
       'shop:cart:billing:name',
       'shop:cart:billing:phone',
       'shop:cart:billing:email',
+      'shop:cart:billing:business',
       'shop:cart:billing:unit',
       'shop:cart:billing:street_1',
       'shop:cart:billing:street_2',
@@ -29,6 +30,7 @@ describe Shop::Tags::Address do
       'shop:cart:shipping:id',
       'shop:cart:shipping:name',
       'shop:cart:shipping:phone',
+      'shop:cart:shipping:business',
       'shop:cart:shipping:email',
       'shop:cart:shipping:unit',
       'shop:cart:shipping:street_1',
@@ -186,6 +188,15 @@ describe Shop::Tags::Address do
           @page.should render(tag).as(exp)
         end
       end
+      context 'shop:cart:billing:business' do
+        it 'should return the email' do
+          tag = %{<r:shop:cart:billing><r:business /></r:shop:cart:billing>}
+          exp = @billing.business
+        
+          @page.should render(tag).as(exp)
+        end
+      end
+
       context 'shop:cart:billing:email' do
         it 'should return the email' do
           tag = %{<r:shop:cart:billing><r:email /></r:shop:cart:billing>}
@@ -253,4 +264,4 @@ describe Shop::Tags::Address do
     end
   end
   
-end
+end

data/spec/models/shop_address_spec.rb

@@ -62,6 +62,12 @@ describe ShopAddress do
         @address.valid?.should be_true
       end
     end
+    context 'company' do
+      it 'should not require' do
+        @address.company = nil
+        @address.valid?.should be_true
+      end
+    end
   end
   
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-shop-extension
 version: !ruby/object:Gem::Version 
-  hash: 361
+  hash: 375
   prerelease: 
   segments: 
   - 0
   - 94
-  - 7
-  version: 0.94.7
+  - 8
+  version: 0.94.8
 platform: ruby
 authors: 
 - Dirk Kelly
@@ -17,12 +17,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-21 00:00:00 +08:00
+date: 2011-03-30 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: radiant
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -33,12 +33,12 @@ dependencies:
         - 9
         - 1
         version: 0.9.1
+  prerelease: false
   type: :runtime
-  name: radiant
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: activemerchant
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,12 +49,12 @@ dependencies:
         - 8
         - 0
         version: 1.8.0
+  prerelease: false
   type: :runtime
-  name: activemerchant
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: fastercsv
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -65,12 +65,12 @@ dependencies:
         - 5
         - 3
         version: 1.5.3
+  prerelease: false
   type: :runtime
-  name: fastercsv
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: acts_as_list
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -81,12 +81,12 @@ dependencies:
         - 1
         - 2
         version: 0.1.2
+  prerelease: false
   type: :runtime
-  name: acts_as_list
-  version_requirements: *id004
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: radiant-settings-extension
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,12 +97,12 @@ dependencies:
         - 1
         - 1
         version: 1.1.1
+  prerelease: false
   type: :runtime
-  name: radiant-settings-extension
-  version_requirements: *id005
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: radiant-images-extension
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -113,12 +113,12 @@ dependencies:
         - 5
         - 0
         version: 0.5.0
+  prerelease: false
   type: :runtime
-  name: radiant-images-extension
-  version_requirements: *id006
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  name: radiant-forms-extension
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -129,12 +129,12 @@ dependencies:
         - 2
         - 6
         version: 3.2.6
+  prerelease: false
   type: :runtime
-  name: radiant-forms-extension
-  version_requirements: *id007
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  name: radiant-users-extension
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -145,12 +145,12 @@ dependencies:
         - 0
         - 2
         version: 0.0.2
+  prerelease: false
   type: :runtime
-  name: radiant-users-extension
-  version_requirements: *id008
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  name: radiant-drag_order-extension
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -161,9 +161,9 @@ dependencies:
         - 3
         - 9
         version: 0.3.9
+  prerelease: false
   type: :runtime
-  name: radiant-drag_order-extension
-  version_requirements: *id009
+  requirement: *id009
 description: Radiant Shop is an attempt at a simple but complete store. It includes Products, Categories, Orders and Credit Card Payments
 email: dk@dirkkelly.com
 executables: []
@@ -300,6 +300,7 @@ files:
 - db/migrate/20101208121105_move_to_page_attachments.rb
 - db/migrate/20101214023052_fix_addressable_column_type.rb
 - db/migrate/20110119095350_add_position_to_shop_category.rb
+- db/migrate/20110330042956_add_company_to_address.rb
 - db/seed.rb
 - db/seeds/forms.rb
 - db/seeds/layouts.rb
@@ -412,7 +413,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Shop Extension for Radiant CMS