trailblazer-loader 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 834b1fea8e8901fdabf13ec60bc9fe18096219a1
-  data.tar.gz: 3678824bf53a228bea541e24d592a74a384810a6
+  metadata.gz: f975435027b00685780102cadeb527eec303f687
+  data.tar.gz: d9b1808f03432b5cf0536d20aed9eb3ddc5be540
 SHA512:
-  metadata.gz: e0075624d8d4eee0c286edab53eab61fd69c612ccabeea6bcde1ce619334edd562a15ba3905631db75717d1c40cc807fac471e1529d6cb63c7281b19762e1fda
-  data.tar.gz: 6e6231501f23b037e87460be30438f29edead8d4120b8f9ba2f6cce89d2e3a9c3a6140bcf5ca87ac635c04e3a144c471aeb84dc234d57b45fc8de9389f3909c2
+  metadata.gz: cee8af018a6c130d725394e0cf3c52c9813c5afeb45b572c58546d4bb9d2ee20287af170dede5597065416deed6ce93fd09b7a4e5cfe6ade93bcf3c6bf12a32e
+  data.tar.gz: b1aab9bc12f494e23c311b8e2364b979091519630e63ce337bc547c0fcb6ed8de6f3e427563017e9795b44a4ae062741ef9c091f7b310141ed390e39e9a9f45f

data/CHANGES.md

@@ -1,3 +1,12 @@
+# 0.1.0
+
+* New option `:root` to allow using loader for sources other than the current directory, e.g. for gems or Rails engines.
+* `:concept_root` is now prefixed with `:root`.
+* Use `File::SEPARATOR` for filename operations.
+* Don't use a regexp anymore to find concept files, but `Loader#concept_dirs` which includes plural names.
+* Allow irregular directory names such as `policies`.
+* Allow prepending to the pipeline using `:prepend`. Note that this is a temporary API and will be removed.
+
 # 0.0.9
 
 * Bug fix :cough:.

data/README.md

@@ -193,7 +193,13 @@ You do not need this step should you use one of the following binding gems.
 Trailblazer::Loader.new.() { |file| require_dependency(File.join(Rails.app.root, file)) }
 ```
 
-`:concepts_root`
+Per default, Trailblazer-loader will use `app/concepts` as the root path for the file search. Change that with the `:concepts_root` option.
+
+```ruby
+Trailblazer::Loader.new.(concepts_root: "./concepts/") { |file| require_relative(file) }
+```
+
+Note that `:concepts_root` needs a trailing slash.
 
 ## Mixing
 

data/lib/trailblazer/loader.rb

@@ -3,13 +3,18 @@ require "pp"
 
 module Trailblazer
   class Loader
+
+    def concept_dirs
+      %w{ callback  cell  contract  operation  policy   representer  view
+          callbacks cells contracts operations policies representers views }
+    end
+
     # Please note that this is subject to change - we're still finding out the best way
     # to explicitly load files.
-    #
-    # NOTE: i will most probably use call_sheet and dry-container here soon.
     def call(options={}, &block)
-      options[:concepts_root] ||= "app/concepts/"
-      options[:concept_dirs] = concept_dirs
+      options[:root]          ||= "."
+      options[:concepts_root] ||= "#{options[:root]}/app/concepts/"
+      options[:concept_dirs]  ||= concept_dirs
 
       pipeline = options[:pipeline] || Pipeline[
         FindDirectories,
@@ -22,6 +27,9 @@ module Trailblazer
         # pipeline = Representable::Pipeline::Insert.(pipeline, *args) # FIXME: implement :before in Pipeline.
         pipeline.last.insert(pipeline.last.index(args.last[:before]), args.first)
       end
+      if args = options[:prepend]
+        pipeline << args
+      end
 
       files =  pipeline.([], options).flatten
 
@@ -34,19 +42,15 @@ module Trailblazer
       pp files if options[:debug]
     end
 
-    def concept_dirs
-      %w{ callback cell contract operation policy representer view }
-    end
-
     FindDirectories  = ->(input, options) { Dir.glob("#{options[:concepts_root]}**/") }
     # Filter out all directories containing /(callback|cell|contract|operation|policy|representer|view)/
-    FindConcepts     = ->(input, options) { input.shift; input.reject { |dir| dir =~ /(#{options[:concept_dirs].join("|")})/ } }
+    FindConcepts     = ->(input, options) { input.reject { |dir| (dir.split(File::SEPARATOR) & options[:concept_dirs]).any? } }
     PrintConcepts    = ->(input, options) { puts "  concepts: #{input.inspect}"; input }
 
     # lame heuristic, but works for me: sort by directory levels.
     # app/concepts/comment
     # app/concepts/api/v1/comment
-    SortByLevel  = ->(input, options) { input.sort { |a, b| a.split("/").size <=> b.split("/").size } }
+    SortByLevel  = ->(input, options) { input.sort { |a, b| a.split(File::SEPARATOR).size <=> b.split(File::SEPARATOR).size } }
     # Extract concept name from path, e.g. /api/v1/comment.
     ConceptName   = ->(input, options) { options[:name] = input.sub(options[:concepts_root], "").chomp("/"); [] }
     # Find all .rb files in one particular concept directory, e.g. as in /concepts/comment/*.rb.
@@ -55,7 +59,7 @@ module Trailblazer
 
       Dir.glob("#{options[:concepts_root]}#{options[:name]}/*.rb") +        # .rb files directly in this concept.
         Dir.glob("#{options[:concepts_root]}#{options[:name]}/*/*.rb").     # .rb in :concept/operation/*.rb
-        find_all { |file| file =~ /(#{options[:concept_dirs].join("|")})/ } # but only those, no sub-concepts!
+        find_all { |file| (file.split(File::SEPARATOR) & options[:concept_dirs]).any? } # but only those, no sub-concepts!
     end
 
     # operation files should be loaded after callbacks, policies, and the like: [callback.rb, contract.rb, policy.rb, operation.rb]
@@ -63,6 +67,8 @@ module Trailblazer
     SortCreateFirst   = ->(input, options) { input.sort }
     AddConceptFiles   = ->(input, options) { input }
 
+
+    # FindRbFiles       = ->(input, options) { input + Dir.glob("#{options[:concepts_root]}#{options[:name]}/*.rb") }
   private
 
     def load_files(files)

data/lib/trailblazer/loader/version.rb

@@ -1,5 +1,5 @@
 module Trailblazer
   class Loader
-    VERSION = "0.0.9"
+    VERSION = "0.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-loader
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler