schemaker 0.1.3 → 0.1.4

Sign up to get free protection for your applications and to get access to all the features.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1.3
1
+ 0.1.4
@@ -45,13 +45,18 @@ module Schemaker
45
45
 
46
46
  # configure each model in turn
47
47
  def configure
48
+ return quick_join if !join_model
48
49
  [subject_model, object_model, join_model].compact.each do |model|
49
50
  model.configure
50
51
  end
51
52
  end
52
53
 
54
+ def quick_join
55
+ subject_model.quick_join
56
+ end
57
+
53
58
  def logs
54
- @logs ||= [subject_model, object_model, join_model].inject([]) do |res, model|
59
+ @logs ||= [subject_model, object_model, join_model].compact.inject([]) do |res, model|
55
60
  res << model.logs
56
61
  res
57
62
  end.flatten
@@ -122,10 +122,7 @@ module Schemaker
122
122
  opts_str = options.empty? ? '' : options.inspect.insert(0, ', ').gsub(/[{}]/ , '')
123
123
  log "#{my_class_name}.#{relationship_name} :#{key_name}#{opts_str}" if log_on?
124
124
 
125
- puts "keyname: #{key_name}"
126
-
127
125
  return my_class.send(relationship_name, key_name) if options.empty?
128
-
129
126
  my_class.send(relationship_name, key_name, options)
130
127
  end
131
128
 
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "schemaker"
8
- s.version = "0.1.3"
8
+ s.version = "0.1.4"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Kristian Mandrup"]
@@ -13,4 +13,19 @@ describe models_class do
13
13
  logs_matches(models.logs, 'UserAccount.has_many :troles').should
14
14
  end
15
15
  end
16
+ end
17
+
18
+ describe "quick join models" do
19
+ let(:models) do
20
+ # subject, object, join
21
+ models_class.new UserAccount, Role, nil, :subject_key => :troles
22
+ end
23
+
24
+ describe '#quick_join' do
25
+ it 'should configure all models' do
26
+ models.quick_join
27
+
28
+ logs_matches(models.logs, 'UserAccount.has_and_belongs_to_many :role').should
29
+ end
30
+ end
16
31
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: schemaker
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.3
4
+ version: 0.1.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2011-10-12 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: sweetloader
16
- requirement: &2162469820 !ruby/object:Gem::Requirement
16
+ requirement: &2157961700 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 0.1.1
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *2162469820
24
+ version_requirements: *2157961700
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: activerecord
27
- requirement: &2162469100 !ruby/object:Gem::Requirement
27
+ requirement: &2157958740 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 3.0.1
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *2162469100
35
+ version_requirements: *2157958740
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rspec
38
- requirement: &2162356580 !ruby/object:Gem::Requirement
38
+ requirement: &2157953560 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 2.6.0
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *2162356580
46
+ version_requirements: *2157953560
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: database_cleaner
49
- requirement: &2162355880 !ruby/object:Gem::Requirement
49
+ requirement: &2157949900 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 0.6.8
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *2162355880
57
+ version_requirements: *2157949900
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: sqlite3
60
- requirement: &2162355200 !ruby/object:Gem::Requirement
60
+ requirement: &2157940680 !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: :development
67
67
  prerelease: false
68
- version_requirements: *2162355200
68
+ version_requirements: *2157940680
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: cutter
71
- requirement: &2162354540 !ruby/object:Gem::Requirement
71
+ requirement: &2157936340 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *2162354540
79
+ version_requirements: *2157936340
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: bundler
82
- requirement: &2162353920 !ruby/object:Gem::Requirement
82
+ requirement: &2157930420 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '1'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *2162353920
90
+ version_requirements: *2157930420
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: jeweler
93
- requirement: &2162353220 !ruby/object:Gem::Requirement
93
+ requirement: &2157927500 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '1.6'
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *2162353220
101
+ version_requirements: *2157927500
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: rcov
104
- requirement: &2162352400 !ruby/object:Gem::Requirement
104
+ requirement: &2157926400 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *2162352400
112
+ version_requirements: *2157926400
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: yard
115
- requirement: &2162351700 !ruby/object:Gem::Requirement
115
+ requirement: &2157924840 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
120
120
  version: '0'
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *2162351700
123
+ version_requirements: *2157924840
124
124
  description: Configures relationships between subject, join and object model for a
125
125
  given behavior
126
126
  email: kmandrup@gmail.com
@@ -169,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
169
169
  version: '0'
170
170
  segments:
171
171
  - 0
172
- hash: -1992204561229499507
172
+ hash: -1046788284345704373
173
173
  required_rubygems_version: !ruby/object:Gem::Requirement
174
174
  none: false
175
175
  requirements: