scopiform 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60fdf69684da8b4a16efc5b52b69bcae18d30824b844fb57fdc3219780ed2894
-  data.tar.gz: fbc86f9e966127b7c64546adc46b805e1c78caaa6d8aa9c49acceaeea7120639
+  metadata.gz: 5f4f7678ce36e47c795736985a53b7656a2223afbd0b119702a2ccd41ff2d523
+  data.tar.gz: 282cfccb56d1760a2ae9d2e55bc4706555684086c0fc906161eefaf663d13865
 SHA512:
-  metadata.gz: 6165fbab6073d4ec637aed25cfb58d2f13ef7ecd590724b17374f47e9718850c62740655768f11f1e1b7f14a119a30eba863897c6189b620844e03b0c54fa0ee
-  data.tar.gz: 5730438bea472073e31a9f37d45ce3de8e066615e9dea0b0fa99af5bb955d5b3192cd068898c6367515d959d84354a202c90d405f5a08f488f8f07f342439aa7
+  metadata.gz: 8ea922c85bd6098946058bbafe2cf3b93b7012535af34932eb2168b0569b19b86d25a3fadf97e30265e49132a746dffab93a30889a8e29d6683fc71d03291f04
+  data.tar.gz: 68daa6ffcbe5ddc91e61b68a662bc52352a860eb64e31a511473177b0454497e937f947e7cd3300844faf34b47b49904cba0292043d7e8c1c81c6d8db7b08c7c

data/lib/scopiform/association_scopes.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support/concern'
-require 'scopiform/scope_context'
+require 'scopiform/utilities'
 
 module Scopiform
   module AssociationScopes
@@ -12,23 +12,6 @@ module Scopiform
     end
 
     module ClassMethods
-      def scopiform_association_scope(association, method, value, ctx:)
-        is_root = ctx.nil?
-        ctx = ScopeContext.from(ctx)
-        ctx.set(arel_table) if is_root || ctx.arel_table.blank?
-
-        ctx.association = association
-        ctx.build_joins
-
-        applied = ctx.association.klass.send(method, value, ctx: ScopeContext.from(ctx).set(ctx.association_arel_table))
-
-        if is_root
-          ctx.scopes.reduce(joins(ctx.joins).merge(applied)) { |chain, scope| chain.merge(scope) }
-        else
-          ctx.scopes.reduce(all.merge(applied)) { |chain, scope| chain.merge(scope) }
-        end
-      end
-
       def reflection_added(_name, reflection)
         setup_association_auto_scopes(reflection)
       end
@@ -45,7 +28,7 @@ module Scopiform
         auto_scope_add(
           association.name,
           proc { |value, ctx: nil|
-            scopiform_association_scope(association, :apply_filters, value, ctx: ctx)
+            Utilities.association_scope(self, association, :apply_filters, value, ctx: ctx)
           },
           suffix: '_is',
           argument_type: :hash
@@ -55,7 +38,7 @@ module Scopiform
         auto_scope_add(
           association.name,
           proc { |value, ctx: nil|
-            scopiform_association_scope(association, :apply_sorts, value, ctx: ctx)
+            Utilities.association_scope(self, association, :apply_sorts, value, ctx: ctx)
           },
           prefix: 'sort_by_',
           argument_type: :hash,

data/lib/scopiform/string_number_scopes.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support/concern'
+require 'scopiform/utilities'
 
 module Scopiform
   module StringNumberScopes
@@ -13,14 +14,6 @@ module Scopiform
     module ClassMethods
       private
 
-      def cast_to_text(arel_column)
-        cast_to = connection.adapter_name.downcase.starts_with?('mysql') ? 'CHAR' : 'TEXT'
-        Arel::Nodes::NamedFunction.new(
-          'CAST',
-          [arel_column.as(cast_to)]
-        )
-      end
-
       def setup_string_and_number_auto_scopes
         string_numbers = Helpers::STRING_TYPES + Helpers::NUMBER_TYPES
         string_number_columns = safe_columns.select do |column|
@@ -42,7 +35,7 @@ module Scopiform
             name,
             proc { |value, ctx: nil, **|
               arel_column = scopiform_arel(ctx)[name]
-              arel_column = cast_to_text(arel_column) if cast
+              arel_column = Utilities.cast_to_text(arel_column, connection) if cast
               where(arel_column.matches("%#{ActiveRecord::Base.sanitize_sql_like(value.to_s)}%"))
             },
             suffix: '_contains',
@@ -54,7 +47,7 @@ module Scopiform
             name,
             proc { |value, ctx: nil, **|
               arel_column = scopiform_arel(ctx)[name]
-              arel_column = cast_to_text(arel_column) if cast
+              arel_column = Utilities.cast_to_text(arel_column, connection) if cast
               where.not(arel_column.matches("%#{ActiveRecord::Base.sanitize_sql_like(value.to_s)}%"))
             },
             suffix: '_not_contains',
@@ -66,7 +59,7 @@ module Scopiform
             name,
             proc { |value, ctx: nil, **|
               arel_column = scopiform_arel(ctx)[name]
-              arel_column = cast_to_text(arel_column) if cast
+              arel_column = Utilities.cast_to_text(arel_column, connection) if cast
               where(arel_column.matches("#{ActiveRecord::Base.sanitize_sql_like(value.to_s)}%"))
             },
             suffix: '_starts_with',
@@ -78,7 +71,7 @@ module Scopiform
             name,
             proc { |value, ctx: nil, **|
               arel_column = scopiform_arel(ctx)[name]
-              arel_column = cast_to_text(arel_column) if cast
+              arel_column = Utilities.cast_to_text(arel_column, connection) if cast
               where.not(arel_column.matches("#{ActiveRecord::Base.sanitize_sql_like(value.to_s)}%"))
             },
             suffix: '_not_starts_with',
@@ -90,7 +83,7 @@ module Scopiform
             name,
             proc { |value, ctx: nil, **|
               arel_column = scopiform_arel(ctx)[name]
-              arel_column = cast_to_text(arel_column) if cast
+              arel_column = Utilities.cast_to_text(arel_column, connection) if cast
               where(arel_column.matches("%#{ActiveRecord::Base.sanitize_sql_like(value.to_s)}"))
             },
             suffix: '_ends_with',
@@ -102,7 +95,7 @@ module Scopiform
             name,
             proc { |value, ctx: nil, **|
               arel_column = scopiform_arel(ctx)[name]
-              arel_column = cast_to_text(arel_column) if cast
+              arel_column = Utilities.cast_to_text(arel_column, connection) if cast
               where.not(arel_column.matches("%#{ActiveRecord::Base.sanitize_sql_like(value.to_s)}"))
             },
             suffix: '_not_ends_with',

data/lib/scopiform/utilities.rb

@@ -0,0 +1,30 @@
+require 'scopiform/scope_context'
+
+module Scopiform
+  module Utilities
+    def self.cast_to_text(arel_column, connection)
+      cast_to = connection.adapter_name.downcase.starts_with?('mysql') ? 'CHAR' : 'TEXT'
+      Arel::Nodes::NamedFunction.new(
+        'CAST',
+        [arel_column.as(cast_to)]
+      )
+    end
+
+    def self.association_scope(active_record, association, method, value, ctx:)
+      is_root = ctx.nil?
+      ctx = ScopeContext.from(ctx)
+      ctx.set(active_record.arel_table) if is_root || ctx.arel_table.blank?
+
+      ctx.association = association
+      ctx.build_joins
+
+      applied = ctx.association.klass.send(method, value, ctx: ScopeContext.from(ctx).set(ctx.association_arel_table))
+
+      if is_root
+        ctx.scopes.reduce(active_record.joins(ctx.joins).merge(applied)) { |chain, scope| chain.merge(scope) }
+      else
+        ctx.scopes.reduce(active_record.all.merge(applied)) { |chain, scope| chain.merge(scope) }
+      end
+    end
+  end
+end

data/lib/scopiform/version.rb

@@ -1,3 +1,3 @@
 module Scopiform
-  VERSION = '0.2.4'.freeze
+  VERSION = '0.2.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scopiform
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - jayce.pulsipher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-04 00:00:00.000000000 Z
+date: 2021-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -101,6 +101,7 @@ files:
 - lib/scopiform/scope_definition.rb
 - lib/scopiform/string_number_date_scopes.rb
 - lib/scopiform/string_number_scopes.rb
+- lib/scopiform/utilities.rb
 - lib/scopiform/version.rb
 - lib/tasks/scopiform_tasks.rake
 homepage: https://github.com/3-form/scopiform