dragonfly 0.7.6 → 0.7.7

data/History.md

@@ -1,3 +1,15 @@
+0.7.7 (2010-10-31)
+==================
+Features
+--------
+- Added username/password authentication to mongo data store
+
+Fixes
+-----
+- Fixes for Windows, inc. tempfile binmode and closing files
+- "IOError: closed stream" fix (hopefully!)
+
+
 0.7.6 (2010-09-12)
 ==================
 Features

data/README.md

@@ -65,6 +65,10 @@ It's highly customizable, and works with any data type (not just images).
 
 For more info, consult the <a href="http://markevans.github.com/dragonfly"><big><strong>DOCUMENTATION</strong></big></a>
 
+Add-ons
+=======
+For third-party add-ons, see [the Add-ons wiki](http://github.com/markevans/dragonfly/wiki/Dragonfly-add-ons)
+
 Issues
 ======
 Please use the <a href="http://github.com/markevans/dragonfly/issues">github issue tracker</a> if you have any issues.
@@ -77,8 +81,6 @@ Credits
 =======
 - [Mark Evans](http://github.com/markevans) (author)
 
-
 Copyright
 ========
-
 Copyright (c) 2009-2010 Mark Evans. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.7.6
+0.7.7

data/dragonfly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dragonfly}
-  s.version = "0.7.6"
+  s.version = "0.7.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]
-  s.date = %q{2010-09-12}
+  s.date = %q{2010-10-31}
   s.email = %q{mark@new-bamboo.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",

data/extra_docs/DataStorage.md

@@ -79,6 +79,8 @@ It won't normally need configuring, but if you wish to:
       c.host = 'http://egg.heads:5000'                # defaults to localhost
       c.port = '27018'                                # defaults to mongo default (27017)
       c.database = 'my_database'                      # defaults to 'dragonfly'
+      c.username = 'some_user'                        # only needed if mongo is running in auth mode
+      c.password = 'some_password'                    # only needed if mongo is running in auth mode
     end
 
 You can also pass these options to `MongoDataStore.new` as an options hash.

data/extra_docs/Index.md

@@ -1,5 +1,3 @@
-Dragonfly Documentation
-=======================
 Dragonfly is a {http://rack.rubyforge.org Rack} framework for on-the-fly image handling in Ruby.
 
 It is suitable for using with web frameworks such as Rails(2.3 and 3), Sinatra, etc.
@@ -16,6 +14,10 @@ Installation
 
     gem install dragonfly
 
+Add-ons
+-------
+For third-party add-ons, see [the Add-ons wiki](http://github.com/markevans/dragonfly/wiki/Dragonfly-add-ons)
+
 Issues
 ------
 Please use the <a href="http://github.com/markevans/dragonfly/issues">github issue tracker</a>.

data/irbrc.rb

@@ -1,3 +1,5 @@
+require "rubygems"
+require "bundler/setup"
 require File.dirname(__FILE__) + '/lib/dragonfly'
 APP = Dragonfly[:images].configure_with(:rmagick)
 

data/lib/dragonfly/data_storage/file_data_store.rb

@@ -34,8 +34,10 @@ module Dragonfly
 
       def retrieve(relative_path)
         path = absolute(relative_path)
+        file = File.new(path)
+        file.close
         [
-          File.new(path),
+          file,
           retrieve_extra_data(path)
         ]
       rescue Errno::ENOENT => e
@@ -81,14 +83,14 @@ module Dragonfly
       end
 
       def store_extra_data(data_path, temp_object)
-        File.open(extra_data_path(data_path), 'w') do |f|
+        File.open(extra_data_path(data_path), 'wb') do |f|
           f.write Marshal.dump(temp_object.attributes)
         end
       end
 
       def retrieve_extra_data(data_path)
         path = extra_data_path(data_path)
-        File.exist?(path) ? Marshal.load(File.read(path)) : {}
+        File.exist?(path) ?  File.open(path,'rb'){|f| Marshal.load(f.read) } : {}
       end
 
       def prepare_path(path)

data/lib/dragonfly/data_storage/mongo_data_store.rb

@@ -10,6 +10,8 @@ module Dragonfly
       configurable_attr :host
       configurable_attr :port
       configurable_attr :database, 'dragonfly'
+      configurable_attr :username
+      configurable_attr :password
 
       # Mongo gem deprecated ObjectID in favour of ObjectId
       OBJECT_ID = defined?(BSON::ObjectId) ? BSON::ObjectId : BSON::ObjectID
@@ -19,9 +21,12 @@ module Dragonfly
         self.host = opts[:host]
         self.port = opts[:port]
         self.database = opts[:database] if opts[:database]
+        self.username = opts[:username]
+        self.password = opts[:password]
       end
 
       def store(temp_object, opts={})
+        ensure_authenticated!
         temp_object.file do |f|
           mongo_id = grid.put(f, :metadata => marshal_encode(temp_object.attributes))
           mongo_id.to_s
@@ -29,6 +34,7 @@ module Dragonfly
       end
 
       def retrieve(uid)
+        ensure_authenticated!
         grid_io = grid.get(bson_id(uid))
         extra = marshal_decode(grid_io.metadata)
         extra[:meta].merge!(:stored_at => grid_io.upload_date)
@@ -41,13 +47,12 @@ module Dragonfly
       end
 
       def destroy(uid)
+        ensure_authenticated!
         grid.delete(bson_id(uid))
       rescue Mongo::GridFileNotFound, INVALID_OBJECT_ID => e
         raise DataNotFound, "#{e} - #{uid}"
       end
 
-      private
-
       def connection
         @connection ||= Mongo::Connection.new(host, port)
       end
@@ -60,6 +65,14 @@ module Dragonfly
         @grid ||= Mongo::Grid.new(db)
       end
 
+      private
+
+      def ensure_authenticated!
+        if username
+          @authenticated ||= db.authenticate(username, password)
+        end
+      end
+      
       def bson_id(uid)
         OBJECT_ID.from_string(uid)
       end

data/lib/dragonfly/temp_object.rb

@@ -48,7 +48,7 @@ module Dragonfly
     end
 
     def data
-      @data ||= initialized_data || file.read
+      @data ||= initialized_data || file{|f| f.read }
     end
 
     def tempfile
@@ -56,23 +56,22 @@ module Dragonfly
         case initialized_with
         when :tempfile
           @tempfile = initialized_tempfile
+          @tempfile.close
         when :data
-          @tempfile = Tempfile.new('dragonfly')
-          @tempfile.binmode
-          @tempfile.write(initialized_data)
+          @tempfile = new_tempfile(initialized_data)
         when :file
           @tempfile = copy_to_tempfile(initialized_file.path)
         end
-        @tempfile.close
         @tempfile
       end
     end
 
     def file(&block)
       f = tempfile.open
+      tempfile.binmode
       if block_given?
         ret = yield f
-        f.close
+        tempfile.close
       else
         ret = f
       end
@@ -117,16 +116,16 @@ module Dragonfly
 
     def to_file(path)
       if initialized_data
-        File.open(path, 'w'){|f| f.write(initialized_data) }
+        File.open(path, 'wb'){|f| f.write(initialized_data) }
       else
         FileUtils.cp(self.path, path)
       end
-      File.new(path)
+      File.new(path, 'rb')
     end
 
     def to_io(&block)
       if initialized_data
-        StringIO.open(initialized_data, &block)
+        StringIO.open(initialized_data, 'rb', &block)
       else
         file(&block)
       end
@@ -197,7 +196,7 @@ module Dragonfly
     end
 
     def copy_to_tempfile(path)
-      tempfile = Tempfile.new('dragonfly')
+      tempfile = new_tempfile
       FileUtils.cp File.expand_path(path), tempfile.path
       tempfile
     end
@@ -208,5 +207,13 @@ module Dragonfly
       raise ArgumentError, "Unrecognised options #{invalid_keys.inspect}" if invalid_keys.any?
     end
 
+    def new_tempfile(content=nil)
+      tempfile = Tempfile.new('dragonfly')
+      tempfile.binmode
+      tempfile.write(content) if content
+      tempfile.close
+      tempfile
+    end
+
   end
 end

data/spec/dragonfly/data_storage/file_data_store_spec.rb

@@ -136,11 +136,16 @@ describe Dragonfly::DataStorage::FileDataStore do
   end
   
   describe "retrieve" do
+    it "should return a closed file" do
+      uid = @data_store.store(@temp_object)
+      file, extra = @data_store.retrieve(uid)
+      file.should be_closed
+    end
     it "should be able to retrieve any file, stored or not (and without extra data)" do
       FileUtils.mkdir_p("#{@data_store.root_path}/jelly_beans/are")
       File.open("#{@data_store.root_path}/jelly_beans/are/good", 'w'){|f| f.write('hey dog') }
       file, meta = @data_store.retrieve("jelly_beans/are/good")
-      file.read.should == 'hey dog'
+      File.read(file.path).should == 'hey dog'
       meta.should == {}
     end
   end

data/spec/dragonfly/data_storage/mongo_data_store_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require File.dirname(__FILE__) + '/../../spec_helper'
 require File.dirname(__FILE__) + '/data_store_spec'
 require 'mongo'
@@ -10,9 +11,28 @@ describe Dragonfly::DataStorage::MongoDataStore do
     rescue Mongo::ConnectionFailure => e
       pending "You need to start mongo on localhost:27017 to test the MongoDataStore"
     end
-    @data_store = Dragonfly::DataStorage::MongoDataStore.new
+    @data_store = Dragonfly::DataStorage::MongoDataStore.new :database => 'dragonfly_test'
   end
   
   it_should_behave_like 'data_store'
+  
+  describe "authenticating" do
+    before(:each) do
+      @temp_object = Dragonfly::TempObject.new('Feijão verde')
+    end
+    
+    it "should not attempt to authenticate if a username is not given" do
+      @data_store.db.should_not_receive(:authenticate)
+      @data_store.store(@temp_object)    
+    end
+    
+    it "should attempt to authenticate once if a username is given" do
+      @data_store.username = 'terry'
+      @data_store.password = 'butcher'
+      @data_store.db.should_receive(:authenticate).exactly(:once).with('terry','butcher').and_return(true)
+      uid = @data_store.store(@temp_object)
+      @data_store.retrieve(uid)
+    end
+  end
 
 end

data/spec/dragonfly/function_manager_spec.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-def have_keys(*keys)
-  simple_matcher("have keys #{keys.join(', ')}") do |given|
+Spec::Matchers.define :have_keys do |*keys|
+  match do |given|
     given.keys.map{|sym| sym.to_s }.sort == keys.map{|sym| sym.to_s }.sort
   end
 end

data/spec/dragonfly/job_spec.rb

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 # Matchers
-def match_steps(steps)
-  simple_matcher("match steps #{steps.inspect}") do |given|
+Spec::Matchers.define :match_steps do |steps|
+  match do |given|
     given.map{|step| step.class } == steps
   end
 end

data/spec/dragonfly/temp_object_spec.rb

@@ -80,6 +80,10 @@ describe Dragonfly::TempObject do
             'doogie'
           end.should == 'doogie'
         end
+        it "should enable reading the file twice" do
+          @temp_object.file{|f| f.read }.should == "HELLO"
+          @temp_object.file{|f| f.read }.should == "HELLO"
+        end
       end
 
       describe "tempfile" do
@@ -170,7 +174,6 @@ describe Dragonfly::TempObject do
       end
     end
 
-
   end
 
   describe "initializing from a string" do

data/spec/image_matchers.rb

@@ -22,14 +22,20 @@ def image_properties(image)
   }
 end
 
-def have_width(width)
-  simple_matcher("have width #{width}"){|given| width.should === image_properties(given)[:width].to_i }
+Spec::Matchers.define :have_width do |width|
+  match do |given|
+    width.should === image_properties(given)[:width].to_i
+  end
 end
 
-def have_height(height)
-  simple_matcher("have height #{height}"){|given| height.should === image_properties(given)[:height].to_i }
+Spec::Matchers.define :have_height do |height|
+  match do |given|
+    height.should === image_properties(given)[:height].to_i
+  end
 end
 
-def have_format(format)
-  simple_matcher("have format #{format}"){|given| image_properties(given)[:format].should == format }
+Spec::Matchers.define :have_format do |format|
+  match do |given|
+    image_properties(given)[:format].should == format
+  end
 end

data/spec/simple_matchers.rb

@@ -1,5 +1,5 @@
-def match_url(url)
-  simple_matcher("match url #{url}") do |given|
+Spec::Matchers.define :match_url do |url|
+  match do |given|
     given_path, given_query_string = given.split('?')
     path, query_string = url.split('?')
 
@@ -7,22 +7,22 @@ def match_url(url)
   end
 end
 
-def be_an_empty_directory
-  simple_matcher("be empty") do |given|
+Spec::Matchers.define :be_an_empty_directory do
+  match do |given|
     Dir.entries(given) == ['.','..']
   end
 end
 
 # The reason we need this is that ActiveRecord 2.x returns just a string/nil, whereas AR 3 always returns an array
-def match_ar_error(string)
-  simple_matcher("match activerecord error") do |given|
+Spec::Matchers.define :match_ar_error do |string|
+  match do |given|
     error = given.is_a?(Array) ? given.first : given
     error == string
   end
 end
 
-def include_hash(hash)
-  simple_matcher("include hash #{hash.inspect}") do |given|
+Spec::Matchers.define :include_hash do |hash|
+  match do |given|
     given.merge(hash) == given
   end
 end
@@ -32,8 +32,8 @@ def memory_usage
   `ps -o rss= -p #{$$}`.strip.to_i
 end
 
-def leak_memory
-  simple_matcher("leak memory") do |given|
+Spec::Matchers.define :leak_memory do
+  match do |given|
     memory_before = memory_usage
     given.call
     memory_after = memory_usage

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 6
-  version: 0.7.6
+  - 7
+  version: 0.7.7
 platform: ruby
 authors: 
 - Mark Evans
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-12 00:00:00 +01:00
+date: 2010-10-31 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency