machined 0.5.0 → 0.6.0

Sign up to get free protection for your applications and to get access to all the features.
@@ -18,15 +18,17 @@ module Machined
18
18
  :skip_bundle => false,
19
19
  :digest_assets => false,
20
20
  :gzip_assets => false,
21
- :layout => "main",
21
+ :layout => "application",
22
22
 
23
23
  # Sprocket paths and URLs
24
24
  :assets_path => "assets",
25
- :assets_paths => %w(lib/assets vendor/assets),
25
+ :assets_paths => %w(app/assets lib/assets vendor/assets),
26
26
  :assets_url => "/assets",
27
27
  :pages_path => "pages",
28
+ :pages_paths => %w(app/pages),
28
29
  :pages_url => "/",
29
30
  :views_path => "views",
31
+ :views_paths => %w(app/views),
30
32
 
31
33
  # Compression configuration
32
34
  :compress => false,
@@ -3,8 +3,8 @@
3
3
  <head lang="en">
4
4
  <meta charset="utf-8">
5
5
  <title><%= title %></title>
6
- <%= stylesheet_link_tag "main" %>
7
- <%= javascript_include_tag "main" %>
6
+ <%= stylesheet_link_tag "application" %>
7
+ <%= javascript_include_tag "application" %>
8
8
  </head>
9
9
  <body>
10
10
  <%= yield %>
@@ -1,3 +1,3 @@
1
1
  module Machined
2
- VERSION = "0.5.0"
2
+ VERSION = "0.6.0"
3
3
  end
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: machined
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 0.5.0
5
+ version: 0.6.0
6
6
  platform: ruby
7
7
  authors:
8
8
  - Pete Browne
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2011-11-30 00:00:00 Z
13
+ date: 2011-12-17 00:00:00 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: sprockets
@@ -277,13 +277,13 @@ files:
277
277
  - lib/machined/static_compiler.rb
278
278
  - lib/machined/templates/site/Gemfile.tt
279
279
  - lib/machined/templates/site/assets/images/.empty_directory
280
- - lib/machined/templates/site/assets/javascripts/main.js.coffee
281
- - lib/machined/templates/site/assets/stylesheets/main.css.scss
280
+ - lib/machined/templates/site/assets/javascripts/application.js.coffee
281
+ - lib/machined/templates/site/assets/stylesheets/application.css.scss
282
282
  - lib/machined/templates/site/config.ru
283
283
  - lib/machined/templates/site/machined.rb
284
284
  - lib/machined/templates/site/pages/index.html.erb
285
285
  - lib/machined/templates/site/public/.empty_directory
286
- - lib/machined/templates/site/views/layouts/main.html.erb
286
+ - lib/machined/templates/site/views/layouts/application.html.erb
287
287
  - lib/machined/utils.rb
288
288
  - lib/machined/version.rb
289
289
  - machined.gemspec
@@ -319,7 +319,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
319
319
  requirements:
320
320
  - - ">="
321
321
  - !ruby/object:Gem::Version
322
- hash: -2894475183900037284
322
+ hash: -4282035788662597022
323
323
  segments:
324
324
  - 0
325
325
  version: "0"
@@ -328,7 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
328
328
  requirements:
329
329
  - - ">="
330
330
  - !ruby/object:Gem::Version
331
- hash: -2894475183900037284
331
+ hash: -4282035788662597022
332
332
  segments:
333
333
  - 0
334
334
  version: "0"