octopress-ink 1.0.0.rc.30 → 1.0.0.rc.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcc51a1a453784cb3a90c6160d1cf153a78a0176
-  data.tar.gz: b7f07b207482ae30731e390493225a46293b3148
+  metadata.gz: 5c20ee013f448dd230e3203d32a0fe56bb12c137
+  data.tar.gz: 644b4e9b0bbf6a54e3b30acf354141a8bbb98153
 SHA512:
-  metadata.gz: b68e8536e6a318709a44d7f3bb6f0da79f7c2290e9a4c69297c5822380d052e3de147a28b76ea6a7e1ef3a8fae7fb5eb9aa2ff7ec7126c116a783fadd8a5b32b
-  data.tar.gz: 2d84b28d13238dabdd81b20b4ebc2af87bba88e49220e52cc96f7d6db379a6c6664ec9e8d031c121fc309193ea48b45ff4263916482017b1598c2c9b6b3a3568
+  metadata.gz: 83957a422d9173dd9ccd1a8a530379c6518bc48b5b5a70a6ddcaa2ae23213ee8297e4698f98a000eed7c11b117bc71baf3ba6aeff7abb0453f0fafe4633197b9
+  data.tar.gz: fc01925879bfdf24c039a334a779c8486da9a6ce0f4dc469b86416db23bbfab99cad91673b0fd4a6f5eaf8abcd4d3b1df2c75d51915732af5abc64e2e2240a8c

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+### 1.0.0 RC31 - 2015-01-26
+
+- Fix: Sass partials in subdirectories aren't added to asset pipeline.
+- Fix: Now copies assets in subdirectories into correct paths.
+- Fix: Plugins are now loaded via Jekyll's plugin manager
+
 ### 1.0.0 RC30 - 2015-01-22
 
 - Added `set_lang` placeholder so plugins can easily integrate with [octopress-multilingual](https://github.com/octopress/multilingual).

data/lib/octopress-ink.rb

@@ -108,7 +108,7 @@ module Octopress
     #
     #
     def self.list(options={})
-      Octopress.site(options)
+      site = Octopress.site(options)
       Plugins.register
       options = {'minimal'=>true} if options.empty?
       message = "Octopress Ink - v#{VERSION}\n"

data/lib/octopress-ink/assets/asset.rb

@@ -81,8 +81,8 @@ module Octopress
           else
             target_dir = user_dir
           end
-          FileUtils.mkdir_p target_dir
-          FileUtils.cp plugin_path, target_dir
+          FileUtils.mkdir_p File.join(target_dir, File.dirname(file))
+          FileUtils.cp plugin_path, File.join(target_dir, file)
           target_dir.sub!(Dir.pwd+'/', '')
           "+ ".green + "#{File.join(target_dir, filename)}"
         end

data/lib/octopress-ink/assets/sass.rb

@@ -18,7 +18,7 @@ module Octopress
         end
 
         def add
-          unless file =~ /^_/
+          unless File.basename(file).start_with?('_')
             Plugins.add_css_tag tag
             Plugins.static_files << StaticFileContent.new(compile, destination)
           end

data/lib/octopress-ink/plugin.rb

@@ -145,7 +145,7 @@ module Octopress
       def disable_assets
         disabled = []
         config['disable'] ||= {}
-        config['disable'].each do |key,val| 
+        config['disable'].each do |key,val|
           next unless can_disable.include? key
           if !!val == val
             disabled << key if val
@@ -164,7 +164,7 @@ module Octopress
 
 
       def can_disable
-        [ 
+        [
           'pages',
           'sass',
           'css',
@@ -182,20 +182,20 @@ module Octopress
         {
           'layouts'     => @layouts,
           'includes'    => @includes,
-          'pages'       => @pages, 
-          'sass'        => @sass, 
+          'pages'       => @pages,
+          'sass'        => @sass,
           'css'         => @css,
-          'js'          => @js, 
-          'minjs'       => @no_compress_js, 
-          'coffee'      => @coffee, 
-          'images'      => @images, 
-          'fonts'       => @fonts, 
+          'js'          => @js,
+          'minjs'       => @no_compress_js,
+          'coffee'      => @coffee,
+          'images'      => @images,
+          'fonts'       => @fonts,
           'files'       => @files,
           'config-file' => [@config]
         }
       end
-      
-      # Return information about each asset 
+
+      # Return information about each asset
       def assets_list(options)
         message = ''
         no_assets = []
@@ -273,7 +273,7 @@ module Octopress
       #
       # input: options (an array ['type',...], hash {'type'=>true}
       # or string of asset types)
-      # 
+      #
       # Output a hash of assets instances {'files' => @files }
       #
       def select_assets(asset_types)
@@ -282,7 +282,7 @@ module Octopress
         # Or from Ink modules as an array of asset names
         #
         if asset_types.is_a? Hash
-           
+
           # Show Sass and CSS when 'stylesheets' is chosen
           if asset_types['stylesheets']
             asset_types['css'] = true
@@ -303,9 +303,9 @@ module Octopress
         # Args should allow a single asset as a string too
         #
         if asset_types.is_a? String
-          asset_types = [asset_types] 
+          asset_types = [asset_types]
         end
-        
+
         # Match asset_types against list of assets and
         # remove asset_types which don't belong
         #
@@ -387,7 +387,7 @@ module Octopress
 
       def glob_assets(dir)
         return [] unless Dir.exist? dir
-        Find.find(dir).to_a.reject do |file| 
+        Find.find(dir).to_a.reject do |file|
           File.directory?(file) || File.basename(file) =~ /^\./
         end
       end
@@ -400,8 +400,21 @@ module Octopress
         @sass.reject(&:disabled?).compact
       end
 
+      # Internal: Remove Sass partials from Sass assets.
+      # Partials can be in "stylesheets" or its sub-directories.
+      #
+      # Examples
+      #
+      #   _partial.scss is rejected
+      #   dir/_partial.scss is rejected
+      #   dir/dir/_partial.scss is rejected
+      #   snake_case.scss is not rejected
+      #   dir/snake_case.scss is not rejected
+      #   dir/dir/snake_case.scss is not rejected
+      #
+      # Returns Sass assets not including partials.
       def sass_without_partials
-        sass.reject{|f| f.file =~ /^_/ }
+        sass.reject { |f| File.basename(f.file).start_with?('_') }
       end
 
       def js

data/lib/octopress-ink/plugins.rb

@@ -43,6 +43,7 @@ module Octopress
       end
 
       def self.register
+        Octopress.site.plugin_manager.conscientious_require
         plugins.each do |p| 
           p.register
         end

data/lib/octopress-ink/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.30
+  version: 1.0.0.rc.31
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll