assetable 0.1.9 → 0.1.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDZjYTk0MWJjYWE4ZDkxMjVkNGNiOWQ5ODk2MDZkMjQ5M2E3ZTBlZA==
+    ZTFjYWI5NzVhMGUzYjhiNjEzMDdmNzJkYmYzY2ZjZDQyMDQ4ZjY4OQ==
   data.tar.gz: !binary |-
-    OTAxMTQ4M2YxZjFkYzFlODQ5MTY3MGNmODkzNTBkODJlNjY1OWE4ZQ==
+    YWM4OTJiYjY3NWNmODZiODdmNmI1NTZkN2Y1OTM1Y2RkOWY5YmQ4MA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    N2E3YThjNTcyOGYxNGY3NDQ2OTBjNTNhNGRlZjJlYjNmNzc2ZWE2ZmU2YTI1
-    ZmI3NGU2MTVlOWYzZGQzMjlmOWIxMjY4NTQ1ZTkzOTU3OGRjYWFiMzM5YWE3
-    MmZiYmIwMTQwOWUzNjE0NzVjYjAxNmFiYmZkYmE0NDQxYzU2NTc=
+    YzljYzI4YzE2YWJhOGE1MWNlYTg5YmIxMWI2NmRiZWY1ZjU2YTA4OThmOGUx
+    ZDZhZWU2MGYzYzE0NTVkODYwZmZlOWFkOGI4NjczMjFiYzc4NWI5Y2FkMTBm
+    YjM0YzEyMzAxMWQ4MTkwNGVhM2FmOWQ2YmZjYWNhMjhiYWI1YTA=
   data.tar.gz: !binary |-
-    MDc1YWUwNDlkMjNkNjY3NDE1MjkzYzA3YWVkNzRkY2IzM2RhNmFjODViY2E5
-    NGM5YWYxOGFlYWE5ZWZmZjMxZmY1MzIxMzEyNGM1MDE3Njc5NTMxOGU1ZDc4
-    MWI1MzM5NGQyZDgwZmZkMmU1NjA2MWMwNzM3NDBiOTM4MmM3NWE=
+    ZTZiZGNiMWQyOGJiYzJhYTE3NjViNWI2OWFiYzYzNGI1NmM4OGI5ZmI0NTQx
+    MzJkN2MwMGI0ZmZkYTY1MWNlZGZiODJiNTk5ZDQzYTI1MjE1ZTliYjlkMjk0
+    ZjBlMzdjMzVlYTdjYmZiNGExZjRlZGNhMTg0MDVlMTE4N2FiY2E=

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

@@ -13,7 +13,7 @@
       fileUpdated: options.fileUpdated
       gallery: false
       id: null
-      max_file_size: "10mb"
+      max_file_size: options.max_file_size
       multiple_queues: true
       multi_selection: true
       max_file_count: 0
@@ -213,6 +213,7 @@ bind_uploaders = ->
         url: "/assetable/assets"
         fieldname: field
         directions: $this.attr('data-uploader-directions')
+        max_file_size: $this.attr("data-max-file-size")
         authenticity_token: $("meta[name=\"csrf-token\"]").attr("content")
         onUploaded: (resp) ->
           $this.find('.uploader-data-wrapper').html(resp.html)

data/config/initializers/gallery_input.rb

@@ -30,7 +30,7 @@ class ActionView::Helpers::FormBuilder
     uploader_html = content_tag(:div, (asset_preview.html_safe), class: "uploader-data-wrapper")
 
     # Wrap the previews and uploader in a div
-    uploader_wrapper = content_tag(:div, uploader_html, class: "gallery-uploader", id: options[:id], :'data-uploader-input-name' => fieldname)
+    uploader_wrapper = content_tag(:div, uploader_html, class: "gallery-uploader", id: options[:id], :'data-uploader-input-name' => fieldname, :'data-uploader-directions' => get_directions(options), :'data-max-file-size' => get_max_file_size(options))
     return uploader_wrapper
   end
 

data/config/initializers/uploader_input.rb

@@ -16,8 +16,6 @@ class ActionView::Helpers::FormBuilder
     # Set the fieldname
     fieldname = @object_name + "[#{method}_association_attributes][asset_id]"
 
-    directions = options[:directions] || ''
-
     # Create the uploader
     value = @object.nil? ? nil : @object.send(method)
 
@@ -32,7 +30,7 @@ class ActionView::Helpers::FormBuilder
     uploader_html = content_tag(:div, (asset_preview), class: "uploader-data-wrapper")
 
     # Create and return the uploader html
-    uploader_wrapper = content_tag(:div, uploader_html, class: "uploader #{'uploader-has-asset' if asset} #{options[:class]}", id: options[:id], :'data-uploader-input-name' => fieldname, :'data-uploader-directions' => directions)
+    uploader_wrapper = content_tag(:div, uploader_html, class: "uploader #{'uploader-has-asset' if asset} #{options[:class]}", id: options[:id], :'data-uploader-input-name' => fieldname, :'data-uploader-directions' => get_directions(options), :'data-max-file-size' => get_max_file_size(options))
     return uploader_wrapper
   end
 
@@ -85,4 +83,12 @@ class ActionView::Helpers::FormBuilder
     return @object_name + output + "_#{label}"
   end
 
+  def get_max_file_size options
+    (options[:max_file_size] || Assetable.max_file_size || "10MB").to_s
+  end
+
+  def get_directions options
+    directions = options[:directions] || ''
+  end
+
 end

data/lib/assetable/config.rb

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

data/lib/assetable/version.rb

@@ -1,3 +1,3 @@
 module Assetable
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assetable
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - John Koht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails