tienda 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 933f506f2bd775ae3c0f5d799a27d41d29d55c6e
-  data.tar.gz: 3f7b45825520d4627b312ec2961d5582d766625d
+  metadata.gz: edf111d05bb6bea52a0e5cbe91c43f8616d359d1
+  data.tar.gz: 7c59e4ea1357e278c4b8641775ba5861f89d8230
 SHA512:
-  metadata.gz: 0cfa436a52083dec422649329cd0ce7850773e97b79e4ccc70437f4ed77eb0aef9a97c79967bbaa8ca25031d23ad972e38ec89387b6baaed9d21b21299ffc2cb
-  data.tar.gz: af034953e10a3b0f96f64939001ea0a42abb4b4e844ebbb187ffdde2ed37d6bb3af20edc30a843ec93c7bf91cc8806a9bba1a0c831561635c5e240b133f44b11
+  metadata.gz: 71f53bf4675bb97b2ee8e413eca9ddbdd6c1bd7de7148f56b3942fd4f49b70298e7815c216213cacf8a3c9fae79a25d1dfa9a58a812b1b647bd40d9e5e8d39d2
+  data.tar.gz: 146f2925b2d153afd168b8c95c1ce3ef6aac3c7e91440efb9a6bd94c203e7f2e42177d22ad34a8a21b2cbd1e76cc19b5feb38547c54e5f95cfe0b8a9dcdd279d

data/app/controllers/tienda/product_categories_controller.rb

@@ -42,7 +42,7 @@ module Tienda
     private
 
     def safe_params
-      params[:product_category].permit(:name, :permalink, :description, :image_file, :parent_id)
+      params[:product_category].permit(:name, :permalink, :description, :image, :parent_id)
     end
 
   end

data/app/helpers/tienda/application_helper.rb

@@ -15,30 +15,6 @@ module Tienda
       content_tag :span, t("tienda.orders.statuses.#{status}"), :class => "status-tag #{status}"
     end
 
-    def attachment_preview(attachment, options = {})
-      if attachment
-        String.new.tap do |s|
-          if attachment.mounted_as == :image
-            style = "style='background-image:url(#{attachment.url})'"
-          else
-            style = ''
-          end
-          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'>#{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>"
-          s << "</div>"
-          s << "</div>"
-        end.html_safe
-      elsif !options[:hide_if_blank]
-        "<div class='attachmentPreview'><div class='imgContainer'><div class='img none'></div></div><div class='desc none'>#{t('helpers.attachment_preview.no_attachment')}</div></div>".html_safe
-      end
-    end
-
     def settings_label(field, html_class)
       "<label for='settings_#{field}' class='#{html_class}'>#{t("tienda.settings.labels.#{field}")}</label>".html_safe
     end

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

@@ -29,10 +29,11 @@
     .panel-body
       .row
         .col-md-12
-          = f.label :image_file, t('tienda.product_category.image')
+          = f.label :image, t('tienda.product_category.image')
           %div
-            = attachment_preview @product_category.image
-            %p= f.file_field :image_file, class: 'form-control'
+            - unless @product_category.image.blank?
+              = image_tag @product_category.image.url
+            %p= f.file_field :image, class: 'form-control'
 
   .panel.panel-default
     .panel-body

data/config/initializers/mime_types.rb

@@ -0,0 +1 @@
+Mime::Type.register "application/vnd.ms-excel", :xls

data/lib/tienda/version.rb

@@ -1,3 +1,3 @@
 module Tienda
-  VERSION = '2.1.1'
+  VERSION = '2.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tienda
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Gonzalo Robaina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -202,6 +202,9 @@ dependencies:
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
@@ -209,6 +212,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
@@ -216,6 +222,9 @@ dependencies:
   name: carrierwave-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
@@ -223,6 +232,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
@@ -230,6 +242,9 @@ dependencies:
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.7
@@ -237,6 +252,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.7
@@ -541,6 +559,7 @@ files:
 - app/views/tienda/variants/index.html.haml
 - config/initializers/assets.rb
 - config/initializers/carrierwave.rb
+- config/initializers/mime_types.rb
 - config/locales/en.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml