roachclip 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/roachclip.rb

@@ -31,8 +31,10 @@ module Roachclip
       path = options.delete(:path) || "/gridfs/fs/%s-%s"
       self.roaches << {:name => name, :options => options}
 
+      options[:default_style] ||= :original
+      
       options[:styles] ||= {}
-      options[:styles].each { |k,v| self.attachment "#{name}_#{k}"}
+      options[:styles].each { |k,v| self.attachment "#{name}_#{k}" unless k == options[:default_style] }
 
       before_save :process_roaches
       before_save :destroy_nil_roaches
@@ -62,7 +64,8 @@ module Roachclip
       roaches.each do |img|
         name = img[:name]
         styles = img[:options][:styles]
-
+        default_style = img[:options][:default_style]
+        
         return unless assigned_attachments[name]
 
         src = Tempfile.new ["roachclip", name.to_s].join('-')
@@ -75,8 +78,14 @@ module Roachclip
           thumbnail = Paperclip::Thumbnail.new src, styles[style_key]
           tmp_file_name = thumbnail.make
           stored_file_name = send("#{name}_name").gsub(/\.(\w*)\Z/) { "_#{style_key}.#{$1}" }
-          send "#{name}_#{style_key}=", tmp_file_name
-          send "#{name}_#{style_key}_name=", stored_file_name
+
+          if style_key == default_style
+            send "#{name}=", tmp_file_name
+            send "#{name}_name=", stored_file_name
+          else
+            send "#{name}_#{style_key}=", tmp_file_name
+            send "#{name}_#{style_key}_name=", stored_file_name
+          end
         end
       end
     end
@@ -85,11 +94,12 @@ module Roachclip
       roaches.each do |img|
         name = img[:name]
         styles = img[:options][:styles]
-
+        default_style = img[:options][:default_style]
+        
         return unless @nil_attachments && @nil_attachments.include?(name)
 
         styles.keys.each do |style_key|
-          send "#{name}_#{style_key}=", nil
+          send "#{name}_#{style_key}=", nil unless style_key == default_style
         end
       end
     end

data/roachclip.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roachclip}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Angilly"]

data/test/unit/test_roachclip.rb

@@ -121,6 +121,57 @@ class RoachclipTest < Test::Unit::TestCase
         end
       end
     end
+
+    context "with a default style" do
+      setup do
+        Doc.roachclip :image, { :styles => { :default => { :geometry => '100x100' }, :thumb => { :geometry => '50x50' } }, :default_style => :default }
+        @doc = Doc.new
+      end
+
+      should "not add an attachment for the default style" do
+        assert !@doc.respond_to?(:image_default)
+        assert !@doc.respond_to?(:image_default=)
+      end
+      
+      should "add attachment for thumb style" do
+        assert @doc.respond_to?(:image_thumb)
+        assert @doc.respond_to?(:image_thumb=)
+      end
+      
+      should "process all styles" do
+        Paperclip::Thumbnail.any_instance.expects(:make).twice
+        @doc.image = File.open(test_file_path)
+        @doc.save!
+      end
+      
+      should "not destroy the default style roach" do
+        @doc.image = File.open(test_file_path)
+        @doc.save!
+        
+        @doc.expects(:image_thumb=).with(nil).at_least_once
+        @doc.expects(:image_default=).never
+        @doc.image = nil
+        @doc.save!
+      end
+    end
+    
+    context "with the :original style" do
+      setup do
+        Doc.roachclip :image, { :styles => { :original => { :geometry => '100x100' } } }
+        @doc = Doc.new
+      end
+
+      should "behave as the default style" do
+        assert !@doc.respond_to?(:image_original)
+        assert !@doc.respond_to?(:image_original=)
+      end
+      
+      should "process the original image" do
+        Paperclip::Thumbnail.any_instance.expects(:make).once
+        @doc.image = File.open(test_file_path)
+        @doc.save!
+      end
+    end
   end
 
   def fname

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Ryan Angilly