machined 1.0.1 → 1.0.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.
Files changed (8) hide show
  1. data/Gemfile +1 -1
  2. data/lib/machined/helpers/page_helpers.rb +1 -1
  3. data/lib/machined/sprocket.rb +6 -0
  4. data/lib/machined/templates/site/Gemfile.tt +1 -1
  5. data/lib/machined/version.rb +1 -1
  6. data/machined.gemspec +3 -3
  7. data/spec/machined/cli_spec.rb +1 -1
  8. metadata +10 -10
data/Gemfile CHANGED
@@ -1,2 +1,2 @@
1
- source :rubygems
1
+ source 'https://rubygems.org'
2
2
  gemspec
data/lib/machined/helpers/page_helpers.rb CHANGED
@@ -26,7 +26,7 @@ module Machined
26
26
  # Returns the URL to this asset, appending the sprocket's URL.
27
27
  # For HTML files, this will return pretty URLs.
28
28
  def url
29
- File.join(environment.config.url, @logical_path).sub /(index)?\.html$/, ''
29
+ File.join(environment.config.url, @logical_path).sub /(index)?\.html?$/, ''
30
30
  end
31
31
  end
32
32
  end
data/lib/machined/sprocket.rb CHANGED
@@ -56,5 +56,11 @@ module Machined
56
56
  register_engine ext, template
57
57
  end
58
58
  end
59
+
60
+ # Override the default Sprockets method which incorrectly returns '.htm'.
61
+ def extension_for_mime_type(type) # :nodoc:
62
+ return '.html' if type == 'text/html'
63
+ super
64
+ end
59
65
  end
60
66
  end
data/lib/machined/templates/site/Gemfile.tt CHANGED
@@ -1,4 +1,4 @@
1
- source :rubygems
1
+ source 'https://rubygems.org'
2
2
 
3
3
  gem 'machined', '<%= Machined::VERSION %>'
4
4
 
data/lib/machined/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Machined
2
- VERSION = '1.0.1'
2
+ VERSION = '1.0.2'
3
3
  end
data/machined.gemspec CHANGED
@@ -20,14 +20,14 @@ Gem::Specification.new do |s|
20
20
 
21
21
  s.add_dependency 'rack', '~> 1.5.0'
22
22
  s.add_dependency 'sprockets', '~> 2.9.0'
23
- s.add_dependency 'sprockets-helpers', '~> 0.8.0'
24
- s.add_dependency 'sprockets-sass', '~> 0.9.1'
23
+ s.add_dependency 'sprockets-helpers', '~> 1.0.0'
24
+ s.add_dependency 'sprockets-sass', '~> 1.0.0'
25
25
  s.add_dependency 'padrino-helpers', '~> 0.10.6'
26
26
  s.add_dependency 'activesupport', '~> 3.2.3'
27
27
  s.add_dependency 'i18n', '~> 0.6.0'
28
28
  s.add_dependency 'thor', '~> 0.15.4'
29
29
  s.add_dependency 'crush', '~> 0.3.3'
30
- s.add_development_dependency 'rspec', '~> 2.9.0'
30
+ s.add_development_dependency 'rspec', '~> 2.13.0'
31
31
  s.add_development_dependency 'rack-test', '~> 0.6.1'
32
32
  s.add_development_dependency 'test-construct', '~> 1.2.0'
33
33
  s.add_development_dependency 'unindent', '~> 1.0'
data/spec/machined/cli_spec.rb CHANGED
@@ -95,7 +95,7 @@ describe Machined::CLI do
95
95
  within_construct do |c|
96
96
  machined_cli 'new my_site'
97
97
  File.read('my_site/Gemfile').should == <<-CONTENT.unindent
98
- source :rubygems
98
+ source 'https://rubygems.org'
99
99
 
100
100
  gem 'machined', '#{Machined::VERSION}'
101
101
 
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: 1.0.1
4
+ version: 1.0.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-02-27 00:00:00.000000000 Z
12
+ date: 2013-04-20 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rack
@@ -50,7 +50,7 @@ dependencies:
50
50
  requirements:
51
51
  - - ~>
52
52
  - !ruby/object:Gem::Version
53
- version: 0.8.0
53
+ version: 1.0.0
54
54
  type: :runtime
55
55
  prerelease: false
56
56
  version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
58
58
  requirements:
59
59
  - - ~>
60
60
  - !ruby/object:Gem::Version
61
- version: 0.8.0
61
+ version: 1.0.0
62
62
  - !ruby/object:Gem::Dependency
63
63
  name: sprockets-sass
64
64
  requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
66
66
  requirements:
67
67
  - - ~>
68
68
  - !ruby/object:Gem::Version
69
- version: 0.9.1
69
+ version: 1.0.0
70
70
  type: :runtime
71
71
  prerelease: false
72
72
  version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
74
74
  requirements:
75
75
  - - ~>
76
76
  - !ruby/object:Gem::Version
77
- version: 0.9.1
77
+ version: 1.0.0
78
78
  - !ruby/object:Gem::Dependency
79
79
  name: padrino-helpers
80
80
  requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ dependencies:
162
162
  requirements:
163
163
  - - ~>
164
164
  - !ruby/object:Gem::Version
165
- version: 2.9.0
165
+ version: 2.13.0
166
166
  type: :development
167
167
  prerelease: false
168
168
  version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
170
170
  requirements:
171
171
  - - ~>
172
172
  - !ruby/object:Gem::Version
173
- version: 2.9.0
173
+ version: 2.13.0
174
174
  - !ruby/object:Gem::Dependency
175
175
  name: rack-test
176
176
  requirement: !ruby/object:Gem::Requirement
@@ -428,7 +428,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
428
428
  version: '0'
429
429
  segments:
430
430
  - 0
431
- hash: 3309700500908118760
431
+ hash: 660830095036463815
432
432
  required_rubygems_version: !ruby/object:Gem::Requirement
433
433
  none: false
434
434
  requirements:
@@ -437,7 +437,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
437
437
  version: '0'
438
438
  segments:
439
439
  - 0
440
- hash: 3309700500908118760
440
+ hash: 660830095036463815
441
441
  requirements: []
442
442
  rubyforge_project: machined
443
443
  rubygems_version: 1.8.23