bunch 1.0.0pre1 → 1.0.0pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efebcfd36e823c3ec86e0442561e0dae5b269992
-  data.tar.gz: a5e89ce41f38db3a0b6b1bb0b93ac19f4778ad6c
+  metadata.gz: 6d5aba69bf87251e2474a2b0851ef99d5d85b7ef
+  data.tar.gz: c4583b708490467740c0846b67e7413a6af5b5a9
 SHA512:
-  metadata.gz: 3f66c4238a91ea23234ff00fa0b3dadfaa6a304f6e5c144e10d3388cda68a45228edf3e280ed932a5f66804ae4760541d80fe4cc8c35986efca9ee1165a906f6
-  data.tar.gz: 37d71071cd267674130898cd31856e47d788e26ebf765ddba3e34c888fdd040d6bfd0b5122bb9c8ba04f8e0ba6ef5a59cc3967755d221d02abc8c18f2d375481
+  metadata.gz: 3f1aa8c5167f12b45e444c0568b615a6e287809496054a0bc21f48c22ba243c17b5289292fe40ad2bb4e49478ae615a4199040a4dc97d0d965bb777f513ee144
+  data.tar.gz: f806f3cb5188661a16d3f889fab249e74a8cd0bfb2711a1e886bc41dec87b367daa0f54a3143d4d3624b2defba2daf77754c1ebaaef3a52ee439d373d72ff13a

data/README.md

@@ -0,0 +1,4 @@
+Bunch: (Almost) configuration-free asset bundling.
+==================================================
+
+<img src="http://i.imgur.com/QqufL.png">

data/lib/bunch/combiner.rb

@@ -18,10 +18,10 @@ module Bunch
       if tree.name
         @path << tree.name
 
-        combine_file = tree.get("_combine")
+        combine_file = tree.get("_combine") || tree.get("_.yml")
 
         if combine_file || combining?
-          ordering = combine_file ? combine_file.content : ""
+          ordering = combine_file ? extract_ordering(combine_file.content) : ""
           push_context Context.new(@path, ordering)
         end
       end
@@ -46,7 +46,7 @@ module Bunch
     end
 
     def visit_file(file)
-      return if file.path == "_combine"
+      return if file.path == "_combine" || file.path == "_.yml"
 
       if combining?
         context.add file.path, file.content, file.extension
@@ -82,13 +82,23 @@ module Bunch
       @contexts.any?
     end
 
+    def extract_ordering(file_content)
+      as_yaml = YAML.load(file_content)
+
+      if as_yaml.is_a?(Array)
+        as_yaml
+      else
+        file_content.split("\n").map(&:strip)
+      end
+    end
+
     class Context
       attr_accessor :ordering, :extension
 
-      def initialize(path, ordering_file_contents)
+      def initialize(path, ordering)
         @path = path.join("/")
         @content = {}
-        @ordering = ordering_file_contents.split("\n")
+        @ordering = ordering
         @extension = nil
         @empty = true
       end

data/lib/bunch/middleware.rb

@@ -22,9 +22,10 @@ module Bunch
     private
 
     def build_url_map(paths_and_options)
-      paths, options = paths_and_options.partition { |k, _| String === k }
+      paths, options_arr = paths_and_options.partition { |k, _| String === k }
+      options = { environment: "development" }.merge(Hash[options_arr])
       mapping = Hash[paths.map do |url, directory|
-        [url, Server.new(Hash[options].merge(root: directory))]
+        [url, Server.new(options.merge(root: directory))]
       end]
       Rack::URLMap.new(mapping)
     end

data/lib/bunch/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Bunch
-  VERSION = "1.0.0pre1"
+  VERSION = "1.0.0pre2"
 end

data/spec/bunch/combiner_spec.rb

@@ -96,6 +96,26 @@ module Bunch
       }},
       {"a" => {"e.js" => "stuff"}}
 
+    scenario "ordering specified as YAML",
+      {"a" => {
+         "d" => "pants",
+         "a" => "spigot",
+         "_combine" => "- d\n- a\n",
+         "c" => "deuce",
+         "b" => "rands"
+      }},
+      {"a" => "pants\nspigot\nrands\ndeuce"}
+
+    scenario "ordering in _.yml instead of _combine (compatibility)",
+      {"a" => {
+         "d" => "pants",
+         "a" => "spigot",
+         "_.yml" => "- d\n- a\n",
+         "c" => "deuce",
+         "b" => "rands"
+      }},
+      {"a" => "pants\nspigot\nrands\ndeuce"}
+
     it "raises when one combine has incompatible files" do
       proc do
         result_for_hash(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunch
 version: !ruby/object:Gem::Version
-  version: 1.0.0pre1
+  version: 1.0.0pre2
 platform: ruby
 authors:
 - Ryan Fitzgerald
@@ -246,6 +246,7 @@ files:
 - Gemfile
 - Guardfile
 - LICENSE.txt
+- README.md
 - Rakefile
 - bin/bunch
 - bunch.gemspec