djanowski-tti 0.2.2 → 0.4.0

data/lib/configurable.rb

@@ -6,6 +6,7 @@ module Configurable
     def self.configure
       self.configuration ||= Configuration.new(self)
       yield(configuration)
+      configuration
     end
     EOS
   end
@@ -26,6 +27,14 @@ module Configurable
         @config[key]
       end
     end
+
+    def default!
+      @default_config = @config.dup
+    end
+
+    def reset!
+      @config = @default_config ? @default_config.dup : {}
+    end
   end
 
   def config

data/lib/tti.rb

@@ -56,7 +56,7 @@ class Tti
   end
 
   def url
-    CGI.escape [config.url_prefix || config.path_prefix, filename].join('/')
+    [config.url_prefix || config.path_prefix, filename].join('/')
   end
 
   def width_or_computed
@@ -89,17 +89,24 @@ class Tti
 
   def to_html
     save
-    %{<img src="#{url}" alt="#{text}" />}
+    %{<img src="#{h url}" alt="#{h text}" />}
   end
 
   def font_file
-    file = Dir["#{font}.*"].first || Dir["fonts/#{font}.*"].first
+    file = Array(config.fonts_dir).detect do |dir|
+      Dir[File.join(dir, "#{font}.*")].first
+    end
 
     file ? File.join(Dir.pwd, file) : font
   end
 
+  def h(*args)
+    CGI.escapeHTML(*args)
+  end
+
   configure do |config|
     config.path_prefix = 'tmp'
     config.font_size = 24
-  end
+    config.fonts_dir = ['.', 'fonts']
+  end.default!
 end

data/rails/init.rb

@@ -5,4 +5,5 @@ ActionView::Base.send(:include, Tti::Helper)
 Tti.configure do |config|
   config.path_prefix = 'public/images/tti'
   config.url_prefix = '/images/tti'
+  config.fonts_dir = ['', 'fonts'].map {|d| File.join(RAILS_ROOT, d) } if Object.const_defined?(:RAILS_ROOT)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: djanowski-tti
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.4.0
 platform: ruby
 authors: 
 - Damian Janowski