trailblazer-loader 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f755ff4167de7bd9d86372dc8f22c21376d79275
-  data.tar.gz: 7454f5278ade16311382c59ac7e3fa53b3fd876d
+  metadata.gz: fcfd96e03897aacc8a5ceb4d3b32e2b184d9059c
+  data.tar.gz: 2b176fe74a75f7d94a801565a79d2b48bcff5335
 SHA512:
-  metadata.gz: 34010c6e18015936b643d3f478c1306fecb6307b403d2aa8cf712229ef6d3b8065be9c850420a80705acfe53dc624c5670b70a36c9a6baf8a371c87886e30311
-  data.tar.gz: 407642142a5136d250de896ab0066ea2f31611c8dffc51571e169e9913a8d22f327d393b95dd41e36d304dfd6da4573e5fd91eaee745187cb7ecad492e33714f
+  metadata.gz: 4c966a7ce3c44c882e8ade689493139db04375c93a0ce6681444900db62e1e56dbc8cd8765c5a1648d699b2b6664566543361087e0f756f5874ebe1da3c30849
+  data.tar.gz: 4306fd9543a7c0a78c19c9bc6cf50ca6bf285847b2072216e01740a77215855ec1abe21f6fa10afc4ef1f865857b335192c9c423f60b157135ebd6193d54dc3c

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 0.0.7
+
+* Fix a ordering bug. Thanks @Hermanverschooten.
+
 # 0.0.6
 
 * Allow injection of additional files in `Loader::ConceptFiles` from earlier functions.

data/lib/trailblazer/loader.rb

@@ -14,19 +14,18 @@ module Trailblazer
       pipeline = options[:pipeline] || Pipeline[
         FindDirectories,
         FindConcepts,
-        # PrintConcepts,
         SortByLevel,
         Pipeline::Collect[ConceptName, ConceptFiles, SortCreateFirst, SortOperationLast, AddConceptFiles] # per concept.
       ]
 
       if args = options[:insert] # FIXME: this only implements a sub-set.
         # pipeline = Representable::Pipeline::Insert.(pipeline, *args) # FIXME: implement :before in Pipeline.
-        pipeline[3].insert(pipeline[3].index(args.last[:before]), args.first)
+        pipeline.last.insert(pipeline.last.index(args.last[:before]), args.first)
       end
 
       files =  pipeline.([], options).flatten
 
-      pp files
+      pp files if ENV['RACK_ENV'] == 'development'
 
       load_files(files, &block)
     end
@@ -56,7 +55,7 @@ module Trailblazer
     end
 
     # operation files should be loaded after callbacks, policies, and the like: [callback.rb, contract.rb, policy.rb, operation.rb]
-    SortOperationLast = ->(input, options) { input.sort { |a, b| (a =~ /operation/ && b !~ /operation/) ? 1 : -1 } }
+    SortOperationLast = ->(input, options) { input.sort { |a, b| a =~ /operation/ && b !~ /operation/ ? 1 : a !~ /operation/ && b =~ /operation/ ? 0 : a <=> b  } }
     SortCreateFirst   = ->(input, options) { input.sort }
     AddConceptFiles   = ->(input, options) { input }
 

data/lib/trailblazer/loader/version.rb

@@ -1,5 +1,5 @@
 module Trailblazer
   class Loader
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-loader
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-25 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler