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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f02f550ffc7f48015697d04cdc5ad1a54a3693c4c0fcb141500224fc78cfeec7
-  data.tar.gz: 96ef5227beb750c1e6845ecaafd7d11b5dc888f31a96acf29c2a26dde37d544e
+  metadata.gz: 50f9ead434db94b752243dc9e02394e66b3ddfffce6ef928d956a216b60f1152
+  data.tar.gz: 8076e981ada88139570808b4a557ab2ff8fc142da0968194f16a4ad343af2ccd
 SHA512:
-  metadata.gz: e73a79efe0958a13aaf6845cd0ee546bd8dcc7520cbc062f91aa1d7dab36ecd707f1c0f4f454f1b3027369ea1ac74f61112a2167b9507204861478981474785e
-  data.tar.gz: b90c1d6ea6bba1888cc6a19693682409ea553415073ae14c23db7431855d596b86b0cbb1c8edc81e9f9bfa1032d0b6c0545fbd2b056d09408aa36d2c27840fe6
+  metadata.gz: 766afa51855672ad7ad6d0dad90f7dcd3431f2ef3a26a9c1d56c7eb77d2bef6cff5cc1a29b0f2c0a6e8289f72e7da27737e7d199ec6074969c4850e7cbe31f89
+  data.tar.gz: f57a1021461f0dbe7d769badd5267eada20a0c331e801bea521326454089873fa0ed474be55bcac6b075af6afe704cb1452f6e8b80f2d663e9e4ad2e6db3d691

data/README.md

@@ -3,7 +3,6 @@
 [![Build Status](https://travis-ci.org/TwilightCoders/active_record-framing.svg)](https://travis-ci.org/TwilightCoders/active_record-framing)
 [![Maintenence ](https://api.codeclimate.com/v1/badges/762cdcd63990efa768b0/maintainability)](https://codeclimate.com/github/TwilightCoders/active_record-framing/maintainability)
 [![Coverage    ](https://codeclimate.com/github/TwilightCoders/active_record-framing/badges/coverage.svg)](https://codeclimate.com/github/TwilightCoders/active_record-framing/coverage)
-[![Dependencies](https://img.shields.io/librariesio/github/twilightcoders/active_record-framing.svg)](https://depfu.com/github/TwilightCoders/active_record-framing)
 
 # ActiveRecord::Framing
 
@@ -13,7 +12,7 @@ Unlike scopes, they do not affect the values of attributes upon creation.
 
 ## Requirements
 
-- Ruby 2.3+
+- Ruby 2.4+
 - ActiveRecord 4.2+
 
 ## Installation

data/lib/active_record/framing/compat/active_record_4_2.rb

@@ -0,0 +1,13 @@
+{
+  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

data/lib/active_record/framing/compat/active_record_5_0.rb

@@ -0,0 +1,12 @@
+{
+  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

data/lib/active_record/framing/compat/active_record_5_1.rb

@@ -0,0 +1,12 @@
+{
+  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

data/lib/active_record/framing/core_extension.rb

@@ -63,18 +63,6 @@ module ActiveRecord
         return @registry[frame_type][model.name]
       end
 
-      # def value_for(frame_type, model, skip_inherited_frame = false)
-      #   raise_invalid_frame_type!(frame_type)
-      #   return @registry[frame_type][model.name] if skip_inherited_frame
-      #   klass = model
-      #   base = model.base_class
-      #   while klass <= base
-      #     value = @registry[frame_type][klass.name]
-      #     return value if value
-      #     klass = klass.superclass
-      #   end
-      # end
-
       # Sets the +value+ for a given +frame_type+ and +model+.
       def set_value_for(frame_type, model, value)
         raise_invalid_frame_type!(frame_type)

data/lib/active_record/framing/default.rb

@@ -37,15 +37,6 @@ module ActiveRecord
           block_given? ? unframed_all.framing { yield } : unframed_all
         end
 
-        # Are there attributes associated with this frame?
-        def frame_attributes? # :nodoc:
-          super || default_frames.any? || respond_to?(:default_frame)
-        end
-
-        def before_remove_const #:nodoc:
-          self.current_frame = nil
-        end
-
         def ignore_default_frame?
           FrameRegistry.value_for(:ignore_default_frame, base_class)
         end

data/lib/active_record/framing/named.rb

@@ -142,6 +142,8 @@ module ActiveRecord
         end
 
         constant = frame_name.to_s.classify.to_sym
+        valid_frame_name?(constant)
+
         arel_tn = "#{frame_name}/#{self.table_name}"
 
         the_frame = body.respond_to?(:to_proc) ? body : body.method(:call)
@@ -184,9 +186,9 @@ module ActiveRecord
       private
 
         def valid_frame_name?(name)
-          if respond_to?(name, true) && logger
+          if const_defined?(name) && logger
             logger.warn "Creating frame :#{name}. " \
-              "Overwriting existing method #{self.name}.#{name}."
+              "Overwriting existing const #{self.name}::#{name}."
           end
         end
     end

data/lib/active_record/framing/query_methods.rb

@@ -3,67 +3,55 @@ module ActiveRecord
     module QueryMethods
 
       if ::ActiveRecord.version >= Gem::Version.new("5.1") # 5.1+
-        {
-          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
+        require 'active_record/framing/compat/active_record_5_1'
       elsif ::ActiveRecord.version >= Gem::Version.new("5.0") # 5.0+
-        {
-          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
+        require 'active_record/framing/compat/active_record_5_0'
       elsif ::ActiveRecord.version >= Gem::Version.new("4.2") # 4.2+
-        {
-          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
+        require 'active_record/framing/compat/active_record_4_2'
       else
         raise NotImplementedError, "ActiveRecord::Framing does not support Rails #{::ActiveRecord.version}"
       end
 
-      def from!(value, subquery_name = nil) # :nodoc:
-        super.tap do |rel|
-          frames_values = frames_values.merge(value.frames_values) if value.is_a?(::ActiveRecord::Relation)
-        end
-      end
+      # def from!(value, subquery_name = nil) # :nodoc:
+      #   super.tap do |rel|
+      #     if value.is_a?(::ActiveRecord::Relation) && value.frames_values.any?
+      #       self.frames_values = self.frames_values.merge(value.frames_values)
+      #       value.frames_values.clear
+      #     end
+      #   end
+      # end
 
-      def frame(value)
-        spawn.frame!(value)
-      end
+      # def frame(value)
+      #   spawn.frame!(value)
+      # end
 
       def frame!(value)
-        if key = frame_key(value)
-          self.frames_values = self.frames_values.merge(key => value)
+        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
+
+        self.frames_values = self.frames_values.merge(cte)
+
         self
       end
 
       def reframe(*args)
+        spawn.reframe!(*args)
+      end
+
+      # TODO: Consistent keys class: symbol, string, Arel::Table
+      def reframe!(*args)
         args.flatten!
         # TODO: Convert array (if present) to nil hash {value => nil}
         # and merge with hash (if present) as second arg

data/lib/active_record/framing/railtie.rb

@@ -11,7 +11,7 @@ module ActiveRecord::Framing
       ActiveSupport.on_load(:active_record) do
         ::ActiveRecord::Base.prepend(ActiveRecord::Framing)
         ::ActiveRecord::Relation.prepend(ActiveRecord::Framing::Relation)
-        ::ActiveRecord::Relation.include(ActiveRecord::Framing::QueryMethods)
+        ::ActiveRecord::Relation.prepend(ActiveRecord::Framing::QueryMethods)
         ::ActiveRecord::Relation.prepend(ActiveRecord::Framing::SpawnMethods)
       end
     end

data/lib/active_record/framing/relation.rb

@@ -59,19 +59,6 @@ module ActiveRecord
         end
       end
 
-      def frame_key(cte)
-        case cte
-        when ActiveRecord::Relation
-          cte.table.name
-        when Arel::Nodes::As
-          cte.left.name
-        when String
-          cte
-        else
-          nil
-        end
-      end
-
       # Frame all queries to the current frame.
       #
       #   Comment.where(post_id: 1).framing do

data/lib/active_record/framing/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Framing
-    VERSION = "0.1.0-4"
+    VERSION = "0.1.0-5"
   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.4
+  version: 0.1.0.pre.5
 platform: ruby
 authors:
 - Dale Stevens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-14 00:00:00.000000000 Z
+date: 2019-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -34,32 +34,60 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: combustion
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -76,30 +104,44 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: combustion
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Allows for larger level scoping (framing) that affect complicated queries
   more holistically
 email:
@@ -113,6 +155,9 @@ files:
 - README.md
 - lib/active_record/framing.rb
 - lib/active_record/framing/attribute_methods.rb
+- lib/active_record/framing/compat/active_record_4_2.rb
+- lib/active_record/framing/compat/active_record_5_0.rb
+- lib/active_record/framing/compat/active_record_5_1.rb
 - lib/active_record/framing/core_extension.rb
 - lib/active_record/framing/default.rb
 - lib/active_record/framing/named.rb
@@ -134,7 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"