delayed_paperclip 2.6.0.0 → 2.6.1

data/spec/spec_helper.rb

@@ -0,0 +1,86 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+
+require 'rails'
+require 'active_record'
+require 'rspec'
+require 'mocha/api'
+
+require 'paperclip/railtie'
+Paperclip::Railtie.insert
+
+require 'delayed_paperclip/railtie'
+DelayedPaperclip::Railtie.insert
+
+# Connect to sqlite
+ActiveRecord::Base.establish_connection(
+  "adapter" => "sqlite3",
+  "database" => ":memory:"
+)
+
+# Path for filesystem writing
+ROOT = Pathname(File.expand_path(File.join(File.dirname(__FILE__), '..')))
+
+FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures")
+ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
+Paperclip.logger = ActiveRecord::Base.logger
+
+RSpec.configure do |config|
+  config.mock_with :mocha
+
+  config.filter_run focus: true
+  config.run_all_when_everything_filtered = true
+end
+
+Dir["./spec/integration/examples/*.rb"].sort.each {|f| require f}
+
+# Reset table and class with image_processing column or not
+def reset_dummy(options = {})
+  options[:with_processed] = true unless options.key?(:with_processed)
+  build_dummy_table(options[:with_processed])
+  reset_class("Dummy", options)
+end
+
+# Dummy Table for images
+# with or without image_processing column
+def build_dummy_table(with_processed)
+  ActiveRecord::Base.connection.create_table :dummies, :force => true do |t|
+    t.string   :name
+    t.string   :image_file_name
+    t.string   :image_content_type
+    t.integer  :image_file_size
+    t.datetime :image_updated_at
+    t.boolean(:image_processing, :default => false) if with_processed
+  end
+end
+
+def reset_class(class_name, options)
+  # setup class and include paperclip
+  options[:paperclip] = {} if options[:paperclip].nil?
+  ActiveRecord::Base.send(:include, Paperclip::Glue)
+  Object.send(:remove_const, class_name) rescue nil
+
+  # Set class as a constant
+  klass = Object.const_set(class_name, Class.new(ActiveRecord::Base))
+
+  # Setup class with paperclip and delayed paperclip
+  klass.class_eval do
+    include Paperclip::Glue
+
+    has_attached_file  :image, options[:paperclip]
+    options.delete(:paperclip)
+
+    process_in_background :image, options if options[:with_processed]
+
+    after_update :reprocess if options[:with_after_update_callback]
+
+    def reprocess
+      image.reprocess!
+    end
+
+  end
+
+  Rails.stubs(:root).returns(Pathname.new(ROOT).join('spec', 'tmp'))
+  klass.reset_column_information
+  klass
+end

data/test/base_delayed_paperclip_test.rb

@@ -156,7 +156,7 @@ module BaseDelayedPaperclipTest
   def test_after_callback_is_functional
     Dummy.send(:define_method, :done_processing) { puts 'done' }
     Dummy.after_image_post_process :done_processing
-    Dummy.any_instance.expects(:done_processing)
+    Dummy.any_instance.expects(:done_processing).once
     dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
     dummy.save!
     process_jobs
@@ -164,11 +164,10 @@ module BaseDelayedPaperclipTest
 
   def test_delayed_paperclip_functioning_with_after_update_callback
     reset_class "Dummy", :with_processed => true, :with_after_update_callback => true
-    Dummy.any_instance.expects(:reprocess)
+    Dummy.any_instance.expects(:reprocess).once
     dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
     dummy.save!
     process_jobs
-    dummy.name = "foobar123"
   end
 
   def test_delayed_paperclip_functioning_with_only_process_option
@@ -200,6 +199,7 @@ module BaseDelayedPaperclipTest
     reset_class "Dummy", :with_processed => true, :paperclip => { :styles => {:thumbnail => ['12x12', :jpg]} }
     dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
     dummy.save!
+
     existing_jobs_count = jobs_count
     dummy.update_attribute(:image_processing, false)
     dummy.image.reprocess_without_delay!(:thumbnail)

data/test/test_helper.rb

@@ -1,11 +1,10 @@
 require 'rubygems'
 require 'test/unit'
-require 'mocha'
+require 'mocha/setup'
 require 'active_record'
 require 'logger'
 require 'sqlite3'
 require 'paperclip/railtie'
-require 'debugger'
 
 Paperclip::Railtie.insert
 
@@ -30,17 +29,16 @@ ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
 ActiveRecord::Base.establish_connection(config['test'])
 Paperclip.logger = ActiveRecord::Base.logger
 
-# def reset_dummy(options = {})
-#   reset_dummy(options)
-#   Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
-# end
 
+# Reset table and class with image_processing column or not
 def reset_dummy(options = {})
   options[:with_processed] = true unless options.key?(:with_processed)
   build_dummy_table(options[:with_processed])
   reset_class("Dummy", options)
 end
 
+# Dummy Table for images
+# with or without image_processing column
 def build_dummy_table(with_processed)
   ActiveRecord::Base.connection.create_table :dummies, :force => true do |t|
     t.string   :name
@@ -52,17 +50,25 @@ def build_dummy_table(with_processed)
   end
 end
 
+
 def reset_class(class_name, options)
+  # setup class and include paperclip
   options[:paperclip] = {} if options[:paperclip].nil?
   ActiveRecord::Base.send(:include, Paperclip::Glue)
   Object.send(:remove_const, class_name) rescue nil
+
+  # Set class as a constant
   klass = Object.const_set(class_name, Class.new(ActiveRecord::Base))
+
+  # Setup class with paperclip and delayed paperclip
   klass.class_eval do
     include Paperclip::Glue
-    has_attached_file  :image, options[:paperclip]
 
+    has_attached_file  :image, options[:paperclip]
     options.delete(:paperclip)
+
     process_in_background :image, options if options[:with_processed]
+
     after_update :reprocess if options[:with_after_update_callback]
 
     def reprocess
@@ -70,6 +76,7 @@ def reset_class(class_name, options)
     end
 
   end
+
   klass.reset_column_information
   klass
 end

metadata

@@ -1,128 +1,114 @@
 --- !ruby/object:Gem::Specification
 name: delayed_paperclip
 version: !ruby/object:Gem::Version
-  version: 2.6.0.0
-  prerelease: 
+  version: 2.6.1
 platform: ruby
 authors:
 - Jesse Storimer
 - Bert Goethals
 - James Gifford
+- Scott Carleton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: delayed_job
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: resque
+  name: delayed_job
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sidekiq
+  name: resque
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: debugger
+  name: sidekiq
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Process your Paperclip attachments in the background with delayed_job,
@@ -132,48 +118,95 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.textile
+- .gitignore
+- .rbenv-version
+- .ruby-gemset
+- .ruby-version
+- .travis.yml
+- Appraisals
+- CONTRIBUTING
+- ChangeLog
+- Gemfile
 - LICENSE
+- README.textile
 - Rakefile
+- delayed_paperclip.gemspec
+- gemfiles/paperclip3_5.gemfile
+- gemfiles/paperclip3_5.gemfile.lock
+- gemfiles/rails3.gemfile
+- gemfiles/rails3.gemfile.lock
+- gemfiles/rails3_1.gemfile
+- gemfiles/rails3_1.gemfile.lock
+- gemfiles/rails3_2.gemfile
+- gemfiles/rails3_2.gemfile.lock
 - init.rb
 - lib/delayed_paperclip.rb
-- lib/delayed_paperclip/url_generator.rb
 - lib/delayed_paperclip/attachment.rb
-- lib/delayed_paperclip/jobs/resque.rb
+- lib/delayed_paperclip/jobs.rb
 - lib/delayed_paperclip/jobs/delayed_job.rb
+- lib/delayed_paperclip/jobs/resque.rb
 - lib/delayed_paperclip/jobs/sidekiq.rb
 - lib/delayed_paperclip/railtie.rb
-- lib/delayed_paperclip/jobs.rb
-- test/resque_paperclip_test.rb
-- test/delayed_paperclip_test.rb
+- lib/delayed_paperclip/url_generator.rb
+- lib/delayed_paperclip/version.rb
+- rails/init.rb
+- spec/delayed_paperclip/attachment_spec.rb
+- spec/delayed_paperclip/class_methods_spec.rb
+- spec/delayed_paperclip/instance_methods_spec.rb
+- spec/delayed_paperclip/url_generator_spec.rb
+- spec/delayed_paperclip_spec.rb
+- spec/fixtures/12k.png
+- spec/integration/delayed_job_spec.rb
+- spec/integration/examples/base.rb
+- spec/integration/resque_spec.rb
+- spec/integration/sidekiq_spec.rb
+- spec/spec_helper.rb
+- test/base_delayed_paperclip_test.rb
 - test/database.yml
+- test/delayed_paperclip_test.rb
 - test/fixtures/12k.png
-- test/base_delayed_paperclip_test.rb
+- test/resque_paperclip_test.rb
 - test/sidekiq_paperclip.rb
 - test/test_helper.rb
-- rails/init.rb
 homepage: http://github.com/jrgifford/delayed_paperclip
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Process your Paperclip attachments in the background.
-test_files: []
+test_files:
+- spec/delayed_paperclip/attachment_spec.rb
+- spec/delayed_paperclip/class_methods_spec.rb
+- spec/delayed_paperclip/instance_methods_spec.rb
+- spec/delayed_paperclip/url_generator_spec.rb
+- spec/delayed_paperclip_spec.rb
+- spec/fixtures/12k.png
+- spec/integration/delayed_job_spec.rb
+- spec/integration/examples/base.rb
+- spec/integration/resque_spec.rb
+- spec/integration/sidekiq_spec.rb
+- spec/spec_helper.rb
+- test/base_delayed_paperclip_test.rb
+- test/database.yml
+- test/delayed_paperclip_test.rb
+- test/fixtures/12k.png
+- test/resque_paperclip_test.rb
+- test/sidekiq_paperclip.rb
+- test/test_helper.rb