ancestry 2.2.0 → 2.2.1
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.
- checksums.yaml +4 -4
- data/ancestry.gemspec +1 -0
- data/lib/ancestry/has_ancestry.rb +7 -2
- data/lib/ancestry/instance_methods.rb +6 -1
- metadata +15 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d611bf01715a442ecd16502afc11ad026f4bb40e
|
4
|
+
data.tar.gz: 8f35de80e537902979302f933d969f9809164368
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d42e2cb51ccbebc16babbdc96f735391b41c1a0269fd3974139acfbdd95a38ce68995fcfbb515dc901b42339008d6053a60d881c51cf09ee95f0e631c4f0fff9
|
7
|
+
data.tar.gz: 8309d979e01d4475b55aced74260db7829d09f81bcc567c7daac66d1b422bd63e77a8257b8e379651f309157a5d350bd7c00a80adfb7ad06d047d731314ceece
|
data/ancestry.gemspec
CHANGED
@@ -37,6 +37,7 @@ EOF
|
|
37
37
|
|
38
38
|
s.required_ruby_version = '>= 1.8.7'
|
39
39
|
s.add_runtime_dependency 'activerecord', '>= 3.0.0'
|
40
|
+
s.add_development_dependency 'yard'
|
40
41
|
s.add_development_dependency 'rake', '~> 10.0'
|
41
42
|
s.add_development_dependency 'test-unit'
|
42
43
|
s.add_development_dependency 'minitest'
|
@@ -43,8 +43,13 @@ class << ActiveRecord::Base
|
|
43
43
|
scope :descendants_of, lambda { |object| where(to_node(object).descendant_conditions) }
|
44
44
|
scope :subtree_of, lambda { |object| where(to_node(object).subtree_conditions) }
|
45
45
|
scope :siblings_of, lambda { |object| where(to_node(object).sibling_conditions) }
|
46
|
-
|
47
|
-
|
46
|
+
if %w(mysql mysql2 sqlite postgresql).include?(connection.adapter_name.downcase)
|
47
|
+
scope :ordered_by_ancestry, lambda { reorder("coalesce(#{connection.quote_table_name(table_name)}.#{connection.quote_column_name(ancestry_column)}, '')") }
|
48
|
+
scope :ordered_by_ancestry_and, lambda { |order| reorder("coalesce(#{connection.quote_table_name(table_name)}.#{connection.quote_column_name(ancestry_column)}, ''), #{order}") }
|
49
|
+
else
|
50
|
+
scope :ordered_by_ancestry, lambda { reorder("(CASE WHEN #{connection.quote_table_name(table_name)}.#{connection.quote_column_name(ancestry_column)} IS NULL THEN 0 ELSE 1 END), #{connection.quote_table_name(table_name)}.#{connection.quote_column_name(ancestry_column)}") }
|
51
|
+
scope :ordered_by_ancestry_and, lambda { |order| reorder("(CASE WHEN #{connection.quote_table_name(table_name)}.#{connection.quote_column_name(ancestry_column)} IS NULL THEN 0 ELSE 1 END), #{connection.quote_table_name(table_name)}.#{connection.quote_column_name(ancestry_column)}, #{order}") }
|
52
|
+
end
|
48
53
|
scope :path_of, lambda { |object| to_node(object).path }
|
49
54
|
|
50
55
|
# Update descendants with new ancestry before save
|
@@ -256,7 +256,12 @@ module Ancestry
|
|
256
256
|
|
257
257
|
def descendant_conditions
|
258
258
|
t = get_arel_table
|
259
|
-
|
259
|
+
# rails has case sensitive matching.
|
260
|
+
if defined?(ActiveRecord.version) && ActiveRecord.version.to_s >= "5"
|
261
|
+
t[get_ancestry_column].matches("#{child_ancestry}/%", nil, true).or(t[get_ancestry_column].eq(child_ancestry))
|
262
|
+
else
|
263
|
+
t[get_ancestry_column].matches("#{child_ancestry}/%").or(t[get_ancestry_column].eq(child_ancestry))
|
264
|
+
end
|
260
265
|
end
|
261
266
|
|
262
267
|
def descendants depth_options = {}
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ancestry
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.2.
|
4
|
+
version: 2.2.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Stefan Kroes
|
@@ -24,6 +24,20 @@ dependencies:
|
|
24
24
|
- - ">="
|
25
25
|
- !ruby/object:Gem::Version
|
26
26
|
version: 3.0.0
|
27
|
+
- !ruby/object:Gem::Dependency
|
28
|
+
name: yard
|
29
|
+
requirement: !ruby/object:Gem::Requirement
|
30
|
+
requirements:
|
31
|
+
- - ">="
|
32
|
+
- !ruby/object:Gem::Version
|
33
|
+
version: '0'
|
34
|
+
type: :development
|
35
|
+
prerelease: false
|
36
|
+
version_requirements: !ruby/object:Gem::Requirement
|
37
|
+
requirements:
|
38
|
+
- - ">="
|
39
|
+
- !ruby/object:Gem::Version
|
40
|
+
version: '0'
|
27
41
|
- !ruby/object:Gem::Dependency
|
28
42
|
name: rake
|
29
43
|
requirement: !ruby/object:Gem::Requirement
|