machined 0.9.1 → 0.9.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -9,12 +9,12 @@ module Machined
9
9
  # a simplified version of ActionDispatch::Static.
10
10
  class Static
11
11
  def initialize(app, root = '.', cache_control = nil)
12
- @app = app
13
- @root = File.expand_path(root)
12
+ @app = app
13
+ @root = File.expand_path(root)
14
14
  @compiled_root = /^#{Regexp.escape(@root)}/
15
- @file_server = ::Rack::File.new(@root, cache_control)
15
+ @file_server = ::Rack::File.new(@root, 'Cache-Control' => cache_control)
16
16
  end
17
-
17
+
18
18
  def call(env)
19
19
  case env['REQUEST_METHOD']
20
20
  when 'GET', 'HEAD'
@@ -24,17 +24,17 @@ module Machined
24
24
  return @file_server.call(env)
25
25
  end
26
26
  end
27
-
27
+
28
28
  @app.call(env)
29
29
  end
30
-
30
+
31
31
  protected
32
-
32
+
33
33
  def match?(path)
34
34
  full_path = path.empty? ? @root : File.join(@root, path)
35
- matches = Dir[full_path + '{,.html,/index.html}']
36
- match = matches.detect { |f| File.file?(f) }
37
-
35
+ matches = Dir[full_path + '{,.html,/index.html}']
36
+ match = matches.detect { |f| File.file?(f) }
37
+
38
38
  if match
39
39
  ::Rack::Utils.escape match.sub(@compiled_root, '')
40
40
  else
@@ -1,3 +1,3 @@
1
1
  module Machined
2
- VERSION = '0.9.1'
2
+ VERSION = '0.9.2'
3
3
  end
data/machined.gemspec CHANGED
@@ -18,13 +18,14 @@ Gem::Specification.new do |s|
18
18
  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
19
19
  s.require_paths = ['lib']
20
20
 
21
+ s.add_dependency 'rack', '~> 1.5.0'
21
22
  s.add_dependency 'sprockets', '~> 2.6.0'
22
23
  s.add_dependency 'sprockets-helpers', '~> 0.7.1'
23
24
  s.add_dependency 'sprockets-sass', '~> 0.9.1'
24
- s.add_dependency 'padrino-helpers', '~> 0.10.5'
25
+ s.add_dependency 'padrino-helpers', '~> 0.10.6'
25
26
  s.add_dependency 'activesupport', '~> 3.2.3'
26
27
  s.add_dependency 'i18n', '~> 0.6.0'
27
- s.add_dependency 'thor', '~> 0.14.6'
28
+ s.add_dependency 'thor', '~> 0.15.4'
28
29
  s.add_dependency 'crush', '~> 0.3.3'
29
30
  s.add_development_dependency 'rspec', '~> 2.9.0'
30
31
  s.add_development_dependency 'rack-test', '~> 0.6.1'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: machined
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.1
4
+ version: 0.9.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,8 +9,24 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-09-27 00:00:00.000000000 Z
12
+ date: 2013-02-06 00:00:00.000000000 Z
13
13
  dependencies:
14
+ - !ruby/object:Gem::Dependency
15
+ name: rack
16
+ requirement: !ruby/object:Gem::Requirement
17
+ none: false
18
+ requirements:
19
+ - - ~>
20
+ - !ruby/object:Gem::Version
21
+ version: 1.5.0
22
+ type: :runtime
23
+ prerelease: false
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - ~>
28
+ - !ruby/object:Gem::Version
29
+ version: 1.5.0
14
30
  - !ruby/object:Gem::Dependency
15
31
  name: sprockets
16
32
  requirement: !ruby/object:Gem::Requirement
@@ -66,7 +82,7 @@ dependencies:
66
82
  requirements:
67
83
  - - ~>
68
84
  - !ruby/object:Gem::Version
69
- version: 0.10.5
85
+ version: 0.10.6
70
86
  type: :runtime
71
87
  prerelease: false
72
88
  version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +90,7 @@ dependencies:
74
90
  requirements:
75
91
  - - ~>
76
92
  - !ruby/object:Gem::Version
77
- version: 0.10.5
93
+ version: 0.10.6
78
94
  - !ruby/object:Gem::Dependency
79
95
  name: activesupport
80
96
  requirement: !ruby/object:Gem::Requirement
@@ -114,7 +130,7 @@ dependencies:
114
130
  requirements:
115
131
  - - ~>
116
132
  - !ruby/object:Gem::Version
117
- version: 0.14.6
133
+ version: 0.15.4
118
134
  type: :runtime
119
135
  prerelease: false
120
136
  version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +138,7 @@ dependencies:
122
138
  requirements:
123
139
  - - ~>
124
140
  - !ruby/object:Gem::Version
125
- version: 0.14.6
141
+ version: 0.15.4
126
142
  - !ruby/object:Gem::Dependency
127
143
  name: crush
128
144
  requirement: !ruby/object:Gem::Requirement
@@ -412,7 +428,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
412
428
  version: '0'
413
429
  segments:
414
430
  - 0
415
- hash: 123307343
431
+ hash: -1758282341700844957
416
432
  required_rubygems_version: !ruby/object:Gem::Requirement
417
433
  none: false
418
434
  requirements:
@@ -421,7 +437,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
421
437
  version: '0'
422
438
  segments:
423
439
  - 0
424
- hash: 123307343
440
+ hash: -1758282341700844957
425
441
  requirements: []
426
442
  rubyforge_project: machined
427
443
  rubygems_version: 1.8.23