sinatra_more 0.3.25 → 0.3.26

data/VERSION

@@ -1 +1 @@
-0.3.25
+0.3.26

data/lib/sinatra_more/markup_plugin/asset_tag_helpers.rb

@@ -80,14 +80,16 @@ module SinatraMore
 
     def javascript_path(source)
       return source if source =~ /^http/
-      result_path = "/javascripts/#{source.gsub(/.js/, '')}.js"
+      result_path = "/javascripts/#{source.gsub(/.js$/, '')}"
+      result_path << ".js" unless source =~ /\.js\w{2,4}$/
       stamp = File.exist?(result_path) ? File.mtime(result_path) : Time.now.to_i
       "#{result_path}?#{stamp}"
     end
 
     def stylesheet_path(source)
       return source if source =~ /^http/
-      result_path = "/stylesheets/#{source.gsub(/.css/, '')}.css"
+      result_path = "/stylesheets/#{source.gsub(/.css$/, '')}"
+      result_path << ".css" unless source =~ /\.css\w{2,4}$/
       stamp = File.exist?(result_path) ? File.mtime(result_path) : Time.now.to_i
       "#{result_path}?#{stamp}"
     end

data/lib/sinatra_more/support_lite.rb

@@ -1,9 +1,19 @@
 # This is for adding specific methods that are required by sinatra_more if activesupport isn't required
 
 unless String.method_defined?(:titleize) && Hash.method_defined?(:slice)
+  require 'active_support/core_ext/kernel'
+  require 'active_support/core_ext/module'
+  require 'active_support/core_ext/class'
+  require 'active_support/deprecation'
   require 'active_support/inflector'
-  require 'active_support/core_ext/blank'
-  require 'active_support/core_ext/class/attribute_accessors'
   require 'active_support/core_ext/hash'
   require 'active_support/core_ext/array'
 end
+
+unless String.method_defined?(:blank?)
+  begin 
+    require 'active_support/core_ext/object/blank'
+  rescue LoadError
+    require 'active_support/core_ext/blank'
+  end
+end

data/sinatra_more.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.3.25"
+  s.version = "0.3.26"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]
-  s.date = %q{2009-11-25}
+  s.date = %q{2009-11-30}
   s.default_executable = %q{sinatra_gen}
   s.description = %q{Expands sinatra with standard helpers and tools to allow for complex applications}
   s.email = %q{nesquena@gmail.com}

data/test/markup_plugin/test_asset_tag_helpers.rb

@@ -121,6 +121,16 @@ class TestAssetTagHelpers < Test::Unit::TestCase
       actual_html = javascript_include_tag('application')
       assert_has_tag('script', :src => "/javascripts/application.js?#{time.to_i}", :type => "text/javascript") { actual_html }
     end
+    should "display javascript item for path containing js" do
+      time = stop_time_for_test
+      actual_html = javascript_include_tag 'test/jquery.json'
+      assert_has_tag('script', :src => "/javascripts/test/jquery.json?#{time.to_i}", :type => "text/javascript") { actual_html }
+    end
+    should "display javascript item for path containing period" do
+      time = stop_time_for_test
+      actual_html = javascript_include_tag 'test/jquery.min'
+      assert_has_tag('script', :src => "/javascripts/test/jquery.min.js?#{time.to_i}", :type => "text/javascript") { actual_html }
+    end
     should "display javascript item for long relative path" do
       time = stop_time_for_test
       actual_html = javascript_include_tag('example/demo/application')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.3.25
+  version: 0.3.26
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-25 00:00:00 -08:00
+date: 2009-11-30 00:00:00 -08:00
 default_executable: sinatra_gen
 dependencies: 
 - !ruby/object:Gem::Dependency