tagtical 1.4.6 → 1.4.7

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 (3) hide show
  1. data/VERSION +1 -1
  2. data/lib/tagtical/tag.rb +6 -4
  3. metadata +13 -13
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.4.6
1
+ 1.4.7
data/lib/tagtical/tag.rb CHANGED
@@ -248,15 +248,17 @@ module Tagtical
248
248
  sql = args[-1].is_a?(Hash) && args[-1].delete(:sql)
249
249
 
250
250
  sti_column = Tagtical::Tag.arel_table[Tagtical::Tag.inheritance_column]
251
- condition = expand_tag_types(*args).map { |x| x.klass.sti_name }.inject(nil) do |conds, sti_name|
252
- cond = sti_column.eq(sti_name)
253
- conds.nil? ? cond : conds.or(cond)
254
- end
251
+ sti_names = expand_tag_types(*args).map { |x| x.klass.sti_name }
255
252
 
253
+ condition = sti_column.eq(sti_names.delete(nil)) if sti_names.include?(nil)
254
+ sti_names_condition = sti_column.in(sti_names)
255
+ condition = condition ? condition.or(sti_names_condition) : sti_names_condition
256
+
256
257
  if condition && sql
257
258
  condition = condition.to_sql
258
259
  condition.insert(0, " AND ") if sql==:append
259
260
  end
261
+
260
262
  condition
261
263
  end
262
264
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tagtical
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.6
4
+ version: 1.4.7
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2011-07-26 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &2172678160 !ruby/object:Gem::Requirement
16
+ requirement: &2165894820 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - <=
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 3.0.5
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *2172678160
24
+ version_requirements: *2165894820
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rspec
27
- requirement: &2172677680 !ruby/object:Gem::Requirement
27
+ requirement: &2165894340 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - <=
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 2.6.0
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *2172677680
35
+ version_requirements: *2165894340
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: sqlite3-ruby
38
- requirement: &2172677200 !ruby/object:Gem::Requirement
38
+ requirement: &2165893860 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *2172677200
46
+ version_requirements: *2165893860
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: mysql
49
- requirement: &2172676720 !ruby/object:Gem::Requirement
49
+ requirement: &2165893380 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *2172676720
57
+ version_requirements: *2165893380
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: jeweler
60
- requirement: &2172676240 !ruby/object:Gem::Requirement
60
+ requirement: &2165892900 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *2172676240
68
+ version_requirements: *2165892900
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rcov
71
- requirement: &2172675760 !ruby/object:Gem::Requirement
71
+ requirement: &2165892420 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
76
76
  version: '0'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *2172675760
79
+ version_requirements: *2165892420
80
80
  description: Tagtical allows you do create subclasses for Tag and add additional functionality
81
81
  in an STI fashion. For example. You could do Tag::Color.find_by_name('blue').to_rgb.
82
82
  It also supports storing weights or relevance on the taggings.