padrino-helpers 0.6.3 → 0.6.7

Sign up to get free protection for your applications and to get access to all the features.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.6.3
1
+ 0.6.7
@@ -92,12 +92,16 @@ module Padrino
92
92
  # Returns the javascript_path appending the default javascripts path if necessary
93
93
  def javascript_path(source)
94
94
  return source if source =~ /^http/
95
- source = source.to_s.gsub(/\.js$/, '')
96
- source_name = source; source_name << ".js" unless source =~ /\.js/
97
- result_path = source_name if source =~ %r{^/} # absolute path
95
+ source = source.to_s.gsub(/\.js$/, '')
96
+ source_name = source; source_name << ".js" unless source =~ /\.js/
97
+ result_path = source_name if source =~ %r{^/} # absolute path
98
98
  result_path ||= uri_root_path("javascripts", source_name)
99
- stamp = File.exist?(result_path) ? File.mtime(result_path) : Time.now.to_i
100
- "#{result_path}?#{stamp}"
99
+ if result_path =~ /\?/
100
+ result_path
101
+ else
102
+ stamp = File.exist?(result_path) ? File.mtime(result_path) : Time.now.to_i
103
+ "#{result_path}?#{stamp}"
104
+ end
101
105
  end
102
106
 
103
107
  # Returns the stylesheet_path appending the default stylesheets path if necessary
@@ -32,11 +32,10 @@ module Padrino
32
32
  end
33
33
 
34
34
  protected
35
-
36
- # Returns a list of attributes which can only contain an identity value (i.e selected)
37
- def identity_tag_attributes
38
- [:checked, :disabled, :selected, :multiple]
39
- end
35
+ # Returns a list of attributes which can only contain an identity value (i.e selected)
36
+ def identity_tag_attributes
37
+ [:checked, :disabled, :selected, :multiple]
38
+ end
40
39
  end
41
40
  end
42
41
  end
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{padrino-helpers}
8
- s.version = "0.6.3"
8
+ s.version = "0.6.7"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
12
- s.date = %q{2010-01-15}
12
+ s.date = %q{2010-01-26}
13
13
  s.description = %q{Tag helpers, asset helpers, form helpers, form builders and many more helpers for padrino}
14
14
  s.email = %q{nesquena@gmail.com}
15
15
  s.extra_rdoc_files = [
@@ -80,7 +80,7 @@ Gem::Specification.new do |s|
80
80
 
81
81
  if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
82
82
  s.add_runtime_dependency(%q<sinatra>, [">= 0.9.2"])
83
- s.add_runtime_dependency(%q<padrino-core>, ["= 0.6.3"])
83
+ s.add_runtime_dependency(%q<padrino-core>, ["= 0.6.7"])
84
84
  s.add_development_dependency(%q<haml>, [">= 2.2.1"])
85
85
  s.add_development_dependency(%q<shoulda>, [">= 0"])
86
86
  s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
@@ -88,7 +88,7 @@ Gem::Specification.new do |s|
88
88
  s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
89
89
  else
90
90
  s.add_dependency(%q<sinatra>, [">= 0.9.2"])
91
- s.add_dependency(%q<padrino-core>, ["= 0.6.3"])
91
+ s.add_dependency(%q<padrino-core>, ["= 0.6.7"])
92
92
  s.add_dependency(%q<haml>, [">= 2.2.1"])
93
93
  s.add_dependency(%q<shoulda>, [">= 0"])
94
94
  s.add_dependency(%q<mocha>, [">= 0.9.7"])
@@ -97,7 +97,7 @@ Gem::Specification.new do |s|
97
97
  end
98
98
  else
99
99
  s.add_dependency(%q<sinatra>, [">= 0.9.2"])
100
- s.add_dependency(%q<padrino-core>, ["= 0.6.3"])
100
+ s.add_dependency(%q<padrino-core>, ["= 0.6.7"])
101
101
  s.add_dependency(%q<haml>, [">= 2.2.1"])
102
102
  s.add_dependency(%q<shoulda>, [">= 0"])
103
103
  s.add_dependency(%q<mocha>, [">= 0.9.7"])
data/test/helper.rb CHANGED
@@ -8,7 +8,7 @@ require 'webrat'
8
8
  # We try to load the vendored padrino-core if exist
9
9
  %w(core).each do |gem|
10
10
  if File.exist?(File.dirname(__FILE__) + "/../../padrino-#{gem}/lib")
11
- $LOAD_PATH.unshift File.dirname(__FILE__) + "/../../padrino-#{gem}/lib"
11
+ $:.unshift File.dirname(__FILE__) + "/../../padrino-#{gem}/lib"
12
12
  end
13
13
  end
14
14
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: padrino-helpers
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.3
4
+ version: 0.6.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
14
 
15
- date: 2010-01-15 00:00:00 +01:00
15
+ date: 2010-01-26 00:00:00 +01:00
16
16
  default_executable:
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
@@ -33,7 +33,7 @@ dependencies:
33
33
  requirements:
34
34
  - - "="
35
35
  - !ruby/object:Gem::Version
36
- version: 0.6.3
36
+ version: 0.6.7
37
37
  version:
38
38
  - !ruby/object:Gem::Dependency
39
39
  name: haml