middleman-slim 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9797498ef1f23c32c3d8df898cf03a611ea76862
-  data.tar.gz: 4d919141b346d82a41dfad068f59a51b339360ee
+  metadata.gz: 63837fa8dc2f7233c9f30c433cc616b236583bfc
+  data.tar.gz: 79857195db72167bf1501cda4a9c1d20d1d42643
 SHA512:
-  metadata.gz: 069dd9c3eb47093af5567fa717073ec9c1a4435222480be7894124029662da035447359bbe4c4579d154bb9fbd58145a5968771e75883b1a9ffe2c07178ebc58
-  data.tar.gz: f698a14c36d8714e6bddff650db6a613cfc4989d3862d158aae9470f1805949d39483b8dd3245130c418494593c171b0a977c2e562907cef430991fa982ddc2d
+  metadata.gz: 46ee52bdf864a5131c53fd06b2f19bc0932aa2e4deeb84f7ed15c0cc2d7b858ca0236d8c9c25d9cba4e9073e8b0d5985d296a254c620672dfb82c305b588c1ec
+  data.tar.gz: 4ebf663e5ae08c4e7d6720875fc18b9266573753a6a7f318d1a7e24235facac196acf80b5225461f44c7c46467d1ac70a26325bc97dbd9384cec4ac5b60fa36d

data/.travis.yml

@@ -1,15 +1,23 @@
 language: ruby
 rvm:
   - ruby-head
-  - 2.1.1
-  - 2.1.0
-  - 2.0.0
-  - 1.9.3
+  - jruby-head
   - jruby-19mode
+  - 2.2
+  - 2.1
+  - 2.0
+  - 1.9.3
+os:
+  - linux
+  - osx
 matrix:
   fast_finish: true
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-19mode
+    - rvm: jruby-head
 script: bundle exec cucumber
 env: TEST=true
+notifications:
+  webhooks:
+    - https://idobata.io/hook/792c4ace-c92f-44e3-b70b-b2584c40b800

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 yterajima
+Copyright (c) 2013 Yuya Terajima
 
 MIT License
 

data/README.md

@@ -3,18 +3,22 @@
 [![Gem Version](https://badge.fury.io/rb/middleman-slim.svg)][gem]
 [![Build Status](https://travis-ci.org/yterajima/middleman-slim.svg)][travis]
 
-middleman-slim is an extension for the Middleman static site generator that adds support for Slim.
+middleman-slim is an template for Middleman. This template provides Default Template using Slim.
 
 ## Installation
 
-    gem install middleman 
-    gem install middleman-slim 
-    middleman init PROJECT_NAME --template slim
+```
+$ gem install middleman
+$ gem install middleman-slim
+$ middleman init PROJECT_NAME --template slim
+```
 
 ## Run 
  
-    cd PROJECT_NAME
-    middleman server
+```
+$ cd PROJECT_NAME
+$ middleman server
+```
 
 ## Learn more 
 

data/features/build.feature

@@ -0,0 +1,28 @@
+Feature: Middleman-Slim Build
+
+  Scenario: Build a new project
+    Given I run `middleman init MY_PROJECT --template slim`
+    And I cd to "MY_PROJECT"
+    When I run `middleman build`
+    Then the exit status should be 0
+    And the following files should exist:
+      | build/index.html                             |
+      | build/images/background.png                  |
+      | build/images/middleman.png                   |
+      | build/javascripts/all.js                     |
+      | build/stylesheets/all.css                    |
+      | build/stylesheets/normalize.css              |
+    And the file "build/stylesheets/all.css" should contain "../images/"
+
+  Scenario: Build a new project with --images-dir option
+    Given I run `middleman init MY_PROJECT --template slim --images-dir img`
+    And I cd to "MY_PROJECT"
+    When I run `middleman build`
+    Then the exit status should be 0
+    And the following files should exist:
+      | build/img/background.png                     |
+      | build/img/middleman.png                      |
+      | build/stylesheets/all.css                    |
+    And the file "build/stylesheets/all.css" should contain "../img/"
+    And the file "build/stylesheets/all.css" should not contain "../images/"
+

data/features/cli_init.feature

@@ -2,7 +2,7 @@ Feature: Middleman-Slim CLI
 
   Scenario: Create a new project
     Given I run `middleman init MY_PROJECT --template slim`
-    Then the exit status should be 0
+    And the exit status should be 0
     When I cd to "MY_PROJECT"
     Then the following files should exist:
       | Gemfile                                       |
@@ -19,7 +19,7 @@ Feature: Middleman-Slim CLI
 
   Scenario: Create a new project with --images-dir option
     Given I run `middleman init MY_PROJECT --template slim --images-dir img`
-    Then the exit status should be 0
+    And the exit status should be 0
     When I cd to "MY_PROJECT"
     Then the following files should exist:
       | source/img/background.png                     |

data/lib/middleman-slim.rb

@@ -1,5 +1,4 @@
 require 'middleman-core'
-
 require 'middleman-slim/version'
 require 'middleman-slim/template'
 

data/lib/middleman-slim/template.rb

@@ -39,9 +39,7 @@ module Middleman
 
       private
       def replace_images_dir
-        if options[:images_dir] == 'images'
-          return
-        end
+        return if options[:images_dir] == 'images'
 
         open(File.join(location, 'source', options[:css_dir], 'all.css'), 'r+') {|f|
           f.flock(File::LOCK_EX)
@@ -55,5 +53,3 @@ module Middleman
     end
   end
 end
-
-Middleman::Templates.register :slim, Middleman::Slim::Template

data/lib/middleman-slim/template/shared/Gemfile.tt

@@ -1,15 +1,15 @@
-# If you have OpenSSL installed, we recommend updating
-# the following line to use "https"
-source 'http://rubygems.org'
+# If you do not have OpenSSL installed, update
+# the following line to use "http://" instead
+source 'https://rubygems.org'
 
 gem "middleman", "~><%= Middleman::VERSION %>"
-gem "slim", "~> 2.0"
+gem "slim", "=> 2.0"
 
 # Live-reloading plugin
 gem "middleman-livereload", "~> 3.1.0"
 
-# For faster file watcher updates on Windows:
+# for faster file watcher updates on windows:
 gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
 
-# Windows does not come with time zone data
+# windows does not come with time zone data
 gem "tzinfo-data", platforms: [:mswin, :mingw]

data/lib/middleman-slim/template/shared/config.tt

@@ -1,3 +1,5 @@
+require "slim"
+
 ###
 # Compass
 ###
@@ -47,31 +49,11 @@
 #   end
 # end
 
-###
-# Gem
-###
-require 'slim'
-
-<% if options[:css_dir] -%>
-set :css_dir, '<%= options[:css_dir] -%>'
-<% else -%>
-# Change the CSS directory
-# set :css_dir, "alternative_css_directory"
-<% end -%>
-
-<% if options[:js_dir] -%>
-set :js_dir, '<%= options[:js_dir] -%>'
-<% else -%>
-# Change the JS directory
-# set :js_dir, "alternative_js_directory"
-<% end -%>
-
-<% if options[:images_dir] -%>
-set :images_dir, '<%= options[:images_dir] -%>'
-<% else -%>
-# Change the images directory
-# set :images_dir, "alternative_image_directory"
-<% end -%>
+set :css_dir, 'stylesheets'
+
+set :js_dir, 'javascripts'
+
+set :images_dir, 'images'
 
 # Build-specific configuration
 configure :build do

data/lib/middleman-slim/template/source/layouts/layout.slim

@@ -7,7 +7,7 @@ html
     meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible"
 
     /! Use title if it's in the page YAML frontmatter
-    title == data.page.title || "The Middleman"
+    title = data.page.title || "The Middleman"
 
     == stylesheet_link_tag "normalize", "all"
     == javascript_include_tag  "all"

data/lib/middleman-slim/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Slim
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

data/middleman-slim.gemspec

@@ -6,7 +6,7 @@ require 'middleman-slim/version'
 Gem::Specification.new do |spec|
   spec.name          = "middleman-slim"
   spec.version       = Middleman::Slim::VERSION
-  spec.authors       = ["yterajima"]
+  spec.authors       = ["Yuya Terajima"]
   spec.email         = ["terra@e2esound.com"]
   spec.description   = %q{A Middleman template using Slim. You can use Slim as easy in Middleman Project}
   spec.summary       = %q{A Middleman template using Slim.}
@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "slim", "~> 2.0"
-  spec.add_runtime_dependency "middleman", "~>3.2"
+  spec.add_runtime_dependency "slim", ">= 2.0"
+  spec.add_runtime_dependency "middleman", ">= 3.2"
 
-  spec.add_development_dependency "cucumber", "~> 1.3"
-  spec.add_development_dependency "aruba", "~> 0.5"
+  spec.add_development_dependency "cucumber", ">= 1.3"
+  spec.add_development_dependency "aruba", ">= 0.6"
 end

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: middleman-slim
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
-- yterajima
+- Yuya Terajima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-21 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: middleman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 description: A Middleman template using Slim. You can use Slim as easy in Middleman
   Project
 email:
@@ -80,6 +80,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- features/build.feature
 - features/cli_init.feature
 - features/support/env.rb
 - lib/middleman-slim.rb
@@ -120,10 +121,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A Middleman template using Slim.
 test_files:
+- features/build.feature
 - features/cli_init.feature
 - features/support/env.rb