inferred_crumpets 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e49994914324e9b9564161b3713f75ebc20d329
-  data.tar.gz: acf2a10fe6b04e4298f7478d55528cf69c7a3476
+  metadata.gz: 6250044ac0ab2d1597b36ba4475f8ba7efe47cc2
+  data.tar.gz: f14abcedf89bd9e396dafe8481d9ee0217dc615f
 SHA512:
-  metadata.gz: d10b75694952f205811c04ce3613f67676739cad37952035f7adbbc2f51442bc4764b503c6a1fbf07ebc01ede390ebe240a7f71d4b4fed358bb0a35ae8593eda
-  data.tar.gz: b90189c270066f977b842b2664de1ecb3a19ad631a6a2a482a9bc0f77431f99292adfc0020e4c5be06993871a2996f253da5fc6db28fc1c64eecd1be3396659b
+  metadata.gz: ccd76c2a344cb2932ab1214a21e8652ee2a9118751ed36d849eebf5b99608b19d8ec35a93f920a9131ea0830c533ea54a2c2fcf2bbd7b602c266f4da107f30dd
+  data.tar.gz: 867545fa1b70b5486ea715ec8872aa556ea4f6920550323a06a795d9249d0faf0782c70d78060dffc9df6bc01209bf32f74aed436fa3b1f4141f2f314df315b4

data/.gitignore

@@ -7,6 +7,8 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/
 
 # rspec failure tracking
 .rspec_status
+*.gem

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # InferredCrumpets
 
+## 0.2.4
+
+* [TT-3102] Move url checking out into seperate class
+* [TT-3102] Fix regression where subject routes where not build properly
+
 ## 0.2.3
 
 * [TT-3117] Fix: NoMethodError when subject is not linkable

data/lib/inferred_crumpets.rb

@@ -1,3 +1,4 @@
+require "inferred_crumpets/route_checker"
 require "inferred_crumpets/builder"
 require "inferred_crumpets/railtie"
 require "inferred_crumpets/version"

data/lib/inferred_crumpets/builder.rb

@@ -18,9 +18,10 @@ module InferredCrumpets
     end
 
     def initialize(view_context, subject, parents = [])
-      @view_context = view_context
-      @subject      = subject
-      @parents      = parents
+      @route_checker  = RouteChecker.new(view_context)
+      @view_context   = view_context
+      @subject        = subject
+      @parents        = parents
     end
 
     def build_all!
@@ -42,7 +43,7 @@ module InferredCrumpets
     end
 
     def build_crumb_for_collection!
-      return if parents.present? && shallow?
+      return if parents.present? && linkable?
 
       if subject.is_a?(ActiveRecord::Relation)
         view_context.crumbs.add_crumb subject_name.pluralize.titleize
@@ -71,44 +72,38 @@ module InferredCrumpets
 
     def url_for_subject
       return unless can_route?(:show, id: subject.id) && linkable?
-      view_context.url_for(shallow? ? transformed_subject : subject_with_parents)
+      view_context.url_for(transformed_subject)
     end
 
     def url_for_collection
       return view_context.objects_path if view_context.objects_path.present?
       return unless can_route?(:index)
-      view_context.url_for(shallow? ? transformed_subject.class : class_with_parents)
+      return view_context.url_for(transformed_subject.class) if linkable?
+      return view_context.url_for(class_with_parents) if parents_and_class_linkable?
     end
 
     def subject_requires_transformation?
-      subject.respond_to?(:becomes) && view_context.url_for((parents + [subject.class]).compact).blank?
-    rescue NoMethodError
-      true
+      subject.respond_to?(:becomes) && !parents_and_subject_linkable?
     end
 
     def transformed_subject
       subject_requires_transformation? ? subject.becomes(subject.class.base_class) : subject
     end
 
-    def shallow?
-      view_context.url_for(transformed_subject)
-    rescue NoMethodError
-      false
+    def linkable?
+      @route_checker.linkable?(transformed_subject)
     end
 
-    def linkable?
-      view_context.url_for(subject)
-    rescue NoMethodError
-      false
+    def parents_and_subject_linkable?
+      @route_checker.linkable?((parents + [subject.class]).compact)
+    end
+
+    def parents_and_class_linkable?
+      @route_checker.linkable?((parents + [transformed_subject.class]).compact)
     end
 
     def can_route?(action, params = {})
-      view_context.url_for({
-        action:     action,
-        controller: subject.class.table_name,
-      }.merge(params))
-    rescue ActionController::RoutingError
-      false
+      @route_checker.can_route?(subject, action, params)
     end
 
     def action
@@ -123,10 +118,6 @@ module InferredCrumpets
       (parents + [transformed_subject.class]).compact
     end
 
-    def subject_with_parents
-      (parents + [transformed_subject]).compact
-    end
-
     def inherited_resources?
       defined?(InheritedResources) && view_context.controller.responder == InheritedResources::Responder
     end

data/lib/inferred_crumpets/route_checker.rb

@@ -0,0 +1,22 @@
+module InferredCrumpets
+  class RouteChecker
+    def initialize(view_context)
+      @view_context = view_context
+    end
+
+    def linkable?(subject)
+      @view_context.url_for(subject) && true
+    rescue NoMethodError
+      false
+    end
+
+    def can_route?(subject, action, params = {})
+      @view_context.url_for({
+        action:     action,
+        controller: subject.class.table_name,
+      }.merge(params))
+    rescue ActionController::RoutingError
+      false
+    end
+  end
+end

data/lib/inferred_crumpets/version.rb

@@ -1,3 +1,3 @@
 module InferredCrumpets
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inferred_crumpets
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Grant Colegate
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-31 00:00:00.000000000 Z
+date: 2017-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -103,6 +103,7 @@ files:
 - lib/inferred_crumpets.rb
 - lib/inferred_crumpets/builder.rb
 - lib/inferred_crumpets/railtie.rb
+- lib/inferred_crumpets/route_checker.rb
 - lib/inferred_crumpets/version.rb
 - lib/inferred_crumpets/view_helpers.rb
 homepage: https://github.com/sealink/inferred_crumpets