radiant-shop-extension 0.91.4 → 0.91.7

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.add_dependency 'fastercsv',                   '>= 1.5.3'
     gem.add_dependency 'acts_as_list',                '>= 0.1.2'
     gem.add_dependency 'radiant-settings-extension',  '>= 1.1.1'
-    gem.add_dependency 'radiant-images-extension',    '>= 0.4.1'
+    gem.add_dependency 'radiant-images-extension',    '>= 0.5.0'
     gem.add_dependency 'radiant-forms-extension',     '>= 3.2.6'
     gem.add_dependency 'radiant-users-extension',     '>= 0.0.2'
     gem.add_dependency 'radiant-drag_order-extension','>= 0.3.9'

data/VERSION

@@ -1 +1 @@
-0.91.4
+0.91.7

data/app/controllers/admin/shop/products/images_controller.rb

@@ -1,23 +1,21 @@
 class Admin::Shop::Products::ImagesController < Admin::ResourceController
   
-  model_class ShopProductAttachment
+  model_class Attachment
   
   # GET /admin/shop/products/1/images
   # GET /admin/shop/products/1/images.js
   # GET /admin/shop/products/1/images.json                        AJAX and HTML
   #----------------------------------------------------------------------------
   def index
-    error     = 'This Product has no Images.'
-    attr_hash =  ShopProductAttachment.params
+    error = 'This Product has no Images.'
     
     @shop_product = ShopProduct.find(params[:product_id])
-    @shop_product_images = @shop_product.images
     
-    unless @shop_product_images.empty?
+    unless @shop_product.images.empty?
       respond_to do |format|
         format.html { redirect_to edit_admin_shop_product_path(@shop_product) }
-        format.js   { render :partial => '/admin/shop/products/edit/shared/image', :collection => @shop_product_images }
-        format.json { render :json    => @shop_product_images.to_json(attr_hash) }
+        format.js   { render :partial => '/admin/shop/products/edit/shared/image', :collection => @shop_product.images }
+        format.json { render :json    => @shop_product.images.to_json }
       end
     else
       respond_to do |format|
@@ -38,14 +36,12 @@ class Admin::Shop::Products::ImagesController < Admin::ResourceController
   def sort
     notice = 'Successfully sorted Images.'
     error  = 'Could not sort Images.'
-    attr_hash =  ShopProductAttachment.params
-        
     begin
       @shop_product = ShopProduct.find(params[:product_id])
       
       @images = CGI::parse(params[:attachments])['product_attachments[]']
       @images.each_with_index do |id, index|
-        ShopProductAttachment.find(id).update_attributes!({ :position => index+1 })
+        Attachment.find(id).update_attributes!({ :position => index+1 })
       end
       
       respond_to do |format|
@@ -53,7 +49,7 @@ class Admin::Shop::Products::ImagesController < Admin::ResourceController
           redirect_to edit_admin_shop_product_path(@shop_product)
         }
         format.js   { render :partial => '/admin/shop/products/edit/shared/image', :collection => @shop_product.images }
-        format.json { render :json    => @shop_product.images.to_json(attr_hash) }
+        format.json { render :json    => @shop_product.images.to_json }
       end
     rescue
       respond_to do |format|
@@ -72,9 +68,8 @@ class Admin::Shop::Products::ImagesController < Admin::ResourceController
   # POST /admin/shop/products/1/images.json                       AJAX and HTML
   #----------------------------------------------------------------------------
   def create
-    notice   = 'Successfully created Image.'
-    error    = 'Unable to create Image.'
-    attr_hash = ShopProductAttachment.params
+    notice = 'Successfully created Image.'
+    error  = 'Unable to create Image.'
     
     begin
       @shop_product = ShopProduct.find(params[:product_id])
@@ -85,14 +80,14 @@ class Admin::Shop::Products::ImagesController < Admin::ResourceController
         @image = Image.find(params[:attachment][:image_id])
       end
       
-      @shop_product_attachment = @shop_product.attachments.create!({ :image => @image })
+      @attachment = Attachment.create!(:image => @image, :page => @shop_product.page)
       
       respond_to do |format|
         format.html {
           redirect_to edit_admin_shop_product_path(@shop_product)
         }
-        format.js   { render :partial => '/admin/shop/products/edit/shared/image', :locals => { :image => @shop_product_attachment } }
-        format.json { render :json    => @shop_product_attachment.to_json(attr_hash)  }
+        format.js   { render :partial => '/admin/shop/products/edit/shared/image', :locals => { :image => @attachment } }
+        format.json { render :json    => @attachment.to_json  }
       end
     rescue
       respond_to do |format|
@@ -113,11 +108,10 @@ class Admin::Shop::Products::ImagesController < Admin::ResourceController
   def destroy
     notice = 'Image deleted successfully.'
     error  = 'Unable to delete Image.'
-    
     begin
       @shop_product = ShopProduct.find(params[:product_id])
-      @image = @shop_product_attachment.image
-      @shop_product_attachment.destroy
+      @image = @attachment.image
+      @attachment.destroy
       
       respond_to do |format|
         format.html {

data/app/models/shop_category.rb

@@ -8,6 +8,8 @@ class ShopCategory < ActiveRecord::Base
   belongs_to  :updated_by,      :class_name => 'User'
   belongs_to  :product_layout,  :class_name => 'Layout'
   
+  has_many    :attachments, :through => :page
+  
   before_validation             :assign_slug, :assign_breadcrumb, :assign_page_class_name
   
   accepts_nested_attributes_for :page
@@ -40,6 +42,15 @@ class ShopCategory < ActiveRecord::Base
   # Returns the url of the page
   def url; page.url;  end
   
+  # Return an array of the pages images
+  def images; page.images; end
+  
+  # Returns an array of image ids
+  def image_ids; images.map(&:id); end
+  
+  # Returns images not attached to category
+  def available_images; Image.all - images; end
+    
   # Returns the page slug
   def slug; page.slug; end
   

data/app/models/shop_product.rb

@@ -6,15 +6,15 @@ class ShopProduct < ActiveRecord::Base
   belongs_to  :created_by,  :class_name => 'User'
   belongs_to  :updated_by,  :class_name => 'User'
   
-  has_many    :line_items,  :class_name => 'ShopLineItem',          :foreign_key  => :item_id,      :dependent => :destroy
-  has_many    :orders,      :class_name => 'ShopOrder',             :through      => :line_items,   :uniq      => true
-  has_many    :attachments, :class_name => 'ShopProductAttachment', :foreign_key  => :product_id
-  has_many    :images,      :class_name => 'Image',                 :through      => :attachments,  :uniq      => true
+  has_many    :line_items,  :class_name => 'ShopLineItem',  :foreign_key  => :item_id,      :dependent => :destroy
+  has_many    :orders,      :class_name => 'ShopOrder',     :through      => :line_items,   :uniq      => true
+
+  has_many    :attachments, :through => :page
   
   before_validation             :assign_slug, :assign_breadcrumb, :assign_page_class_name
   validates_presence_of         :page
   
-  validates_numericality_of     :price,   :greater_than => 0.00,    :allow_nil => true,     :precisions => 2
+  validates_numericality_of     :price, :greater_than => 0.00, :allow_nil => true, :precisions => 2
   
   accepts_nested_attributes_for :page
   
@@ -48,6 +48,9 @@ class ShopProduct < ActiveRecord::Base
   # Returns an array of customer ids
   def customer_ids; customers.map(&:id); end
   
+  # Return an array of the pages images
+  def images; page.images; end
+  
   # Returns an array of image ids
   def image_ids; images.map(&:id); end
   

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

@@ -5,8 +5,8 @@
         %span.move.attribute
       - body.icon do
         - link_to [:edit_admin, product], :class => 'icon' do
-          - unless product.attachments.empty?
-            = image_tag product.attachments.first.image.url(:icon)
+          - unless product.images.empty?
+            = image_tag product.images.first.url(:icon)
       - body.name do
         %span.name.attribute
           - link_to [:edit_admin, product] do

data/config/locales/en.yml

@@ -63,121 +63,4 @@ en:
     remove_product:
       warning: "Deleting a product is irreversible, make sure you're sure."
     remove_category:
-      warning: "Deleting a category (and its products) is irreversible, make sure you're sure."
-en:
-  number:
-    # Used in number_with_delimiter()
-    # These are also the defaults for 'currency', 'percentage', 'precision', and 'human'
-    format:
-      # Sets the separator between the units, for more precision (e.g. 1.0 / 2.0 == 0.5)
-      separator: "."
-      # Delimets thousands (e.g. 1,000,000 is a million) (always in groups of three)
-      delimiter: ","
-      # Number of decimals, behind the separator (the number 1 with a precision of 2 gives: 1.00)
-      precision: 3
-
-    # Used in number_to_currency()
-    currency:
-      format:
-        # Where is the currency sign? %u is the currency unit, %n the number (default: $5.00)
-        format: "%u%n"
-        unit: "$"
-        # These three are to override number.format and are optional
-        separator: "."
-        delimiter: ","
-        precision: 2
-
-    # Used in number_to_percentage()
-    percentage:
-      format:
-        # These three are to override number.format and are optional
-        # separator: 
-        delimiter: ""
-        # precision: 
-
-    # Used in number_to_precision()
-    precision:
-      format:
-        # These three are to override number.format and are optional
-        # separator:
-        delimiter: ""
-        # precision:
-
-    # Used in number_to_human_size()
-    human:
-      format:
-        # These three are to override number.format and are optional
-        # separator: 
-        delimiter: ""
-        precision: 1
-      storage_units:
-        # Storage units output formatting.
-        # %u is the storage unit, %n is the number (default: 2 MB)
-        format: "%n %u"
-        units:
-          byte:
-            one:   "Byte"
-            other: "Bytes"
-          kb: "KB"
-          mb: "MB"
-          gb: "GB"
-          tb: "TB"
-
-  # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
-  datetime:
-    distance_in_words:
-      half_a_minute: "half a minute"
-      less_than_x_seconds:
-        one:   "less than 1 second"
-        other: "less than %{count} seconds"
-      x_seconds:
-        one:   "1 second"
-        other: "%{count} seconds"
-      less_than_x_minutes:
-        one:   "less than a minute"
-        other: "less than %{count} minutes"
-      x_minutes:
-        one:   "1 minute"
-        other: "%{count} minutes"
-      about_x_hours:
-        one:   "about 1 hour"
-        other: "about %{count} hours"
-      x_days:
-        one:   "1 day"
-        other: "%{count} days"
-      about_x_months:
-        one:   "about 1 month"
-        other: "about %{count} months"
-      x_months:
-        one:   "1 month"
-        other: "%{count} months"
-      about_x_years:
-        one:   "about 1 year"
-        other: "about %{count} years"
-      over_x_years:
-        one:   "over 1 year"
-        other: "over %{count} years"
-      almost_x_years:
-        one:   "almost 1 year"
-        other: "almost %{count} years"
-    prompts:
-      year:   "Year"
-      month:  "Month"
-      day:    "Day"
-      hour:   "Hour"
-      minute: "Minute"
-      second: "Seconds"
-
-  activerecord:
-    errors:
-      template:
-        header:
-          one:    "1 error prohibited this %{model} from being saved"
-          other:  "%{count} errors prohibited this %{model} from being saved"
-        # The variable :count is also available
-        body: "There were problems with the following fields:"
-
-  support:
-    select:
-      # default value for :prompt => true in FormOptionsHelper
-      prompt: "Please select"
+      warning: "Deleting a category (and its products) is irreversible, make sure you're sure."

data/db/migrate/20101208121105_move_to_page_attachments.rb

@@ -0,0 +1,33 @@
+class ShopProductAttachment < ActiveRecord::Base
+  belongs_to :product, :class_name => 'ShopProduct'
+  belongs_to :image
+end
+
+class MoveToPageAttachments < ActiveRecord::Migration
+  def self.up
+    ShopProductAttachment.find_each do |a|
+      Attachment.create(:image => a.image, :page => a.product.page) rescue nil
+    end
+    drop_table :shop_product_attachments
+  end
+
+  def self.down
+    create_table "shop_product_attachments", :force => true do |t|
+      t.integer "position",      :default => 1
+      t.integer "image_id"
+      t.integer "product_id"
+      t.integer "created_by_id"
+      t.integer "updated_by_id"
+    end
+    add_index "shop_product_attachments", ["image_id"],   :name => "index_shop_product_attachments_on_image_id"
+    add_index "shop_product_attachments", ["position"],   :name => "index_shop_product_attachments_on_position"
+    add_index "shop_product_attachments", ["product_id"], :name => "index_shop_product_attachments_on_product_id"
+    
+    Attachment.find_each do |a|
+      if a.page.shop_product
+        ShopProductAttachment.create(:image => a.image, :product => a.page.shop_product)
+      end
+    end
+    
+  end
+end

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

@@ -47,7 +47,7 @@
           
         .modify
           float: right
-          width: 200px
+          overflow: hidden
           text:
             align: right
           font:

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

@@ -60,7 +60,7 @@
           
       .modify
         float: right
-        width: 200px
+        overflow: hidden
         text:
           align: right
         font:

data/radiant-shop-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-shop-extension}
-  s.version = "0.91.4"
+  s.version = "0.91.7"
 
   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-08}
+  s.date = %q{2010-12-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 = [
@@ -43,7 +43,6 @@ Gem::Specification.new do |s|
     "app/models/shop_page.rb",
     "app/models/shop_payment.rb",
     "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",
@@ -141,6 +140,7 @@ Gem::Specification.new do |s|
     "config/routes.rb",
     "db/migrate/20101011063133_setup_shop.rb",
     "db/migrate/20101208045754_address_changes.rb",
+    "db/migrate/20101208121105_move_to_page_attachments.rb",
     "db/seed.rb",
     "db/seeds/forms.rb",
     "db/seeds/layouts.rb",
@@ -197,7 +197,6 @@ Gem::Specification.new do |s|
     "spec/datasets/shop_products.rb",
     "spec/datasets/tags.rb",
     "spec/helpers/nested_tag_helper.rb",
-    "spec/lib/shop/models/image_spec.rb",
     "spec/lib/shop/models/page_spec.rb",
     "spec/lib/shop/tags/address_spec.rb",
     "spec/lib/shop/tags/card_spec.rb",
@@ -220,7 +219,6 @@ Gem::Specification.new do |s|
     "spec/models/shop_line_item_spec.rb",
     "spec/models/shop_order_spec.rb",
     "spec/models/shop_payment_spec.rb",
-    "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",
@@ -250,7 +248,6 @@ Gem::Specification.new do |s|
     "spec/datasets/shop_products.rb",
     "spec/datasets/tags.rb",
     "spec/helpers/nested_tag_helper.rb",
-    "spec/lib/shop/models/image_spec.rb",
     "spec/lib/shop/models/page_spec.rb",
     "spec/lib/shop/tags/address_spec.rb",
     "spec/lib/shop/tags/card_spec.rb",
@@ -273,7 +270,6 @@ Gem::Specification.new do |s|
     "spec/models/shop_line_item_spec.rb",
     "spec/models/shop_order_spec.rb",
     "spec/models/shop_payment_spec.rb",
-    "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",
@@ -290,7 +286,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<fastercsv>, [">= 1.5.3"])
       s.add_runtime_dependency(%q<acts_as_list>, [">= 0.1.2"])
       s.add_runtime_dependency(%q<radiant-settings-extension>, [">= 1.1.1"])
-      s.add_runtime_dependency(%q<radiant-images-extension>, [">= 0.4.1"])
+      s.add_runtime_dependency(%q<radiant-images-extension>, [">= 0.5.0"])
       s.add_runtime_dependency(%q<radiant-forms-extension>, [">= 3.2.6"])
       s.add_runtime_dependency(%q<radiant-users-extension>, [">= 0.0.2"])
       s.add_runtime_dependency(%q<radiant-drag_order-extension>, [">= 0.3.9"])
@@ -300,7 +296,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<fastercsv>, [">= 1.5.3"])
       s.add_dependency(%q<acts_as_list>, [">= 0.1.2"])
       s.add_dependency(%q<radiant-settings-extension>, [">= 1.1.1"])
-      s.add_dependency(%q<radiant-images-extension>, [">= 0.4.1"])
+      s.add_dependency(%q<radiant-images-extension>, [">= 0.5.0"])
       s.add_dependency(%q<radiant-forms-extension>, [">= 3.2.6"])
       s.add_dependency(%q<radiant-users-extension>, [">= 0.0.2"])
       s.add_dependency(%q<radiant-drag_order-extension>, [">= 0.3.9"])
@@ -311,7 +307,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<fastercsv>, [">= 1.5.3"])
     s.add_dependency(%q<acts_as_list>, [">= 0.1.2"])
     s.add_dependency(%q<radiant-settings-extension>, [">= 1.1.1"])
-    s.add_dependency(%q<radiant-images-extension>, [">= 0.4.1"])
+    s.add_dependency(%q<radiant-images-extension>, [">= 0.5.0"])
     s.add_dependency(%q<radiant-forms-extension>, [">= 3.2.6"])
     s.add_dependency(%q<radiant-users-extension>, [">= 0.0.2"])
     s.add_dependency(%q<radiant-drag_order-extension>, [">= 0.3.9"])

data/shop_extension.rb

@@ -16,7 +16,6 @@ class ShopExtension < Radiant::Extension
   UserActionObserver.instance.send :add_observer!, ShopCategory
   UserActionObserver.instance.send :add_observer!, ShopOrder
   UserActionObserver.instance.send :add_observer!, ShopProduct
-  UserActionObserver.instance.send :add_observer!, ShopProductAttachment
   
   def activate
     tab "Shop" do

data/spec/controllers/admin/shop/products/images_controller_spec.rb

@@ -2,17 +2,15 @@ require File.dirname(__FILE__) + "/../../../../spec_helper"
 
 describe Admin::Shop::Products::ImagesController do
   
-  dataset :users
+  dataset :users, :shop_products
     
   before(:each) do
     login_as  :admin
     
-    @shop_product = Object.new
-    stub(@shop_product).id { 1 }
-    mock(ShopProduct).find('1') { @shop_product }
+    @shop_product = shop_products(:soft_bread)
+    @images = @shop_product.images
     
-    @image = Object.new
-    @images = [ @image ]
+    mock(ShopProduct).find(@shop_product.id.to_s) { @shop_product }
   end
   
   describe '#index' do
@@ -60,10 +58,6 @@ describe Admin::Shop::Products::ImagesController do
           response.should redirect_to(edit_admin_shop_product_path(@shop_product))
           flash.now[:error].should be_nil
         end
-        
-        it 'should assign the shop_product_images instance variable' do
-          assigns(:shop_product_images).should === @images
-        end
       end
       
       context 'js' do
@@ -75,10 +69,6 @@ describe Admin::Shop::Products::ImagesController do
           response.should be_success
           response.should render_template('/admin/shop/products/edit/shared/_image')
         end
-        
-        it 'should assign the shop_product_images instance variable' do
-          assigns(:shop_product_images).should === @images
-        end
       end
       
       context 'json' do
@@ -88,11 +78,7 @@ describe Admin::Shop::Products::ImagesController do
         
         it 'should return a json object of the array and success status' do
           response.should be_success
-          response.body.should === @images.to_json(ShopProductAttachment.params)
-        end
-        
-        it 'should assign the shop_product_images instance variable' do
-          assigns(:shop_product_images).should === @images
+          response.body.should === @images.to_json
         end
       end
     end
@@ -141,8 +127,8 @@ describe Admin::Shop::Products::ImagesController do
     
     context 'successfully sorted' do 
       before :each do        
-        mock(ShopProductAttachment).find('2').stub!.update_attributes!({:position => 1}) { true }
-        mock(ShopProductAttachment).find('1').stub!.update_attributes!({:position => 2}) { true }
+        mock(Attachment).find('2').stub!.update_attributes!({:position => 1}) { true }
+        mock(Attachment).find('1').stub!.update_attributes!({:position => 2}) { true }
         
         stub(@shop_product).images { @images }
       end
@@ -185,7 +171,7 @@ describe Admin::Shop::Products::ImagesController do
         
         it 'should return a json object of the array and success status' do
           response.should be_success
-          response.body.should == @images.to_json(ShopProductAttachment.params)
+          response.body.should == @images.to_json
         end
         
         it 'should have ordered the images based on input' do
@@ -236,7 +222,7 @@ describe Admin::Shop::Products::ImagesController do
         
         context 'could not create attachment' do
           before :each do
-            stub(@shop_product).attachments.stub!.create!({ :image => @image }) { raise ActiveRecord::RecordNotSaved }
+            stub(Attachment).create!(anything) { raise ActiveRecord::RecordNotSaved }
           end
           
           context 'html' do
@@ -267,7 +253,7 @@ describe Admin::Shop::Products::ImagesController do
         context 'successfully created attachment' do
           before :each do
             @attachment = Object.new
-            stub(@shop_product).attachments.stub!.create!({ :image => @image }) { @attachment }
+            mock(Attachment).create!(anything) { @attachment }
           end
           
           context 'html' do
@@ -281,7 +267,6 @@ describe Admin::Shop::Products::ImagesController do
             it 'should render the collection partial and success status' do
               post :create, :product_id => @shop_product.id, :image => 'FileObject', :format => 'js'
               response.should be_success
-              assigns(:shop_product_attachment).should == @attachment
               response.should render_template('/admin/shop/products/edit/shared/_image')
             end
           end
@@ -290,7 +275,7 @@ describe Admin::Shop::Products::ImagesController do
             it 'should return a json object of the array and success status' do
               post :create, :product_id => @shop_product.id, :image => 'FileObject', :format => 'json'
               response.should be_success
-              response.body.should == @attachment.to_json(ShopProductAttachment.params)
+              response.body.should == @attachment.to_json
             end
           end
         end
@@ -335,7 +320,7 @@ describe Admin::Shop::Products::ImagesController do
         
         context 'could not create attachment' do
           before :each do
-            stub(@shop_product).attachments.stub!.create!({ :image => @image }) { raise ActiveRecord::RecordNotSaved }
+            stub(Attachment).create!(anything) { raise ActiveRecord::RecordNotSaved }
           end
           
           context 'html' do
@@ -366,7 +351,7 @@ describe Admin::Shop::Products::ImagesController do
         context 'successfully created attachment' do
           before :each do
             @attachment = Object.new
-            stub(@shop_product).attachments.stub!.create!({ :image => @image }) { @attachment }
+            stub(Attachment).create!(anything) { @attachment }
           end
           
           context 'html' do
@@ -380,7 +365,6 @@ describe Admin::Shop::Products::ImagesController do
             it 'should render the collection partial and success status' do
               post :create, :product_id => @shop_product.id, :attachment => { :image_id => '1' }, :format => 'js'
               response.should be_success
-              assigns(:shop_product_attachment).should === @attachment
               response.should render_template('/admin/shop/products/edit/shared/_image')
             end
           end
@@ -389,7 +373,7 @@ describe Admin::Shop::Products::ImagesController do
             it 'should return a json object of the array and success status' do
               post :create, :product_id => @shop_product.id, :attachment => { :image_id => '1' }, :format => 'json'
               response.should be_success
-              response.body.should == @attachment.to_json(ShopProductAttachment.params)
+              response.body.should == @attachment.to_json
             end
           end
         end
@@ -403,7 +387,7 @@ describe Admin::Shop::Products::ImagesController do
     end
     context 'Attachment exists' do
       before :each do 
-        mock(ShopProductAttachment).find('1') { @image }
+        mock(Attachment).find('1') { @image }
         stub(@image).id { 1 }
       end
       context 'could not destroy attachment' do
@@ -453,7 +437,6 @@ describe Admin::Shop::Products::ImagesController do
           it 'should render the collection partial and success status' do
             delete :destroy, :id => @image.id, :product_id => @shop_product.id, :format => 'js'
             response.should be_success
-            assigns(:shop_product_attachment).should == @image
             response.should render_template('/admin/shop/products/edit/shared/_image')
           end
         end

data/spec/datasets/shop_product_attachments.rb

@@ -12,9 +12,9 @@ class ShopProductAttachmentsDataset < Dataset::Base
         :asset_content_type => "image/png",
         :asset_file_size    => i+1*1000
         
-      create_record :shop_product_attachment, image,
+      create_record :attachment, image,
         :image    => images(image.to_sym),
-        :product  => shop_products(image.to_s.split('_')[0,2].join('_').to_sym),
+        :page     => shop_products(image.to_s.split('_')[0,2].join('_').to_sym).page,
         :position => i + 1
     end
   end

data/spec/datasets/shop_products.rb

@@ -37,9 +37,9 @@ class ShopProductsDataset < Dataset::Base
           :asset_content_type => 'image/png',
           :asset_file_size    => i + 1 * 10
         
-        create_record :shop_product_attachment, product,
+        create_record :attachment, product,
           :image      => images(product),
-          :product    => shop_products("#{product.to_s}_#{category.to_s}".to_sym),
+          :page       => shop_products("#{product.to_s}_#{category.to_s}".to_sym).page,
           :position   => 1
       end
     end

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

@@ -279,7 +279,7 @@ describe Shop::Tags::Product do
       end
       context 'failure' do
         it 'should not render' do
-          @product.images.delete_all
+          @product.page.images.delete_all
           
           tag = %{<r:shop:product:images:if_images>failure</r:shop:product:images:if_images>}
           exp = %{}
@@ -295,7 +295,7 @@ describe Shop::Tags::Product do
       
       context 'success' do
         it 'should render' do
-          @product.images.delete_all
+          @product.page.images.delete_all
           
           tag = %{<r:shop:product:images:unless_images>success</r:shop:product:images:unless_images>}
           exp = %{success}
@@ -338,7 +338,7 @@ describe Shop::Tags::Product do
       end
       context 'failure' do
         it 'should not render' do
-          @product.images.delete_all
+          @product.page.images.delete_all
           
           tag = %{<r:shop:product:images:each>failure</r:shop:product:images:each>}
           exp = %{}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-shop-extension
 version: !ruby/object:Gem::Version 
-  hash: 379
+  hash: 381
   prerelease: false
   segments: 
   - 0
   - 91
-  - 4
-  version: 0.91.4
+  - 7
+  version: 0.91.7
 platform: ruby
 authors: 
 - Dirk Kelly
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 +08:00
+date: 2010-12-09 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -108,12 +108,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 11
         segments: 
         - 0
-        - 4
-        - 1
-        version: 0.4.1
+        - 5
+        - 0
+        version: 0.5.0
   name: radiant-images-extension
   requirement: *id006
 - !ruby/object:Gem::Dependency 
@@ -200,7 +200,6 @@ files:
 - app/models/shop_page.rb
 - app/models/shop_payment.rb
 - 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
@@ -298,6 +297,7 @@ files:
 - config/routes.rb
 - db/migrate/20101011063133_setup_shop.rb
 - db/migrate/20101208045754_address_changes.rb
+- db/migrate/20101208121105_move_to_page_attachments.rb
 - db/seed.rb
 - db/seeds/forms.rb
 - db/seeds/layouts.rb
@@ -354,7 +354,6 @@ files:
 - spec/datasets/shop_products.rb
 - spec/datasets/tags.rb
 - spec/helpers/nested_tag_helper.rb
-- spec/lib/shop/models/image_spec.rb
 - spec/lib/shop/models/page_spec.rb
 - spec/lib/shop/tags/address_spec.rb
 - spec/lib/shop/tags/card_spec.rb
@@ -377,7 +376,6 @@ files:
 - spec/models/shop_line_item_spec.rb
 - spec/models/shop_order_spec.rb
 - spec/models/shop_payment_spec.rb
-- 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
@@ -436,7 +434,6 @@ test_files:
 - spec/datasets/shop_products.rb
 - spec/datasets/tags.rb
 - spec/helpers/nested_tag_helper.rb
-- spec/lib/shop/models/image_spec.rb
 - spec/lib/shop/models/page_spec.rb
 - spec/lib/shop/tags/address_spec.rb
 - spec/lib/shop/tags/card_spec.rb
@@ -459,7 +456,6 @@ test_files:
 - spec/models/shop_line_item_spec.rb
 - spec/models/shop_order_spec.rb
 - spec/models/shop_payment_spec.rb
-- 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

data/app/models/shop_product_attachment.rb

@@ -1,35 +0,0 @@
-require 'acts_as_list'
-
-class ShopProductAttachment < ActiveRecord::Base
-  
-  default_scope :order => 'shop_product_attachments.position ASC'
-  
-  belongs_to    :product,   :class_name => 'ShopProduct'
-  belongs_to    :image
-  
-  belongs_to  :created_by,  :class_name => 'User'
-  belongs_to  :updated_by,  :class_name => 'User'
-  
-  acts_as_list  :scope =>   :product
-  
-  def url(*params)
-    image.url(*params) rescue nil
-  end
-  
-  def title(*params)
-    image.title(*params) rescue nil
-  end
-  
-  def caption(*params)
-    image.caption(*params) rescue nil
-  end
-  
-  class << self
-    
-    def params
-      [ :id, :title, :caption, :image_file_name, :image_content_type, :image_file_size ]
-    end
-    
-  end
-  
-end

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

@@ -1,28 +0,0 @@
-require File.dirname(__FILE__) + "/../../../spec_helper"
-
-#
-# Tests for image model extensions
-#
-describe Shop::Models::Image do
-  
-  dataset :shop_products, :shop_product_attachments
-  
-  before :each do
-    @image = images(:soft_bread_front)
-  end
-  
-  context 'relationships' do
-    
-    describe 'product' do
-      it 'should accept and return a product object' do
-        @shop_product = shop_products(:soft_bread)
-        
-        @image.shop_products << @shop_product
-        
-        @image.shop_products.include?(@shop_product).should === true
-      end
-    end
-    
-  end
-  
-end

data/spec/models/shop_product_attachment_spec.rb

@@ -1,75 +0,0 @@
-require File.dirname(__FILE__) + "/../spec_helper"
-
-describe ShopProductAttachment do
-  
-  dataset :shop_products, :shop_product_attachments
-  
-  context 'attributes' do
-  
-    before(:each) do
-      @product_image = shop_products(:soft_bread).attachments.first
-    end
-      
-    it 'should have a product id' do
-      @product_image.product.should === shop_products(:soft_bread)
-    end
-    
-    it 'should have an image id' do
-      @product_image.image.should === images(:soft_bread_front)
-    end
-    
-    it 'should have a position' do
-      @product_image.position.should === 1
-    end
-    
-    it 'should have a product' do
-      @product_image.product.class.should == ShopProduct
-    end
-    
-    it 'should have an image' do
-      @product_image.image.class.should == Image
-    end
-    
-  end
-  
-  context 'alias methods' do
-    
-    before(:each) do
-      stub(AWS::S3::Base).establish_connection!
-      @product_image = shop_products(:soft_bread).attachments.first
-    end
-    
-    describe '#url' do
-      it 'should return its assets url' do
-        stub(@product_image).image.stub!.url { 'url' }
-        @product_image.url.should === @product_image.image.url
-      end
-    end
-    describe '#title' do
-      it 'should return its assets title' do
-        @product_image.title.should === @product_image.image.title
-      end
-    end
-    describe '#caption' do
-      it 'should return its assets caption' do
-        @product_image.caption.should === @product_image.image.caption
-      end
-    end
-  end
-  
-  context 'class methods' do
-    describe '#params' do
-      it 'should have a set of standard parameters' do
-        ShopProductAttachment.params.should === [
-          :id,
-          :title,
-          :caption,
-          :image_file_name,
-          :image_content_type,
-          :image_file_size
-        ]
-      end
-    end
-  end
-  
-end