trailblazer-rails 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01e3a04b3c86bbaf621c3ff2cc6c40df7f4788af
-  data.tar.gz: 7c808e6a1176e12078ed80371867f5585b601824
+  metadata.gz: 4163602857c7fccc8c5b5020b2e158bfc9ef7180
+  data.tar.gz: b241c68e7bcf9e150c44ce7f1b76e2da0fa590a3
 SHA512:
-  metadata.gz: df485f98a78078cabd8711646c88a051fe67a90ba514c5534da0e5fa8556556abfbf9d719c6e6fb0e8fbd2465b314342362f7352d6b936abb774faaab00e3360
-  data.tar.gz: 566fced4a3077db36782dbefda2536f310517fdbbb6ab6365b53e3856a242f11880da5a720c2b5510e21e1a9c9957a72abf295163cffb296532b4488ba534a67
+  metadata.gz: 1e4cce8c6b4019ee469846df195cc6e026b2c92a1db171d3949ab38c83a272e604f5f881d2e959977ec8f0fb304b025611f1fcf95d241c3d1620a228878e4ac2
+  data.tar.gz: afa31ea710f3e707f672aa524d717ce9fb58a7399931031ad160a760f01148ab2b8a258594acc225799451092838e3de64cdd6143dd7f87333cfdf073cf265f3

data/CHANGES.md

@@ -1,3 +1,8 @@
+# 0.2.2
+
+* Remove cells loading code, this happens via trailblazer-loader now.
+* We now load the concept's model file if it exists.
+
 # 0.2.1
 
 * Require `trailblazer-loader`.

data/lib/trailblazer/rails/railtie.rb

@@ -3,14 +3,8 @@ require "trailblazer/loader"
 
 module Trailblazer
   class Railtie < ::Rails::Railtie
-    def self.autoload_operations(app)
-      Loader.new.(app.root) { |file| require_dependency(file) }
-    end
-
-    def self.autoload_cells(app)
-      Dir.glob("app/concepts/**/*cell.rb") do |f|
-        require_dependency "#{app.root}/#{f}" # load app/concepts/{concept}/cell.rb.
-      end
+    def self.load_concepts(app)
+      Loader.new.(insert: [ModelFile, before: Loader::ConceptFiles]) { |file| require_dependency("#{app.root}/#{file}") }
     end
 
     # This is to autoload Operation::Dispatch, etc. I'm simply assuming people find this helpful in Rails.
@@ -23,8 +17,7 @@ module Trailblazer
       # the trb autoloading has to be run after initializers have been loaded, so we can tweak inclusion of features in
       # initializers.
       ActionDispatch::Reloader.to_prepare do
-        Trailblazer::Railtie.autoload_operations(app)
-        Trailblazer::Railtie.autoload_cells(app)
+        Trailblazer::Railtie.load_concepts(app)
       end
     end
 
@@ -35,5 +28,11 @@ module Trailblazer
     initializer "trailblazer.application_controller" do
       require "trailblazer/rails/application_controller"
     end
+
+    # Prepend model file, before the concept files like operation.rb get loaded.
+    ModelFile = ->(input, options) do
+      model = "app/models/#{options[:name]}.rb"
+      File.exist?(model) ? [model]+input : input
+    end
   end
 end

data/lib/trailblazer/rails/version.rb

@@ -1,5 +1,5 @@
 module Trailblazer
   module Rails
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/trailblazer-rails.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "trailblazer", ">= 1.0.4"
-  spec.add_dependency "trailblazer-loader", ">= 0.0.1"
+  spec.add_dependency "trailblazer-loader", ">= 0.0.2"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trailblazer
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement