radiant-shop-extension 0.91.7 → 0.92.0

data/VERSION

@@ -1 +1 @@
-0.91.7
+0.92.0

data/app/models/shop_category.rb

@@ -39,6 +39,14 @@ class ShopCategory < ActiveRecord::Base
     ).map(&:shop_product)
   end
   
+  # Returns the categories nested directly beneath this
+  def categories
+    pages = page.children.all(
+      :conditions => { :class_name => 'ShopCategoryPage' },
+      :order      => 'pages.position ASC'
+    ).map(&:shop_category)
+  end
+  
   # Returns the url of the page
   def url; page.url;  end
   

data/app/views/admin/shop/products/index/_product.html.haml

@@ -9,12 +9,13 @@
             = image_tag product.images.first.url(:icon)
       - body.name do
         %span.name.attribute
-          - link_to [:edit_admin, product] do
-            = number_to_currency(product.price)
-            = product.name
+          = link_to product.name, [:edit_admin, product]
       - body.sku do
         %span.sku.attribute
           = product.sku
+      - body.price do
+        %span.price.attribute
+          = number_to_currency(product.price)
       - body.modify do
         .modify
           %span.remove

data/lib/shop/interface/products.rb

@@ -23,7 +23,7 @@ module Shop
               index.head.concat     %w{}
               index.category.concat %w{move name handle modify}
               index.products.concat %w{body}
-              index.product.concat  %w{move icon name sku modify}
+              index.product.concat  %w{move icon name sku price modify}
               index.foot.concat     %w{buttons}
             end
             products.remove = products.index

data/lib/shop/tags/category.rb

@@ -33,6 +33,8 @@ module Shop
       
       tag 'shop:category' do |tag|
         tag.locals.shop_category = Helpers.current_category(tag)
+        tag.locals.shop_categories = tag.locals.shop_category.categories
+        
         tag.expand unless tag.locals.shop_category.nil?
       end
       
@@ -76,6 +78,12 @@ module Shop
         %{<a href="#{category.url}"#{attributes}>#{text}</a>}
       end
       
+      tag 'shop:category:images' do |tag|
+        tag.locals.images = tag.locals.shop_category.attachments
+        
+        tag.expand
+      end
+      
     end
   end
 end

data/lib/shop/tags/product.rb

@@ -78,35 +78,6 @@ module Shop
         tag.expand
       end
       
-      desc %{ expands if the product has a valid image }
-      tag 'shop:product:images:if_images' do |tag|
-        tag.expand if tag.locals.images.present?
-      end
-      
-      desc %{ expands if the product does not have a valid image }
-      tag 'shop:product:images:unless_images' do |tag|
-        tag.expand unless tag.locals.images.present?
-      end
-      
-      desc %{ iterates through each of the products images }
-      tag 'shop:product:images:each' do |tag|
-        content = ''
-        
-        tag.locals.images.each do |image|
-          tag.locals.image = image
-          content << tag.expand
-        end
-        
-        content
-      end
-      
-      desc %{ iterates through each of the products images }
-      tag 'shop:product:images:image' do |tag|
-        tag.locals.image = Helpers.current_image(tag)
-        
-        tag.expand
-      end
-      
     end
   end
 end

data/public/stylesheets/sass/admin/extensions/shop/index.sass

@@ -40,7 +40,7 @@
           text:
             decoration: none
           
-          &:hover
+          a:hover
             color: #0066ce
             text:
               decoration: underline

data/public/stylesheets/sass/admin/extensions/shop/products/index.sass

@@ -46,8 +46,8 @@
           size: 16px
         text:
           decoration: none
-          
-        &:hover
+        
+        a:hover
           color: #0066ce
           text:
             decoration: underline
@@ -57,6 +57,12 @@
           style: italic
           size: 0.9em
         color: #000000
+        
+      .price
+        position: absolute
+        right: 90px
+        font-size: 0.8em
+        font-weight: bold
           
       .modify
         float: right

data/radiant-shop-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-shop-extension}
-  s.version = "0.91.7"
+  s.version = "0.92.0"
 
   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-09}
+  s.date = %q{2010-12-14}
   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 = [
@@ -156,7 +156,6 @@ Gem::Specification.new do |s|
     "lib/shop/interface/orders.rb",
     "lib/shop/interface/products.rb",
     "lib/shop/models/form_extension.rb",
-    "lib/shop/models/image.rb",
     "lib/shop/models/page.rb",
     "lib/shop/models/user.rb",
     "lib/shop/tags/address.rb",
@@ -187,13 +186,13 @@ Gem::Specification.new do |s|
     "spec/controllers/admin/shops_controller_spec.rb",
     "spec/datasets/forms.rb",
     "spec/datasets/shop_addresses.rb",
+    "spec/datasets/shop_attachments.rb",
     "spec/datasets/shop_categories.rb",
     "spec/datasets/shop_config.rb",
     "spec/datasets/shop_customers.rb",
     "spec/datasets/shop_line_items.rb",
     "spec/datasets/shop_orders.rb",
     "spec/datasets/shop_payments.rb",
-    "spec/datasets/shop_product_attachments.rb",
     "spec/datasets/shop_products.rb",
     "spec/datasets/tags.rb",
     "spec/helpers/nested_tag_helper.rb",
@@ -238,13 +237,13 @@ Gem::Specification.new do |s|
     "spec/controllers/admin/shops_controller_spec.rb",
     "spec/datasets/forms.rb",
     "spec/datasets/shop_addresses.rb",
+    "spec/datasets/shop_attachments.rb",
     "spec/datasets/shop_categories.rb",
     "spec/datasets/shop_config.rb",
     "spec/datasets/shop_customers.rb",
     "spec/datasets/shop_line_items.rb",
     "spec/datasets/shop_orders.rb",
     "spec/datasets/shop_payments.rb",
-    "spec/datasets/shop_product_attachments.rb",
     "spec/datasets/shop_products.rb",
     "spec/datasets/tags.rb",
     "spec/helpers/nested_tag_helper.rb",

data/shop_extension.rb

@@ -36,7 +36,6 @@ class ShopExtension < Radiant::Extension
     end
     
     Page.send :include,  Shop::Models::Page
-    Image.send :include, Shop::Models::Image
     User.send :include,  Shop::Models::User
     
     ApplicationController.send :include, Shop::Controllers::ApplicationController

data/spec/datasets/shop_attachments.rb

@@ -0,0 +1,35 @@
+class ShopAttachmentsDataset < Dataset::Base
+  
+  uses :shop_products
+  
+  def load
+    category_images = [ :bread, :milk, :salad ]
+    product_images  = [ :soft_bread_front, :soft_bread_back, :soft_bread_top, :crusty_bread_front, :warm_bread_front ]
+    
+    product_images.each_with_index do |image, i|
+      create_record :image, image, 
+        :title              => image.to_s,
+        :asset_file_name    => "#{image.to_s}_file_name.png",
+        :asset_content_type => "image/png",
+        :asset_file_size    => i+1*1000
+        
+      create_record :attachment, image,
+        :image    => images(image.to_sym),
+        :page     => shop_products(image.to_s.split('_')[0,2].join('_').to_sym).page,
+        :position => i + 1
+    end
+    
+    category_images.each_with_index do |image, i|
+      create_record :image, image, 
+        :title              => image.to_s,
+        :asset_file_name    => "#{image.to_s}_file_name.png",
+        :asset_content_type => "image/png",
+        :asset_file_size    => i+1*1000
+        
+      create_record :attachment, image,
+        :image    => images(image.to_sym),
+        :page     => shop_categories(image).page,
+        :position => i + 1
+    end
+  end
+end

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

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + "/../../../spec_helper"
 
 describe Shop::Tags::Category do
   
-  dataset :pages, :shop_categories, :shop_products
+  dataset :pages, :shop_categories, :shop_products, :shop_attachments
 
   it 'should describe these tags' do
     Shop::Tags::Category.tags.sort.should == [
@@ -17,7 +17,8 @@ describe Shop::Tags::Category do
       'shop:category:if_current',
       'shop:category:link',
       'shop:category:name',
-      'shop:category:slug'].sort
+      'shop:category:slug',
+      'shop:category:images'].sort
   end
 
   before :each do
@@ -186,4 +187,38 @@ describe Shop::Tags::Category do
     end
   end
   
+  describe '<r:shop:category:images>' do
+    before :each do
+      mock(Shop::Tags::Helpers).current_category(anything) { @category }
+    end
+    
+    context 'success' do
+      it 'should open if images exist' do
+        tag = %{<r:shop:category:images>success</r:shop:category:images>}
+        exp = %{success}
+        @page.should render(tag).as(exp)
+      end
+      it 'should assign images for default tags' do
+        tag = %{<r:shop:category:images:each:image>success</r:shop:category:images:each:image>}
+        exp = @category.images.map{'success'}.join('')
+        @page.should render(tag).as(exp)
+      end
+    end
+    context 'failure' do
+      before :each do
+        @category.page.attachments.destroy_all { [] }
+      end
+      it 'should render' do          
+        tag = %{<r:shop:category:images>success</r:shop:category:images>}
+        exp = %{success}
+        @page.should render(tag).as(exp)
+      end
+      it 'should not assign images for default tags' do
+        tag = %{<r:shop:category:images:each:image>failure</r:shop:category:images:each:image>}
+        exp = %{}
+        @page.should render(tag).as(exp)
+      end
+    end
+  end  
+  
 end

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

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + "/../../../spec_helper"
 
 describe Shop::Tags::Helpers do
   
-  dataset :pages, :tags, :shop_products, :shop_orders, :shop_addresses, :shop_line_items, :shop_product_attachments
+  dataset :pages, :tags, :shop_products, :shop_orders, :shop_addresses, :shop_line_items, :shop_attachments
   
   before :all do
     @page = pages(:home)
@@ -45,6 +45,8 @@ describe Shop::Tags::Helpers do
     end
   end
   
+  it 'should test nested categories'
+  
   describe '#current_category' do
     before :each do
       @category = shop_categories(:bread)

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

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + "/../../../spec_helper"
 
 describe Shop::Tags::Product do
   
-  dataset :pages, :shop_config, :shop_products, :shop_product_attachments
+  dataset :pages, :shop_config, :shop_products, :shop_attachments
   
   it 'should describe these tags' do
     Shop::Tags::Product.tags.sort.should == [
@@ -18,11 +18,7 @@ describe Shop::Tags::Product do
       'shop:product:slug',
       'shop:product:description',
       'shop:product:link',
-      'shop:product:images',
-      'shop:product:images:if_images',
-      'shop:product:images:unless_images',
-      'shop:product:images:each',
-      'shop:product:images:image'].sort
+      'shop:product:images'].sort
   end
   
   before :all do
@@ -265,107 +261,35 @@ describe Shop::Tags::Product do
       end
     end
     
-    describe '<r:shop:product:images:if_images>' do
+    describe '<r:shop:product:images>' do
       before :each do
         mock(Shop::Tags::Helpers).current_product(anything) { @product }
       end
       
       context 'success' do
-        it 'should render' do
-          tag = %{<r:shop:product:images:if_images>success</r:shop:product:images:if_images>}
+        it 'should open if images exist' do
+          tag = %{<r:shop:product:images>success</r:shop:product:images>}
           exp = %{success}
           @page.should render(tag).as(exp)
         end
-      end
-      context 'failure' do
-        it 'should not render' do
-          @product.page.images.delete_all
-          
-          tag = %{<r:shop:product:images:if_images>failure</r:shop:product:images:if_images>}
-          exp = %{}
+        it 'should assign images for default tags' do
+          tag = %{<r:shop:product:images:each:image>success</r:shop:product:images:each:image>}
+          exp = @product.images.map{'success'}.join('')
           @page.should render(tag).as(exp)
         end
       end
-    end
-
-    describe '<r:shop:product:images:unless_images>' do
-      before :each do
-        mock(Shop::Tags::Helpers).current_product(anything) { @product }
-      end
-      
-      context 'success' do
-        it 'should render' do
-          @product.page.images.delete_all
-          
-          tag = %{<r:shop:product:images:unless_images>success</r:shop:product:images:unless_images>}
-          exp = %{success}
-          @page.should render(tag).as(exp)
-        end
-      end
-      
       context 'failure' do
-        it 'should not render' do
-          tag = %{<r:shop:product:images:unless_images>failure</r:shop:product:images:unless_images>}
-          exp = %{}
-          @page.should render(tag).as(exp)
+        before :each do
+          @product.page.attachments.destroy_all
         end
-      end
-    end
-    
-    describe '<r:shop:product:images>' do
-      before :each do
-        mock(Shop::Tags::Helpers).current_product(anything) { @product }
-      end
-      
-      it 'should render' do
-        tag = %{<r:shop:product:images>success</r:shop:product:images>}
-        exp = %{success}
-        @page.should render(tag).as(exp)
-      end
-    end
-    
-    describe '<r:shop:product:images:each>' do
-      before :each do
-        mock(Shop::Tags::Helpers).current_product(anything) { @product }
-      end
-      
-      context 'success' do
-        it 'should assign the local image for each' do
-          tag = %{<r:shop:product:images:each><r:image:id /></r:shop:product:images:each>}
-          exp =  @product.attachments.map{ |i| i.id }.join('')
-          @page.should render(tag).as(exp)
-        end    
-      end
-      context 'failure' do
-        it 'should not render' do
-          @product.page.images.delete_all
-          
-          tag = %{<r:shop:product:images:each>failure</r:shop:product:images:each>}
-          exp = %{}
-          @page.should render(tag).as(exp)
-        end
-      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>}
+        it 'should render' do          
+          tag = %{<r:shop:product:images>success</r:shop:product:images>}
           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}
+        it 'should not assign images for default tags' do
+          tag = %{<r:shop:product:images:each:image>failure</r:shop:product:images:each:image>}
+          exp = %{}
           @page.should render(tag).as(exp)
         end
       end

data/spec/models/shop_category_spec.rb

@@ -51,6 +51,10 @@ describe ShopCategory do
       end
     end
     
+    it 'should test #products'
+    
+    it 'should test #categories'
+    
     context '#handle' do
       it 'should return a handle formatted url' do
         @category.handle.should === ShopProduct.to_sku(@category.page.url)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-shop-extension
 version: !ruby/object:Gem::Version 
-  hash: 381
+  hash: 367
   prerelease: false
   segments: 
   - 0
-  - 91
-  - 7
-  version: 0.91.7
+  - 92
+  - 0
+  version: 0.92.0
 platform: ruby
 authors: 
 - Dirk Kelly
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-09 00:00:00 +08:00
+date: 2010-12-14 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -313,7 +313,6 @@ files:
 - lib/shop/interface/orders.rb
 - lib/shop/interface/products.rb
 - lib/shop/models/form_extension.rb
-- lib/shop/models/image.rb
 - lib/shop/models/page.rb
 - lib/shop/models/user.rb
 - lib/shop/tags/address.rb
@@ -344,13 +343,13 @@ files:
 - spec/controllers/admin/shops_controller_spec.rb
 - spec/datasets/forms.rb
 - spec/datasets/shop_addresses.rb
+- spec/datasets/shop_attachments.rb
 - spec/datasets/shop_categories.rb
 - spec/datasets/shop_config.rb
 - spec/datasets/shop_customers.rb
 - spec/datasets/shop_line_items.rb
 - spec/datasets/shop_orders.rb
 - spec/datasets/shop_payments.rb
-- spec/datasets/shop_product_attachments.rb
 - spec/datasets/shop_products.rb
 - spec/datasets/tags.rb
 - spec/helpers/nested_tag_helper.rb
@@ -424,13 +423,13 @@ test_files:
 - spec/controllers/admin/shops_controller_spec.rb
 - spec/datasets/forms.rb
 - spec/datasets/shop_addresses.rb
+- spec/datasets/shop_attachments.rb
 - spec/datasets/shop_categories.rb
 - spec/datasets/shop_config.rb
 - spec/datasets/shop_customers.rb
 - spec/datasets/shop_line_items.rb
 - spec/datasets/shop_orders.rb
 - spec/datasets/shop_payments.rb
-- spec/datasets/shop_product_attachments.rb
 - spec/datasets/shop_products.rb
 - spec/datasets/tags.rb
 - spec/helpers/nested_tag_helper.rb

data/lib/shop/models/image.rb

@@ -1,14 +0,0 @@
-module Shop
-  module Models
-    module Image
-      
-      def self.included(base)
-        base.class_eval do
-          has_many :shop_product_attachments, :dependent => :destroy
-          has_many :shop_products,            :through => :shop_product_attachments, :source => :product
-        end
-      end
-      
-    end
-  end
-end

data/spec/datasets/shop_product_attachments.rb

@@ -1,21 +0,0 @@
-class ShopProductAttachmentsDataset < Dataset::Base
-  
-  uses :shop_products
-  
-  def load
-    images = [ :soft_bread_front, :soft_bread_back, :soft_bread_top, :crusty_bread_front, :warm_bread_front ]
-    
-    images.each_with_index do |image, i|
-      create_record :image, image, 
-        :title              => image.to_s,
-        :asset_file_name    => "#{image.to_s}_file_name.png",
-        :asset_content_type => "image/png",
-        :asset_file_size    => i+1*1000
-        
-      create_record :attachment, image,
-        :image    => images(image.to_sym),
-        :page     => shop_products(image.to_s.split('_')[0,2].join('_').to_sym).page,
-        :position => i + 1
-    end
-  end
-end