dragonfly 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c7ef9f7d15b8aa06c44ce7e52c5da69be5c43ee
-  data.tar.gz: 9daf8a467a894251790c3f2a40ddfde9fcc36808
+  metadata.gz: a9dca04f47fde05feeb3cb2192ae1568e491194f
+  data.tar.gz: fe028ae883c750d8dc32dcb1feca6c1880dcb94e
 SHA512:
-  metadata.gz: 3ba7140e8176f2bc9609343fe5b73be21c9e0a010dc91498faff2fe7b87622ca7f143cd26230884a162635669d968c02c2e309eaa8ccd19fdb2738ab98679cf5
-  data.tar.gz: cdadf8324dae8dc6cf359bbb0fb106e859d418edd95a177844146a6edd11d8bd8affa48432de8116aca2eb8b738dae615874f8c7b8e32394d17f291872817370
+  metadata.gz: ca794e9db454392290f4425fa07d321afd2246e3020197ce4b05bcd8204fce5c38d5c263201f261139dd1647fbac57738c2829424aadd4686291e3c7f06ef2b9
+  data.tar.gz: 5210c6cc3dc87058b977485c1587ff53a60bb45d5ff9d964e75cb5f19a0c1eb0ba0c3fc8f9315c235c4cf9a4093c23a53975b0a7b7d49e43fd43384df643766a

data/History.md

@@ -1,3 +1,10 @@
+1.0.8 (2015-04-23)
+===================
+Fixes
+--------
+- Job#close re-added, so that tempfiles are immediately removed after each request
+- Specs passing for 1.8.7, 1.9.2 (i18n gem version specified)
+
 1.0.7 (2014-08-26)
 ===================
 Changes

data/README.md

@@ -37,16 +37,6 @@ Documentation
 
 <a href="http://rubydoc.info/github/markevans/dragonfly/frames">RDoc documentation is here</a>
 
-Upgrading from v0.9 to v1.0
-===========================
-Dragonfly has changed somewhat since version 0.9.
-See [the Upgrading wiki](http://github.com/markevans/dragonfly/wiki/Upgrading-from-0.9-to-1.0) for notes on changes, and feel free to add anything you come across while upgrading!
-
-Changes are listed in [History.md](https://github.com/markevans/dragonfly/blob/master/History.md)
-
-If for whatever reason you can't upgrade, then
-<a href="http://markevans.github.io/dragonfly/v0.9.15">the docs for version 0.9.x are here</a>.
-
 Installation
 ============
 
@@ -54,17 +44,18 @@ Installation
 
 or in your Gemfile
 ```ruby
-gem 'dragonfly', '~> 1.0.7'
+gem 'dragonfly', '~> 1.0.8'
 ```
 
 Require with
 ```ruby
 require 'dragonfly'
 ```
+Articles
+========
+See [the Articles wiki](http://github.com/markevans/dragonfly/wiki/Articles) for articles and tutorials.
 
-Ruby Versions
-=============
-Dragonfly has been tested with ruby versions 1.8.7, 1.9.2, 1.9.3, 2.0.0, jruby 1.7.8 and rubinius 2.2.
+Please feel free to contribute!!
 
 Plugins / add-ons
 =================
@@ -80,6 +71,20 @@ Suggestions/Questions
 =====================
 <a href="http://groups.google.com/group/dragonfly-users">Google group dragonfly-users</a>
 
+Ruby Versions
+=============
+Dragonfly has been tested with ruby versions 1.8.7, 1.9.2, 1.9.3, 2.0.0, jruby 1.7.8 and rubinius 2.2.
+
+Upgrading from v0.9 to v1.0
+===========================
+Dragonfly has changed somewhat since version 0.9.
+See [the Upgrading wiki](http://github.com/markevans/dragonfly/wiki/Upgrading-from-0.9-to-1.0) for notes on changes, and feel free to add anything you come across while upgrading!
+
+Changes are listed in [History.md](https://github.com/markevans/dragonfly/blob/master/History.md)
+
+If for whatever reason you can't upgrade, then
+<a href="http://markevans.github.io/dragonfly/v0.9.15">the docs for version 0.9.x are here</a>.
+
 Credits
 =======
 [Mark Evans](http://github.com/markevans) (author) with awesome contributions from

data/dragonfly.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency("webmock")
   if RUBY_VERSION < '1.9.3'
     spec.add_development_dependency("activemodel", '~> 3.2')
+    spec.add_development_dependency("i18n", '~> 0.6.11')
   else
     spec.add_development_dependency("activemodel")
   end

data/lib/dragonfly/job.rb

@@ -22,7 +22,8 @@ module Dragonfly
                    :data, :file, :tempfile, :path, :to_file, :size, :each,
                    :meta, :meta=, :add_meta, :name, :name=, :basename, :basename=, :ext, :ext=, :mime_type,
                    :analyse, :shell_eval, :store,
-                   :b64_data
+                   :b64_data,
+                   :close
 
     require 'dragonfly/job/fetch'
     require 'dragonfly/job/fetch_file'

data/lib/dragonfly/version.rb

@@ -1,3 +1,3 @@
 module Dragonfly
-  VERSION = '1.0.7'
+  VERSION = '1.0.8'
 end

data/spec/dragonfly/file_data_store_spec.rb

@@ -9,11 +9,11 @@ describe Dragonfly::FileDataStore do
   end
 
   def assert_exists(path)
-    File.exists?(path).should be_true
+    File.exists?(path).should be_truthy
   end
 
   def assert_does_not_exist(path)
-    File.exists?(path).should be_false
+    File.exists?(path).should be_falsey
   end
 
   def assert_contains(dir, filepattern)

data/spec/dragonfly/image_magick/plugin_spec.rb

@@ -37,13 +37,13 @@ describe "a configured imagemagick app" do
     end
 
     it "should say if it's portrait" do
-      image.portrait?.should be_true
-      image.portrait.should be_true # for using with magic attributes
+      image.portrait?.should be_truthy
+      image.portrait.should be_truthy # for using with magic attributes
     end
 
     it "should say if it's landscape" do
-      image.landscape?.should be_false
-      image.landscape.should be_false # for using with magic attributes
+      image.landscape?.should be_falsey
+      image.landscape.should be_falsey # for using with magic attributes
     end
 
     it "should return the format" do
@@ -51,16 +51,16 @@ describe "a configured imagemagick app" do
     end
 
     it "should say if it's an image" do
-      image.image?.should be_true
-      image.image.should be_true # for using with magic attributes
+      image.image?.should be_truthy
+      image.image.should be_truthy # for using with magic attributes
     end
 
     it "should say if it's not an image" do
-      app.create("blah").image?.should be_false
+      app.create("blah").image?.should be_falsey
     end
 
     it "should return false for pdfs" do
-      image.encode('pdf').image?.should be_false
+      image.encode('pdf').image?.should be_falsey
     end
   end
 

data/spec/dragonfly/model/model_spec.rb

@@ -268,7 +268,7 @@ describe "models" do
         end
 
         it 'should mark the attribute as changed' do
-          @item.preview_image_uid_changed?.should be_true
+          @item.preview_image_uid_changed?.should be_truthy
         end
       end
 
@@ -293,7 +293,7 @@ describe "models" do
         end
 
         it 'should mark the attribute as changed' do
-          @item.preview_image_uid_changed?.should be_true
+          @item.preview_image_uid_changed?.should be_truthy
         end
 
       end
@@ -463,7 +463,7 @@ describe "models" do
         @item.preview_image.number_of_As.should == 2
       end
       it "should report that it responds to analyser methods" do
-        @item.preview_image.respond_to?(:number_of_As).should be_true
+        @item.preview_image.respond_to?(:number_of_As).should be_truthy
       end
       it "should include analyser methods in methods" do
         @item.preview_image.methods.map{|m| m.to_sym }.should include(:number_of_As)
@@ -673,7 +673,7 @@ describe "models" do
 
       it "should return true when called if set with #{value.inspect}" do
         @item.remove_preview_image = value
-        @item.remove_preview_image.should be_true
+        @item.remove_preview_image.should be_truthy
       end
     end
 
@@ -692,12 +692,12 @@ describe "models" do
 
       it "should return false when called if set with #{value.inspect}" do
         @item.remove_preview_image = value
-        @item.remove_preview_image.should be_false
+        @item.remove_preview_image.should be_falsey
       end
     end
 
     it "should return false by default for the getter" do
-      @item.remove_preview_image.should be_false
+      @item.remove_preview_image.should be_falsey
     end
 
   end
@@ -955,9 +955,9 @@ describe "models" do
     end
 
     it "should be changed when assigned" do
-      expect( @item.preview_image_changed? ).to be_false
+      expect( @item.preview_image_changed? ).to be_falsey
       @item.preview_image = 'ggg'
-      expect( @item.preview_image_changed? ).to be_true
+      expect( @item.preview_image_changed? ).to be_truthy
     end
 
     describe "after saving" do
@@ -967,22 +967,22 @@ describe "models" do
       end
 
       it "should not be changed" do
-        expect( @item.preview_image_changed? ).to be_false
+        expect( @item.preview_image_changed? ).to be_falsey
       end
 
       it "should be changed when set to nil" do
         @item.preview_image = nil
-        expect( @item.preview_image_changed? ).to be_true
+        expect( @item.preview_image_changed? ).to be_truthy
       end
 
       it "should be changed when changed" do
         @item.preview_image = "asdf"
-        expect( @item.preview_image_changed? ).to be_true
+        expect( @item.preview_image_changed? ).to be_truthy
       end
 
       it "should not be changed when reloaded" do
         item = @item_class.find(@item.id)
-        expect( @item.preview_image_changed? ).to be_false
+        expect( @item.preview_image_changed? ).to be_falsey
       end
 
     end
@@ -1213,18 +1213,18 @@ describe "models" do
     end
 
     it "returns false if unassigned" do
-      @item.photo_stored?.should be_false
+      @item.photo_stored?.should be_falsey
     end
 
     it "returns false if assigned but not stored" do
       @item.photo = "Asdf"
-      @item.photo_stored?.should be_false
+      @item.photo_stored?.should be_falsey
     end
 
     it "returns true if stored" do
       @item.photo = "Asdf"
       @item.save!
-      @item.photo_stored?.should be_true
+      @item.photo_stored?.should be_truthy
     end
   end
 

data/spec/dragonfly/temp_object_spec.rb

@@ -118,7 +118,7 @@ describe Dragonfly::TempObject do
         end
         it "should write to a file" do
           @temp_object.to_file(@filename)
-          File.exists?(@filename).should be_true
+          File.exists?(@filename).should be_truthy
         end
         it "should write the correct data to the file" do
           @temp_object.to_file(@filename)
@@ -140,7 +140,7 @@ describe Dragonfly::TempObject do
         it "should create intermediate subdirs" do
           filename = 'tmp/gog/mcgee'
           @temp_object.to_file(filename)
-          File.exists?(filename).should be_true
+          File.exists?(filename).should be_truthy
           FileUtils.rm_rf('tmp/gog')
         end
         it "should allow not creating intermediate subdirs" do
@@ -211,9 +211,9 @@ describe Dragonfly::TempObject do
     it "should delete its internal tempfile on close" do
       temp_object = new_temp_object("HELLO")
       path = temp_object.path
-      File.exist?(path).should be_true
+      File.exist?(path).should be_truthy
       temp_object.close
-      File.exist?(path).should be_false
+      File.exist?(path).should be_falsey
     end
 
  end
@@ -240,9 +240,9 @@ describe Dragonfly::TempObject do
     it "should delete its internal tempfile on close" do
       temp_object = new_temp_object("HELLO")
       path = temp_object.path
-      File.exist?(path).should be_true
+      File.exist?(path).should be_truthy
       temp_object.close
-      File.exist?(path).should be_false
+      File.exist?(path).should be_falsey
     end
   end
 
@@ -281,7 +281,7 @@ describe Dragonfly::TempObject do
     it "doesn't remove the file on close" do
       temp_object = new_temp_object("HELLO")
       temp_object.close
-      File.exist?(temp_object.path).should be_true
+      File.exist?(temp_object.path).should be_truthy
     end
   end
 
@@ -319,7 +319,7 @@ describe Dragonfly::TempObject do
     it "doesn't remove the file on close" do
       temp_object = new_temp_object("HELLO")
       temp_object.close
-      File.exist?(temp_object.path).should be_true
+      File.exist?(temp_object.path).should be_truthy
     end
 
   end

data/spec/dragonfly/url_attributes_spec.rb

@@ -6,17 +6,17 @@ describe Dragonfly::UrlAttributes do
 
   describe "empty" do
     it "returns true when empty" do
-      url_attributes.empty?.should be_true
+      url_attributes.empty?.should be_truthy
     end
 
     it "returns false when not empty" do
       url_attributes.some = 'thing'
-      url_attributes.empty?.should be_false
+      url_attributes.empty?.should be_falsey
     end
 
     it "returns true if all values are nil" do
       url_attributes.some = nil
-      url_attributes.empty?.should be_true
+      url_attributes.empty?.should be_truthy
     end
   end
 

data/spec/dragonfly/utils_spec.rb

@@ -11,7 +11,7 @@ describe Dragonfly::Utils do
       {}
     ].each do |obj|
       it "returns true for #{obj.inspect}" do
-        obj.blank?.should be_true
+        obj.blank?.should be_truthy
       end
     end
 
@@ -24,7 +24,7 @@ describe Dragonfly::Utils do
       7.3
     ].each do |obj|
       it "returns false for #{obj.inspect}" do
-        obj.blank?.should be_false
+        obj.blank?.should be_falsey
       end
     end
   end

data/spec/dragonfly/whitelist_spec.rb

@@ -3,21 +3,21 @@ require 'spec_helper'
 describe Dragonfly::Whitelist do
   it "matches regexps" do
     whitelist = Dragonfly::Whitelist.new([/platipus/])
-    whitelist.include?("platipus").should be_true
-    whitelist.include?("small platipus in the bath").should be_true
-    whitelist.include?("baloney").should be_false
+    whitelist.include?("platipus").should be_truthy
+    whitelist.include?("small platipus in the bath").should be_truthy
+    whitelist.include?("baloney").should be_falsey
   end
 
   it "matches strings" do
     whitelist = Dragonfly::Whitelist.new(["platipus"])
-    whitelist.include?("platipus").should be_true
-    whitelist.include?("small platipus in the bath").should be_false
-    whitelist.include?("baloney").should be_false
+    whitelist.include?("platipus").should be_truthy
+    whitelist.include?("small platipus in the bath").should be_falsey
+    whitelist.include?("baloney").should be_falsey
   end
 
   it "only needs one match" do
-    Dragonfly::Whitelist.new(%w(a b)).include?("c").should be_false
-    Dragonfly::Whitelist.new(%w(a b c)).include?("c").should be_true
+    Dragonfly::Whitelist.new(%w(a b)).include?("c").should be_falsey
+    Dragonfly::Whitelist.new(%w(a b c)).include?("c").should be_truthy
   end
 
   it "allows pushing" do

data/spec/functional/cleanup_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe "cleaning up tempfiles" do
+
+  let (:app) {
+    test_app.configure{
+      processor :copy do |content|
+        content.shell_update do |old_path, new_path|
+          "cp #{old_path} #{new_path}"
+        end
+      end
+    }
+  }
+
+  it "unlinks tempfiles on each request" do
+    expect {
+      uid = app.store("blug")
+      url = app.fetch(uid).copy.url
+      request(app, url)
+    }.not_to increase_num_tempfiles
+  end
+end

data/spec/functional/remote_on_the_fly_spec.rb

@@ -36,7 +36,7 @@ describe "remote on-the-fly urls" do
   end
 
   it "should store the content when first called" do
-    File.exist?('tmp/dragonfly_test_urls/yay.txt').should be_false
+    File.exist?('tmp/dragonfly_test_urls/yay.txt').should be_falsey
     request(@app, @job.url)
     File.read('tmp/dragonfly_test_urls/yay.txt').should == 'TEST'
   end

data/spec/functional/shell_commands_spec.rb

@@ -11,7 +11,7 @@ describe "using the shell" do
         app.generate(:plain, 10, 10, 'white').convert("-resize 5x5 ; touch tmp/stuff").apply
       rescue Dragonfly::Shell::CommandFailed
       end
-      File.exist?('tmp/stuff').should be_false
+      File.exist?('tmp/stuff').should be_falsey
     end
   end
 

data/spec/support/simple_matchers.rb

@@ -19,22 +19,6 @@ RSpec::Matchers.define :include_hash do |hash|
   end
 end
 
-def memory_usage
-  GC.start # Garbage collect
-  `ps -o rss= -p #{$$}`.strip.to_i
-end
-
-RSpec::Matchers.define :leak_memory do
-  match do |given|
-    memory_before = memory_usage
-    given.call
-    memory_after = memory_usage
-    result = memory_after > memory_before
-    puts "#{memory_after} > #{memory_before}" if result
-    result
-  end
-end
-
 RSpec::Matchers.define :match_attachment_classes do |classes|
   match do |given_classes|
     given_classes.length == classes.length &&
@@ -63,3 +47,14 @@ RSpec::Matchers.define :match_steps do |steps|
     given.map{|step| step.class } == steps
   end
 end
+
+RSpec::Matchers.define :increase_num_tempfiles do
+  match do |block|
+    num_tempfiles_before = Dir.entries(Dir.tmpdir).size
+    block.call
+    num_tempfiles_after = Dir.entries(Dir.tmpdir).size
+    increased = num_tempfiles_after > num_tempfiles_before
+    puts "Num tempfiles increased: #{num_tempfiles_before} -> #{num_tempfiles_after}" if increased
+    increased
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Mark Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -224,6 +224,7 @@ files:
 - spec/dragonfly_spec.rb
 - spec/fixtures/deprecated_stored_content/eggs.bonus
 - spec/fixtures/deprecated_stored_content/eggs.bonus.meta
+- spec/functional/cleanup_spec.rb
 - spec/functional/configuration_spec.rb
 - spec/functional/model_urls_spec.rb
 - spec/functional/remote_on_the_fly_spec.rb
@@ -266,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Ideal gem for handling attachments in Rails, Sinatra and Rack applications.
@@ -312,6 +313,7 @@ test_files:
 - spec/dragonfly_spec.rb
 - spec/fixtures/deprecated_stored_content/eggs.bonus
 - spec/fixtures/deprecated_stored_content/eggs.bonus.meta
+- spec/functional/cleanup_spec.rb
 - spec/functional/configuration_spec.rb
 - spec/functional/model_urls_spec.rb
 - spec/functional/remote_on_the_fly_spec.rb