octopress-ink 1.0.0.rc.41 → 1.0.0.rc.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae4c767603111477b17cc1a114faa2b21f496f5b
-  data.tar.gz: 1270563568f44529d5ae82c59acd1678d6877f0d
+  metadata.gz: b6a3788546bf6c3c415f0fd6d9c981980a23f2fe
+  data.tar.gz: cbdfca85d3ac072d7c3d35bc5dfa09791ff5bcd1
 SHA512:
-  metadata.gz: fa63a50bfbdfcca6225ec32528d2adae7803bc6746be374bb82f5bc8ad62ee9d5f96c290520d526a1481a5ddcfcd60cff1c1f723392978cf75300ff6adcd8d2a
-  data.tar.gz: 6aad860f4d89d61c12de9ab41e679377b58ab93aca49b9590326009e25951c64d36dfdc56ff9f16c3b362291f0dd79db4d34c2f86de90e8bdbffd1132d7d6ee7
+  metadata.gz: d0f97de7fb8c243ab15a50b38514477d05de8b4f39d99e0b0cc1a3044082dfed0896bf31496e4a6149f3c444e1ee723a0b9f11aa2b2c9c188ccf7daae2a859c3
+  data.tar.gz: 90feb962267ede61af217ff432b7bdceb23306994c032c75e390df763eb27c1fcbc047035da8bac575b4be49682387990acd2c65606b007b613cf5f176e5920b

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 1.0.0 RC42 - 2015-02-15
+- New: Plugins can define order for stylesheet and javascript assets.
+
 ### 1.0.0 RC41 - 2015-02-13
 - Fix: Properly copies pages without permalinks.
 - Permalink configurations now allow directories and file extensions in config keys.

data/assets/docs/creating-a-plugin.markdown

@@ -151,6 +151,24 @@ Note: Assets are copied at build time and assets will not overwrite an existing
 | stylesheets     | `theme.scss` and `print.css` are combined with all plugin stylesheets into a single fingerprinted file. |
 | docs            | Add documentation files for your plugin here. Users will be able to read it by running `octopress docs`. |
 
+### Ordering Javascript and Stylesheet assets
+
+By default when scripts and stylesheets are combined, they are added based on
+their order in the file system. You can manually specify order like this:
+
+```
+order_js:
+ - jquery.js
+ - kittens.coffee
+
+order_css:
+ - normalize.css
+ - site.sass
+```
+Assets will ordered as specified. Any additional assets will be appended based on their order in the file system.
+
+Note: It is not necessary to write full paths in these configurations. An asset at `javascripts/lib/jquery.js` will match `jquery.js` and be ordered accordingly.
+
 
 ### Layouts
 

data/lib/octopress-ink/commands/new.rb

@@ -48,7 +48,6 @@ module Octopress
             add_dependency
             add_plugin
             add_assets
-            add_test_files
           end
         end
 
@@ -191,34 +190,6 @@ website:       ""                                 # Optional project website
           config.rstrip
         end
 
-        # Creates a blank Jekyll site for testing out a new plugin
-        #
-        def self.add_test_files
-          test_dir = File.join(@settings[:path], 'test')
-
-          dirs = %w{_layouts _posts _expected}.map do |d|
-            File.join(test_dir, d)
-          end
-
-          create_empty_dirs dirs
-
-          index = File.join(test_dir, 'index.html')
-          action = File.exist?(index) ? "exists".rjust(12).blue.bold : "create".rjust(12).green.bold
-
-          FileUtils.touch File.join(test_dir, '_expected', 'index.html')
-          FileUtils.touch File.join(test_dir, 'index.html')
-
-          config_path = File.join(test_dir, '_config.yml')
-          config_content = "gems:\n  - #{@settings[:name]}"
-          write(config_path, config_content)
-
-          clash_path = File.join(test_dir, '.clash.yml')
-          clash_content = "title: Standard build\nbuild: true\ncompare: _expected _site"
-          write(clash_path, clash_content)
-
-          puts "#{action}  #{index.sub("#{Dir.pwd}/", '')}"
-        end
-
         def self.write(path, contents)
           action = File.exist?(path) ? "written".rjust(12).blue.bold : "create".rjust(12).green.bold
 

data/lib/octopress-ink/plugin.rb

@@ -104,14 +104,25 @@ module Octopress
         copied.compact
       end
 
+      def sort(files, config)
+        sorted = []
+        config.each do |item|
+          files.each do |file|
+            sorted << files.delete(file) if file.path.to_s.include? item
+          end
+        end
+
+        sorted.concat files
+      end
+
       # stylesheets should include Sass and CSS
       #
       def stylesheets
-        css.clone.concat sass_without_partials
+        sort(css.clone.concat(sass_without_partials), config['order_css'] || [])
       end
 
       def javascripts
-        js.clone.concat coffee
+        sort(js.clone.concat(coffee), config['order_js'] || [])
       end
 
       def no_compress_js

data/lib/octopress-ink/version.rb

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

metadata

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