transloadit-rails 1.0.8 → 1.1.0

data/.gitignore

@@ -1,6 +1,7 @@
 .bundle
 .rvmrc
 .yardoc
+.ruby-version
 
 Gemfile.lock
 

data/.travis.yml

@@ -0,0 +1,31 @@
+language: ruby
+rvm:
+  - ree
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - rbx-18mode
+  - rbx-19mode
+  - jruby-18mode
+  - jruby-19mode
+script: "bundle exec rake test"
+
+gemfile:
+  - gemfiles/3.0.gemfile
+  - gemfiles/3.1.gemfile
+  - gemfiles/3.2.gemfile
+  - gemfiles/4.0.gemfile
+
+matrix:
+  exclude:
+    - rvm: jruby-18mode
+      gemfile: gemfiles/4.0.gemfile
+    - rvm: rbx-18mode
+      gemfile: gemfiles/4.0.gemfile
+    - rvm: 1.8.7
+      gemfile: gemfiles/4.0.gemfile
+    - rvm: ree
+      gemfile: gemfiles/4.0.gemfile
+    - rvm: 1.9.2
+      gemfile: gemfiles/4.0.gemfile

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/transloadit/rails-sdk.png?branch=master)](https://travis-ci.org/transloadit/rails-sdk)
+
 # transloadit-rails
 
 Fantastic file uploading for your Rails application.
@@ -33,7 +35,8 @@ $ rails g transloadit:install
 
 Edit `config/transloadit.yml`. It has an `auth` section for your transloadit
 credentials and a `templates` section to define or refer to existing
-templates.
+templates. It is highly recommended to [enable authentication](https://transloadit.com/docs/authentication) and signing for
+the upload forms.
 
 ```yaml
 auth:
@@ -54,6 +57,47 @@ templates:
         height: 200
 ```
 
+### Configuration by Environment
+
+The transloadit configurations can be further broken up by environment tags to
+match the environments used by the application (i.e.  development, test,
+production).
+
+Please note, the environment tags must match the application's environments
+exactly in order to be used.
+
+```yaml
+development:
+  auth:
+    key     : '4d2e...'
+    ...
+
+  templates:
+    s3_store: '4d2e...'
+    ...
+
+production:
+  auth:
+    key     : '123a...'
+    ...
+
+  templates:
+    s3_store: '789b...'
+    ...
+```
+
+## Support IE6 or jQuery < 1.9
+
+If you have to support IE6 and use a jQuery version below 1.9, you have to change
+the jquery_sdk_version in the config to 'v1.0.0':
+
+```yaml
+production:
+  jquery_sdk_version: 'v1.0.0'
+  auth:
+    ...
+```
+
 ## Usage
 
 Refer to the templates with the `transloadit` helper. This requires jQuery,

data/Rakefile

@@ -1,8 +1,6 @@
 require 'rubygems/package_task'
 require 'rake/testtask'
 
-RUBIES = %w{ 1.9.2 1.8.7 1.8.6 rbx-1.2.0 }
-
 GEMSPEC = 'transloadit-rails.gemspec'
 
 spec = eval open(GEMSPEC).read
@@ -15,40 +13,10 @@ Rake::TestTask.new do |test|
   test.pattern = 'test/**/test_*.rb'
 end
 
-namespace :test do
-  begin
-    `rvm -v` # raise an exception if RVM isn't installed
-    
-    desc 'Run tests against all supported Rubies'
-    task :multiruby do
-      system "rvm #{RUBIES.join(',')} ruby bundle exec rake -s test"
-      
-      # clean up after Rubinius
-      require 'pathname'
-      Pathname.glob('**/*.rbc').each {|path| path.unlink }
-    end
-    
-    namespace :multiruby do
-      desc 'Prepare supported rubiesfor testing'
-      task :setup do
-        warn 'Preparing multiruby. This may take awhile...'
-        
-        # create gemsets, install bundler, bundle
-        RUBIES.each {|ruby| system "rvm #{ruby} gemset create transloadit" }
-        system "rvm #{RUBIES.join(',')} gem install bundler --no-ri --no-rdoc"
-        system "rvm #{RUBIES.join(',')} ruby bundle install"
-      end
-    end
-  rescue Errno::ENOENT
-    desc 'You need `rvm` installed to test against multiple Rubies'
-    task :multiruby
-  end
-end
-
 begin
   require 'yard'
   require 'yard/rake/yardoc_task'
-  
+
   YARD::Rake::YardocTask.new :doc do |yard|
     yard.options = %w{
       --title  Transloadit Rails

data/gemfiles/3.0.gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+gem 'railties', '~> 3.0.0'
+gemspec :path => '../'

data/gemfiles/3.1.gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+gem 'railties', '~> 3.1.0'
+gemspec :path => '../'

data/gemfiles/3.2.gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+gem 'railties', '~> 3.2.0'
+gemspec :path => '../'

data/gemfiles/4.0.gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+gem 'railties', '>= 4.0.0.beta'
+gemspec :path => '../'

data/lib/templates/transloadit/transloadit.yml

@@ -1,6 +1,45 @@
-auth:
-  key     :
-  secret  :
-  duration: 1800 # 30 minute validity period for signed upload forms
+development:
+  # the jquery_sdk version you want to use, read up on it here:
+  # https://transloadit.com/blog/2013/02/transloadit-javascript-plugin-and-jquery-1-9
+  # defaults to latest
+  # use "v1.0.0" if you need IE6 support (using jQuery < 1.9)
+  jquery_sdk_version: 'latest'
+  auth:
+    key     : 'YOUR_KEY'
+    secret  : 'YOUR_SECRET' # this is optional, but highly recommended, https://transloadit.com/docs/authentication
+    duration: 1800 # 30 minute validity period for signed upload forms
 
-templates:
+  templates:
+    # template identified by template_id
+    s3_store: 'S3_STORE_TEMPLATE_ID'
+
+    # template defined inline
+    image_resize:
+      steps:
+        resize:
+          robot : '/image/resize'
+          width : 320
+          height: 200
+
+production:
+  # the jquery_sdk version you want to use, read up on it here:
+  # https://transloadit.com/blog/2013/02/transloadit-javascript-plugin-and-jquery-1-9
+  # defaults to latest
+  # use "v1.0.0" if you need IE6 support (using jQuery < 1.9)
+  jquery_sdk_version: 'latest'
+  auth:
+    key     : 'YOUR_KEY'
+    secret  : 'YOUR_SECRET' # this is optional, but highly recommended, https://transloadit.com/docs/authentication
+    duration: 1800 # 30 minute validity period for signed upload forms
+
+  templates:
+    # template identified by template_id
+    s3_store: 'S3_STORE_TEMPLATE_ID'
+
+    # template defined inline
+    image_resize:
+      steps:
+        resize:
+          robot : '/image/resize'
+          width : 320
+          height: 200

data/lib/transloadit/rails/engine.rb

@@ -10,12 +10,6 @@ class Transloadit
     class Engine < ::Rails::Engine
       CONFIG_PATH = 'config/transloadit.yml'
 
-      initializer 'transloadit-rails.action_controller' do |app|
-        ActiveSupport.on_load :action_controller do
-          helper TransloaditHelper
-        end
-      end
-
       initializer 'transloadit-rails.action_view' do |app|
         ActiveSupport.on_load :action_view do
           include Transloadit::Rails::ViewHelper

data/lib/transloadit/rails/version.rb

@@ -1,5 +1,5 @@
 class Transloadit
   module Rails
-    VERSION = '1.0.8'
+    VERSION = '1.1.0'
   end
 end

data/lib/transloadit/rails/view_helper.rb

@@ -16,4 +16,38 @@ module Transloadit::Rails::ViewHelper
 
     fields
   end
+
+  #
+  # Enables the jQuery integration for Transloadit, and ensures the form is
+  # marked with an encoding type of `multipart/form-data`.
+  #
+  def transloadit_jquerify(id, options = {})
+    version = Transloadit::Rails::Engine.configuration['jquery_sdk_version'] || 'latest'
+
+    javascript_tag %{
+      jQuery(function($) {
+        var script = '//assets.transloadit.com/js/jquery.transloadit2-#{version}.js';
+
+        $.getScript(script, function() {
+          $('##{id}')
+            .attr('enctype', 'multipart/form-data')
+            .transloadit(#{options_to_json(options)});
+        });
+      });
+    }
+  end
+
+  private
+
+    def options_to_json(options)
+      callbacks = [
+        :onstart, :onprogress, :onupload, :onresult, :oncancel, :onerror, :onsuccess
+      ]
+
+      js_options = options.map do |key, val|
+        "#{key.to_json}: #{callbacks.include?(key.downcase) ? val : val.to_json}"
+      end.join(",\n")
+
+      "{#{js_options}}"
+    end
 end

data/transloadit-rails.gemspec

@@ -6,28 +6,28 @@ Gem::Specification.new do |gem|
   gem.name     = 'transloadit-rails'
   gem.version  = Transloadit::Rails::VERSION
   gem.platform = Gem::Platform::RUBY
-  
+
   gem.authors  = ['Stephen Touset', 'Robin Mehner']
   gem.email    = ['stephen@touset.org', 'robin@coding-robin.de']
   gem.homepage = 'http://github.com/transloadit/rails-sdk/'
-  
+
   gem.summary     = 'Official Rails gem for Transloadit'
   gem.description = 'The transloadit-rails gem allows you to automate uploading files through the Transloadit REST API'
-  
+
   gem.required_rubygems_version = '>= 1.3.6'
   gem.rubyforge_project         = 'transloadit-rails'
-  
+
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.require_paths = %w{ lib }
-  
+
   gem.add_dependency 'transloadit', '>= 1.0.2'
-  gem.add_dependency 'railties',    '~> 3'
-  
+  gem.add_dependency 'railties',    '>= 3'
+
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'minitest' # needed for < 1.9.2
   gem.add_development_dependency 'simplecov'
-  
+
   gem.add_development_dependency 'yard'
-  gem.add_development_dependency 'rdiscount' # for YARD rdoc formatting
+  gem.add_development_dependency 'kramdown' # for YARD rdoc formatting
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transloadit-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-11 00:00:00.000000000 Z
+date: 2013-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: transloadit
@@ -33,7 +33,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
@@ -41,7 +41,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdiscount
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -134,10 +134,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
-- app/helpers/transloadit_helper.rb
+- gemfiles/3.0.gemfile
+- gemfiles/3.1.gemfile
+- gemfiles/3.2.gemfile
+- gemfiles/4.0.gemfile
 - lib/generators/transloadit/install_generator.rb
 - lib/templates/transloadit/transloadit.yml
 - lib/transloadit-rails.rb

data/app/helpers/transloadit_helper.rb

@@ -1,33 +0,0 @@
-module TransloaditHelper  
-  #
-  # Enables the jQuery integration for Transloadit, and ensures the form is
-  # marked with an encoding type of `multipart/form-data`.
-  #
-  def transloadit_jquerify(id, options = {})
-    javascript_tag %{
-      jQuery(function($) {
-        var script = '//assets.transloadit.com/js/jquery.transloadit2.js';
-
-        $.getScript(script, function() {
-          $('##{id}')
-            .attr('enctype', 'multipart/form-data')
-            .transloadit(#{options_to_json(options)});
-        });
-      });
-    }
-  end
-
-  private
-
-    def options_to_json(options)
-      callbacks = [
-        :onstart, :onprogress, :onupload, :onresult, :oncancel, :onerror, :onsuccess
-      ]
-
-      js_options = options.map do |key, val|
-        "#{key.to_json}: #{callbacks.include?(key.downcase) ? val : val.to_json}"
-      end.join(",\n")
-
-      "{#{js_options}}"
-    end
-end