usmu 0.3.2 → 0.3.3

data/spec/template/layout_spec.rb

@@ -21,19 +21,19 @@ RSpec.describe Usmu::Template::Layout do
     # This will also get tested during the acceptance tests, though we test here explicitly to help aid narrow where
     # the bug actually is.
     configuration = Usmu::Configuration.from_file('test-site/usmu.yml')
-    layout = Usmu::Template::Layout.new(configuration, 'html.slim')
+    layout = Usmu::Template::Layout.new(configuration, 'html.slim', configuration.layouts_metadata.metadata('html.slim'))
   end
 
   it 'should add a default load_path for sass templates' do
     configuration = Usmu::Configuration.from_hash({'source' => 'src'}, 'test/usmu.yml')
-    layout = Usmu::Template::Layout.new(configuration, 'css/app.scss', 'scss', "body{color: #000;}", {})
+    layout = Usmu::Template::Layout.new(configuration, 'css/app.scss', {}, 'scss', 'body{color: #000;}')
     defaults = layout.send :add_template_defaults, {}, 'sass'
     expect(defaults[:load_paths]).to eq(['test/src/css'])
   end
 
   it 'should merge load_path\'s for sass templates' do
     configuration = Usmu::Configuration.from_hash({'source' => 'src'}, 'test/usmu.yml')
-    layout = Usmu::Template::Layout.new(configuration, 'css/app.scss', 'scss', "body{color: #000;}", {})
+    layout = Usmu::Template::Layout.new(configuration, 'css/app.scss', {}, 'scss', 'body{color: #000;}')
     defaults = layout.send :add_template_defaults, {load_paths: ['test/src/assets/scss']}, 'sass'
     expect(defaults[:load_paths].sort).to eq(['test/src/assets/scss', 'test/src/css'])
   end

data/spec/template/page_spec.rb

@@ -7,12 +7,12 @@ RSpec.describe Usmu::Template::Page do
   let(:configuration) { Usmu::Configuration.from_hash({}) }
 
   it 'uses the \'source\' folder' do
-    page = Usmu::Template::Page.new(configuration, 'index.md', 'md', '# test', {})
+    page = Usmu::Template::Page.new(configuration, 'index.md', {}, 'md', '# test')
     expect(page.send :content_path).to eq('src')
   end
 
   it 'has an input path' do
-    page = Usmu::Template::Page.new(configuration, 'index.md', 'md', '# test', {})
+    page = Usmu::Template::Page.new(configuration, 'index.md', {}, 'md', '# test')
     expect(page.respond_to? :input_path).to eq(true)
     expect(page.input_path).to eq('src/index.md')
   end

data/spec/template/static_file_spec.rb

@@ -7,20 +7,20 @@ RSpec.describe Usmu::Template::StaticFile do
   let(:configuration) { Usmu::Configuration.from_file('test-site/usmu.yml') }
 
   it 'uses the \'source\' folder' do
-    file = Usmu::Template::StaticFile.new(configuration, 'robots.txt')
+    file = Usmu::Template::StaticFile.new(configuration, 'robots.txt', {})
     rendered = file.render
     expect(rendered).to eq(File.read('test-site/expected-site/robots.txt'))
   end
 
   it 'has an input path' do
     configuration = Usmu::Configuration.from_hash({})
-    page = Usmu::Template::StaticFile.new(configuration, 'robots.txt', 'txt', '', {})
+    page = Usmu::Template::StaticFile.new(configuration, 'robots.txt', {}, 'txt', '')
     expect(page.respond_to? :input_path).to eq(true)
     expect(page.input_path).to eq('src/robots.txt')
   end
 
   it 'has an output filename that matches input' do
-    file = Usmu::Template::StaticFile.new(configuration, 'robots.txt')
+    file = Usmu::Template::StaticFile.new(configuration, 'robots.txt', {})
     expect(file.output_filename).to eq('robots.txt')
   end
 end

data/test-site/content/assets/external.scss

@@ -0,0 +1,5 @@
+$color: black;
+
+body {
+  color: $color;
+}

data/test-site/content/assets/meta.yml

@@ -0,0 +1,2 @@
+---
+static: true

data/test-site/expected-site/assets/external.scss

@@ -0,0 +1,5 @@
+$color: black;
+
+body {
+  color: $color;
+}

data/usmu.gemspec

@@ -18,16 +18,16 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.test_files    = spec.files.grep(%r{^(test-site|spec)/})
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = Gem::Requirement.new('>= 1.9.3')
+
   spec.add_dependency 'slim', '~> 3.0'
   spec.add_dependency 'tilt', '~> 2.0'
-  spec.add_dependency 'redcarpet', '~> 3.2', '>= 3.2.1'
   spec.add_dependency 'deep_merge', '~> 1.0'
   spec.add_dependency 'commander', '~> 4.2'
   spec.add_dependency 'logging', '~> 1.8'
-  #spec.add_dependency 'pry'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake', '~> 10.0'
@@ -35,8 +35,19 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'yard', '~> 0.8'
   spec.add_development_dependency 'guard', '~> 2.8'
   spec.add_development_dependency 'guard-rspec', '~> 4.3'
-  spec.add_development_dependency 'libnotify', '~> 0.9'
   spec.add_development_dependency 'turnip', '~> 1.2'
   spec.add_development_dependency 'sass', '~> 3.4'
   spec.add_development_dependency 'timeout', '~> 0.0'
+
+  case ENV['BUILD_PLATFORM']
+    when 'ruby'
+      spec.add_dependency 'redcarpet', '~> 3.2', '>= 3.2.1'
+      spec.add_development_dependency 'libnotify', '~> 0.9'
+    when 'java'
+      spec.platform = 'java'
+      spec.add_dependency 'kramdown', '~> 1.5'
+    when nil
+    else
+      STDERR.puts "WARNING: Unknown platform: #{ENV['BUILD_PLATFORM']}. This may not result in a working gem."
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usmu
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Matthew Scharley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-11 00:00:00.000000000 Z
+date: 2015-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
@@ -38,26 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -185,61 +165,81 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.3'
 - !ruby/object:Gem::Dependency
-  name: libnotify
+  name: turnip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: turnip
+  name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: timeout
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
-  name: timeout
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.1
+- !ruby/object:Gem::Dependency
+  name: libnotify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.9'
 description: |2
       Usmu is a static site generator built in Ruby that leverages the Tilt API to support many different template
       engines. It supports local generation but is designed to be used with the web-based editor.
@@ -257,7 +257,6 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile-jruby
 - Guardfile
 - LICENSE.md
 - README.md
@@ -268,6 +267,7 @@ files:
 - lib/usmu/deployment.rb
 - lib/usmu/deployment/directory_diff.rb
 - lib/usmu/deployment/remote_file_interface.rb
+- lib/usmu/metadata_service.rb
 - lib/usmu/plugin.rb
 - lib/usmu/plugin/core.rb
 - lib/usmu/plugin/core_hooks.rb
@@ -289,6 +289,7 @@ files:
 - spec/acceptance/steps/full_site_build_steps.rb
 - spec/configuration_spec.rb
 - spec/deployment/directory_diff_spec.rb
+- spec/metadata_service_spec.rb
 - spec/mock/usmu/mock_plugin.rb
 - spec/mock/usmu/mock_remote_files.rb
 - spec/plugin/core_spec.rb
@@ -301,6 +302,8 @@ files:
 - spec/template/static_file_spec.rb
 - spec/ui/console_spec.rb
 - test-site/content/.dotfiletest.txt
+- test-site/content/assets/external.scss
+- test-site/content/assets/meta.yml
 - test-site/content/css/_partial.scss
 - test-site/content/css/app.scss
 - test-site/content/default.md
@@ -311,6 +314,7 @@ files:
 - test-site/content/posts/test-post.md
 - test-site/content/robots.txt
 - test-site/expected-site/.dotfiletest.txt
+- test-site/expected-site/assets/external.scss
 - test-site/expected-site/css/app.css
 - test-site/expected-site/default.html
 - test-site/expected-site/embedded.html
@@ -323,7 +327,6 @@ files:
 - test-site/layouts/embedded.slim
 - test-site/layouts/html.slim
 - test-site/usmu.yml
-- usmu-jruby.gemspec
 - usmu.gemspec
 homepage: https://github.com/usmu/usmu
 licenses:
@@ -337,7 +340,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -354,6 +357,7 @@ test_files:
 - spec/acceptance/steps/full_site_build_steps.rb
 - spec/configuration_spec.rb
 - spec/deployment/directory_diff_spec.rb
+- spec/metadata_service_spec.rb
 - spec/mock/usmu/mock_plugin.rb
 - spec/mock/usmu/mock_remote_files.rb
 - spec/plugin/core_spec.rb
@@ -365,4 +369,30 @@ test_files:
 - spec/template/page_spec.rb
 - spec/template/static_file_spec.rb
 - spec/ui/console_spec.rb
+- test-site/content/.dotfiletest.txt
+- test-site/content/assets/external.scss
+- test-site/content/assets/meta.yml
+- test-site/content/css/_partial.scss
+- test-site/content/css/app.scss
+- test-site/content/default.md
+- test-site/content/embedded.md
+- test-site/content/embedded.meta.yml
+- test-site/content/index.md
+- test-site/content/index.meta.yml
+- test-site/content/posts/test-post.md
+- test-site/content/robots.txt
+- test-site/expected-site/.dotfiletest.txt
+- test-site/expected-site/assets/external.scss
+- test-site/expected-site/css/app.css
+- test-site/expected-site/default.html
+- test-site/expected-site/embedded.html
+- test-site/expected-site/index.html
+- test-site/expected-site/posts/test-post.html
+- test-site/expected-site/robots.txt
+- test-site/includes/footer.meta.yml
+- test-site/includes/footer.slim
+- test-site/layouts/embedded.meta.yml
+- test-site/layouts/embedded.slim
+- test-site/layouts/html.slim
+- test-site/usmu.yml
 has_rdoc: 

data/Gemfile-jruby

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in usmu.gemspec
-gemspec name: 'usmu-jruby'

data/usmu-jruby.gemspec

@@ -1,43 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'usmu/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'usmu'
-  spec.version       = Usmu::VERSION
-  spec.authors       = ['Matthew Scharley']
-  spec.email         = ['matt.scharley@gmail.com']
-  spec.summary       = %q{A static site generator with a web-based frontend for editing.}
-  spec.description   = <<-EOD
-    Usmu is a static site generator built in Ruby that leverages the Tilt API to support many different template
-    engines. It supports local generation but is designed to be used with the web-based editor.
-  EOD
-  spec.homepage      = 'https://github.com/usmu/usmu'
-  spec.license       = 'MIT'
-  spec.platform      = 'java'
-
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
-
-  spec.add_dependency 'slim', '~> 3.0'
-  spec.add_dependency 'tilt', '~> 2.0'
-  spec.add_dependency 'kramdown', '~> 1.5'
-  spec.add_dependency 'deep_merge', '~> 1.0'
-  spec.add_dependency 'commander', '~> 4.2'
-  spec.add_dependency 'logging', '~> 1.8'
-
-  spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.1'
-  spec.add_development_dependency 'yard', '~> 0.8'
-  spec.add_development_dependency 'cane', '~> 2.6'
-  spec.add_development_dependency 'simplecov', '~> 0.9'
-  spec.add_development_dependency 'guard', '~> 2.8'
-  spec.add_development_dependency 'guard-rspec', '~> 4.3'
-  spec.add_development_dependency 'turnip', '~> 1.2'
-  spec.add_development_dependency 'sass', '~> 3.4'
-  spec.add_development_dependency 'timeout', '~> 0.0'
-end