radiant-shop-extension 0.11.1 → 0.11.3

data/README.md

@@ -33,4 +33,4 @@ pppps: love heart
     
 # Migrating in Development
 
-    rm db/development.sqlite3.db; rake db:migrate; rake radiant:extensions:scoped:migrate; rake radiant:extensions:settings:migrate; rake radiant:extensions:drag:migrate; rake radiant:extensions:forms:migrate; rake radiant:extensions:images:migrate; rake radiant:extensions:shop:migrate; rake radiant:extensions:shop_mg:migrate; rake radiant:extensions:export:load;
+    rm db/development.sqlite3.db; rake db:migrate; rake radiant:extensions:scoped:migrate; rake radiant:extensions:settings:migrate; rake radiant:extensions:drag:migrate; rake radiant:extensions:forms:migrate; rake radiant:extensions:images:migrate; rake radiant:extensions:shop:migrate; rake radiant:extensions:export:load;

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gem.authors = ["Dirk Kelly", "John Barker"]
     gem.add_dependency 'radiant',                     '>= 0.9.1'
     gem.add_dependency 'radiant-forms-extension',     '>= 3.1.1'
-    gem.add_dependency 'radiant-images-extension',    '>= 0.2.0'
+    gem.add_dependency 'radiant-images-extension',    '>= 0.3.2'
     gem.add_dependency 'radiant-layouts-extension',   '>= 0.9.1'
     gem.add_dependency 'radiant-settings-extension',  '>= 1.1.1'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.11.1
+0.11.3

data/app/models/shop_category.rb

@@ -21,7 +21,7 @@ class ShopCategory < ActiveRecord::Base
   def handle; ShopProduct.to_sku(page.url); end
   
   # Returns the content of the product's page's description part
-  def description; page.parts.find_by_name('description').content end
+  def description; page.parts.find_by_name('description').content; rescue ''; end
   
   # Returns products through the pages children
   def products; page.children.map(&:shop_product); end
@@ -38,7 +38,7 @@ class ShopCategory < ActiveRecord::Base
   class << self
     
     # Sorts a group of categories based on their ID and position in an array
-    def sort(*category_ids)
+    def sort(category_ids)
       category_ids.each_with_index do |id, index|
         ShopCategory.find(id).page.update_attributes!(
           :position  => index+1

data/app/models/shop_product.rb

@@ -36,7 +36,7 @@ class ShopProduct < ActiveRecord::Base
   def category_id; category.id; end
   
   # Returns the content of the product's page's description part
-  def description; page.parts.find_by_name('description').content rescue nil; end
+  def description; page.parts.find_by_name('description').content rescue ''; end
   
   # Returns the url of the page
   def url; page.url; end
@@ -71,7 +71,7 @@ class ShopProduct < ActiveRecord::Base
   class << self
     
     # Sorts products within a category
-    def sort(category_id, *product_ids)
+    def sort(category_id, product_ids)
       parent_id = ShopCategory.find(category_id).page_id
       
       product_ids.each_with_index do |id, index|

data/app/views/admin/shop/categories/edit/parts/_description.html.haml

@@ -1,4 +1,4 @@
 - f.fields_for :page do |pf|
   - pf.fields_for :parts do |pfp|
-    = pfp.hidden_field :name, :value => 'Description'
+    = pfp.hidden_field :name, :value => 'description'
     ~ pfp.text_area :content, :class => "textarea large", :style => "width: 100%"

data/app/views/admin/shop/products/edit/parts/_description.html.haml

@@ -1,4 +1,4 @@
 - f.fields_for :page do |pf|
   - pf.fields_for :parts do |pfp|
-    = pfp.hidden_field :name, :value => 'Description'
+    = pfp.hidden_field :name, :value => 'description'
     ~ pfp.text_area :content, :class => "textarea large", :style => "width: 100%"

data/db/seeds/forms.rb

@@ -3,17 +3,29 @@ puts "Seed Shop Forms";
 # Add Cart Item
 
 Form.create({
-  :title  => 'AddCartItem',
-  :action => '/shop/cart/items',
+  :title  => 'CartAddProduct',
+  :action => '/shop/cart', # Redirects to the cart listing
   :body   => <<-BODY
 <r:shop:product>
   <input type="hidden" name="line_item[item_id]" value="<r:id />" />
-  <!-- Your Customisation Below -->
+  <input type="hidden" name="line_item[item_type]" value="ShopProduct" />
   
-  <r:form:text name='line_item[quantity]' value="1" /> <!-- Amount of items to add -->
-  <input type="submit" name="add_to_cart" id="add_to_cart_<r:id />" value="Add To Cart" />
+  <input type="hidden" name="line_item[quantity]" value="1" />
+  <input type="submit" name="add_to_cart" id="add_to_cart_<r:id />" value="Buy Now" />
+</r:shop:product>
+BODY
+})
+
+Form.create({
+  :title  => 'CartAddProductVariant',
+  :action => '/shop/cart', # Redirects to the cart listing
+  :body   => <<-BODY
+<r:shop:product>
+  <input type="hidden" name="line_item[item_id]" value="<r:id />" />
+  <input type="hidden" name="line_item[item_type]" value="ShopProduct" />
   
-  <!-- Your Customisation Above -->
+  <input type="hidden" name="line_item[quantity]" value="1" />
+  <input type="submit" name="add_to_cart" id="add_to_cart_<r:id />" value="Buy Now" />
 </r:shop:product>
 BODY
 })
@@ -21,19 +33,18 @@ BODY
 # Update Cart Item
 
 Form.create({
-  :title  => 'UpdateCartItem',
-  :action => '/shop/cart/items/x',
+  :title  => 'CartUpdateItem',
+  :action => '',
   :body   => <<-BODY
-<r:shop:cart:item>
-  <input type="hidden" name="_method" value="put" />
-  <input type="hidden" name="line_item[id]" value="<r:id />" />
-  <!-- Your Customisation Below -->
-  
-  <input type="text" name="line_item[quantity]" value="<r:quantity />" />
-  <input type="submit" name="add_to_cart" id="update_<r:id />" value="Update" />
-  
-  <!-- Your Customisation Above -->
-</r:shop:cart:item>
+<r:shop:cart>
+  <r:item>
+    <input type="hidden" name="_method" value="put" />
+    <input type="hidden" name="line_item[id]" value="<r:item:id />" />
+    
+    <input type="text" name="line_item[quantity]" value="<r:quantity />" />
+    <input type="submit" name="add_to_cart" id="update_<r:id />" value="Update" />
+  </r:item>
+</r:shop:cart>
 BODY
 })
 

data/lib/shop/tags/category.rb

@@ -3,19 +3,19 @@ module Shop
     module Category
       include Radiant::Taggable
       
-      desc %{ expands if there are shop categories within the context }
-      tag 'shop:if_categories' do |tag|
-        tag.expand if Helpers.current_categories(tag).present?
+      tag 'shop:categories' do |tag|
+        tag.locals.shop_categories = Helpers.current_categories(tag)
+        tag.expand
       end
       
-      desc %{ expands if there are not shop categories within the context }
-      tag 'shop:unless_categories' do |tag|
-        tag.expand unless Helpers.current_categories(tag).present?
+      desc %{ expands if there are shop categories within the context }
+      tag 'shop:categories:if_categories' do |tag|
+        tag.expand if tag.locals.shop_categories.present?
       end
       
-      tag 'shop:categories' do |tag|
-        tag.locals.shop_categories = Helpers.current_categories(tag)
-        tag.expand if tag.locals.shop_categories.present?
+      desc %{ expands if there are not shop categories within the context }
+      tag 'shop:categories:unless_categories' do |tag|
+        tag.expand if tag.locals.shop_categories.empty?
       end
       
       desc %{ iterates through each product category }
@@ -73,7 +73,7 @@ module Shop
         
         text = tag.double? ? tag.expand : category.name
         
-        %{<a href="#{category.slug}"#{attributes}>#{text}</a>}
+        %{<a href="#{category.url}"#{attributes}>#{text}</a>}
       end
       
     end

data/lib/shop/tags/product.rb

@@ -57,7 +57,7 @@ module Shop
         
         text = tag.double? ? tag.expand : tag.locals.shop_product.name
         
-        %{<a href="#{tag.locals.shop_product.slug}"#{attributes}>#{text}</a>}
+        %{<a href="#{tag.locals.shop_product.url}"#{attributes}>#{text}</a>}
       end
       
       desc %{ outputs the slug to the products generated page }

data/radiant-shop-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-shop-extension}
-  s.version = "0.11.1"
+  s.version = "0.11.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dirk Kelly", "John Barker"]
-  s.date = %q{2010-10-08}
+  s.date = %q{2010-10-09}
   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 = [
@@ -399,20 +399,20 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<radiant>, [">= 0.9.1"])
       s.add_runtime_dependency(%q<radiant-forms-extension>, [">= 3.1.1"])
-      s.add_runtime_dependency(%q<radiant-images-extension>, [">= 0.2.0"])
+      s.add_runtime_dependency(%q<radiant-images-extension>, [">= 0.3.2"])
       s.add_runtime_dependency(%q<radiant-layouts-extension>, [">= 0.9.1"])
       s.add_runtime_dependency(%q<radiant-settings-extension>, [">= 1.1.1"])
     else
       s.add_dependency(%q<radiant>, [">= 0.9.1"])
       s.add_dependency(%q<radiant-forms-extension>, [">= 3.1.1"])
-      s.add_dependency(%q<radiant-images-extension>, [">= 0.2.0"])
+      s.add_dependency(%q<radiant-images-extension>, [">= 0.3.2"])
       s.add_dependency(%q<radiant-layouts-extension>, [">= 0.9.1"])
       s.add_dependency(%q<radiant-settings-extension>, [">= 1.1.1"])
     end
   else
     s.add_dependency(%q<radiant>, [">= 0.9.1"])
     s.add_dependency(%q<radiant-forms-extension>, [">= 3.1.1"])
-    s.add_dependency(%q<radiant-images-extension>, [">= 0.2.0"])
+    s.add_dependency(%q<radiant-images-extension>, [">= 0.3.2"])
     s.add_dependency(%q<radiant-layouts-extension>, [">= 0.9.1"])
     s.add_dependency(%q<radiant-settings-extension>, [">= 1.1.1"])
   end

data/shop_extension.rb

@@ -29,11 +29,6 @@ class ShopExtension < Radiant::Extension
       admin.variants  = Radiant::AdminUI.load_default_shop_variants_regions
     end
     
-    # if admin.respond_to? :page
-    #   admin.page.edit.add :layout_row, 'shop_category'
-    #   admin.page.edit.add :layout_row, 'shop_product' 
-    # end
-    
     # Tags
     Page.send :include, Shop::Tags::Core, Shop::Tags::Address, Shop::Tags::Card, Shop::Tags::Cart, Shop::Tags::Category, Shop::Tags::Item, Shop::Tags::Package, Shop::Tags::Product, Shop::Tags::ProductVariant, Shop::Tags::Responses
     

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

@@ -4,6 +4,22 @@ describe Shop::Tags::Category do
   
   dataset :pages, :shop_categories, :shop_products
 
+  it 'should describe these tags' do
+    Shop::Tags::Category.tags.sort.should == [
+      'shop:categories',
+      'shop:categories:each',
+      'shop:categories:if_categories',
+      'shop:categories:unless_categories',
+      'shop:category',
+      'shop:category:description',
+      'shop:category:handle',
+      'shop:category:id',
+      'shop:category:if_current',
+      'shop:category:link',
+      'shop:category:name',
+      'shop:category:slug'].sort
+  end
+
   before :each do
     @page = pages(:home)
   end
@@ -12,14 +28,33 @@ describe Shop::Tags::Category do
     @category = shop_categories(:bread)
   end
   
-  describe '<r:shop:if_categories>' do
-    context 'success' do
+  describe '<r:shop:categories>' do
+    context 'categories exist' do
       it 'should render' do
         mock(Shop::Tags::Helpers).current_categories(anything) { [@category] }
-        
-        tag = %{<r:shop:if_categories>success</r:shop:if_categories>}
+        tag = %{<r:shop:categories>success</r:shop:categories>}
         exp = %{success}
-
+      
+        @page.should render(tag).as(exp)
+      end
+    end
+    context 'categories dont exist' do
+      it 'should render' do
+        mock(Shop::Tags::Helpers).current_categories(anything) { [] }
+        tag = %{<r:shop:categories>success</r:shop:categories>}
+        exp = %{success}
+      
+        @page.should render(tag).as(exp)
+      end
+    end
+  end
+  
+  describe '<r:shop:categories:if_categories>' do
+    context 'success' do
+      it 'should render' do
+        tag = %{<r:shop:categories:if_categories>success</r:shop:categories:if_categories>}
+        exp = %{success}
+        
         @page.should render(tag).as(exp)
       end
     end
@@ -27,44 +62,32 @@ describe Shop::Tags::Category do
       it 'should not render' do
         mock(Shop::Tags::Helpers).current_categories(anything) { [] }
         
-        tag = %{<r:shop:if_categories>failure</r:shop:if_categories>}
+        tag = %{<r:shop:categories:if_categories>failure</r:shop:categories:if_categories>}
         exp = %{}
         @page.should render(tag).as(exp)
       end
     end
   end
   
-  describe '<r:shop:unless_categories>' do
+  describe '<r:shop:categories:unless_categories>' do
     context 'success' do
       it 'should render' do
         mock(Shop::Tags::Helpers).current_categories(anything) { [] }
         
-        tag = %{<r:shop:unless_categories>success</r:shop:unless_categories>}
+        tag = %{<r:shop:categories:unless_categories>success</r:shop:categories:unless_categories>}
         exp = %{success}
         @page.should render(tag).as(exp)
       end
     end
     context 'failure' do
       it 'should not render' do
-        mock(Shop::Tags::Helpers).current_categories(anything) { [@category] }
-        
-        tag = %{<r:shop:unless_categories>failure</r:shop:unless_categories>}
+        tag = %{<r:shop:categories:unless_categories>failure</r:shop:categories:unless_categories>}
         exp = %{}
         @page.should render(tag).as(exp)
       end
     end
   end
   
-  describe '<r:shop:categories>' do
-    it 'should render' do
-      mock(Shop::Tags::Helpers).current_categories(anything) { [@category] }
-      tag = %{<r:shop:categories>success</r:shop:categories>}
-      exp = %{success}
-      
-      @page.should render(tag).as(exp)
-    end
-  end
-  
   describe '<r:shop:category:if_current>' do
     before :each do
       mock(Shop::Tags::Helpers).current_category(anything) { @category }
@@ -141,13 +164,13 @@ describe Shop::Tags::Category do
     context 'standalone' do
       it 'should render an anchor element' do
         tag = %{<r:shop:category:link />}
-        exp = %{<a href="#{@category.slug}">#{@category.name}</a>}
+        exp = %{<a href="#{@category.url}">#{@category.name}</a>}
         
         @page.should render(tag).as(exp)
       end
       it 'should assign attributes' do
         tag = %{<r:shop:category:link title="title" data-title="data-title"/>}
-        exp = %{<a href="#{@category.slug}" data-title="data-title" title="title">#{@category.name}</a>}
+        exp = %{<a href="#{@category.url}" data-title="data-title" title="title">#{@category.name}</a>}
         
         @page.should render(tag).as(exp)          
       end
@@ -156,7 +179,7 @@ describe Shop::Tags::Category do
     context 'wrapped' do
       it 'should render an anchor element' do
         tag = %{<r:shop:category:link>title</r:shop:category:link>}
-        exp = %{<a href="#{@category.slug}">title</a>}
+        exp = %{<a href="#{@category.url}">title</a>}
         
         @page.should render(tag).as(exp)
       end

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

@@ -218,12 +218,12 @@ describe Shop::Tags::Product do
       context 'standalone' do
         it 'should render an anchor element' do
           tag = %{<r:shop:product:link />}
-          exp = %{<a href="#{@product.slug}">#{@product.name}</a>}
+          exp = %{<a href="#{@product.url}">#{@product.name}</a>}
           @page.should render(tag).as(exp)
         end
         it 'should assign attributes' do
           tag = %{<r:shop:product:link title="title" data-title="data-title"/>}
-          exp = %{<a href="#{@product.slug}" data-title="data-title" title="title">#{@product.name}</a>}
+          exp = %{<a href="#{@product.url}" data-title="data-title" title="title">#{@product.name}</a>}
           @page.should render(tag).as(exp)
         end
       end
@@ -231,7 +231,7 @@ describe Shop::Tags::Product do
       context 'wrapped' do
         it 'should render an anchor element' do
           tag = %{<r:shop:product:link>title</r:shop:product:link>}
-          exp = %{<a href="#{@product.slug}">title</a>}
+          exp = %{<a href="#{@product.url}">title</a>}
           @page.should render(tag).as(exp)
         end
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-shop-extension
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 53
   prerelease: false
   segments: 
   - 0
   - 11
-  - 1
-  version: 0.11.1
+  - 3
+  version: 0.11.3
 platform: ruby
 authors: 
 - Dirk Kelly
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-08 00:00:00 +08:00
+date: 2010-10-09 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,9 +62,9 @@ dependencies:
         hash: 23
         segments: 
         - 0
+        - 3
         - 2
-        - 0
-        version: 0.2.0
+        version: 0.3.2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency