assetable 0.2.2 → 0.2.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDMxNzlhNTkyNjhiZWU1M2E2ZjA4OTVhMTE2OGM4NzUzYzQ3YmFjNQ==
+    NjdkNGY5ZTA4YjM5ZTYzN2M0MWJmYWIzOWYyNjk0OWU1NDczNWRlZg==
   data.tar.gz: !binary |-
-    ZTIzN2MxZDFmNWY1ZTI0OTgyZDNhY2UxM2NkNDUyMmE3Yjg2NzE0Yg==
-!binary "U0hBNTEy":
+    NDMxMWI4MDQwMDE1MDcxNDM1NGM5ZDk5YjFlYjlmMTJkNmFhYWNiZA==
+SHA512:
   metadata.gz: !binary |-
-    YjExMTViODM1ZDAxZDA5MmYwYWFlNjZlZWU4MzljN2QyNzEzNDhhZTA4YzE1
-    OTRlOTc0OThhYjY2OWJhY2VmYzczZWZjMmQ2ZjgyYmZmNDdhY2I1YWU0NDhl
-    NGQzYzZkMzU0NDY3YzRiYmY0NTVlYzVmZDgxYmE0ZTAxZjRiYjU=
+    MjY2NzE3ZjhiYTE5OGZlODMyNDA1YTZkYjBjZTNhN2U4ZmNjOThjODRkNzVi
+    MTViZTU5YTJhMTc5YWJjZmNmM2E0YjA1OWVlNjM0ZmNhMWU4MTcxODBlNmY1
+    MjZjYWI4MjU1NzJjM2IyOTJlYWZmOTkzYTk5YjkyMDFmNjc1ZTA=
   data.tar.gz: !binary |-
-    ODZiODNjN2Y2ZjkyZDkyZGU2MWVmMzIxOTRjOWI2ZWUwMzExOTk3MTNkZmRi
-    NDE0MjU1NzlmMDZmMTI3MGYxYWMzZGE1YjBjZjgxMmNjY2UwOTE2NDg4NmRl
-    NTc3YmM1OTQ1Nzc0OWRhOWIyZTMzYzU5NzMxZjI3MjJiNDgxZDk=
+    Njg5NWI1NzBmNzJiYWI4YTYwYTBjMDBlMmY5ZTNjY2E4YzIwZDlhNGYzOWQ0
+    M2MyNGEyZDk2Mzg1Njk1ZGE2MDRlODBlZGVhNjE3NjZkODI3MDAwZjYyMTYw
+    OWU5MzZhYmNhMzU3NWIyZWY4NDhiMDRjZGI2MjdlZDFkY2ZhMDI=

data/app/assets/javascripts/assetable/assetable_uploader.js.coffee

@@ -83,7 +83,7 @@
             extensions: "zip"
           ,
             title: "Documents"
-            extensions: "pdf, doc, docx, xls, xlsx"
+            extensions: "pdf,doc,docx,xls,xlsx"
           ]
           max_file_size: assetable_uploader.options.max_file_size
           prevent_duplicates: true
@@ -134,6 +134,7 @@
         $(this).removeClass "droppable" if $(this).hasClass("droppable")
 
       $(draggable_selector).on "drop", ->
+        $(this).find('.alert').remove()
         $(this).removeClass "droppable" if $(this).hasClass("droppable")
 
 

data/app/assets/javascripts/assetable/uploader.js.coffee

@@ -9,7 +9,7 @@ bind_uploaders = ->
       $this.assetable_uploader
         multi_selection: false
         url: "/assetable/assets.js"
-        # directions: $this.attr('data-uploader-directions')
+        directions: $this.attr('data-uploader-directions')
         # max_file_size: $this.attr("data-max-file-size")
         authenticity_token: $("meta[name=\"csrf-token\"]").attr("content")
         fileRemoved: (item, button) ->

data/app/controllers/assetable/assets_controller.rb

@@ -31,9 +31,9 @@ class Assetable::AssetsController < ActionController::Base
     end
 
     # Return
+    @fieldname = params[:fieldname]
+    @uploader_id = params[:uploader_id]
     if @asset.errors.empty? and @asset.save
-      @fieldname = params[:fieldname]
-      @uploader_id = params[:uploader_id]
       render :create
     else
       render :error

data/app/inputs/uploader_input.rb

@@ -17,7 +17,8 @@ class UploaderInput < SimpleForm::Inputs::FileInput
     uploader_html = template.content_tag(:div, (hidden_field + preview.html_safe), class: "uploader-assets-wrapper")
 
     # Create and return the uploader html
-    uploader_wrapper = template.content_tag :div, (uploader_html + directions_html.html_safe), class: "assetable-uploader"
+    directions = options[:directions]
+    uploader_wrapper = template.content_tag :div, (uploader_html + directions_html(directions).html_safe), class: "assetable-uploader"
     return uploader_wrapper
   end
 

data/app/models/asset.rb

@@ -19,8 +19,9 @@ class Asset < ActiveRecord::Base
   has_many :asset_attachments, :as => :assetable, :dependent => :destroy
   has_many :assetable, :through => :asset_attachments
   
-  before_save :update_asset_attributes
+  before_validation :update_asset_attributes
 
+  validates_uniqueness_of :checksum, message: "File has already been uploaded." if Assetable.unique_assets
 
 
   # File Type Helpers

data/app/views/assetable/assets/_directions.html.haml

@@ -3,7 +3,10 @@
   .uploader-directions-copy
     = link_to "select file", "#", class: "browse-btn"
     or
-    = link_to "add a third party service", Rails.application.routes.url_helpers.new_assetable_external_service_path, class: "btn-third-party", remote: true
+    - if directions.present?
+      = directions
+    - else
+      = link_to "add a third party service", Rails.application.routes.url_helpers.new_assetable_external_service_path, class: "btn-third-party", remote: true
 
     / or
     / = link_to "select from gallery", Rails.application.routes.url_helpers.assetable_assets_path(fieldname: fieldname, uploader_id: id), remote: true

data/app/views/assetable/assets/error.js.erb

@@ -0,0 +1,3 @@
+var uploader = $('#<%= @uploader_id %>');
+
+$('#<%= @uploader_id %>').append('<%= j render partial: "assetable/shared/templates/asset_error", locals: { asset: @asset, fieldname: @fieldname } %>');

data/app/views/assetable/shared/templates/_asset_error.html.haml

@@ -0,0 +1,2 @@
+.alert.alert-danger
+  = asset.errors.full_messages.join(", ")

data/config/initializers/assetable.rb

@@ -0,0 +1,6 @@
+# Default configs
+Assetable.configure do |config|
+  config.storage = :fog
+  config.max_file_size = "10MB"
+  config.unique_assets = true
+end

data/lib/assetable/config.rb

@@ -4,6 +4,7 @@ module Assetable
     VALID_OPTION_KEYS = [
       :storage,
       :max_file_size,
+      :unique_assets,
       :external_document_types,
       :external_document_icons
     ]

data/lib/assetable/inputs/uploaders.rb

@@ -20,8 +20,8 @@ module Assetable::Uploaders
     ActionController::Base.new.send(:render_to_string, partial: "assetable/shared/templates/#{type.downcase.to_s}_item", locals: { asset: asset, fieldname: fieldname })
   end
 
-  def directions_html
-    ActionController::Base.new.send(:render_to_string, :partial => 'assetable/assets/directions')
+  def directions_html directions=nil
+    ActionController::Base.new.send(:render_to_string, partial: 'assetable/assets/directions', locals: {directions: directions})
   end
 
 end

data/lib/assetable/version.rb

@@ -1,3 +1,3 @@
 module Assetable
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assetable
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - John Koht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -283,6 +283,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.rdoc
+- Rakefile
 - app/assets/images/assetable/icon-upload.png
 - app/assets/images/assetable/icons/icon-ai.png
 - app/assets/images/assetable/icons/icon-css.png
@@ -350,6 +353,7 @@ files:
 - app/views/assetable/assets/_table.html.haml
 - app/views/assetable/assets/create.js.erb
 - app/views/assetable/assets/edit.js.erb
+- app/views/assetable/assets/error.js.erb
 - app/views/assetable/assets/index.js.erb
 - app/views/assetable/assets/insert.js.erb
 - app/views/assetable/assets/update.js.erb
@@ -357,8 +361,10 @@ files:
 - app/views/assetable/external_services/create.js.erb
 - app/views/assetable/external_services/new.js.erb
 - app/views/assetable/shared/_asset_preview.html.haml
+- app/views/assetable/shared/templates/_asset_error.html.haml
 - app/views/assetable/shared/templates/_asset_item.html.haml
 - app/views/assetable/shared/templates/_gallery_item.html.haml
+- config/initializers/assetable.rb
 - config/initializers/carrierwave.rb
 - config/initializers/gallery_input.rb
 - config/initializers/uploader_input.rb
@@ -368,16 +374,13 @@ files:
 - db/migrate/20131125200943_create_galleries.rb
 - db/migrate/20140121173312_add_ratio_to_assets.rb
 - db/migrate/20140220053656_add_sort_order_to_asset_attachments.rb
+- lib/assetable.rb
 - lib/assetable/active_record/base.rb
 - lib/assetable/config.rb
 - lib/assetable/engine.rb
 - lib/assetable/inputs/uploaders.rb
 - lib/assetable/version.rb
-- lib/assetable.rb
 - lib/tasks/assetable_tasks.rake
-- MIT-LICENSE
-- Rakefile
-- README.rdoc
 - test/fixtures/asset_attachments.yml
 - test/fixtures/assets.yml
 - test/fixtures/images.yml
@@ -405,7 +408,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Dead simple asset uploader attachments for your active record models
@@ -418,4 +421,3 @@ test_files:
 - test/models/asset_test.rb
 - test/models/image_test.rb
 - test/models/video_test.rb
-has_rdoc: