octopress-ink 1.0.0.rc.11 → 1.0.0.rc.13

data/lib/octopress-ink/plugin.rb

@@ -131,7 +131,7 @@ module Octopress
           assets.each { |a| copied << a.copy(path) }
         end
 
-        copied
+        copied.compact
       end
 
       # stylesheets should include Sass and CSS

data/lib/octopress-ink/plugin_asset_pipeline.rb

@@ -7,7 +7,7 @@ module Octopress
       def self.compile_css(content)
         configs = sass_converter.sass_configs
         configs[:syntax] = :scss
-        configs[:style] = :compressed if Ink.config['compress_css']
+        configs[:style] = :compressed if Octopress.config['compress_css']
 
         Sass.compile(content, configs)
       end
@@ -36,7 +36,7 @@ module Octopress
         if @sass_converter
           @sass_converter
         else
-          Ink.site.converters.each do |c|
+          Octopress.site.converters.each do |c|
             @sass_converter = c if c.kind_of?(Jekyll::Converters::Sass) 
           end
           @sass_converter
@@ -89,7 +89,6 @@ module Octopress
         css = combine_stylesheets
         css.keys.each do |media|
           contents = compile_css(css[media])
-          contents = AutoprefixerRails.process(contents)
           write_files(contents, combined_stylesheet_path(media)) 
         end
       end
@@ -157,8 +156,8 @@ module Octopress
       def self.write_combined_javascript
         js = combine_javascripts
         unless js == ''
-          if Ink.config['compress_js']
-            settings = Jekyll::Utils.symbolize_hash_keys(Ink.config['uglifier'])
+          if Octopress.config['compress_js']
+            settings = Jekyll::Utils.symbolize_hash_keys(Octopress.config['uglifier'])
             js = Uglifier.new(settings).compile(js)
           end
           write_files(js, combined_javascript_path)

data/lib/octopress-ink/plugins.rb

@@ -128,13 +128,13 @@ module Octopress
       # Read plugin dir from site configs
       #
       def self.custom_dir
-        Ink.site.config['plugins']
+        Octopress.site.config['plugins']
       end
 
       # Copy/Generate Stylesheets
       #
       def self.add_stylesheets
-        if Ink.config['combine_css']
+        if Octopress.config['combine_css']
           PluginAssetPipeline.write_combined_stylesheet
         else
           add_assets(%w{css sass})
@@ -144,7 +144,7 @@ module Octopress
       # Copy/Generate Javascripts
       #
       def self.add_javascripts
-        if Ink.config['combine_js']
+        if Octopress.config['combine_js']
           PluginAssetPipeline.write_combined_javascript
         else
           add_assets(%w{js coffee})
@@ -152,7 +152,7 @@ module Octopress
       end
 
       def self.css_tags
-        if Ink.config['combine_css']
+        if Octopress.config['combine_css']
           PluginAssetPipeline.combined_stylesheet_tag
         else
           @css_tags.join('')
@@ -160,7 +160,7 @@ module Octopress
       end
 
       def self.js_tags
-        if Ink.config['combine_js']
+        if Octopress.config['combine_js']
           PluginAssetPipeline.combined_javascript_tag
         else
           @js_tags.join('')

data/lib/octopress-ink/tags.rb

@@ -1,19 +1,8 @@
 module Octopress
   module Ink
     module Tags
-      autoload :IncludeTag,           'octopress-ink/tags/include'
-      autoload :AssignTag,            'octopress-ink/tags/assign'
-      autoload :ReturnTag,            'octopress-ink/tags/return'
-      autoload :FilterTag,            'octopress-ink/tags/filter'
-      autoload :RenderTag,            'octopress-ink/tags/render'
-      autoload :CaptureTag,           'octopress-ink/tags/capture'
       autoload :JavascriptTag,        'octopress-ink/tags/javascript'
       autoload :StylesheetTag,        'octopress-ink/tags/stylesheet'
-      autoload :ContentForTag,        'octopress-ink/tags/content_for'
-      autoload :YieldTag,             'octopress-ink/tags/yield'
-      autoload :WrapTag,              'octopress-ink/tags/wrap'
-      autoload :AbortTag,             'octopress-ink/tags/abort'
-      autoload :LineCommentTag,       'octopress-ink/tags/line_comment'
       autoload :DocUrlTag,            'octopress-ink/tags/doc_url'
     end
   end

data/lib/octopress-ink/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Ink
-    VERSION = "1.0.0.rc.11"
+    VERSION = "1.0.0.rc.13"
   end
 end

data/octopress-ink.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Octopress::Ink::VERSION
   spec.authors       = ["Brandon Mathis"]
   spec.email         = ["brandon@imathis.com"]
-  spec.description   = %q{A starting point for creating gem-based Jekyll themes and plugins}
-  spec.summary       = %q{A starting point for creating gem-based Jekyll themes and plugins}
+  spec.description   = %q{A framework creating Jekyll/Octopress themes and plugins}
+  spec.summary       = %q{A framework creating Jekyll/Octopress themes and plugins}
   spec.homepage      = "https://github.com/octopress/ink"
   spec.license       = "MIT"
 
@@ -20,11 +20,13 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "jekyll", "~> 2.0"
   spec.add_runtime_dependency "uglifier", "~> 2.5"
-  spec.add_runtime_dependency "autoprefixer-rails", "~> 1.1", ">= 1.1.20140403"
-  spec.add_runtime_dependency "jekyll-page-hooks", "~> 1.3"
+  spec.add_runtime_dependency "octopress-hooks", "~> 2.2"
+  spec.add_runtime_dependency "octopress-include-tag", "~> 1.0"
+  spec.add_runtime_dependency "octopress-filters", "~> 1.1"
+  spec.add_runtime_dependency "octopress"
 
-  spec.add_development_dependency "octopress"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "pry-debugger"
+  spec.add_development_dependency "clash"
 end

data/test/.clash.yml

@@ -0,0 +1,46 @@
+-
+  name: Simple build
+  build: true
+-
+  name: Compare build
+  compare: _expected/site _site
+-
+  name: Should build with separate javascript and stylesheet files
+  build: true
+  config:
+    octopress: _combine_false.yml
+  compare:
+    - _expected/combine_css_false _site/stylesheets
+    - _expected/combine_js_false _site/javascripts
+-
+  name: Should compress stylesheets and javascripts
+  build: true
+  config:
+    octopress: _compress_false.yml
+  compare:
+    - _expected/compress_false/stylesheets _site/stylesheets
+    - _expected/compress_false/javascripts _site/javascripts
+-
+  name: Should copy all theme assets
+  before: octopress ink copy theme --path _copy --force
+  compare: _expected/copy_test _copy
+  after: rm -rf _copy
+-
+  name: Should copy only pages and layouts
+  before: octopress ink copy theme --layouts --pages --path _copy --force
+  compare: _expected/copy_layouts_pages _copy
+  after: rm -rf _copy
+-
+  name: Should create a plugins scaffold
+  before: 
+    - 'git config user.name > .git-config-user-name'
+    - 'git config user.email > .git-config-user-email'
+    - 'git config user.name ""'
+    - 'git config user.email ""'
+    - 'octopress ink new test-theme --theme'
+    - 'rm -rf test-theme/.git'
+  compare: _expected/test-theme-expected test-theme
+  after:
+    - 'cat .git-config-user-name | tr -d "\n" | xargs -0 git config user.name'
+    - 'cat .git-config-user-email | tr -d "\n" | xargs -0 git config user.email'
+    - 'rm -rf test-theme .git-config-user-name .git-config-user-email'

data/test/Gemfile

@@ -1,5 +1,3 @@
 source 'https://rubygems.org'
 
-gem "octopress-ink", path: "../"
-gem "pry-debugger"
-gem "octopress", path: "../../cli"
+gemspec path: "../"

data/test/_config.yml

@@ -1,8 +1,9 @@
-name: Your New Jekyll Site
-markdown: redcarpet
-highlighter: pygments
-source: source
-destination: site
 include_test: foo.html
-render_test: kittens
+exclude:
+  - Gemfile*
+
+url: http://octopress.org
 timezone: America/Chicago
+markdown: redcarpet
+name: Your New Jekyll Site
+source: source

data/test/_expected/combine_css_false/theme/main.css

@@ -0,0 +1,2 @@
+body {
+  background: #bcbcbc; }

data/test/{compress_false → _expected/compress_false}/stylesheets/all-.css

@@ -7,7 +7,7 @@ body {
   color: #444; }
 
 body {
-  background: black; }
+  background: #bcbcbc; }
 
 /* Plugin: Awesome Sauce */
 .plugin-widget {

data/test/{copy_layouts_pages/_copy → _expected/copy_layouts_pages}/pages/three.md

@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: theme:default
 permalink: /test_pages/three.html
 ---
 

data/test/{plugins/test-theme → _expected/copy_test}/config.yml

@@ -1,2 +1,5 @@
 test: config from theme
 test_override: also config from theme
+
+sass:
+  import: colors

data/test/{copy_test/_copy → _expected/copy_test}/pages/three.md

@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: theme:default
 permalink: /test_pages/three.html
 ---
 

data/test/_expected/copy_test/stylesheets/disable-this.css

@@ -0,0 +1 @@
+.do-not-exist { background: #bcbcbc; }

data/test/_expected/copy_test/stylesheets/main.scss

@@ -0,0 +1,5 @@
+---
+property: background
+---
+@import '{{ theme.sass.import }}';
+body { {{ page.property }}: $bg; }

data/test/_expected/site/index.html

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title>Your New Jekyll Site</title>
+    <meta name="viewport" content="width=device-width">
+  </head>
+  <body class=" ">
+    <div class='local-override'>
+one <span class='separator'></b> two <span class='separator'></b> three <span class='separator'></b> four five
+</div>
+
+  </body>
+</html>

data/test/_expected/site/stylesheets/all-.css

@@ -0,0 +1 @@
+body{margin:2px;padding:2px}.main{color:#444}body{background:#bcbcbc}.plugin-widget{background:red;color:#fff}

data/test/_expected/site/test_pages/three.html

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title></title>
+    <meta name="viewport" content="width=device-width">
+  </head>
+  <body class=" ">
+    <p>SUB BABY</p>
+
+  </body>
+</html>