attachment_magick 0.2.0 → 0.2.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    attachment_magick (0.1.0)
+    attachment_magick (0.2.0)
       dragonfly (>= 0.8.1)
       jquery-rails (>= 0.2.7)
       marcosinger-auto_html (>= 1.3.4)

data/lib/attachment_magick.rb

@@ -67,8 +67,11 @@ module AttachmentMagick
     def grid_methods
       self.attachment_magick_default_options[:styles].each do |key, value|
         self.send :define_singleton_method, "style_#{key.to_s}" do
+          value[:width]   = value[:width] == 0 ? nil : value[:width]
+          value[:height]  = value[:height] == 0 ? nil : value[:height]
+
           metric = "#{value[:width]}x#{value[:height]}"
-          metric = "#{metric}#" if value[:height] && value[:crop] == true
+          metric = "#{metric}#{value[:ajust]}" if value[:ajust]
 
           return metric
         end

data/lib/attachment_magick/dsl.rb

@@ -7,7 +7,6 @@ module AttachmentMagick
       @set    = set
       @styles = {}
       @default_grids = default_grids
-      @default_options = {:crop => true}
     end
 
     def method_missing(name, *params, &blk)
@@ -21,13 +20,14 @@ module AttachmentMagick
         options = {}
         options.merge!(:width   => values.first.to_i) if values.first
         options.merge!(:height  => values.last.to_i)  if values.second
+        options.merge!(:ajust   => values.second.match(/\W/).to_s) unless values.second.match(/\W/).to_s.blank? if values.second
 
         options = @default_grids[name.to_sym].merge(options)
       elsif options.is_a?(Hash)
         options = @default_grids[name.to_sym].merge(options)
       end
 
-      @styles.merge!(name.to_sym => @default_options.merge(options))
+      @styles.merge!(name.to_sym => options)
     end
 
     def styles

data/lib/attachment_magick/version.rb

@@ -1,3 +1,3 @@
 module AttachmentMagick
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/test/attachment_magick/units/artist_test.rb

@@ -5,7 +5,7 @@ class ArtistTest < ActiveSupport::TestCase
     assert_equal "36x36",     Artist.style_thumb
     assert_equal "54x",       Artist.style_grid_1
     assert_equal "150x",      Artist.style_grid_10
-    assert_equal "200x300#",  Artist.style_grid_15
+    assert_equal "200x300",   Artist.style_grid_15
     assert_equal "909x230#",  Artist.style_grid_16
   end
 end

data/test/attachment_magick/units/attachment_magick_test.rb

@@ -22,12 +22,14 @@ class AttachmentMagickTest < ActiveSupport::TestCase
 
     attachment_magick do
       grid_1 "300x150"
+      grid_7 "x560>"
     end
   end
 
   test "deveria manter o valor do grid original" do
-    assert_equal "300x150#",  Cat.style_grid_1
-    assert_equal "54x",       Dog.style_grid_1
+    assert_equal "300x150", Cat.style_grid_1
+    assert_equal "x560>",   Cat.style_grid_7
+    assert_equal "54x",     Dog.style_grid_1
   end
 
   def test_has_attachment_magick

data/test/dummy/app/models/artist.rb

@@ -12,8 +12,8 @@ class Artist
     grid_1
     grid_10 :width => 150
     grid_15 "200x300"
-    grid_16 :height => 230
-    thumb   :crop => false
+    grid_16 :height => 230, :ajust => "#"
+    thumb
     fullscreen
     publisher
   end

metadata

@@ -2,7 +2,7 @@
 name: attachment_magick
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - "Marco Ant\xC3\xB4nio Singer"
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-08 00:00:00 -03:00
+date: 2011-04-09 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency