active_record-framing 0.1.0.pre.8 → 0.1.0.pre.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab0c33dbeba1bf12e4f49d8e51fada71519e03993edc8a15821b88bbabc37061
-  data.tar.gz: 74750a483858cd179c5051db28d3bc272c9440bacf51fc8c50cc0f43c48806ba
+  metadata.gz: 1c45ff57cff6a36c65d09cc5c6e33a8d394c0f35eb6097f64213e458d41d4509
+  data.tar.gz: 8bd322afcc0c2406367c43354baa15f60291063fce86a91c8bb24dfaeaefd5f2
 SHA512:
-  metadata.gz: ae7e047fefd79d7bb836b04b69bcc7378b6fae4057fbfe6299cf0ec3fd37904e9b9e034ebaf86107f628c8b2efb319946d00bbc4a4111a3fb7eff257db577300
-  data.tar.gz: 2b09eaecb22f6d66fe20b9215589f0f816f0538f53e5b8be833fd09c1e68e4f58e9168d74d81774de89f4ac0e8528bc95c1b781bb06d84a28b9f32ed180a85d5
+  metadata.gz: ebfb3761c9c471e80b2b7e77d235f1b74c85dcbb185f470da6f6f8732489802ababfb31ee039680781afdfd5d353d7417e8e0e62e2408bc1010044a1c540cfeb
+  data.tar.gz: faba924aef8072dc5c98a7bfc6e67decbadab3bc7eaa75b162c9de4a4410716bb89513124c0a27df1d8dc0a55c88507aa3883b5c01207330d4528bf818f55e56

data/lib/active_record/framing/core_extension.rb

@@ -10,6 +10,9 @@ module ActiveRecord
     def self.prepended(subclass)
       subclass.singleton_class.class_eval do
         alias_method :unframed_all, :all
+
+        # Subclasses need to be able to call its parent's
+        protected :relation
       end
 
       subclass.include Default

data/lib/active_record/framing/default.rb

@@ -57,6 +57,22 @@ module ActiveRecord
           self.ignore_default_frame = false
         end
 
+      protected
+
+        def build_frame(frames, arel_table, base_rel = nil, &block)
+          cte_relation = frames.inject(base_rel.clone) do |collection, frame|
+            frame = frame.respond_to?(:to_proc) ? frame : frame.method(:call)
+            # Exec the frame, or grab the default_frame (by calling relation)
+            frame_relation = base_rel.instance_exec(&frame)
+            collection.merge!(frame_relation || base_rel)
+          end
+
+          relation.frame!(Arel::Nodes::As.new(arel_table, cte_relation.arel)).tap do |rel|
+            extension = Module.new(&block) if block_given?
+            rel.extending!(extension) if extension
+          end
+        end
+
       private
 
         def ignore_default_frame=(ignore)
@@ -135,14 +151,7 @@ module ActiveRecord
           elsif default_frames.any?
             ignore_default_frame do
               cte_table = Arel::Table.new(table_name)
-
-              cte_relation = default_frames.inject(relation) do |default_frame, frame|
-                frame = frame.respond_to?(:to_proc) ? frame : frame.method(:call)
-                default_frame.merge!(relation.instance_exec(&frame))
-              end
-
-              base_rel ||= relation
-              base_rel.frame!(Arel::Nodes::As.new(cte_table, cte_relation.arel))# if cte_relation
+              build_frame(default_frames, cte_table, base_rel || relation)
             end
           end
         end

data/lib/active_record/framing/named.rb

@@ -18,20 +18,20 @@ module ActiveRecord
       # You can define a frame that applies to all finders using
       # {default_frame}[rdoc-ref:Framing::Default::ClassMethods#default_frame].
       def all
-        rel = unframed_all
         if (current_frame = self.current_frame)
           if self == current_frame.klass
             current_frame.clone
           else
-            rel.merge!(current_frame)
+            unframed_all.merge!(current_frame)
           end
         else
-          default_framed(rel)
+          # default_framed.merge!(unframed_all)
+          unframed_all.merge!(default_framed)
         end
       end
 
       # def default_framed(frame = relation) # :nodoc:
-      def default_framed(frame = nil) # :nodoc:
+      def default_framed(frame = relation) # :nodoc:
         !ignore_default_frame? && !ActiveRecord::Framing.disabled? && build_default_frame(frame) || frame
       end
 
@@ -146,9 +146,6 @@ module ActiveRecord
 
         arel_tn = "#{frame_name}/#{self.table_name}"
 
-        the_frame = body.respond_to?(:to_proc) ? body : body.method(:call)
-        cte_relation = relation.merge!(relation.instance_exec(&the_frame) || relation)
-
         new_class = self.const_set constant, (Class.new(self) do |klass|
           klass.abstract_class = true
           klass.table_name = superclass.table_name
@@ -157,7 +154,13 @@ module ActiveRecord
             superclass.send(:discriminate_class_for_record, record)
           end
 
-          klass.default_frames = []
+          klass.default_frames = [body]
+
+          @current_frame_extension = block
+
+          def klass.current_frame
+            build_frame(default_frames, arel_table, superclass.relation, &@current_frame_extension)
+          end
 
           @arel_table = superclass.arel_table.dup.tap do |at|
             at.name = arel_tn
@@ -165,8 +168,6 @@ module ActiveRecord
 
         end)
 
-        new_class.current_frame = new_class.build_frame(cte_relation, &block)
-
         if dangerous_class_const?(constant)
           raise ArgumentError, "You tried to define a frame named \"#{constant}\" " \
             "on the model \"#{self.constant}\", but Active Record already defined " \
@@ -175,13 +176,6 @@ module ActiveRecord
 
       end
 
-      def build_frame(frame, &block)
-        extension = Module.new(&block) if block
-        relation.frame!(Arel::Nodes::As.new(arel_table, frame.arel)).tap do |rel|
-          rel.extending!(extension) if extension
-        end
-      end
-
       private
 
         def valid_frame_name?(name)

data/lib/active_record/framing/query_methods.rb

@@ -31,17 +31,17 @@ module ActiveRecord
         value = value.all if (value.is_a?(Class) && value < ::ActiveRecord::Base)
 
         cte = \
-        case value
-        when ::ActiveRecord::Relation
-          # {value.table.name => value.frames_values}
-          value.frames_values
-        when Arel::Nodes::As
-          {value.left.name => value}
-        when String
-          {arel_table.name => value}
-        else
-          {}
-        end
+          case value
+          when ::ActiveRecord::Relation
+            # {value.table.name => value.frames_values}
+            value.frames_values
+          when Arel::Nodes::As
+            {value.left.name => value}
+          when String
+            {arel_table.name => value}
+          else
+            {}
+          end
 
         self.frames_values = self.frames_values.merge(cte)
 

data/lib/active_record/framing/relation.rb

@@ -30,7 +30,7 @@ module ActiveRecord
       # NOTE: In Rails 5.2 (at least) we could use the InnerJoin.left.type_caster
       def build_frames(manager)
         # NOTE: We cannot early exclude associations because some associations are different from their table names
-        # TODO: cache known associations?
+        # TODO: cache known associations, (renable warning)
         assocs = klass.reflect_on_all_associations.inject(Hash.new) do |assocs, assoc|
           begin
             assocs[assoc.table_name] = assoc
@@ -39,6 +39,7 @@ module ActiveRecord
             #   ActiveRecord::Framing was trying to inspect the association #{assoc.name}
             #     on the #{assoc.active_record.name} model but seems there is an issue
             #     locating the model backing it.
+            #     Error: #{e.message}
             # WARN
           end
           assocs
@@ -46,7 +47,7 @@ module ActiveRecord
 
         manager.join_sources.each do |join_source|
           next unless join_source&.left&.respond_to?(:name)
-          if assoc = assocs[join_source.left.name]
+          if (assoc = assocs[join_source.left.name])
             source = reframe_values.fetch(assoc.name) { assoc.klass }
 
             join_source.left.name = source.arel_table.name

data/lib/active_record/framing/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Framing
-    VERSION = "0.1.0-8"
+    VERSION = "0.1.0-9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-framing
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.8
+  version: 0.1.0.pre.9
 platform: ruby
 authors:
 - Dale Stevens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-11 00:00:00.000000000 Z
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord