transloadit-rails 0.9.1 → 0.9.2

data/README.md

@@ -9,7 +9,7 @@ you to automate uploading files through the Transloadit REST API.
 
 ## Install
 
-    gem install transloadit
+    gem install transloadit-rails
 
 ## Getting started
 
@@ -65,32 +65,32 @@ It also uses JavaScript to ensure your form is encoded as `multipart/form-data`.
 In this tutorial, you are going to learn how to use transloadit in a freshly
 setup rails project.
 
-If you haven't already done so, go ahead an install rails as well as the
-transloadit gem:
+If you haven't already done so, go ahead and install Rails.
 
     $ gem install rails
-    $ gem install transloadit
 
-With rails installed, let's create a new app called 'my_app':
+With rails installed, let's create a new app called 'my_app'.
 
     $ rails new my_app
     $ cd my_app
 
 In order to use transloadit in this app, we need to add the gem to our Gemfile
-and bundle things up:
+and bundle things up.
 
     $ echo "gem 'transloadit-rails'" >> Gemfile
     $ bundle install
 
 With that in place, it's time to generate our transloadit configuration, as
-well as a basic UploadsController:
+well as a basic UploadsController and a dummy Upload model.
 
-    $ rails generate transloadit:install
-    $ rails generate controller uploads new create
+    $ rails g transloadit:install
+    $ rails g controller uploads new create
+    $ rails g model upload
+    $ rails db:migrate
 
 The controller generator we just executed has probably put two GET routes into
 your `config/routes.rb`. We don't want those, so lets go ahead an overwrite
-them with this:
+them with this.
 
     MyApp::Application.routes.draw do
       resources :uploads
@@ -119,7 +119,7 @@ Alright, time to create our upload form. In order to do that, please open
     <%= javascript_include_tag '//ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js' %>
 
     <h1>Upload an image</h1>
-    <%= form_for :upload, :html => { :id => 'upload' } do |form| %>
+    <%= form_for Upload.new, :html => { :id => 'upload' } do |form| %>
       <%= form.transloadit :image_resize %>
       <%= form.label      :file, 'File to upload' %>
       <%= form.file_field :file %>
@@ -128,18 +128,11 @@ Alright, time to create our upload form. In order to do that, please open
 
     <%= transloadit_jquerify :upload, :wait => true %>
 
-Now let's open up our `uploads_controller.rb` in order to modify our `create`
-action to parse the response JSON we get from the jQuery plugin:
-
-    def create
-      @upload = ActiveSupport::JSON.decode(params[:transloadit])
-    end
-
-With this in place, we can modify the `create.html.erb` view to render the
-uploaded and resized image:
+With this in place, we can modify the `app/views/uploads/create.html.erb` view
+to render the uploaded and resized image:
 
     <h1>Resized upload image</h1>
-    <%= image_tag @upload['results']['resize'].first['url'] %>
+    <%= image_tag params['transloadit']['results']['resize'].first['url'] %>
 
 That's it. If you've followed the steps closely, you should now be able to
 try your first upload. Don't forget do start your rails server first:

data/lib/transloadit/rails.rb

@@ -5,11 +5,15 @@ require 'rails'
 class Transloadit::Rails < Rails::Engine
   CONFIG_PATH = 'config/transloadit.yml'
   
-  autoload :FormHelper, 'transloadit/rails/form_helper'
+  autoload :ControllerExtensions, 'transloadit/rails/controller_extensions'
+  autoload :FormHelper,           'transloadit/rails/form_helper'
   
   config.to_prepare do
     # add the two helpers to the view stack
-    ApplicationController.helper TransloaditHelper
+    class ActionController::Base
+      include Transloadit::Rails::ControllerExtensions
+      helper TransloaditHelper
+    end
     
     class ActionView::Helpers::FormBuilder
       include Transloadit::Rails::FormHelper

data/lib/transloadit/rails/controller_extensions.rb

@@ -0,0 +1,18 @@
+require 'transloadit/rails'
+
+module Transloadit::Rails::ControllerExtensions
+  extend ActiveSupport::Concern
+  
+  included do
+    before_filter :decode_transloadit_json
+  end
+    
+  def decode_transloadit_json
+    return unless params[:transloadit].present?
+    
+    # wrap transloadit params in a HashWithIndifferentAccess
+    params[:transloadit] = ActiveSupport::HashWithIndifferentAccess.new(
+      ActiveSupport::JSON.decode params[:transloadit]
+    )
+  end
+end

data/lib/transloadit/rails/version.rb

@@ -1,5 +1,5 @@
-require 'transloadit/rails'
-
-class Transloadit::Rails
-  VERSION = '0.9.1'
+class Transloadit
+  class Rails
+    VERSION = '0.9.2'
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: transloadit-rails
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Stephen
@@ -11,7 +11,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 Z
+date: 2011-04-26 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: transloadit
@@ -110,11 +111,13 @@ files:
 - lib/transloadit-rails.rb
 - lib/transloadit/generators.rb
 - lib/transloadit/rails.rb
+- lib/transloadit/rails/controller_extensions.rb
 - lib/transloadit/rails/form_helper.rb
 - lib/transloadit/rails/version.rb
 - test/generators/transloadit/test_install_generator.rb
 - test/test_helper.rb
 - transloadit-rails.gemspec
+has_rdoc: true
 homepage: http://github.com/transloadit/rails-sdk/
 licenses: []
 
@@ -138,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: transloadit-rails
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Official Rails gem for Transloadit