transloadit-rails 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ef397b0d10de134321224d92d3a426778fbce69
-  data.tar.gz: e31f915796467893c049dc607f603eef9b35d77c
+  metadata.gz: 9e46058e6c8e5bcfe204b3b88c65dbf785b1d3fe
+  data.tar.gz: f55864e9016db5bb63c66629364fe05e52838002
 SHA512:
-  metadata.gz: 1940de380e945a81307e602ccba9cbf79ffcfd36799d43b6e66b5b273e00f02f48c9daa736325ca0371f26fccdcb39ea5924ccfe2d81094ab3aa0511101189ed
-  data.tar.gz: 887e3c953dff1f8faaf9a40a45956583f83c45724ddfd1e76c89c6f4356d73561f79e4df60777fded5af699a0ad8c613ac51fff55eb1a042fb6d028c2d5f0c60
+  metadata.gz: e4085ab14244992ac22ab3145bf4efbdbb9df4ffa475215cc1734d7c7c4a5b82407765b615c311aca15756c1787d04b380adc9d2fb0438273352ac8ebbe9cb16
+  data.tar.gz: 1ffcf1c1976bf9d9db1ed6d33aa6abc855ecae065cda4e1eb04bdbe3a1329bdad5f2ee5bfa10d4c2c98f38476a81405f28c604835193df136b75fbe0ac741efb

data/.gitignore

@@ -8,5 +8,6 @@ Gemfile.lock
 coverage
 doc
 pkg
+transloadit-rails-*.gem
 
 test/tmp

data/.travis.yml

@@ -5,9 +5,10 @@ rvm:
   - 2.0.0
   - 2.1.0
   - 2.2.0
-  - 2.3.0-preview1
+  - 2.3.0
   - rbx-2
   - jruby-19mode
+  - jruby-9.0.0.0
 script: "bundle exec rake test"
 
 gemfile:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.2.0 / 2016-03-27 ###
+
+* Allow to pass `max_size` to the helper (thanks @avokhmin)
+
 ### 1.1.2 / 2015-12-15 ###
 
 * Allow `onFileSelect` callback (thanks @netonion)

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2015 Transloadit Ltd.
+Copyright (c) 2016 Transloadit Ltd.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/lib/transloadit/rails/engine.rb

@@ -45,25 +45,38 @@ class Transloadit
       #
       # Returns the Transloadit authentication object.
       #
-      def self.transloadit
+      # options  - The Hash options used to refine the auth params (default: {}):
+      #            :max_size - The Integer maximum size an upload can have in bytes (optional).
+      def self.transloadit(options = {})
         Transloadit.new(
           :key      => self.configuration['auth']['key'],
           :secret   => self.configuration['auth']['secret'],
           :duration => self.configuration['auth']['duration'],
-          :max_size => self.configuration['auth']['max_size']
+          :max_size => options[:max_size] || self.configuration['auth']['max_size']
         )
       end
 
       #
       # Creates an assembly for the named template.
       #
+      # name    - The String or Symbol template name.
+      # options - The Hash options used to refine the Assembly (default: {}):
+      #           :steps    - The Hash with Assembly Steps (optional).
+      #           :max_size - The Integer maximum size an upload can have in bytes (optional).
       def self.template(name, options = {})
+        transloadit = self.transloadit(
+          :max_size => options.delete(:max_size)
+        )
+
         template = self.configuration['templates'].try(:fetch, name.to_s)
+        assembly_options  = case template
+                            when String
+                              { :template_id => template }.merge(options)
+                            when Hash
+                              template.merge(options)
+                            end
 
-        self.transloadit.assembly case template
-          when String then { :template_id => template }.merge(options)
-          when Hash   then template                    .merge(options)
-        end
+        transloadit.assembly(assembly_options)
       end
 
       #

data/lib/transloadit/rails/version.rb

@@ -1,5 +1,5 @@
 class Transloadit
   module Rails
-    VERSION = '1.1.2'
+    VERSION = '1.2.0'
   end
 end

data/lib/transloadit/rails/view_helper.rb

@@ -5,6 +5,10 @@ module Transloadit::Rails::ViewHelper
   # Inserts hidden fields specifying and signing the template for Transloadit
   # to process.
   #
+  # template - The String or Symbol template name.
+  # options  - The Hash options used to refine the Assembly (default: {}):
+  #            :steps    - The Hash with Assembly Steps (optional).
+  #            :max_size - The Integer maximum size an upload can have in bytes (optional).
   def transloadit(template, options = {})
     params = Transloadit::Rails::Engine.template(template, options).to_json
     fields = hidden_field_tag(:params, params, :id => nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transloadit-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Stephen Touset
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2016-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: transloadit