Merge pull request #11 from ScotterC/rails4

Rails4
ScotterC · Jan 16, 2014 · 25162d5 · 25162d5
2 parents db5139a + ccce0fd
commit 25162d5
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,7 +2,6 @@ PATH
   remote: .
   specs:
     fileclip (0.3.1)
-      paperclip
       paperclip (>= 3.5.1)
       railties (>= 3.0)
       rest-client

diff --git a/fileclip.gemspec b/fileclip.gemspec
@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
 
   s.rubygems_version = "2.0.3"
 
-  s.add_dependency 'paperclip', [">= 3.5.1"]
   s.add_dependency 'rest-client'
 
   s.add_development_dependency "rspec"
@@ -28,6 +27,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'coveralls'
   s.add_runtime_dependency(%q<railties>, [">= 3.0"])
 
-  s.add_runtime_dependency "paperclip"
+  s.add_runtime_dependency "paperclip", [">= 3.5.1"]
 end
 
diff --git a/lib/fileclip.rb b/lib/fileclip.rb
@@ -47,7 +47,6 @@ def self.included(base)
 
   module ClassMethods
     def fileclip(name)
-      attr_accessible :filepicker_url
       after_commit  :update_from_filepicker!
 
       set_fileclipped(name)

diff --git a/lib/fileclip/action_view/helpers.rb b/lib/fileclip/action_view/helpers.rb
@@ -52,6 +52,7 @@ def activation(js, id, callback)
 
       # Options
       # Activate (defaults to true) to set own javascript
+      # TODO: add to options to add css classes
       def fileclip_link_builder(link, form_object, options, id)
         # Get attachment name
         attachment_name = form_object.object.attachment_name