stash-magic 0.0.8 → 0.0.9

data/README.rdoc

@@ -264,6 +264,7 @@ The project is speced with
 - 0.0.5   Remove ERB dependency
 - 0.0.7   Make it possible to overwrite the original image with another style in after_stash
 - 0.0.8   Default thumb does not break when file name has signs in the name
+- 0.0.9   Fix a bug when Model#build_image_tag uses a symbol for the attachment name
 
 == Copyright
 

data/spec.rb

@@ -25,6 +25,8 @@ class Treasure < ::Sequel::Model
     primary_key :id
     Integer :age
     String :map # jpeg
+    String :map_tooltip
+    String :map_alternative_text
     String :mappy # jpeg - Used to see if mappy files are not destroyed when map is (because it starts the same)
     String :instructions #pdf
   end
@@ -169,7 +171,16 @@ describe ::StashMagic do
   end
   
   it "Should be able to build image tags" do
-    @t = Treasure.create(:map => @img)
+    @t = Treasure.create(:map => @img, :map_alternative_text => "Wonderful")
+    tag = @t.build_image_tag(:map)
+    tag.should.match(/^<img\s.+\s\/>$/)
+    tag.should.match(/\ssrc="\/stash\/Treasure\/#{@t.id}\/map.jpg"\s/)
+    tag.should.match(/\salt="Wonderful"\s/)
+    tag.should.match(/\stitle=""\s/)
+  end
+  
+  it "Should be able to build image tags and override alt and title" do
+    @t = Treasure.create(:map => @img, :map_alternative_text => "Wonderful")
     tag = @t.build_image_tag(:map,nil,:alt => 'Amazing & Beautiful Map')
     tag.should.match(/^<img\s.+\s\/>$/)
     tag.should.match(/\ssrc="\/stash\/Treasure\/#{@t.id}\/map.jpg"\s/)

data/stash_magic.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s| 
   s.name = 'stash-magic'
-  s.version = "0.0.8"
+  s.version = "0.0.9"
   s.platform = Gem::Platform::RUBY
   s.summary = "File Attachment Made Simple"
   s.description = "A simple attachment system that also handles thumbnails or other styles via ImageMagick. Originaly tested on Sequel ORM but purposedly easy to plug to something else."

data/stash_magic.rb

@@ -37,7 +37,7 @@ module StashMagic
           return if upload_hash=="" # File in the form is unchanged
           
           if upload_hash.nil?
-            destroy_files_for(name) unless self.send(name).nil?
+            destroy_files_for(name) unless self.__send__(name).nil?
             super('')
           else
           
@@ -78,7 +78,7 @@ module StashMagic
   # Returns the url of an attachment in a specific style(original if nil)
   # The argument 'full' means it returns the absolute path(used to save files)
   def file_url(attachment_name, style=nil, full=false)
-    f = send(attachment_name)
+    f = __send__(attachment_name)
     return nil if f.nil?
     fn = style.nil? ? f[:name] : "#{attachment_name}.#{style}"
     "#{file_path(full)}/#{fn}"
@@ -87,8 +87,9 @@ module StashMagic
   # Build the image tag with all SEO friendly info
   # It's possible to add html attributes in a hash
   def build_image_tag(attachment_name, style=nil, html_attributes={})
-    title = send(attachment_name+'_tooltip') rescue nil
-    alt = send(attachment_name+'_alternative_text') rescue nil
+    title_field, alt_field = (attachment_name.to_s+'_tooltip').to_sym, (attachment_name.to_s+'_alternative_text').to_sym
+    title = __send__(title_field) if columns.include?(title_field)
+    alt = __send__(alt_field) if columns.include?(alt_field)
     html_attributes = {:src => file_url(attachment_name, style), :title => title, :alt => alt}.update(html_attributes)
     html_attributes = html_attributes.map do |k,v|
       %{#{k.to_s}="#{html_escape(v.to_s)}"}
@@ -153,7 +154,7 @@ module StashMagic
   end
   
   def after_stash(attachment_name)
-    current = self.send(attachment_name)
+    current = self.__send__(attachment_name)
     convert(attachment_name, "-resize '100x75^' -gravity center -extent 100x75", 'stash_thumb.gif') if !current.nil? && current[:type][/^image\//]
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stash-magic
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Mickael Riga
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-02 00:00:00 +01:00
+date: 2011-07-05 00:00:00 +01:00
 default_executable: 
 dependencies: []