tienda 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75f31e72ee89918573cb2806723fc533734645a9
-  data.tar.gz: 76d33082565183722512ea4cbfdac5d63243410e
+  metadata.gz: b97ea39013c44c15d7d18bce2149a6a07bb2bc18
+  data.tar.gz: 816df89676e8e4d64bf1699a23c101e0ea8268ba
 SHA512:
-  metadata.gz: 4e37424a4dbce21b3484ebaf1899d709ff4f14b3c9bd8e4444a2b9a3fb0fb47243a77eb8bbd2eb553936e4d0c9696939fba981eef11ba17190fd8ce65bb4185a
-  data.tar.gz: 04c0e881b1f0e3a417a0d56433802dd51af397f4b5253de5131579962768816ac5bf0a9a13a9c2606d42191a1d859f4ca622cc6588e070d57dcba564045610c1
+  metadata.gz: ed72a17c07f45fc268b18f449c13f0ba9586ded6d3c85210ba431ece3e231ffcdcc9d801e429b58bef666d94aa227b5713165baf715110c67b9f7407a00964f6
+  data.tar.gz: beea1c4e4b04efe87f531cfe7c6929605741697a3e0e87c3c07509bdf0205dbad9abaef3a60f008542d73304d333500cb5bdef77ee5126f45695230add127784

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

@@ -39,6 +39,24 @@ $ ->
   $('a[rel=searchOrders]').on 'click', ->
     $('div.search-orders').toggleClass('hide')
 
+  # Add a new image to a table
+  $('a[data-behavior=addImageToImagesTable]').on 'click', ->
+    table = $('table.productImages')
+    nextid = table.find('tbody tr:not(.template)').length
+    template = $('tr.template', table).html().replace('[]', "[#{nextid}]")
+    table.append("<tr>#{template}</tr>")
+    false
+
+  # Remove an image from a table
+  $('table.productImages tbody').on 'click', 'tr td.remove a', ->
+    row = $(this).closest('tr')
+    if row.find('.destroy').length
+      row.find('.destroy').val('true')
+      row.fadeOut()
+    else
+      row.remove()
+    false
+
   # Add a new attribute to a table
   $('a[data-behavior=addAttributeToAttributesTable]').on 'click', ->
     table = $('table.productAttributes')

data/app/assets/stylesheets/tienda/custom-styles.scss

@@ -409,11 +409,20 @@ line-height: 1.428571429;
    PRODUCT STYLES
 ------------------------------------------------*/
 
+.productImages.table > tbody > tr > td {
+  vertical-align: middle;
+}
+
+.productImages td.handle,
 .productAttributes td.handle {
   background: image-url('tienda/move.svg') no-repeat center;
   background-size: 16px
 }
 
+.productImages .img_preview {
+  max-height: 60px;
+}
+
 /*----------------------------------------------
    ORDER STATUS STYLES
 ------------------------------------------------*/

data/app/controllers/tienda/products_controller.rb

@@ -6,9 +6,9 @@ module Tienda
 
     def index
       if params[:filter].blank?
-        @products = Tienda::Product.root.includes(:stock_level_adjustments, :default_image, :product_category, :variants).order(:name).group_by(&:product_category).sort_by { |cat, pro| cat.name }
+        @products = Tienda::Product.root.includes(:stock_level_adjustments, :product_images, :product_category, :variants).order(:name).group_by(&:product_category).sort_by { |cat, pro| cat.name }
       else
-        @products = Tienda::Product.root.send(params[:filter]).includes(:stock_level_adjustments, :default_image, :product_category, :variants).order(:name).group_by(&:product_category).sort_by { |cat, pro| cat.name }
+        @products = Tienda::Product.root.send(params[:filter]).includes(:stock_level_adjustments, :product_images, :product_category, :variants).order(:name).group_by(&:product_category).sort_by { |cat, pro| cat.name }
       end
     end
 
@@ -60,7 +60,8 @@ module Tienda
         :tax_rate_id, :stock_control, :default_image_file, :second_image_file,
         :third_image_file, :fourth_image_file, :fifth_image_file,
         :data_sheet_file, :active, :featured, :in_the_box,
-        :product_attributes_array => [:key, :value, :searchable, :public])
+        :product_attributes_array => [:key, :value, :searchable, :public],
+        :product_images_attributes => [:image, :_destroy, :id])
     end
 
   end

data/app/helpers/tienda/application_helper.rb

@@ -18,15 +18,16 @@ module Tienda
     def attachment_preview(attachment, options = {})
       if attachment
         String.new.tap do |s|
-          if attachment.image?
-            style = "style='background-image:url(#{attachment.path})'"
+          if attachment.mounted_as == :image
+            style = "style='background-image:url(#{attachment.url})'"
           else
             style = ''
           end
-          s << "<div class='attachmentPreview #{attachment.image? ? 'image' : 'doc'}'>"
+          s << "<div class='attachmentPreview #{attachment.mounted_as == :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'>#{link_to File.basename(attachment.path), attachment.url}</span>"
+          # s << "<span class='filename'><a href='#{attachment_path(attachment)}'>#{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 << "</span>"

data/app/models/tienda/product.rb

@@ -7,16 +7,9 @@ module Tienda
     require_dependency 'tienda/product/product_attributes'
     require_dependency 'tienda/product/variants'
 
-    # Products have 5 images and a data_sheet
-    attachment :default_image
-    attachment :second_image
-    attachment :third_image
-    attachment :fourth_image
-    attachment :fifth_image
-    attachment :data_sheet
-
     # To preserve backwards compatibility
     alias_attribute :stock, :stock_count
+    alias_attribute :images, :product_images
 
     # The product's category
     #
@@ -37,6 +30,10 @@ module Tienda
     # Stock level adjustments for this product
     has_many :stock_level_adjustments, dependent: :destroy
 
+    # Product Images
+    has_many :product_images, dependent: :destroy
+    accepts_nested_attributes_for :product_images, reject_if: proc { |attributes| attributes['image'].blank? }, allow_destroy: true
+
     # Validations
     with_options if: Proc.new { |p| p.parent.nil? } do |product|
       product.validates :product_category_id, presence: true
@@ -101,13 +98,6 @@ module Tienda
       self.default_variant ? self.default_variant.in_stock? : (stock_control? ? stock_count > 0 : true)
     end
 
-    # Return all product images
-    #
-    # @return [Array]
-    def images
-      nifty_attachments.select { |attachment| attachment.role != "data_sheet" }
-    end
-
     # Return all product categories
     #
     # @return [Array]

data/app/models/tienda/product_category.rb

@@ -1,11 +1,12 @@
 module Tienda
   class ProductCategory < ActiveRecord::Base
 
-    # Categories have an image attachment
-    attachment :image
+    # Mount Uploader
+    mount_uploader :image, CategoryImageUploader
 
     # All products within this category
     has_many :products, dependent: :restrict_with_exception
+    has_many :active_featured_root_products, -> { where(active: true, featured: true, parent_id: nil) }, class_name: 'Tienda::Product'
     # Sub Categories relationships
     has_many :children, class_name: 'Tienda::ProductCategory', foreign_key: :parent_id
     belongs_to :parent, class_name: 'Tienda::ProductCategory'

data/app/models/tienda/product_image.rb

@@ -0,0 +1,9 @@
+module Tienda
+  class ProductImage < ActiveRecord::Base
+    # Relationships
+    belongs_to :product
+
+    # Mount Uploaders
+    mount_uploader :image, ProductImageUploader
+  end
+end

data/app/uploaders/tienda/category_image_uploader.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+module Tienda
+  class CategoryImageUploader < Tienda::ImageUploader
+
+  end
+end

data/app/uploaders/tienda/image_uploader.rb

@@ -0,0 +1,48 @@
+# encoding: utf-8
+module Tienda
+  class ImageUploader < CarrierWave::Uploader::Base
+
+    include CarrierWave::MiniMagick
+
+    storage :aws
+
+    # Override the directory where uploaded files will be stored.
+    # This is a sensible default for uploaders that are meant to be mounted:
+    def store_dir
+      "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+    end
+
+    # Provide a default URL as a default if there hasn't been a file uploaded:
+    # def default_url
+    #   # For Rails 3.1+ asset pipeline compatibility:
+    #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+    #
+    #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+    # end
+
+    # Process files as they are uploaded:
+    # process :scale => [200, 300]
+    #
+    # def scale(width, height)
+    #   # do something
+    # end
+
+    # Create different versions of your uploaded files:
+    # version :thumb do
+    #   process :resize_to_fit => [50, 50]
+    # end
+
+    # Add a white list of extensions which are allowed to be uploaded.
+    # For images you might use something like this:
+    def extension_white_list
+      %w(jpg jpeg gif png)
+    end
+
+    # You can find full list of custom headers in AWS SDK documentation on
+    # AWS::S3::S3Object
+    def download_url(filename)
+      url(response_content_disposition: %Q{attachment; filename="#{filename}"})
+    end
+
+  end
+end

data/app/uploaders/tienda/product_image_uploader.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+module Tienda
+  class ProductImageUploader < Tienda::ImageUploader
+
+  end
+end

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

@@ -73,45 +73,29 @@
     .panel-heading
       = t('tienda.products.attachments')
     .panel-body
-      .row
-        .col-md-6
-          .form-group
-            = f.label :default_image_file, t('tienda.products.default_image')
-            %p= f.file_field :default_image_file, class: 'form-control'
-          %div
-            = attachment_preview @product.default_image
-        .col-md-6
-          .form-group
-            = f.label :second_image_file, t('tienda.products.second_image')
-            %p= f.file_field :second_image_file, class: 'form-control'
-          %div
-            = attachment_preview @product.second_image
-      .row
-        .col-md-6
-          .form-group
-            = f.label :third_image_file, t('tienda.products.third_image')
-            %p= f.file_field :third_image_file, class: 'form-control'
-          %div
-            = attachment_preview @product.third_image
-        .col-md-6
-          .form-group
-            = f.label :fourth_image_file, t('tienda.products.fourth_image')
-            %p= f.file_field :fourth_image_file, class: 'form-control'
-          %div
-            = attachment_preview @product.fourth_image
-      .row
-        .col-md-6
-          .form-group
-            = f.label :fifth_image_file, t('tienda.products.fifth_image')
-            %p= f.file_field :fifth_image_file, class: 'form-control'
-          %div
-            = attachment_preview @product.fifth_image
-        .col-md-6
-          .form-group
-            = f.label :data_sheet_file, t('tienda.products.datasheet')
-            %p= f.file_field :data_sheet_file, class: 'form-control'
-          %div
-            = attachment_preview @product.data_sheet
+      %table.productImages.table.table-hover
+        %thead
+          %tr
+            %th= t('tienda.products.preview')
+            %th= t('tienda.products.file_name')
+            %th.remove= t('tienda.products.remove')
+            %th
+        %tbody
+          %tr.template{style: 'display:none;'}
+            %td= file_field_tag 'product[product_images_attributes][][image]', class: 'form-control'
+            %td= t('tienda.products.file_name')
+            %td.remove= link_to t('tienda.remove') , '#', class: 'btn btn-sm btn-danger'
+            %td
+          - @product.product_images.each_with_index do |image, i|
+            %tr
+              %td= image_tag image.image.url, class: :img_preview
+              %td= File.basename(image.image.path)
+              %td.remove
+                = link_to t("tienda.remove"), '#', class: 'btn btn-sm btn-danger'
+                = hidden_field_tag "product[product_images_attributes][#{i}][id]", image.id
+                = hidden_field_tag "product[product_images_attributes][#{i}][_destroy]", '', class: 'destroy'
+              %td
+      %p.addImage= link_to t('tienda.products.add_image') , '#', data: {behavior: 'addImageToImagesTable'}, class: 'btn btn-success btn-sm'
 
   .panel.panel-default
     .panel-heading

data/config/initializers/carrierwave.rb

@@ -0,0 +1,15 @@
+CarrierWave.configure do |config|
+  AWS_CONFIG = Rails.application.secrets.aws_config
+
+  config.storage    = :aws
+  config.aws_bucket = AWS_CONFIG['s3_bucket_name']
+  config.aws_acl    = :'public-read'
+  config.asset_host = 'https://cdn.masinfinitocasa.com'
+  config.aws_authenticated_url_expiration = 60 * 60 * 24 * 365
+
+  config.aws_credentials = {
+    access_key_id:     AWS_CONFIG['s3_key'],
+    secret_access_key: AWS_CONFIG['s3_secret'],
+    region:            AWS_CONFIG['s3_region']
+  }
+end

data/config/routes.rb

@@ -1,6 +1,5 @@
 Tienda::Engine.routes.draw do
 
-  get 'attachment/:id/:filename.:extension' => 'attachments#show'
   resources :product_categories
   resources :products do
     resources :variants

data/db/migrate/20150626045455_create_tienda_product_images.rb

@@ -0,0 +1,12 @@
+class CreateTiendaProductImages < ActiveRecord::Migration
+  def change
+    create_table :tienda_product_images do |t|
+      t.references :product, index: true
+      t.string :image
+
+      t.timestamps null: false
+    end
+    add_column :tienda_product_categories, :image, :string
+    # add_foreign_key :tienda_product_images, :products
+  end
+end

data/db/migrate/20150628230608_convert_product_images_to_carrierwave.rb

@@ -0,0 +1,31 @@
+class ConvertProductImagesToCarrierwave < ActiveRecord::Migration
+  PRODUCT_IMAGE_TYPES = [:default_image, :second_image, :third_image, :fourth_image, :fifth_image]
+  def up
+    # Product Images
+    PRODUCT_IMAGE_TYPES.each do |image_type|
+      puts "Converting Product's #{image_type}s"
+      sql = "SELECT parent_id, file_name, data FROM nifty_attachments WHERE parent_type = 'Tienda::Product' AND role = '#{image_type}'"
+      ActiveRecord::Base.connection.execute(sql).each do |attachment|
+        File.open(attachment[1], 'wb') { |f| f.write(attachment[2]) }
+        image = Tienda::ProductImage.new
+        image.product_id = attachment[0]
+        File.open(attachment[1], 'r') { |f| image.image = f }
+        image.save
+        File.delete(attachment[1])
+      end
+    end
+
+    #Product Categories Images
+    puts "Converting Product Categoeies' images"
+    sql = "SELECT parent_id, file_name, data FROM nifty_attachments WHERE parent_type = 'Tienda::ProductCategory'"
+    ActiveRecord::Base.connection.execute(sql).each do |attachment|
+      File.open(attachment[1], 'wb') { |f| f.write(attachment[2]) }
+      category = Tienda::ProductCategory.find attachment[0]
+      File.open(attachment[1], 'r') { |f| category.image = f }
+      category.save
+      File.delete(attachment[1])
+    end
+
+    drop_table :nifty_attachments
+  end
+end

data/lib/tienda.rb

@@ -4,10 +4,12 @@ require 'dynamic_form'
 require 'kaminari'
 require 'ransack'
 require 'counter_culture'
+require 'carrierwave'
+require 'carrierwave-aws'
+require 'mini_magick'
 
 require 'nifty/utils'
 require 'nifty/key_value_store'
-require 'nifty/attachments'
 
 module Tienda
   class << self

data/lib/tienda/version.rb

@@ -1,3 +1,3 @@
 module Tienda
-  VERSION = '2.0.2'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tienda
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Gonzalo Robaina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -199,46 +199,54 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.23
 - !ruby/object:Gem::Dependency
-  name: nifty-key-value-store
+  name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
-    - - "<"
+        version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: carrierwave-aws
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: nifty-utils
+  name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 4.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 4.2.7
 - !ruby/object:Gem::Dependency
-  name: nifty-attachments
+  name: nifty-key-value-store
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -248,10 +256,24 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: nifty-utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -447,10 +469,14 @@ files:
 - app/models/tienda/product/variants.rb
 - app/models/tienda/product_attribute.rb
 - app/models/tienda/product_category.rb
+- app/models/tienda/product_image.rb
 - app/models/tienda/setting.rb
 - app/models/tienda/stock_level_adjustment.rb
 - app/models/tienda/tax_rate.rb
 - app/models/tienda/user.rb
+- app/uploaders/tienda/category_image_uploader.rb
+- app/uploaders/tienda/image_uploader.rb
+- app/uploaders/tienda/product_image_uploader.rb
 - app/validators/permalink_validator.rb
 - app/views/layouts/tienda/application.html.haml
 - app/views/layouts/tienda/printable.html.haml
@@ -514,6 +540,7 @@ files:
 - app/views/tienda/variants/form.html.haml
 - app/views/tienda/variants/index.html.haml
 - config/initializers/assets.rb
+- config/initializers/carrierwave.rb
 - config/locales/en.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
@@ -525,6 +552,8 @@ files:
 - db/migrate/20150517212100_update_stock_counter_cache.rb
 - db/migrate/20150603235417_add_document_to_orders.rb
 - db/migrate/20150605232554_add_parent_id_to_categories.rb
+- db/migrate/20150626045455_create_tienda_product_images.rb
+- db/migrate/20150628230608_convert_product_images_to_carrierwave.rb
 - db/seeds.rb
 - db/seeds_data/poe400.jpg
 - db/seeds_data/snom-870-blk.jpg