Merge pull request #421 from lazywei/strong-parameters

Compatibility of rails 4's strong parameters.
jejacks0n · Oct 21, 2013 · 5f17871 · 5f17871 · waclock · Oct 28, 2013
2 parents 9b722b1 + b7edaec
commit 5f17871
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/lib/generators/mercury/install/images/images_generator.rb b/lib/generators/mercury/install/images/images_generator.rb
@@ -16,12 +16,13 @@ def copy_models
             copy_file 'mongoid_paperclip_image.rb', 'app/models/mercury/image.rb'
           else
             copy_file 'ar_paperclip_image.rb', 'app/models/mercury/image.rb'
+            template 'ar_paperclip_image.rb.erb', 'app/models/mercury/image.rb'
             migration_template 'ar_paperclip_image_migration.rb', 'db/migrate/create_mercury_images.rb'
           end
         end
 
         def copy_controller
-          copy_file 'images_controller.rb', 'app/controllers/mercury/images_controller.rb'
+          template 'images_controller.rb.erb', 'app/controllers/mercury/images_controller.rb'
         end
 
         def add_routes

diff --git a/...ll/images/templates/ar_paperclip_image.rb → ...mages/templates/ar_paperclip_image.rb.erb b/...ll/images/templates/ar_paperclip_image.rb → ...mages/templates/ar_paperclip_image.rb.erb
@@ -1,8 +1,9 @@
 class Mercury::Image < ActiveRecord::Base
 
   self.table_name = :mercury_images
-
-  attr_accessible :image
+  <% unless Gem::Version.new(::Rails::VERSION::STRING) >= Gem::Version.new("4.0.0") %>
+    attr_accessible :image
+  <% end %>
 
   has_attached_file :image, :styles => { :medium => "300x300>", :thumb => "100x100>" },
         :path => ":rails_root/public/system/:attachment/:id/:style/:filename",

diff --git a/...all/images/templates/images_controller.rb → ...images/templates/images_controller.rb.erb b/...all/images/templates/images_controller.rb → ...images/templates/images_controller.rb.erb
@@ -4,7 +4,11 @@ class Mercury::ImagesController < MercuryController
 
   # POST /images.json
   def create
-    @image = Mercury::Image.new(params[:image])
+    <% if Gem::Version.new(::Rails::VERSION::STRING) >= Gem::Version.new("4.0.0") %>
+      @image = Mercury::Image.new(params.require(:image).permit(:image))
+    <% else %>
+      @image = Mercury::Image.new(params[:image])
+    <% end %>
     @image.save
     respond_with @image
   end