kelredd-sinatra-helpers 0.2.0 → 0.2.1

data/Rakefile

@@ -17,7 +17,7 @@ spec = Gem::Specification.new do |s|
   s.files            = %w(README.rdoc Rakefile) + Dir.glob("{bin,lib}/**/*")
   s.executables    = ['sinatra']
   
-  s.add_dependency('kelredd-useful', ['>= 0.2.6'])
+  s.add_dependency('kelredd-useful', ['>= 0.3.0'])
   
   s.add_development_dependency("shoulda", [">= 2.10.2"])
   s.add_development_dependency("sinatra", [">= 0.9.4"])

data/lib/sinatra_helpers/erb.rb

@@ -1,9 +1,6 @@
+require "useful/erb_helpers"
+
 Dir[File.join(File.dirname(__FILE__), "erb" ,"*.rb")].each do |file|
   require "sinatra_helpers/erb/#{File.basename(file, ".rb")}"
 end
 
-require "useful/erb_helpers"
-Sinatra::Application.helpers Useful::ErbHelpers::Tags
-Sinatra::Application.helpers Useful::ErbHelpers::Links
-Sinatra::Application.helpers Useful::ErbHelpers::Forms
-Sinatra::Application.helpers Useful::ErbHelpers::Proper

data/lib/sinatra_helpers/erb/forms.rb

@@ -0,0 +1,8 @@
+require 'erb'
+require 'sinatra/base'
+require "useful/erb_helpers/forms"
+
+module SinatraHelpers; end
+module SinatraHelpers::Erb; end
+
+Sinatra::Application.helpers Useful::ErbHelpers::Forms

data/lib/sinatra_helpers/erb/links.rb

@@ -0,0 +1,61 @@
+require 'erb'
+require 'sinatra/base'
+require "useful/erb_helpers/links"
+
+module SinatraHelpers; end
+module SinatraHelpers::Erb; end
+
+module SinatraHelpers::Erb::Links
+  
+  SINATRA_HELPERS_LINKS_TMP_FILE = File.expand_path('./tmp/.sinatra_helpers_links')
+  
+  class << self
+    
+    def registered(app)
+      app.send(:alias_method, :useful_stylesheet_link_tag, :stylesheet_link_tag)
+      app.send(:alias_method, :stylesheet_link_tag, :sinatra_helpers_stylesheet_link_tag)
+
+      app.send(:alias_method, :useful_javascript_include_tag, :javascript_include_tag)
+      app.send(:alias_method, :javascript_include_tag, :sinatra_helpers_javascript_include_tag)
+    end
+    
+  end
+
+  def sinatra_helpers_stylesheet_link_tag(*args)
+    useful_stylesheet_link_tag(sinatra_helpers_links_args(args))
+  end
+  
+  def sinatra_helpers_javascript_include_tag(*args)
+    useful_javascript_include_tag(sinatra_helpers_links_args(args))
+  end
+  
+  private
+  
+  def sinatra_helpers_links_args(args)
+    the_args = args.flatten
+    if the_args.last && the_args.last.kind_of?(::Hash)
+      the_args.last[:timestamp] ||= sinatra_helpers_links_timestamp
+    else
+      the_args << { :timestamp => sinatra_helpers_links_timestamp }
+    end
+    the_args
+  end
+  
+  def sinatra_helpers_links_timestamp
+    if defined?(:development?) && !development?
+      unless File.exists?(SINATRA_HELPERS_LINKS_TMP_FILE)
+        `touch #{SINATRA_HELPERS_LINKS_TMP_FILE}`
+      end
+      File.mtime(SINATRA_HELPERS_LINKS_TMP_FILE).to_i.to_s
+    else
+      Time.now.to_i.to_s
+    end
+  end
+
+end
+
+Sinatra::Application.helpers  Useful::ErbHelpers::Links
+Sinatra::Application.helpers  SinatraHelpers::Erb::Links
+
+Sinatra::Application.register SinatraHelpers::Erb::Links
+

data/lib/sinatra_helpers/erb/proper.rb

@@ -0,0 +1,9 @@
+require 'erb'
+require 'sinatra/base'
+require "useful/erb_helpers/proper"
+
+module SinatraHelpers; end
+module SinatraHelpers::Erb; end
+
+Sinatra::Application.helpers Useful::ErbHelpers::Proper
+

data/lib/sinatra_helpers/erb/tags.rb

@@ -0,0 +1,8 @@
+require 'erb'
+require 'sinatra/base'
+require "useful/erb_helpers/tags"
+
+module SinatraHelpers; end
+module SinatraHelpers::Erb; end
+
+Sinatra::Application.helpers Useful::ErbHelpers::Tags

data/lib/sinatra_helpers/version.rb

@@ -3,7 +3,7 @@ module SinatraHelpers
     
     MAJOR = 0
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
     
     def self.to_s # :nodoc:
       [MAJOR, MINOR, TINY].join('.')

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Kelly Redding
@@ -26,9 +26,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 2
-        - 6
-        version: 0.2.6
+        - 3
+        - 0
+        version: 0.3.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -100,7 +100,11 @@ files:
 - Rakefile
 - bin/sinatra
 - lib/sinatra_helpers/environment_tests.rb
+- lib/sinatra_helpers/erb/forms.rb
+- lib/sinatra_helpers/erb/links.rb
 - lib/sinatra_helpers/erb/partials.rb
+- lib/sinatra_helpers/erb/proper.rb
+- lib/sinatra_helpers/erb/tags.rb
 - lib/sinatra_helpers/erb.rb
 - lib/sinatra_helpers/generator/app.rb
 - lib/sinatra_helpers/generator/file_templates/app.js.erb