bulldog 0.2.2 → 0.2.3

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.2.3 2011-01-06
+
+ * #process accepts an :input_file option.
+
 == 0.2.2 2010-07-26
 
  * Support for assigning one attachment to another.

data/lib/bulldog/attachment/base.rb

@@ -27,7 +27,7 @@ module Bulldog
           end
           processor_type = event.processor_type || default_processor_type
           processor_class = Processor.const_get(processor_type.to_s.camelize)
-          processor = processor_class.new(self, stream.path)
+          processor = processor_class.new(self, options[:input] || stream.path)
           styles = reflection.styles
           names = options[:styles] || event.styles and
             styles = reflection.styles.slice(*names)

data/lib/bulldog/version.rb

@@ -1,5 +1,5 @@
 module Bulldog
-  VERSION = [0, 2, 2]
+  VERSION = [0, 2, 3]
 
   class << VERSION
     include Comparable

data/spec/matchers/logging.rb

@@ -0,0 +1,5 @@
+module Matchers
+  def log(expected)
+    Log
+  end
+end

data/spec/unit/attachment/base_spec.rb

@@ -293,6 +293,19 @@ describe Attachment::Base do
         thing.attachment.process(:event).should be_false
       end
     end
+
+    it "should use the given input path, if any" do
+      input_file = nil
+      Thing.has_attachment :attachment do
+        style :normal
+        process :on => :test_event do
+          input_file = self.input_file
+        end
+      end
+      thing = Thing.new(:attachment => uploaded_file('test.jpg'))
+      thing.attachment.process(:test_event, :input => '/path/to/file')
+      input_file.should == '/path/to/file'
+    end
   end
 
   describe "#process!" do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bulldog
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - George Ogata
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-26 00:00:00 -04:00
+date: 2011-01-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
@@ -35,9 +38,11 @@ dependencies:
   name: rspec_outlines
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 0
         - 0
@@ -49,9 +54,11 @@ dependencies:
   name: mocha
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 43
         segments: 
         - 0
         - 9
@@ -137,6 +144,7 @@ files:
 - spec/integration/saving_an_attachment_spec.rb
 - spec/macros/attachment/has_dimensions_spec.rb
 - spec/matchers/file_operations.rb
+- spec/matchers/logging.rb
 - spec/spec_helper.rb
 - spec/unit/attachment/base_spec.rb
 - spec/unit/attachment/image_spec.rb
@@ -167,16 +175,20 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3
@@ -185,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A heavy-duty paperclip.  File attachments for ActiveRecord.
@@ -219,6 +231,7 @@ test_files:
 - spec/integration/saving_an_attachment_spec.rb
 - spec/macros/attachment/has_dimensions_spec.rb
 - spec/matchers/file_operations.rb
+- spec/matchers/logging.rb
 - spec/spec_helper.rb
 - spec/unit/attachment/base_spec.rb
 - spec/unit/attachment/image_spec.rb