pakyow-reflection 1.0.0.rc3 → 1.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e9031c45360015c7b068ad6f85938902ac14f3cb5cb0e4d55ca4999c81d0e99
-  data.tar.gz: 262f93fbf4fea38139806e6fd917cd85c134e5a287151121a091fd3f4e981ec6
+  metadata.gz: 439c0fba540fdf1fc9b0fbd624c15ece95bc0a6df70061739b737b68bb91c125
+  data.tar.gz: 25b1a106b2b7afe76b4aa67ab9f6772a8dca937080885e4e91b0b14d66b4d9f6
 SHA512:
-  metadata.gz: 440f1e6a0e2076a0f1e01bbb1f892cf36ffa94668fb110b7653ddcfc32de2f7404587242445c4ac13f69cbef254ab7e7cd4e0db972afcf13b334db88606f2c54
-  data.tar.gz: dc888c10a53b00cf2c61e6842d272f053b905c33e190fe692191a5987f6415d8c7e1d5f47eebbd1e1eb1f8de4cd9d1b07da63ef41d1d2fc521d6f95e8383dcf7
+  metadata.gz: 2b1d83128091f06d7b141e90834c91b06d394e017a2ba862d06dfc71084ced0ecd45d7c488c85bc4c064dd3442d3351bf6903186eff03e3bbfbf916781a4b415
+  data.tar.gz: 5ad860dcc0bbe4a7980ab6acf1cfa971e4d22c62a2336574d1a121d424fe2366364daf777840dc3b8b697b73340591c0927a2e58989b56609fdba4a9c6623ca4

data/lib/pakyow/reflection/action.rb

@@ -16,6 +16,10 @@ module Pakyow
         @name == normalize(name)
       end
 
+      def cleanup
+        @node = nil
+      end
+
       private
 
       def normalize(name)

data/lib/pakyow/reflection/behavior/reflecting.rb

@@ -37,6 +37,13 @@ module Pakyow
             # Build the endpoints.
             #
             builders[:endpoints].build(@mirror.endpoints)
+
+            # Cleanup.
+            #
+            unless Pakyow.env?(:test)
+              @mirror.scopes.each(&:cleanup)
+              @mirror.endpoints.each(&:cleanup)
+            end
           end
         end
       end

data/lib/pakyow/reflection/builders/actions.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require "pakyow/reflection/builders/abstract"
+require "pakyow/reflection/builders/base"
 require "pakyow/reflection/builders/helpers/controller"
 
 module Pakyow
   module Reflection
     module Builders
       # @api private
-      class Actions < Abstract
+      class Actions < Base
         include Helpers::Controller
 
         def build(actions)

data/lib/pakyow/reflection/builders/{abstract.rb → base.rb}

@@ -3,7 +3,7 @@
 module Pakyow
   module Reflection
     module Builders
-      class Abstract
+      class Base
         def initialize(app, scopes)
           @app, @scopes = app, scopes
         end

data/lib/pakyow/reflection/builders/endpoints.rb

@@ -2,7 +2,7 @@
 
 require "pakyow/support/core_refinements/string/normalization"
 
-require "pakyow/reflection/builders/abstract"
+require "pakyow/reflection/builders/base"
 require "pakyow/reflection/builders/helpers/controller"
 require "pakyow/reflection/extensions/controller"
 
@@ -10,7 +10,7 @@ module Pakyow
   module Reflection
     module Builders
       # @api private
-      class Endpoints < Abstract
+      class Endpoints < Base
         include Helpers::Controller
 
         using Support::Refinements::String::Normalization

data/lib/pakyow/reflection/builders/source.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require "pakyow/reflection/builders/abstract"
+require "pakyow/reflection/builders/base"
 
 module Pakyow
   module Reflection
     module Builders
       # @api private
-      class Source < Abstract
+      class Source < Base
         def build(scope)
           (source_for_scope(scope) || define_source_for_scope(scope)).class_eval do
             scope.attributes.each do |attribute|

data/lib/pakyow/reflection/endpoint.rb

@@ -19,6 +19,10 @@ module Pakyow
         end
       end
 
+      def cleanup
+        @node = nil
+      end
+
       private
 
       def parse_dataset(dataset)
@@ -71,6 +75,10 @@ module Pakyow
       def add_exposure(exposure)
         @exposures << exposure
       end
+
+      def cleanup
+        @exposures.each(&:cleanup)
+      end
     end
   end
 end

data/lib/pakyow/reflection/extensions/controller.rb

@@ -76,27 +76,13 @@ module Pakyow
                 end
               end
 
-              if reflected_exposure.children.any?
-                associations = data.send(
-                  reflected_exposure.scope.plural_name
-                ).source.class.associations.values.flatten
-
-                reflected_exposure.children.each do |nested_reflected_exposure|
-                  association = associations.find { |possible_association|
-                    possible_association.associated_source_name == nested_reflected_exposure.scope.plural_name
-                  }
-
-                  if association
-                    query = query.including(association.name)
-                  end
-                end
-              end
+              query = apply_includes_to_query(query, reflected_exposure.scope.plural_name, reflected_exposure.children)
 
-              if reflects_specific_object?(reflected_exposure.scope.plural_name) && query.dup.count == 0
+              if reflects_specific_object?(reflected_exposure.scope.plural_name) && query.count == 0
                 trigger 404
               else
                 if !reflected_exposure.binding.to_s.include?("form") || reflected_endpoint.view_path.end_with?("/edit")
-                  expose reflected_exposure.binding, query
+                  expose reflected_exposure.binding.to_s, query
                 end
               end
             end
@@ -139,7 +125,9 @@ module Pakyow
               # TODO: Handle cases where objects are associated by id but routed by another field.
               # Implement when we allow foreign keys to be specified in associations.
               #
-              values[self.class.parent.nested_param] = params[self.class.parent.nested_param]
+              if proxy.source.class.attributes.key?(self.class.parent.nested_param)
+                values[self.class.parent.nested_param] = params[self.class.parent.nested_param]
+              end
             end
 
             # Limit the action for update, delete.
@@ -277,6 +265,29 @@ module Pakyow
             end
           end
         end
+
+        def apply_includes_to_query(query, plural_name, children)
+          associations = data.send(
+            plural_name
+          ).source.class.associations.values.flatten
+
+          children.group_by { |child|
+            child.scope.plural_name
+          }.each do |nested_plural_name, child_exposures|
+            association = associations.find { |possible_association|
+              possible_association.associated_source_name == nested_plural_name
+            }
+
+            if association
+              context = self
+              query = query.including(association.name) {
+                context.__send__(:apply_includes_to_query, self, nested_plural_name, child_exposures.flat_map(&:children))
+              }
+            end
+          end
+
+          query
+        end
       end
     end
   end

data/lib/pakyow/reflection/mirror.rb

@@ -73,34 +73,32 @@ module Pakyow
               view_path, view.info.dig(:reflection, :endpoint)
             )
 
-            unless endpoint.exposures.any? { |e| e.binding == binding_scope_view.channeled_binding_name}
-              exposure = Exposure.new(
-                scope: scope,
-                node: binding_scope_node,
-                parent: parent_exposure,
-                binding: binding_scope_view.channeled_binding_name,
-                dataset: binding_scope_view.label(:dataset)
-              )
+            exposure = Exposure.new(
+              scope: scope,
+              node: binding_scope_node,
+              parent: parent_exposure,
+              binding: binding_scope_view.channeled_binding_name,
+              dataset: binding_scope_view.label(:dataset)
+            )
 
-              endpoint.add_exposure(exposure)
+            endpoint.add_exposure(exposure)
 
-              # Discover nested view scopes.
-              #
-              discover_view_scopes(
-                view_path: view_path,
-                view: binding_scope_view,
-                parent_scope: scope,
-                parent_exposure: exposure,
-                binding_path: binding_path.dup << binding_scope_node.label(:binding)
-              )
-            end
+            # Discover nested view scopes.
+            #
+            discover_view_scopes(
+              view_path: view_path,
+              view: binding_scope_view,
+              parent_scope: scope,
+              parent_exposure: exposure,
+              binding_path: binding_path.dup << binding_scope_node.label(:binding)
+            )
           end
         end
 
         # Discover forms.
         #
         view.object.each_significant_node(:form) do |form_node|
-          if form_node.labeled?(:binding)
+          if form_node.labeled?(:binding) && !form_node.labeled?(:plug)
             form_view = Presenter::View.from_object(form_node)
             scope = scope_for_binding(form_view.binding_name, parent_scope)
 
@@ -172,13 +170,15 @@ module Pakyow
         #
         view.object.find_significant_nodes(:endpoint).select { |endpoint_node|
           endpoint_node.label(:endpoint).to_s.end_with?("_delete")
+        }.reject { |endpoint_node|
+          endpoint_node.label(:endpoint).to_s.start_with?("@")
         }.each do |endpoint_node|
           scope = scope_for_binding(
             endpoint_node.label(:endpoint).to_s.split("_", 2)[0],
             parent_scope
           )
 
-          unless scope.action(:delete)
+          if scope && endpoint_node.label(:endpoint).to_s == "#{scope.plural_name}_delete" && !scope.action(:delete)
             scope.actions << Action.new(
               name: :delete,
               scope: scope,

data/lib/pakyow/reflection/scope.rb

@@ -53,6 +53,10 @@ module Pakyow
         Support.inflector.pluralize(@name).to_sym
       end
 
+      def cleanup
+        @actions.each(&:cleanup)
+      end
+
       private
 
       def normalize(name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pakyow-reflection
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0.rc4
 platform: ruby
 authors:
 - Bryan Powell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-09 00:00:00.000000000 Z
+date: 2019-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pakyow-core
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: 1.0.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: 1.0.0.rc4
 - !ruby/object:Gem::Dependency
   name: pakyow-data
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: 1.0.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: 1.0.0.rc4
 - !ruby/object:Gem::Dependency
   name: pakyow-form
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: 1.0.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: 1.0.0.rc4
 - !ruby/object:Gem::Dependency
   name: pakyow-presenter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: 1.0.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: 1.0.0.rc4
 - !ruby/object:Gem::Dependency
   name: pakyow-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: 1.0.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: 1.0.0.rc4
 description: Reflected behavior for Pakyow
 email: bryan@metabahn.com
 executables: []
@@ -95,8 +95,8 @@ files:
 - lib/pakyow/reflection/behavior/config.rb
 - lib/pakyow/reflection/behavior/reflecting.rb
 - lib/pakyow/reflection/behavior/rendering/install_form_metadata.rb
-- lib/pakyow/reflection/builders/abstract.rb
 - lib/pakyow/reflection/builders/actions.rb
+- lib/pakyow/reflection/builders/base.rb
 - lib/pakyow/reflection/builders/endpoints.rb
 - lib/pakyow/reflection/builders/helpers/controller.rb
 - lib/pakyow/reflection/builders/source.rb