stash-magic 0.0.4 → 0.0.5

data/README.rdoc

@@ -196,13 +196,13 @@ It is of course possible. StashMagic provides a hook called after_stash which ta
 
 What you have to do is overwrite the hook. For example, say you want every attachment to have a 200x200 perfect squared version:
 
-  after_stash(attachment_name)
+  def after_stash(attachment_name)
     image_magick(attachment_name, 'square.jpg') { im_resize(200, 200, '^') }
   end
   
 Of course you can do something different for any attachment. You just need to use the attachment name in a case statement for example. Or you can do something different depending on the type of file using the getters. For example:
 
-  after_stash(attachment_name)
+  def after_stash(attachment_name)
     attachment_hash = self.send(attachment_name)
     image_magick(attachment_name, 'square.jpg') { im_resize(200, 200, '^') } if attachment_hash[:type][/^image\//]
   end
@@ -254,6 +254,7 @@ The project is speced with
 - 0.0.1   Begins
 - 0.0.2   Add im_negate to the ImageMagick builder
 - 0.0.3   Fix image destruction when there is nothing to destroy
+- 0.0.5   Remove ERB dependency
 
 == Copyright
 

data/spec.rb

@@ -170,10 +170,10 @@ describe ::StashMagic do
   
   it "Should be able to build image tags" do
     @t = Treasure.create(:map => @img)
-    tag = @t.build_image_tag(:map,nil,:alt => 'Amazing Map')
+    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/)
-    tag.should.match(/\salt="Amazing Map"\s/)
+    tag.should.match(/\salt="Amazing &amp; Beautiful Map"\s/)
     tag.should.match(/\stitle=""\s/)
   end
   

data/stash_magic.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s| 
   s.name = 'stash-magic'
-  s.version = "0.0.4"
+  s.version = "0.0.5"
   s.platform = Gem::Platform::RUBY
-  s.summary = "Simple Attachment Manager"
+  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."
   s.files = `git ls-files`.split("\n").sort
   s.test_files = ['spec.rb']

data/stash_magic.rb

@@ -1,5 +1,4 @@
 require 'fileutils'
-require 'erb'
 
 # A replacement for our current attachment system
 # New requirements being:
@@ -92,7 +91,7 @@ module StashMagic
     alt = send(attachment_name+'_alternative_text') rescue nil
     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}="#{ERB::Util.h(v.to_s)}"}
+      %{#{k.to_s}="#{html_escape(v.to_s)}"}
     end.join(' ')
     
     "<img #{html_attributes} />"
@@ -146,7 +145,7 @@ module StashMagic
         FU.chmod(0777, url)
         after_stash(k)
       end
-      # Reset in case we access to times the entry in the same session
+      # Reset in case we access two times the entry in the same session
       # Like setting an attachment and destroying it consecutively
       # Dummy ex:    Model.create(:img => file).update(:img => nil)
       @tempfile_path = nil
@@ -188,4 +187,11 @@ module StashMagic
     end
   end
   
+  private
+  
+  # Stolen from ERB
+  def html_escape(s)
+    s.to_s.gsub(/&/, "&amp;").gsub(/\"/, "&quot;").gsub(/>/, "&gt;").gsub(/</, "&lt;")
+  end
+  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stash-magic
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Mickael Riga
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-04 00:00:00 +00:00
+date: 2011-03-03 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -67,6 +67,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Simple Attachment Manager
+summary: File Attachment Made Simple
 test_files: 
 - spec.rb