fileclip 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f40a90259ac27e876f6cf56f326ab18279b476f5
-  data.tar.gz: decfde8e4d6ac8580cb2d86ec1c3394f37ca9333
+  metadata.gz: 3fa875e233d7b35eef0e879d87bfa59834b8c00d
+  data.tar.gz: ff60c7952f7a7e3647099d7afaf89cd7d9f32a3f
 SHA512:
-  metadata.gz: 9b1f34aef2c3516b4db6e14ae09ab4c6d1a08ade820374c71b9e64d33224b7336028f8104d4aa435095a367f6660619a174d92df3c65cc967cd3bf1d431aee96
-  data.tar.gz: 5b1c57b57955c4b3253dd8362d18b6c9b30ef0df73ef010cd3888ed9303ee59c5edb5d6996c108ef29d7fb4715bd4ef283f95caf843189788121b4b9c95d0b21
+  metadata.gz: e48638eb79dfcdfc0aec9cabb8ceb69994ce354426408f72d77389d3c813bf6318f76072d1f33f99b1eedfdbba522690d025884349e1e6bf68bd3c434b19e211
+  data.tar.gz: e2e0a1a28fd38252f03a15a5309900b19e337db40bbdbc7a2e906a59326607f9c0649df4cf1ca119f187c6200ffdf8dbfd2dc6e4f018136a455ec1ac4d3c2a17

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fileclip (0.2.1)
+    fileclip (0.2.2)
       paperclip
       paperclip (>= 3.5.1)
       railties (>= 3.0)

data/TODO.md

@@ -5,24 +5,16 @@ Backend:
 * create generator for migration
 * create generator for intializer
 * Normalize filenames
-* Change keys as an option.  defaults to filepicker_url
 
 Frontend:
-* Allow overriding of filepicker options
-* Fileclip link to automatically set fields and call it
-* link should act like a normal link helper
-* Minimal amount of JS
 * Loader for filepicker js only if needed
 * Eliminate need for jQuery
 * make it a form builder function that can accept a different url name
 
 Extra features:
-* Work with Delayed Paperclip
-* Work with Resque
 * Work with DelayedJob
 * Work with Sidekiq
 * Fallback to filepicker url if paperclip url doesn't exist
 * Filepicker converts to match paperclip styles
-* Configure Filepicker options
 * FilePicker droppane support
 

data/lib/fileclip.rb

@@ -7,26 +7,25 @@ require 'fileclip/jobs/resque'
 require 'rest-client'
 
 module FileClip
-
   mattr_accessor :change_keys
 
-  def self.change_keys
-    @@change_keys ||= [:filepicker_url]
-  end
+  class << self
 
-  def self.delayed?
-    defined?(DelayedPaperclip)
-    # TODO: replace with checking for delayed options?
-  end
+    def process(klass, instance_id)
+      klass.constantize.find(instance_id).process_from_filepicker
+    end
 
-  class << self
+    # TODO: replace with checking for delayed options?
+    def delayed?
+      defined?(DelayedPaperclip)
+    end
 
     def resque_enabled?
       !!(defined? Resque)
     end
 
-    def process(klass, instance_id)
-      klass.constantize.find(instance_id).process_from_filepicker
+    def change_keys
+      @@change_keys ||= [:filepicker_url]
     end
 
   end

data/lib/fileclip/engine.rb

@@ -1,11 +1,7 @@
+require 'rails'
+
+# Necessary to load asset paths
 module FileClip
-  module Rails
-    class Engine < ::Rails::Engine
-      initializer 'fileclip.insert_into_active_record' do
-        ::ActiveSupport.on_load :active_record do
-          FileClip::Railtie.insert
-        end
-      end
-    end
+  class Engine < ::Rails::Engine
   end
 end

data/lib/fileclip/railtie.rb

@@ -1,10 +1,15 @@
+require 'rails'
+
+# TODO: only include it in models that have paperclip attachments
+# But will require restart of server for it to pick up the class on edit
 module FileClip
-  class Railtie
-    # Glue includes FileClip into ActiveRecord
-    # TODO: only include it in models that have paperclip attachments
-    # Will require restart of server for it to pick up the class on edit
-    def self.insert
+  class Railtie < ::Rails::Railtie
+
+    initializer "fileclip.model_methods" do
       ::ActiveRecord::Base.send(:include, FileClip::Glue)
+    end
+
+    initializer "fileclip.view_helpers" do
       ::ActionView::Base.send(:include, FileClip::ActionView::Helpers)
     end
   end

data/lib/fileclip/version.rb

@@ -1,3 +1,3 @@
 module FileClip
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/fileclip/railtie_spec.rb

@@ -5,7 +5,7 @@ describe FileClip::Railtie do
     it "should include the glue" do
       ActiveRecord::Base.should_receive(:send).with(:include, FileClip::Glue)
       ActionView::Base.should_receive(:send).with(:include, FileClip::ActionView::Helpers)
-      FileClip::Railtie.insert
+      FileClip::Railtie.run_initializers
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fileclip
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Scott Carleton
@@ -151,7 +151,6 @@ files:
 - lib/fileclip/validators.rb
 - lib/fileclip/version.rb
 - spec/fileclip/configuration_spec.rb
-- spec/fileclip/engine_spec.rb
 - spec/fileclip/railtie_spec.rb
 - spec/fileclip/validators_spec.rb
 - spec/fileclip_spec.rb
@@ -184,7 +183,6 @@ specification_version: 4
 summary: A FilePicker / PaperClip mashup.
 test_files:
 - spec/fileclip/configuration_spec.rb
-- spec/fileclip/engine_spec.rb
 - spec/fileclip/railtie_spec.rb
 - spec/fileclip/validators_spec.rb
 - spec/fileclip_spec.rb

data/spec/fileclip/engine_spec.rb

@@ -1,16 +0,0 @@
-require 'spec_helper'
-require 'rails/initializable'
-
-
-describe FileClip::Rails::Engine do
-
-  describe "include on initialzation" do
-    it "should insert fileclip and include view helpers on rails initialzation" do
-      pending
-      FileClip::Railtie.should_receive(:insert)
-      ::ActionView::Base.should_receive(:send).with(:include, FileClip::ActionView::Helpers)
-      FileClip::Rails::Engine.run_initializers
-    end
-  end
-
-end