shoppe 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf9a0256bc9ea841945749f08d51e47c307c574d
-  data.tar.gz: 538c996c91a1a34081fbfe945b7afa450fed2443
+  metadata.gz: 0dcacefeadc890f3dc35dabd24f7287284cc479f
+  data.tar.gz: 7db5436aac835634aa2f6cd135f6035a7e219da6
 SHA512:
-  metadata.gz: e75007e5bccf210a4954380863cadd7061396f758dd59ecfc7a28dd368068f56521c64ab2a501febf51eca1b5530122c7599f2590a740a5547903e78104056b6
-  data.tar.gz: 7f896f5bf90086972c0119d604ad1390262d6ef7d21ee8c382da5a8c7025d3eb72c1745cf9aa69f0db73908bad0fa38b09ddc426e08eb8e570521c8e5623dab9
+  metadata.gz: 94959c589693f5a70d4fd2a838cee7ef2e3106ef4426775155b612f061ce4276df19de0c2d9ff7e8e823cdc06e357e1787e444930ee024a102260df32dff77c8
+  data.tar.gz: 9cd175fe855bcb9234dbd7c519c2fb86edf133ba76094d4fd12f6c993adcc5006f1eb6d9a6fd90eb047e5dc2af77b2fa85b06a5372ee955a1f49c15144ab8003

data/README.md

@@ -39,7 +39,6 @@ instructions below and you'll be up and running in minutes.
     echo "gem 'shoppe', '~> 1.0'" >> Gemfile
     bundle
     rails generate shoppe:setup
-    rails generate nifty:attachments:migration
     rails generate nifty:key_value_store:migration
     rake db:migrate shoppe:setup
     rails server

data/app/assets/javascripts/shoppe/application.coffee

@@ -42,6 +42,11 @@ $ ->
       helper.children().each (index)->
         $(this).width(originals.eq(index).width())
       helper
+
+  $('a[data-behavior=addAttachmentToExtraAttachments]').on 'click', (event) ->
+    event.preventDefault();
+    $('div.extraAttachments').show();
+    $(this).hide();
   
   # Chosen
   $('select.chosen').chosen()

data/app/assets/stylesheets/shoppe/application.scss

@@ -183,7 +183,7 @@ header.main {
 					width:49%;
 					margin:0;
 					float:left;
-					&:last-child { float:right;}
+					&:nth-child(2) { float:right;}
 				}
 
 				&.third {
@@ -299,6 +299,17 @@ header.main {
 	  }
 	}
 
+	div.extraAttachments{
+		display: none;
+
+		dl.half { margin-top: 15px; }
+	}
+
+	p.addAttachments {
+		float: right;
+		margin: 15px 25px 0 0;
+	}
+
 	//
 	// attachment preview
 	//

data/app/controllers/shoppe/attachments_controller.rb

@@ -2,7 +2,7 @@ module Shoppe
   class AttachmentsController < Shoppe::ApplicationController
 
     def destroy
-      @attachment = Nifty::Attachments::Attachment.find(params[:id])
+      @attachment = Shoppe::Attachment.find_by!(token: params[:id])
       @attachment.destroy
       respond_to do |wants|
         wants.html { redirect_to request.referer, :notice => t('shoppe.attachments.remove_notice')}

data/app/controllers/shoppe/products_controller.rb

@@ -5,7 +5,7 @@ module Shoppe
     before_filter { params[:id] && @product = Shoppe::Product.root.find(params[:id]) }
 
     def index
-      @products = Shoppe::Product.root.includes(:translations, :stock_level_adjustments, :default_image, :product_categories, :variants).order(:name).group_by(&:product_category).sort_by { |cat,pro| cat.name }
+      @products = Shoppe::Product.root.includes(:translations, :stock_level_adjustments, :product_categories, :variants).order(:name).group_by(&:product_category).sort_by { |cat,pro| cat.name }
     end
 
     def new
@@ -51,7 +51,8 @@ module Shoppe
     private
 
     def safe_params
-      params[:product].permit(:name, :sku, :permalink, :description, :short_description, :weight, :price, :cost_price, :tax_rate_id, :stock_control, :default_image_file, :data_sheet_file, :active, :featured, :in_the_box, :product_attributes_array => [:key, :value, :searchable, :public], :product_category_ids => [])
+      file_params = [:file, :parent_id, :role, :parent_type, :file => []]
+      params[:product].permit(:name, :sku, :permalink, :description, :short_description, :weight, :price, :cost_price, :tax_rate_id, :stock_control, :active, :featured, :in_the_box, :attachments => [:default_image => file_params, :data_sheet => file_params, :extra => file_params], :product_attributes_array => [:key, :value, :searchable, :public], :product_category_ids => [])
     end
 
   end

data/app/helpers/shoppe/application_helper.rb

@@ -10,19 +10,19 @@ module Shoppe
     end
 
     def attachment_preview(attachment, options = {})
-      if attachment
+      if attachment.present? and attachment.token.present?
         String.new.tap do |s|
           if attachment.image?
-            style = "style='background-image:url(#{attachment.path})'"
+            style = "style='background-image:url(#{attachment.file.thumb.url})'"
           else
             style = ''
           end
           s << "<div class='attachmentPreview #{attachment.image? ? 'image' : 'doc'}'>"
           s << "<div class='imgContainer'><div class='img' #{style}></div></div>"
           s << "<div class='desc'>"
-          s << "<span class='filename'><a href='#{attachment_path(attachment)}'>#{attachment.file_name}</a></span>"
+          s << "<span class='filename'><a href='#{attachment.file.url}'>#{attachment.file_name}</a></span>"
           s << "<span class='delete'>"
-          s << link_to(t('helpers.attachment_preview.delete', :default => 'Delete this file?'), attachment_path(attachment), :method => :delete, :data => {:confirm => t('helpers.attachment_preview.delete_confirm', :default => "Are you sure you wish to remove this attachment?")})
+          s << link_to(t('helpers.attachment_preview.delete', :default => 'Delete this file?'), attachment_path(attachment.token), :method => :delete, :data => {:confirm => t('helpers.attachment_preview.delete_confirm', :default => "Are you sure you wish to remove this attachment?")})
           s << "</span>"
           s << "</div>"
           s << "</div>"

data/app/models/shoppe/attachment.rb

@@ -0,0 +1,48 @@
+module Shoppe
+  class Attachment < ActiveRecord::Base
+
+    # Set the table name
+    self.table_name = "shoppe_attachments"
+
+    # Mount the Carrierwave uploader
+    mount_uploader :file, AttachmentUploader
+
+    # Relationships
+    belongs_to :parent, :polymorphic => true
+
+    # Validations
+    validates :file_name, :presence => true
+    validates :file_type, :presence => true
+    validates :file_size, :presence => true
+    validates :file, :presence => true
+    validates :token, :presence => true, :uniqueness => true
+
+    # All attachments should have a token assigned to this
+    before_validation { self.token = SecureRandom.uuid if self.token.blank? }
+
+    # Set the appropriate values in the model
+    before_validation do
+      if self.file
+        self.file_name = self.file.filename if self.file_name.blank?
+        self.file_type = self.file.content_type if self.file_type.blank?
+        self.file_size = self.file.size if self.file_size.blank?
+      end
+    end
+
+    # Return the attachment for a given role
+    def self.for(role)
+      self.where(:role => role).first
+    end
+
+    # Return the path to the attachment
+    def path
+      file.url
+    end
+
+    # Is the attachment an image?
+    def image?
+      file_type.match(/\Aimage\//).present?
+    end
+    
+  end
+end

data/app/models/shoppe/product.rb

@@ -10,9 +10,8 @@ module Shoppe
     require_dependency 'shoppe/product/product_attributes'
     require_dependency 'shoppe/product/variants'
 
-    # Products have a default_image and a data_sheet
-    attachment :default_image
-    attachment :data_sheet
+    # Attachments for this product
+    has_many :attachments, :as => :parent, :dependent => :destroy, :autosave => true, :class_name => "Shoppe::Attachment"
 
     # The product's categorizations
     #
@@ -63,6 +62,13 @@ module Shoppe
     translates :name, :permalink, :description, :short_description
     scope :ordered, -> { includes(:translations).order(:name) }
 
+    def attachments=(attrs)
+      if attrs["default_image"]["file"].present? then self.attachments.build(attrs["default_image"]) end
+      if attrs["data_sheet"]["file"].present? then self.attachments.build(attrs["data_sheet"]) end
+
+      if attrs["extra"]["file"].present? then attrs["extra"]["file"].each { |attr| self.attachments.build(file: attr, parent_id: attrs["extra"]["parent_id"], parent_type: attrs["extra"]["parent_type"]) } end
+    end
+
     # Return the name of the product
     #
     # @return [String]
@@ -108,6 +114,20 @@ module Shoppe
       self.product_categories.first rescue nil
     end
 
+    # Return attachment for the default_image role
+    # 
+    # @return [String]
+    def default_image
+      self.attachments.for("default_image")
+    end
+
+    # Return attachment for the data_sheet role
+    # 
+    # @return [String]
+    def data_sheet
+      self.attachments.for("data_sheet")
+    end
+
     # Search for products which include the given attributes and return an active record
     # scope of these products. Chainable with other scopes and with_attributes methods.
     # For example:

data/app/models/shoppe/product_category.rb

@@ -12,8 +12,8 @@ module Shoppe
 
     self.table_name = 'shoppe_product_categories'
 
-    # Categories have an image attachment
-    attachment :image
+    # Attachments for this product category
+    has_many :attachments, :as => :parent, :dependent => :destroy, :class_name => "Shoppe::Attachment"
 
     # All products within this category
     has_many :product_categorizations, dependent: :restrict_with_exception, class_name: 'Shoppe::ProductCategorization', inverse_of: :product_category
@@ -51,6 +51,13 @@ module Shoppe
       parent.hierarchy_array.concat [self]
     end
 
+    # Attachment with the role image
+    # 
+    # @return [String]
+    def image
+      self.attachments.for("image")
+    end
+
     private
 
     def set_permalink

data/app/uploaders/shoppe/attachment_uploader.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+
+class Shoppe::AttachmentUploader < CarrierWave::Uploader::Base
+
+  include CarrierWave::MiniMagick
+
+  storage :file
+
+  # Where should files be stored?
+  def store_dir
+    "attachment/#{model.id}"
+  end
+
+  # Returns true if the file is an image
+  def image?(new_file)
+    self.file.content_type.include? 'image'
+  end
+
+  # Returns true if the file is not an image
+  def not_image?(new_file)
+    !self.file.content_type.include? 'image'
+  end
+
+  # Create different versions of your uploaded files:
+  version :thumb, :if => :image? do
+    process :resize_and_pad => [200, 200]
+  end
+
+end

data/app/views/shoppe/products/_form.html.haml

@@ -57,15 +57,35 @@
   = field_set_tag t('shoppe.products.attachments') do
     .splitContainer
       %dl.half
-        %dt= f.label :default_image_file, t('shoppe.products.default_image')
+        %dt= f.label "attachments[default_image][file]", t('shoppe.products.default_image')
         %dd
           = attachment_preview @product.default_image
-          %p= f.file_field :default_image_file
+          %p= f.file_field "attachments[default_image][file]"
+          = f.hidden_field "attachments[default_image][role]", value: "default_image"
+          = f.hidden_field "attachments[default_image][parent_id]", value: @product.id
       %dl.half
-        %dt= f.label :data_sheet_file, t('shoppe.products.datasheet')
+        %dt= f.label "attachments[data_sheet][file]", t('shoppe.products.datasheet')
         %dd
           = attachment_preview @product.data_sheet
-          %p= f.file_field :data_sheet_file
+          %p= f.file_field "attachments[data_sheet][file]"
+          = f.hidden_field "attachments[data_sheet][role]", value: "data_sheet"
+          = f.hidden_field "attachments[data_sheet][parent_id]", value: @product.id
+
+    .splitContainer.extraAttachments
+      %dl.half
+        %dd
+          = attachment_preview nil, hide_if_blank: false
+          %p= f.file_field "attachments[extra][file]", :multiple => true
+          = f.hidden_field "attachments[extra][parent_type]", value: "Shoppe::Product"
+          = f.hidden_field "attachments[extra][parent_id]", value: @product.id
+
+      - @product.attachments.each do |attachment|
+        - unless ["default_image", "data_sheet"].include?(attachment.role)
+          %dl.half
+            %dd
+              = attachment_preview attachment
+
+    %p.addAttachments= link_to t('shoppe.products.add_attachments') , '#', :data => {:behavior => 'addAttachmentToExtraAttachments'}, :class => 'button button-mini green'
 
   - unless @product.has_variants?
     = field_set_tag t('shoppe.products.pricing') do

data/config/locales/de.yml

@@ -387,6 +387,7 @@ de:
       attachments: Anhänge
       back_to_categories: Zurück zu den Kategorien
       category_details: Kategoriedetails
+      choose_product_category: Produktkategorie auswählen
       create_notice: Kategorie wurde erfolgreich erstellt
       delete_confirmation: Möchten Sie diese Kategorie wirklich löschen?
       description: Beschreibung
@@ -400,6 +401,7 @@ de:
       update_notice: Kategorie wurde erfolgreich aktualisiert
 
     products:
+      add_attachments: Anhänge betrachten/hinzufügen
       add_attribute: Attribut hinzufügen
       attachments: Anhänge
       attributes: Attribute
@@ -601,6 +603,7 @@ de:
         users: Benutzer
         countries: Länder
         settings: Einstellungen
+        customers: Kunden
 
     settings:
 

data/config/locales/en.yml

@@ -472,6 +472,7 @@ en:
         hierarchy: Hierarchy
 
     products:
+      add_attachments: View/add attachments
       add_attribute: Add attribute
       attachments: Attachments
       attributes: Attributes

data/config/locales/es.yml

@@ -400,6 +400,7 @@ es:
       update_notice: Categoría actualizada satisfactoriamente
 
     products:
+      add_attachments: Ver/agregar adjuntos
       add_attribute: Agregar atributo
       attachments: Adjuntos
       attributes: Atributos

data/config/locales/pl.yml

@@ -415,6 +415,7 @@ pl:
         hierarchy: Hierarchy
 
     products:
+      add_attachments: Zobacz/dodaj załączniki
       add_attribute: Dodaj atrybut
       attachments: Załączniki
       attributes: Atrybuty

data/config/locales/pt-BR.yml

@@ -402,6 +402,7 @@ pt-BR:
         hierarchy: Hierarchy
 
     products:
+      add_attachments: Visualizar/adicionar anexos
       add_attribute: Adicionar atributo
       attachments: Anexos
       attributes: Atributos

data/db/migrate/20150315223628_create_shoppe_attachments.rb

@@ -0,0 +1,16 @@
+class CreateShoppeAttachments < ActiveRecord::Migration
+  def change
+    create_table :shoppe_attachments do |t|
+      t.integer :parent_id, null: false
+      t.string :parent_type, null: false
+      t.string :token, unique: true
+      t.string :file, null: false
+      t.string :file_name
+      t.integer :file_size
+      t.string :file_type
+      t.string :role
+
+      t.timestamps
+    end
+  end
+end

data/db/schema.rb

@@ -11,20 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150315223628) do
-
-  create_table "nifty_attachments", force: true do |t|
-    t.integer  "parent_id"
-    t.string   "parent_type"
-    t.string   "token"
-    t.string   "digest"
-    t.string   "role"
-    t.string   "file_name"
-    t.string   "file_type"
-    t.binary   "data",        limit: 16777215
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
+ActiveRecord::Schema.define(version: 20150519173350) do
 
   create_table "nifty_key_value_store", force: true do |t|
     t.integer "parent_id"
@@ -48,7 +35,7 @@ ActiveRecord::Schema.define(version: 20150315223628) do
     t.datetime "updated_at"
   end
 
-  add_index "shoppe_addresses", ["customer_id"], name: "index_shoppe_addresses_on_customer_id", using: :btree
+  add_index "shoppe_addresses", ["customer_id"], name: "index_shoppe_addresses_on_customer_id"
 
   create_table "shoppe_attachments", force: true do |t|
     t.integer  "parent_id",   null: false
@@ -97,10 +84,10 @@ ActiveRecord::Schema.define(version: 20150315223628) do
     t.text     "country_ids"
   end
 
-  add_index "shoppe_delivery_service_prices", ["delivery_service_id"], name: "index_shoppe_delivery_service_prices_on_delivery_service_id", using: :btree
-  add_index "shoppe_delivery_service_prices", ["max_weight"], name: "index_shoppe_delivery_service_prices_on_max_weight", using: :btree
-  add_index "shoppe_delivery_service_prices", ["min_weight"], name: "index_shoppe_delivery_service_prices_on_min_weight", using: :btree
-  add_index "shoppe_delivery_service_prices", ["price"], name: "index_shoppe_delivery_service_prices_on_price", using: :btree
+  add_index "shoppe_delivery_service_prices", ["delivery_service_id"], name: "index_shoppe_delivery_service_prices_on_delivery_service_id"
+  add_index "shoppe_delivery_service_prices", ["max_weight"], name: "index_shoppe_delivery_service_prices_on_max_weight"
+  add_index "shoppe_delivery_service_prices", ["min_weight"], name: "index_shoppe_delivery_service_prices_on_min_weight"
+  add_index "shoppe_delivery_service_prices", ["price"], name: "index_shoppe_delivery_service_prices_on_price"
 
   create_table "shoppe_delivery_services", force: true do |t|
     t.string   "name"
@@ -113,7 +100,7 @@ ActiveRecord::Schema.define(version: 20150315223628) do
     t.string   "tracking_url"
   end
 
-  add_index "shoppe_delivery_services", ["active"], name: "index_shoppe_delivery_services_on_active", using: :btree
+  add_index "shoppe_delivery_services", ["active"], name: "index_shoppe_delivery_services_on_active"
 
   create_table "shoppe_order_items", force: true do |t|
     t.integer  "order_id"
@@ -129,8 +116,8 @@ ActiveRecord::Schema.define(version: 20150315223628) do
     t.datetime "updated_at"
   end
 
-  add_index "shoppe_order_items", ["order_id"], name: "index_shoppe_order_items_on_order_id", using: :btree
-  add_index "shoppe_order_items", ["ordered_item_id", "ordered_item_type"], name: "index_shoppe_order_items_ordered_item", using: :btree
+  add_index "shoppe_order_items", ["order_id"], name: "index_shoppe_order_items_on_order_id"
+  add_index "shoppe_order_items", ["ordered_item_id", "ordered_item_type"], name: "index_shoppe_order_items_ordered_item"
 
   create_table "shoppe_orders", force: true do |t|
     t.string   "token"
@@ -177,9 +164,9 @@ ActiveRecord::Schema.define(version: 20150315223628) do
     t.integer  "customer_id"
   end
 
-  add_index "shoppe_orders", ["delivery_service_id"], name: "index_shoppe_orders_on_delivery_service_id", using: :btree
-  add_index "shoppe_orders", ["received_at"], name: "index_shoppe_orders_on_received_at", using: :btree
-  add_index "shoppe_orders", ["token"], name: "index_shoppe_orders_on_token", using: :btree
+  add_index "shoppe_orders", ["delivery_service_id"], name: "index_shoppe_orders_on_delivery_service_id"
+  add_index "shoppe_orders", ["received_at"], name: "index_shoppe_orders_on_received_at"
+  add_index "shoppe_orders", ["token"], name: "index_shoppe_orders_on_token"
 
   create_table "shoppe_payments", force: true do |t|
     t.integer  "order_id"
@@ -195,8 +182,8 @@ ActiveRecord::Schema.define(version: 20150315223628) do
     t.datetime "updated_at"
   end
 
-  add_index "shoppe_payments", ["order_id"], name: "index_shoppe_payments_on_order_id", using: :btree
-  add_index "shoppe_payments", ["parent_payment_id"], name: "index_shoppe_payments_on_parent_payment_id", using: :btree
+  add_index "shoppe_payments", ["order_id"], name: "index_shoppe_payments_on_order_id"
+  add_index "shoppe_payments", ["parent_payment_id"], name: "index_shoppe_payments_on_parent_payment_id"
 
   create_table "shoppe_product_attributes", force: true do |t|
     t.integer  "product_id"
@@ -209,9 +196,9 @@ ActiveRecord::Schema.define(version: 20150315223628) do
     t.boolean  "public",     default: true
   end
 
-  add_index "shoppe_product_attributes", ["key"], name: "index_shoppe_product_attributes_on_key", using: :btree
-  add_index "shoppe_product_attributes", ["position"], name: "index_shoppe_product_attributes_on_position", using: :btree
-  add_index "shoppe_product_attributes", ["product_id"], name: "index_shoppe_product_attributes_on_product_id", using: :btree
+  add_index "shoppe_product_attributes", ["key"], name: "index_shoppe_product_attributes_on_key"
+  add_index "shoppe_product_attributes", ["position"], name: "index_shoppe_product_attributes_on_position"
+  add_index "shoppe_product_attributes", ["product_id"], name: "index_shoppe_product_attributes_on_product_id"
 
   create_table "shoppe_product_categories", force: true do |t|
     t.string   "name"
@@ -227,17 +214,44 @@ ActiveRecord::Schema.define(version: 20150315223628) do
     t.boolean  "permalink_includes_ancestors", default: false
   end
 
-  add_index "shoppe_product_categories", ["lft"], name: "index_shoppe_product_categories_on_lft", using: :btree
-  add_index "shoppe_product_categories", ["permalink"], name: "index_shoppe_product_categories_on_permalink", using: :btree
-  add_index "shoppe_product_categories", ["rgt"], name: "index_shoppe_product_categories_on_rgt", using: :btree
+  add_index "shoppe_product_categories", ["lft"], name: "index_shoppe_product_categories_on_lft"
+  add_index "shoppe_product_categories", ["permalink"], name: "index_shoppe_product_categories_on_permalink"
+  add_index "shoppe_product_categories", ["rgt"], name: "index_shoppe_product_categories_on_rgt"
 
   create_table "shoppe_product_categorizations", force: true do |t|
     t.integer "product_id",          null: false
     t.integer "product_category_id", null: false
   end
 
-  add_index "shoppe_product_categorizations", ["product_category_id"], name: "categorization_by_product_category_id", using: :btree
-  add_index "shoppe_product_categorizations", ["product_id"], name: "categorization_by_product_id", using: :btree
+  add_index "shoppe_product_categorizations", ["product_category_id"], name: "categorization_by_product_category_id"
+  add_index "shoppe_product_categorizations", ["product_id"], name: "categorization_by_product_id"
+
+  create_table "shoppe_product_category_translations", force: true do |t|
+    t.integer  "shoppe_product_category_id", null: false
+    t.string   "locale",                     null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "name"
+    t.string   "permalink"
+    t.text     "description"
+  end
+
+  add_index "shoppe_product_category_translations", ["locale"], name: "index_shoppe_product_category_translations_on_locale"
+  add_index "shoppe_product_category_translations", ["shoppe_product_category_id"], name: "index_75826cc72f93d014e54dc08b8202892841c670b4"
+
+  create_table "shoppe_product_translations", force: true do |t|
+    t.integer  "shoppe_product_id", null: false
+    t.string   "locale",            null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "name"
+    t.string   "permalink"
+    t.text     "description"
+    t.text     "short_description"
+  end
+
+  add_index "shoppe_product_translations", ["locale"], name: "index_shoppe_product_translations_on_locale"
+  add_index "shoppe_product_translations", ["shoppe_product_id"], name: "index_shoppe_product_translations_on_shoppe_product_id"
 
   create_table "shoppe_products", force: true do |t|
     t.integer  "parent_id"
@@ -259,9 +273,9 @@ ActiveRecord::Schema.define(version: 20150315223628) do
     t.boolean  "default",                                   default: false
   end
 
-  add_index "shoppe_products", ["parent_id"], name: "index_shoppe_products_on_parent_id", using: :btree
-  add_index "shoppe_products", ["permalink"], name: "index_shoppe_products_on_permalink", using: :btree
-  add_index "shoppe_products", ["sku"], name: "index_shoppe_products_on_sku", using: :btree
+  add_index "shoppe_products", ["parent_id"], name: "index_shoppe_products_on_parent_id"
+  add_index "shoppe_products", ["permalink"], name: "index_shoppe_products_on_permalink"
+  add_index "shoppe_products", ["sku"], name: "index_shoppe_products_on_sku"
 
   create_table "shoppe_settings", force: true do |t|
     t.string "key"
@@ -269,7 +283,7 @@ ActiveRecord::Schema.define(version: 20150315223628) do
     t.string "value_type"
   end
 
-  add_index "shoppe_settings", ["key"], name: "index_shoppe_settings_on_key", using: :btree
+  add_index "shoppe_settings", ["key"], name: "index_shoppe_settings_on_key"
 
   create_table "shoppe_stock_level_adjustments", force: true do |t|
     t.integer  "item_id"
@@ -282,8 +296,8 @@ ActiveRecord::Schema.define(version: 20150315223628) do
     t.datetime "updated_at"
   end
 
-  add_index "shoppe_stock_level_adjustments", ["item_id", "item_type"], name: "index_shoppe_stock_level_adjustments_items", using: :btree
-  add_index "shoppe_stock_level_adjustments", ["parent_id", "parent_type"], name: "index_shoppe_stock_level_adjustments_parent", using: :btree
+  add_index "shoppe_stock_level_adjustments", ["item_id", "item_type"], name: "index_shoppe_stock_level_adjustments_items"
+  add_index "shoppe_stock_level_adjustments", ["parent_id", "parent_type"], name: "index_shoppe_stock_level_adjustments_parent"
 
   create_table "shoppe_tax_rates", force: true do |t|
     t.string   "name"
@@ -303,6 +317,6 @@ ActiveRecord::Schema.define(version: 20150315223628) do
     t.datetime "updated_at"
   end
 
-  add_index "shoppe_users", ["email_address"], name: "index_shoppe_users_on_email_address", using: :btree
+  add_index "shoppe_users", ["email_address"], name: "index_shoppe_users_on_email_address"
 
 end

data/lib/shoppe.rb

@@ -10,8 +10,8 @@ require "globalize"
 
 require 'nifty/utils'
 require 'nifty/key_value_store'
-require 'nifty/attachments'
 require 'nifty/dialog'
+require 'carrierwave'
 
 module Shoppe
   class << self

data/lib/shoppe/engine.rb

@@ -41,6 +41,11 @@ module Shoppe
         require 'shoppe/view_helpers'
         ActionView::Base.send :include, Shoppe::ViewHelpers
       end
+
+      ActiveSupport.on_load(:active_record) do
+        require 'shoppe/model_extension'
+        ActiveRecord::Base.send :include, Shoppe::ModelExtension
+      end
       
       # Load default navigation
       require 'shoppe/default_navigation'

data/lib/shoppe/model_extension.rb

@@ -0,0 +1,44 @@
+module Shoppe
+  module ModelExtension
+
+    def self.included(base)
+      base.extend ClassMethods
+      base.after_save do
+        if @pending_attachments
+          @pending_attachments.each do |pa|
+            old_attachments = self.attachments.where(:role => pa[:role]).pluck(:id)
+            self.attachments.create(:file => pa[:file], :role => pa[:role])
+            self.attachments.where(:id => old_attachments).destroy_all
+          end
+          @pending_attachments = nil
+        end
+      end
+    end
+
+    module ClassMethods
+      
+      def attachment(name)
+        unless self.reflect_on_all_associations(:has_many).map(&:name).include?(:attachments)
+          has_many :attachments, :as => :parent, :dependent => :destroy, :class_name => 'Shoppe::Attachment'
+        end
+        
+        has_one name, -> { select(:id, :token, :parent_id, :parent_type, :file_name, :file_type, :file_size).where(:role => name) }, :class_name => 'Shoppe::Attachment', :as => :parent
+
+        define_method "#{name}_file" do
+          instance_variable_get("@#{name}_file")
+        end
+
+        define_method "#{name}_file=" do |file|
+          instance_variable_set("@#{name}_file", file)
+          if file.is_a?(ActionDispatch::Http::UploadedFile)
+            @pending_attachments ||= []
+            @pending_attachments << {:role => name, :file => file}
+          else
+            nil
+          end
+        end
+      end   
+    end
+
+  end
+end

data/lib/shoppe/version.rb

@@ -1,3 +1,3 @@
 module Shoppe
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 end

data/lib/tasks/shoppe.rake

@@ -1,4 +1,5 @@
 namespace :shoppe do
+
   desc "Load seed data for the Shoppe"
   task :seed => :environment do
     require File.join(Shoppe.root, 'db', 'seeds')
@@ -25,5 +26,28 @@ namespace :shoppe do
     Rake::Task["shoppe:import_countries"].invoke    if Shoppe::Country.all.empty?
     Rake::Task["shoppe:create_default_user"].invoke if Shoppe::User.all.empty?
   end
+
+  desc "Converts nifty-attachment attachments to Shoppe Attachments"
+  task :attachments => :environment do
+    require "nifty/attachments"
+
+    attachments = Nifty::Attachments::Attachment.all
+
+    attachments.each do |attachment|
+      object = attachment.parent_type.constantize.find(attachment.parent_id)
+
+      attach = object.attachments.build
+      attach.role = attachment.role
+      attach.file_name = attachment.file_name
+
+      tempfile = Tempfile.new("attach-#{attachment.token}")
+      tempfile.binmode
+      tempfile.write(attachment.data)
+      uploaded_file = ActionDispatch::Http::UploadedFile.new(tempfile: tempfile, filename: attachment.file_name, type: attachment.file_type)
+
+      attach.file = uploaded_file
+      attach.save!
+    end
+  end
   
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: shoppe
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Adam Cooke
+- Dean Perry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-27 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -176,14 +177,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: globalize
   requirement: !ruby/object:Gem::Requirement
@@ -239,45 +240,67 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: nifty-attachments
+  name: nifty-dialog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.7
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.7
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: nifty-dialog
+  name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
-    - - "<"
+        version: 0.10.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: fog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.31.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
-    - - "<"
+        version: 1.31.0
+- !ruby/object:Gem::Dependency
+  name: mini_magick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 4.2.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.7
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -394,6 +417,7 @@ description: A full Rails engine providing e-commerce functionality for any Rail
   4 application.
 email:
 - adam@atechmedia.com
+- dean@voupe.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -478,6 +502,7 @@ files:
 - app/mailers/shoppe/order_mailer.rb
 - app/mailers/shoppe/user_mailer.rb
 - app/models/shoppe/address.rb
+- app/models/shoppe/attachment.rb
 - app/models/shoppe/country.rb
 - app/models/shoppe/customer.rb
 - app/models/shoppe/delivery_service.rb
@@ -499,6 +524,7 @@ files:
 - app/models/shoppe/stock_level_adjustment.rb
 - app/models/shoppe/tax_rate.rb
 - app/models/shoppe/user.rb
+- app/uploaders/shoppe/attachment_uploader.rb
 - app/validators/permalink_validator.rb
 - app/views/layouts/shoppe/application.html.haml
 - app/views/layouts/shoppe/printable.html.haml
@@ -597,6 +623,7 @@ files:
 - db/migrate/20141026181718_add_nested_to_product_categories.rb
 - db/migrate/20141027215005_create_shoppe_addresses.rb
 - db/migrate/20150315215633_add_customer_to_shoppe_orders.rb
+- db/migrate/20150315223628_create_shoppe_attachments.rb
 - db/migrate/20150513171350_create_shoppe_product_category_translation_table.rb
 - db/migrate/20150519173350_create_shoppe_product_translation_table.rb
 - db/schema.rb
@@ -627,6 +654,7 @@ files:
 - lib/shoppe/errors/payment_declined.rb
 - lib/shoppe/errors/refund_failed.rb
 - lib/shoppe/errors/unorderable_item.rb
+- lib/shoppe/model_extension.rb
 - lib/shoppe/navigation_manager.rb
 - lib/shoppe/orderable_item.rb
 - lib/shoppe/settings.rb