magick_title 0.1.8 → 0.2.0.rc1

data/README.md

@@ -3,8 +3,8 @@ Magick Title
 
 Want beautiful copyright-protected browser-compatible custom-smoothed & kerned fonts? MagickTitle delivers just that by using [imagemagick](http://www.imagemagick.org/script/index.php) to generate titles based on the options you provide.
 
-** ----- in beta! ----- **
-   
+Want your titles to be automagically created for your Rails apps' models? Check out [has_magick_title](https://github.com/citrus/has_magick_title).
+
 
 Requirements
 ------------
@@ -21,7 +21,7 @@ As usual, just use the `gem install` command:
     
 Or add magick_title as a gem in your Gemfile:
 
-    gem 'magick_title', '>= 0.1.7' 
+    gem 'magick_title', '>= 0.1.8' 
 
 Then run `bundle install`
 
@@ -163,9 +163,8 @@ To Do
 * Write more tests
 * Smart option validation (:color => 'fff' converts to :color => '#fff' and :color => 'pink' fails)
 * More documentation
-* Auto ActiveRecord integration (`has_magick_title` class method)
 * Heroku support / tempfiles / base64
-* Clean up and publish demo app
+* Clean up and publish demo app (/test/dummy)
 
 
 License

data/lib/magick_title/image.rb

@@ -137,15 +137,7 @@ module MagickTitle
     def to_html(opts={})
       opts = { :parent => nil } if opts === false
       opts = { :parent => opts } if opts.is_a?(String)
-      opts = options[:to_html].merge(:alt => text, :src => url).merge(opts)
-      parent = opts.delete(:parent)
-      tag = %(<img#{hash_to_attributes(opts)}/>)
-      if parent
-        ptag = parent.is_a?(String) ? parent : parent.is_a?(Hash) ? parent.delete(:tag) : nil
-        ptag ||= "h1"
-        tag = %(<#{ptag}#{hash_to_attributes(parent)}>#{tag}</#{ptag}>)
-      end    
-      tag
+      Renderer.to_html(text, url, options[:to_html].merge(opts))
     end
     
     
@@ -222,16 +214,6 @@ module MagickTitle
         end
         dupe || file
       end
-  
-      
-      # Converts a hash to a string of html style key="value" pairs
-      def hash_to_attributes(hash)
-        attributes = []
-        return "" unless hash.is_a?(Hash)
-        hash.each { |key, value| attributes << %(#{key}="#{value}") if value and 0 < value.length }
-        return "" if attributes.length == 0
-        " " + attributes.join(" ").strip
-      end
           
   end # Image
   

data/lib/magick_title/renderer.rb

@@ -0,0 +1,36 @@
+module MagickTitle
+
+  module Renderer
+    
+    extend self
+    
+    # Creates and HTML image tag with the options provided
+    def to_html(text, url, opts={})
+      opts = { :parent => nil } if opts === false
+      opts = { :parent => opts } if opts.is_a?(String)
+      opts[:alt] ||= text
+      opts.merge!(:src => url)
+      parent = opts.delete(:parent)
+      tag = %(<img#{hash_to_attributes(opts)}/>)
+      if parent
+        ptag = parent.is_a?(String) ? parent : parent.is_a?(Hash) ? parent.delete(:tag) : nil
+        ptag ||= "h1"
+        tag = %(<#{ptag}#{hash_to_attributes(parent)}>#{tag}</#{ptag}>)
+      end    
+      tag
+    end
+    
+    private
+    
+      # Converts a hash to a string of html style key="value" pairs
+      def hash_to_attributes(hash)
+        attributes = []
+        return "" unless hash.is_a?(Hash)
+        hash.each { |key, value| attributes << %(#{key}="#{value}") if value and 0 < value.length }
+        return "" if attributes.length == 0
+        " " + attributes.join(" ").strip
+      end
+      
+  end # Renderer
+  
+end # MagickTitle

data/lib/magick_title/version.rb

@@ -1,3 +1,3 @@
 module MagickTitle
-  VERSION = "0.1.8"
+  VERSION = "0.2.0.rc1"
 end

data/lib/magick_title.rb

@@ -1,6 +1,7 @@
 require 'magick_title/hash'
 require 'magick_title/options'
 require 'magick_title/image'
+require 'magick_title/renderer'
 
 module MagickTitle
 

data/test/test_dsl.rb

@@ -33,4 +33,4 @@ class TestDsl < Test::Unit::TestCase
     assert_equal "h2", MagickTitle.styles[:h2][:to_html][:parent][:tag]
   end
     
-end
+end

data/test/test_image.rb

@@ -182,4 +182,4 @@ class TestImage < Test::Unit::TestCase
     
   end
   
-end
+end

data/test/test_magick_title.rb

@@ -15,9 +15,9 @@ class TestMagickTitle < Test::Unit::TestCase
   
   should "not get cut off" do
     
-    @title = MagickTitle.say("HELLO MAGICK TITLE OF DOOM!", :font_path => "/Users/Spencer/Library/Fonts", :font => "HelveticaNeueLTStd-UltLt.otf", :color => "#000000")
+    @title = MagickTitle.say("HELLO MAGICK TITLE OF DOOM!", :color => "#000000")
     assert File.exists?(@title.fullpath)
     
   end
   
-end
+end

data/test/test_options.rb

@@ -2,6 +2,14 @@ require 'helper'
 
 class TestOptions < Test::Unit::TestCase
 
+  def setup
+    @font_path = MagickTitle.options[:font_path]
+  end
+  
+  def teardown
+    MagickTitle.options[:font_path] = @font_path
+  end
+  
   should "raise error on invalid option" do
     
     assert_raise(NoMethodError) do
@@ -9,9 +17,16 @@ class TestOptions < Test::Unit::TestCase
     end    
     
     assert_raise(NoMethodError) do
-      MagickTitle.option[:size] = 56
+      MagickTitle.options[:size] = 56
     end    
 
   end
-      
-end
+  
+  should "use custom font path" do
+    MagickTitle.options[:font_path] = File.expand_path("../dummy/fonts/custom/nested", __FILE__)
+    assert File.exists?(File.join(MagickTitle.options[:font_path], "Lobster.ttf"))
+    @title = MagickTitle.say("Hello Magick Title with Custom font path!", :font => "Lobster.ttf")
+    assert File.exists?(@title.fullpath)
+  end
+  
+end

data/test/{test_to_html.rb → test_renderer.rb}

@@ -3,7 +3,7 @@
 
 require 'helper'
 
-class TestToHtml < Test::Unit::TestCase
+class TestRenderer < Test::Unit::TestCase
 
   def assert_opening_tag(html, tag, inline=false)
     assert html.match(Regexp.new("#{'^' unless inline}<#{tag}\s?")), "#{tag} opening tag"
@@ -17,8 +17,25 @@ class TestToHtml < Test::Unit::TestCase
     assert html.match(/\/>$/), "Has self closing tag"
   end
   
+  context "the renderer by itself" do
   
-  context "an existing title" do
+    should "create the most basic tag" do
+      tag = %(<img alt="Hello" src="test.jpg"/>)
+      html = MagickTitle::Renderer.to_html("Hello", "test.jpg", false)
+      assert_equal tag, html
+    end
+    
+    should "create the most basic tag inside a parent" do
+      tag = %(<p><img alt="Hello" src="test.jpg"/></p>)
+      html = MagickTitle::Renderer.to_html("Hello", "test.jpg", "p")
+      assert_equal tag, html
+    end
+    
+    
+  
+  end  
+  
+  context "with an existing title" do
   
     setup do
       @title = MagickTitle::Image.create("hello mr. to_html!")
@@ -74,4 +91,5 @@ class TestToHtml < Test::Unit::TestCase
   
   end
   
-end
+  
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: magick_title
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.1.8
+  prerelease: 6
+  version: 0.2.0.rc1
 platform: ruby
 authors: 
 - Spencer Steffen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-05 00:00:00 -07:00
+date: 2011-05-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,9 +53,9 @@ files:
 - lib/magick_title/hash.rb
 - lib/magick_title/image.rb
 - lib/magick_title/options.rb
+- lib/magick_title/renderer.rb
 - lib/magick_title/version.rb
 - magick_title.gemspec
-- test/bench/hash_to_attributes.rb
 - test/dummy/.gitignore
 - test/dummy/Gemfile
 - test/dummy/app.rb
@@ -65,6 +65,7 @@ files:
 - test/dummy/fonts/PermanentMarker.ttf
 - test/dummy/fonts/Raleway-Thin.ttf
 - test/dummy/fonts/RockSalt.ttf
+- test/dummy/fonts/custom/nested/Lobster.ttf
 - test/dummy/public/favicon.ico
 - test/dummy/public/javascripts/jquery-1.5.1.min.js
 - test/dummy/public/javascripts/jquery-ui-1.8.10.custom.min.js
@@ -92,7 +93,7 @@ files:
 - test/test_image.rb
 - test/test_magick_title.rb
 - test/test_options.rb
-- test/test_to_html.rb
+- test/test_renderer.rb
 has_rdoc: true
 homepage: https://github.com/citrus/magick_title
 licenses: []
@@ -111,9 +112,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: magick_title
@@ -122,7 +123,6 @@ signing_key:
 specification_version: 3
 summary: Converts text to an image using imagemagick.
 test_files: 
-- test/bench/hash_to_attributes.rb
 - test/dummy/.gitignore
 - test/dummy/Gemfile
 - test/dummy/app.rb
@@ -132,6 +132,7 @@ test_files:
 - test/dummy/fonts/PermanentMarker.ttf
 - test/dummy/fonts/Raleway-Thin.ttf
 - test/dummy/fonts/RockSalt.ttf
+- test/dummy/fonts/custom/nested/Lobster.ttf
 - test/dummy/public/favicon.ico
 - test/dummy/public/javascripts/jquery-1.5.1.min.js
 - test/dummy/public/javascripts/jquery-ui-1.8.10.custom.min.js
@@ -159,4 +160,4 @@ test_files:
 - test/test_image.rb
 - test/test_magick_title.rb
 - test/test_options.rb
-- test/test_to_html.rb
+- test/test_renderer.rb

data/test/bench/hash_to_attributes.rb

@@ -1,34 +0,0 @@
-require 'benchmark'
-
-puts "Benchmark Hash to Attribtes"
-puts " string vs array"
-puts "-" * 50
-
-# Converts a hash to a string of html style key="value" pairs
-def hash_to_attributes_using_string(hash)
-  attributes = ""
-  return attributes unless hash.is_a?(Hash)
-  hash.each { |key, value| attributes << key.to_s << "=\"" << value.strip << "\" " if value and 0 < value.length }
-  attributes.strip
-end
-
-def hash_to_attributes_using_array(hash)
-  attributes = []
-  return attributes unless hash.is_a?(Hash)
-  hash.each { |key, value| attributes << %(#{key}="#{value.strip}") if value and 0 < value.length }
-  attributes.join(" ")
-end
-
-
-@hash = { :id => "some-html-id", :class => "a-css-class-that-is-long ", :href => "http://google.com   ", :title => "Visit Google!", :rel => "that-related-thing" }
-
-using_string = hash_to_attributes_using_string(@hash)
-using_array  = hash_to_attributes_using_array(@hash)
-
-raise "Strings don't match!" unless using_string == using_array
-
-n = 999999999999999999999
-Benchmark.bm do |x|
-  x.report { hash_to_attributes_using_string(@hash) }
-  x.report { hash_to_attributes_using_array(@hash) }
-end