active_record-framing 0.1.0.pre.3 → 0.1.0.pre.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bb54c09be5bd01b84d55f0bb8e959e5ef1a5c7f6a13d4f6ed55089f901129b1
-  data.tar.gz: 20d17ac8e31e7866148b70d2983d2941bd298e4cd9fa6e94e5756e85a52a904d
+  metadata.gz: f02f550ffc7f48015697d04cdc5ad1a54a3693c4c0fcb141500224fc78cfeec7
+  data.tar.gz: 96ef5227beb750c1e6845ecaafd7d11b5dc888f31a96acf29c2a26dde37d544e
 SHA512:
-  metadata.gz: 8ba3bbbb8ebc8eeaabdbcabc927ed2a2358922c91286f99007a99354e38165f6f62a33c56030b2e3cf1e3457864793feed1a9277c1eacd4f52dbf55d1cf76463
-  data.tar.gz: 6dbd8f819768e3e90ce8b9777d7280fa793cbe276a9af84da4fed7ab961b4fba1cc284e7cdb337c07372c8d623d4b2c0db43f5cdc3854b74e379da0a5de85db1
+  metadata.gz: e73a79efe0958a13aaf6845cd0ee546bd8dcc7520cbc062f91aa1d7dab36ecd707f1c0f4f454f1b3027369ea1ac74f61112a2167b9507204861478981474785e
+  data.tar.gz: b90c1d6ea6bba1888cc6a19693682409ea553415073ae14c23db7431855d596b86b0cbb1c8edc81e9f9bfa1032d0b6c0545fbd2b056d09408aa36d2c27840fe6

data/lib/active_record/framing/named.rb

@@ -147,21 +147,24 @@ module ActiveRecord
         the_frame = body.respond_to?(:to_proc) ? body : body.method(:call)
         cte_relation = relation.merge!(relation.instance_exec(&the_frame) || relation)
 
-        # self.const_set constant, Class.new(DelegateClass(self)) do |klass|
         delegator = self.name.to_sym
-        self.const_set(constant, self.dup).class_eval do |klass|
-        # self.const_set constant, Class.new do |klass|
-          extend SingleForwardable
-          def_delegators delegator, :type_caster, :table_name, :discriminate_class_for_record
+        new_class = self.const_set constant, (Class.new(self) do |klass|
+          klass.abstract_class = true
+          klass.table_name = superclass.table_name
+
+          def klass.discriminate_class_for_record(record)
+            superclass.send(:discriminate_class_for_record, record)
+          end
 
           klass.default_frames = []
 
-          @arel_table = klass.arel_table.dup.tap do |at|
+          @arel_table = superclass.arel_table.dup.tap do |at|
             at.name = arel_tn
           end
 
-          klass.current_frame = build_frame(cte_relation, &block)
-        end
+        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}\" " \

data/lib/active_record/framing/query_methods.rb

@@ -3,29 +3,44 @@ module ActiveRecord
     module QueryMethods
 
       if ::ActiveRecord.version >= Gem::Version.new("5.1") # 5.1+
-        def frames_values
-          get_value(:frames)
+        {
+          frames: ::ActiveRecord::Relation::FROZEN_EMPTY_HASH,
+          reframe: ::ActiveRecord::Relation::FROZEN_EMPTY_HASH
+        }.each do |value_name, default_value|
+          define_method("#{value_name}_values") do
+            get_value(value_name)
+          end
+          define_method("#{value_name}_values=") do |value|
+            set_value(value_name, value)
+          end
+          ::ActiveRecord::Relation::DEFAULT_VALUES[value_name] = default_value
         end
-        def frames_values=(value)
-          set_value(:frames, value)
-        end
-        ::ActiveRecord::Relation::DEFAULT_VALUES[:frames] = ::ActiveRecord::Relation::FROZEN_EMPTY_HASH
       elsif ::ActiveRecord.version >= Gem::Version.new("5.0") # 5.0+
-        def frames_values
-          @values[:frames] || ::ActiveRecord::Relation::FROZEN_EMPTY_HASH
-        end
-        def frames_values=(values)
-          assert_mutability!
-          @values[:frames] = values
+        {
+          frames: ::ActiveRecord::Relation::FROZEN_EMPTY_HASH,
+          reframe: ::ActiveRecord::Relation::FROZEN_EMPTY_HASH
+        }.each do |value_name, default_value|
+          define_method("#{value_name}_values") do
+            @values[value_name] || default_value
+          end
+          define_method("#{value_name}_values=") do |values|
+            assert_mutability!
+            @values[value_name] = values
+          end
         end
       elsif ::ActiveRecord.version >= Gem::Version.new("4.2") # 4.2+
-        def frames_values
-          @values[:frames] || {}
-        end
-        def frames_values=(values)
-          raise ImmutableRelation if @loaded
-          check_cached_relation
-          @values[:frames] = values
+        {
+          frames: {},
+          reframe: {}
+        }.each do |value_name, default_value|
+          define_method("#{value_name}_values") do
+            @values[value_name] || default_value
+          end
+          define_method("#{value_name}_values=") do |values|
+            raise ImmutableRelation if @loaded
+            check_cached_relation
+            @values[value_name] = values
+          end
         end
       else
         raise NotImplementedError, "ActiveRecord::Framing does not support Rails #{::ActiveRecord.version}"
@@ -48,72 +63,13 @@ module ActiveRecord
         self
       end
 
-      # Removes an unwanted relation that is already defined on a chain of relations.
-      # This is useful when passing around chains of relations and would like to
-      # modify the relations without reconstructing the entire chain.
-      #
-      #   User.order('email DESC').unframe(:order) == User.all
-      #
-      # The method arguments are symbols which correspond to the names of the methods
-      # which should be unframed. The valid arguments are given in VALID_UNSCOPING_VALUES.
-      # The method can also be called with multiple arguments. For example:
-      #
-      #   User.order('email DESC').select('id').where(name: "John")
-      #       .unframe(:order, :select, :where) == User.all
-      #
-      # One can additionally pass a hash as an argument to unframe specific +:where+ values.
-      # This is done by passing a hash with a single key-value pair. The key should be
-      # +:where+ and the value should be the where value to unframe. For example:
-      #
-      #   User.where(name: "John", active: true).unframe(where: :name)
-      #       == User.where(active: true)
-      #
-      # This method is similar to #except, but unlike
-      # #except, it persists across merges:
-      #
-      #   User.order('email').merge(User.except(:order))
-      #       == User.order('email')
-      #
-      #   User.order('email').merge(User.unframe(:order))
-      #       == User.all
-      #
-      # This means it can be used in association definitions:
-      #
-      #   has_many :comments, -> { unframe(where: :trashed) }
-      #
-      # def unframe(*args)
-      #   check_if_method_has_arguments!(:unframe, args)
-      #   spawn.unframe!(*args)
-      # end
-
-      # def unframe!(*args) # :nodoc:
-      #   args.flatten!
-      #   self.unframe_values += args
-
-      #   args.each do |frame|
-      #     case frame
-      #     when Symbol
-      #       frame = :left_outer_joins if frame == :left_joins
-      #       if !VALID_UNSCOPING_VALUES.include?(frame)
-      #         raise ArgumentError, "Called unframe() with invalid unframing argument ':#{frame}'. Valid arguments are :#{VALID_UNSCOPING_VALUES.to_a.join(", :")}."
-      #       end
-      #       set_value(frame, DEFAULT_VALUES[frame])
-      #     when Hash
-      #       frame.each do |key, target_value|
-      #         if key != :where
-      #           raise ArgumentError, "Hash arguments in .unframe(*args) must have :where as the key."
-      #         end
-
-      #         target_values = Array(target_value).map(&:to_s)
-      #         self.where_clause = where_clause.except(*target_values)
-      #       end
-      #     else
-      #       raise ArgumentError, "Unrecognized framing: #{args.inspect}. Use .unframe(where: :attribute_name) or .unframe(:order), for example."
-      #     end
-      #   end
-
-      #   self
-      # end
+      def reframe(*args)
+        args.flatten!
+        # TODO: Convert array (if present) to nil hash {value => nil}
+        # and merge with hash (if present) as second arg
+        self.reframe_values = self.reframe_values.merge(args.first)
+        self
+      end
     end
   end
 end

data/lib/active_record/framing/relation.rb

@@ -6,11 +6,6 @@ module ActiveRecord
       def build_arel(*)
         super.tap do |ar|
           unless ignore_default_frame?
-            # alias_tracker.aliased_table_for(
-            #   reflection.table_name,
-            #   table_alias_for(reflection, parent, reflection != node.reflection),
-            #   reflection.klass.type_caster
-            # )
             build_frames(ar)
             ar.with(*frames_values.values) if frames_values.any?
           end
@@ -34,14 +29,32 @@ module ActiveRecord
       #    @table_alias=nil>,
       # NOTE: In Rails 5.2 (at least) we could use the InnerJoin.left.type_caster
       def build_frames(manager)
-        join_names = manager.join_sources.collect do |source|
-          source.left.name.to_s # TODO: Need to_s?
+        # NOTE: We cannot early exclude associations because some associations are different from their table names
+        # TODO: cache known associations?
+        assocs = klass.reflect_on_all_associations.inject(Hash.new) do |assocs, assoc|
+          begin
+            assocs[assoc.table_name] = assoc
+          rescue NameError => e
+            # warn <<~WARN.chomp
+            #   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.
+            # WARN
+          end
+          assocs
         end
 
-        # NOTE: We cannot early exclude associations because some associations are different from their table names
-        klass.reflect_on_all_associations.each do |assoc|
-          if join_names.include?(assoc.table_name) && assoc.klass.default_frames.any? && assoc_default_frame = assoc.klass.send(:build_default_frame)
-            merge!(assoc_default_frame)
+        manager.join_sources.each do |join_source|
+          next unless join_source&.left&.respond_to?(:name)
+          if assoc = assocs[join_source.left.name]
+            source = reframe_values.fetch(assoc.name) { assoc.klass }
+
+            join_source.left.name = source.arel_table.name
+            if source < ::ActiveRecord::Base
+              merge!(source.all)
+            elsif source < ::ActiveRecord::Relation
+              merge!(source)
+            end
           end
         end
       end
@@ -59,42 +72,6 @@ module ActiveRecord
         end
       end
 
-      # def reframe(*args) # :nodoc:
-      #   args.compact!
-      #   args.flatten!
-      #   # binding.pry
-      #   self
-      # end
-
-      # def reframe!(*args) # :nodoc:
-      #   args.flatten!
-      #   self.unframe_values += args
-
-      #   args.each do |frame|
-      #     case frame
-      #     when Symbol
-      #       frame = :left_outer_joins if frame == :left_joins
-      #       if !VALID_UNSCOPING_VALUES.include?(frame)
-      #         raise ArgumentError, "Called unframe() with invalid unframing argument ':#{frame}'. Valid arguments are :#{VALID_UNSCOPING_VALUES.to_a.join(", :")}."
-      #       end
-      #       set_value(frame, DEFAULT_VALUES[frame])
-      #     when Hash
-      #       frame.each do |key, target_value|
-      #         if key != :where
-      #           raise ArgumentError, "Hash arguments in .unframe(*args) must have :where as the key."
-      #         end
-
-      #         target_values = Array(target_value).map(&:to_s)
-      #         self.where_clause = where_clause.except(*target_values)
-      #       end
-      #     else
-      #       raise ArgumentError, "Unrecognized framing: #{args.inspect}. Use .unframe(where: :attribute_name) or .unframe(:order), for example."
-      #     end
-      #   end
-
-      #   self
-      # end
-
       # Frame all queries to the current frame.
       #
       #   Comment.where(post_id: 1).framing do
@@ -116,22 +93,6 @@ module ActiveRecord
       def scoping
         framing { super }
       end
-
-      # def _exec_frame(*args, &block) # :nodoc:
-      #   @delegate_to_klass = true
-      #   instance_exec(*args, &block) || self
-      # ensure
-      #   @delegate_to_klass = false
-      # end
-
-      # def frame_for_create
-      #   where_values_hash.merge!(create_with_value.stringify_keys)
-      # end
-
-      # def empty_frame? # :nodoc:
-      #   @values == klass.unframed.values
-      # end
-
     end
   end
 end

data/lib/active_record/framing/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Framing
-    VERSION = "0.1.0-3"
+    VERSION = "0.1.0-4"
   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.3
+  version: 0.1.0.pre.4
 platform: ruby
 authors:
 - Dale Stevens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-09 00:00:00.000000000 Z
+date: 2019-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord