scopiform 0.2.11 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/scopiform/helpers.rb +7 -7
  3. data/lib/scopiform/scope_context.rb +2 -4
  4. data/lib/scopiform/version.rb +1 -1
  5. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: cf263f19bfbf29c2ce932d57306b0c4c0da85307b79a9f2df059fbe05a04a2b1
4
- data.tar.gz: '0261898e3563b6ffeb8f5b3ae7e070e350929f8be178956e8fe5518ceaa8bd05'
3
+ metadata.gz: 1341353e3403325beb778224790730f56c03065dd31917ac0ef8399fe1498d94
4
+ data.tar.gz: dc8dd19fca04add1c89af04349876e25ad21568d5df9095224ab026c38bd92db
5
5
  SHA512:
6
- metadata.gz: a4a0b35d5023ac441e99b5b82bfefc79c5e2aa74f36d1464ccc659f1c4be2099eb3a45571fdb567b19835bacf78f148860f55ff56a455032df63a26bed269805
7
- data.tar.gz: 973ecc6033a2461c5b6b111ed506ff6fdb291318e7348d4c8a17be8e9d86a5dec6dca2e2b620452024d73070a002e7813fdcb1a8c55ecac5dbc2df8732ffdc83
6
+ metadata.gz: 228b89cf7af47b3fae772c2d72bdfed9a9a7b7fd898306a8a05600913a59cbd50d7d826a0b4f82c454af872b6f6196aa2bb4cdeb455a54017708460c91b730b6
7
+ data.tar.gz: e9d2cb5879a0cbb6175366c5cbfc5d5f76f76b0ff89978c854821429a37a653a603ae130830400d31544cb758170bbb01ab28fee1c4b04d1178783a81676adbd
data/lib/scopiform/helpers.rb CHANGED
@@ -6,7 +6,7 @@ module Scopiform
6
6
  module Helpers
7
7
  extend ActiveSupport::Concern
8
8
 
9
- STRING_TYPES = %i[string text].freeze
9
+ STRING_TYPES = %i[string text varchar].freeze
10
10
  NUMBER_TYPES = %i[integer float decimal].freeze
11
11
  DATE_TYPES = %i[date time datetime timestamp].freeze
12
12
 
@@ -63,16 +63,16 @@ module Scopiform
63
63
 
64
64
  def safe_columns
65
65
  @safe_columns ||= columns
66
- rescue *safe_column_rescue_errors
67
- logger.warn "Unable to load columns for `#{name}`"
68
- @safe_columns = []
66
+ # rescue *safe_column_rescue_errors
67
+ # logger.warn "Unable to load columns for `#{name}`"
68
+ # @safe_columns = []
69
69
  end
70
70
 
71
71
  def safe_columns_hash
72
72
  @safe_columns_hash ||= columns_hash
73
- rescue *safe_column_rescue_errors
74
- logger.warn "Unable to load columns_hash for `#{name}`"
75
- @safe_columns_hash = {}
73
+ # rescue *safe_column_rescue_errors
74
+ # logger.warn "Unable to load columns_hash for `#{name}`"
75
+ # @safe_columns_hash = {}
76
76
  end
77
77
 
78
78
  private
data/lib/scopiform/scope_context.rb CHANGED
@@ -67,10 +67,8 @@ module Scopiform
67
67
  private
68
68
 
69
69
  def conditions
70
- # Rails 4 join_keys has arity of 1, expecting a klass as an argument
71
- keys = association.method(:join_keys).arity == 1 ? association.join_keys(association.klass) : association.join_keys
72
- [*keys.foreign_key]
73
- .zip([*keys.key])
70
+ [*association.join_foreign_key]
71
+ .zip([*association.join_primary_key])
74
72
  .map { |foreign, primary| arel_table[foreign].eq(association_arel_table[primary]) }
75
73
  .reduce { |acc, cond| acc.and(cond) }
76
74
  end
data/lib/scopiform/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Scopiform
2
- VERSION = '0.2.11'.freeze
2
+ VERSION = '0.3.0'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: scopiform
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.11
4
+ version: 0.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - jayce.pulsipher
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-02-03 00:00:00.000000000 Z
11
+ date: 2025-04-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activerecord
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: 4.2.7
19
+ version: 6.1.0.rc1
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - ">="
25
25
  - !ruby/object:Gem::Version
26
- version: 4.2.7
26
+ version: 6.1.0.rc1
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: appraisal
29
29
  requirement: !ruby/object:Gem::Requirement