tagtical 1.4.10 → 1.4.11
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/lib/tagtical/tag.rb +11 -7
- data/spec/tagtical/tag_spec.rb +22 -5
- metadata +14 -14
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.4.
|
1
|
+
1.4.11
|
data/lib/tagtical/tag.rb
CHANGED
@@ -363,18 +363,22 @@ module Tagtical
|
|
363
363
|
# Returns an array of potential class names for this specific type.
|
364
364
|
def derive_class_candidates
|
365
365
|
[].tap do |arr|
|
366
|
-
|
366
|
+
sti_level = 0
|
367
|
+
suffixes = [[classify, sti_level]]
|
367
368
|
klass = taggable_class
|
368
369
|
while klass < ActiveRecord::Base
|
369
|
-
suffixes.concat ["#{klass}#{classify}", "#{klass}::#{classify}"]
|
370
|
+
suffixes.concat [["#{klass}#{classify}", "#{klass}::#{classify}", sti_level += 1]]
|
370
371
|
klass = klass.superclass
|
371
372
|
end
|
372
|
-
suffixes.map { |s| [
|
373
|
-
|
374
|
-
|
375
|
-
|
373
|
+
suffixes.map! { |s| s[0..-2].map { |t| [t, "#{t}Tag"] }.flatten << s.last } # expand with "Tag" suffix
|
374
|
+
suffixes.each do |names| # support Interest and InterestTag class names
|
375
|
+
names[0..-2].map do |name|
|
376
|
+
"Tagtical::Tag".tap do |longest_candidate|
|
377
|
+
longest_candidate << "::#{name}" unless name=="Tag"
|
378
|
+
end.scan(/^|::/) { arr << [$', names.last] } # Klass, Tag::Klass, Tagtical::Tag::Klass
|
379
|
+
end
|
376
380
|
end
|
377
|
-
end.
|
381
|
+
end.sort_by { |candidate, sti_level| [-candidate.split("::").size, sti_level] }.map(&:first).uniq # More nested classnames first
|
378
382
|
end
|
379
383
|
|
380
384
|
# Take operator types (ie <, >, =) and convert them into :children, :current, or :parents.
|
data/spec/tagtical/tag_spec.rb
CHANGED
@@ -384,12 +384,29 @@ describe Tagtical::Tag do
|
|
384
384
|
end
|
385
385
|
|
386
386
|
describe "#derive_class_candidates" do
|
387
|
-
|
388
|
-
|
389
|
-
|
390
|
-
"Tagtical::Tag::Skill", "Tag::TaggableModelSkillTag", "Tag::TaggableModelSkill", "TaggableModel::SkillTag",
|
391
|
-
"TaggableModel::Skill", "Tag::SkillTag", "Tag::Skill", "TaggableModelSkillTag", "TaggableModelSkill", "SkillTag", "Skill"]
|
387
|
+
before(:all) do
|
388
|
+
# use an inheriting tag model so we can test the building up the sti chain.
|
389
|
+
@candidates = Tagtical::Tag::Type.new("skill", InheritingTaggableModel).send(:derive_class_candidates)
|
392
390
|
end
|
391
|
+
subject { @candidates }
|
392
|
+
|
393
|
+
it do
|
394
|
+
should == ["Tagtical::Tag::InheritingTaggableModel::Skill", "Tagtical::Tag::InheritingTaggableModel::SkillTag",
|
395
|
+
"Tagtical::Tag::TaggableModel::SkillTag", "Tagtical::Tag::TaggableModel::Skill", "Tagtical::Tag::SkillTag",
|
396
|
+
"Tagtical::Tag::Skill", "Tagtical::Tag::InheritingTaggableModelSkill", "Tag::InheritingTaggableModel::Skill",
|
397
|
+
"Tagtical::Tag::InheritingTaggableModelSkillTag", "Tag::InheritingTaggableModel::SkillTag",
|
398
|
+
"Tagtical::Tag::TaggableModelSkill", "Tag::TaggableModel::Skill", "Tagtical::Tag::TaggableModelSkillTag",
|
399
|
+
"Tag::TaggableModel::SkillTag", "Tag::SkillTag", "Tag::Skill", "Tag::InheritingTaggableModelSkillTag",
|
400
|
+
"InheritingTaggableModel::Skill", "InheritingTaggableModel::SkillTag", "Tag::InheritingTaggableModelSkill",
|
401
|
+
"TaggableModel::Skill", "Tag::TaggableModelSkill", "TaggableModel::SkillTag", "Tag::TaggableModelSkillTag",
|
402
|
+
"SkillTag", "Skill", "InheritingTaggableModelSkill", "InheritingTaggableModelSkillTag", "TaggableModelSkill", "TaggableModelSkillTag"]
|
403
|
+
end
|
404
|
+
|
405
|
+
it "should be favor deeper sti levels" do
|
406
|
+
nesting_counts = @candidates.map { |x| x.split("::").size }
|
407
|
+
nesting_counts.sort_by { |c| -c }.should == nesting_counts
|
408
|
+
end
|
409
|
+
|
393
410
|
end
|
394
411
|
|
395
412
|
describe "#tag_list_name" do
|
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.
|
4
|
+
version: 1.4.11
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2011-
|
12
|
+
date: 2011-08-02 00:00:00.000000000Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rails
|
16
|
-
requirement: &
|
16
|
+
requirement: &2161698740 !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: *
|
24
|
+
version_requirements: *2161698740
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: rspec
|
27
|
-
requirement: &
|
27
|
+
requirement: &2161698260 !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: *
|
35
|
+
version_requirements: *2161698260
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: sqlite3-ruby
|
38
|
-
requirement: &
|
38
|
+
requirement: &2161697780 !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: *
|
46
|
+
version_requirements: *2161697780
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: mysql
|
49
|
-
requirement: &
|
49
|
+
requirement: &2161697300 !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: *
|
57
|
+
version_requirements: *2161697300
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: jeweler
|
60
|
-
requirement: &
|
60
|
+
requirement: &2161696820 !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: *
|
68
|
+
version_requirements: *2161696820
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: rcov
|
71
|
-
requirement: &
|
71
|
+
requirement: &2161696340 !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: *
|
79
|
+
version_requirements: *2161696340
|
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.
|