toy-locomotive 0.0.3 → 0.0.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/lib/toy-locomotive/router/controller.rb +6 -4
  2. data/lib/toy-locomotive/version.rb +1 -1
  3. metadata +10 -10
data/lib/toy-locomotive/router/controller.rb CHANGED
@@ -92,13 +92,15 @@ module ToyLocomotive::Router::Controller
92
92
  end
93
93
 
94
94
  def extract_member_var
95
- parent = instance_variable_get (model = self.class.extract_model).belongs_chain.reverse.pop.to_member_var
96
- parent ? instance_variable_set(model.to_member_var, parent.send(model.to_s.underscore.pluralize).find(params[model.to_params])) : model.find(params[model.to_params])
95
+ parent = (model = self.class.extract_model).belongs_chain.reverse.pop
96
+ parent = parent ? instance_variable_get(parent.to_member_var) : nil
97
+ instance_variable_set(model.to_collection_var, (parent ? parent.send(model.to_s.underscore.pluralize) : model).find(params[model.to_params]))
97
98
  end
98
99
 
99
100
  def extract_collection_var
100
- parent = instance_variable_get (model = self.class.extract_model).belongs_chain.reverse.pop.to_member_var
101
- parent ? instance_variable_set(model.to_collection_var, parent.send(model.to_s.underscore.pluralize)) : model.all
101
+ parent = (model = self.class.extract_model).belongs_chain.reverse.pop
102
+ parent = parent ? instance_variable_get(parent.to_member_var) : nil
103
+ instance_variable_set(model.to_collection_var, (parent ? parent.send(model.to_s.underscore.pluralize) : model.all))
102
104
  end
103
105
 
104
106
  end
data/lib/toy-locomotive/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ToyLocomotive
2
- VERSION = "0.0.3"
2
+ VERSION = "0.0.4"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: toy-locomotive
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.3
4
+ version: 0.0.4
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: 2012-05-15 00:00:00.000000000 Z
12
+ date: 2012-05-16 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &25866492 !ruby/object:Gem::Requirement
16
+ requirement: &26892444 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *25866492
24
+ version_requirements: *26892444
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rspec-rails
27
- requirement: &25865832 !ruby/object:Gem::Requirement
27
+ requirement: &26891724 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *25865832
35
+ version_requirements: *26891724
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: sqlite3
38
- requirement: &25865424 !ruby/object:Gem::Requirement
38
+ requirement: &26890392 !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: :development
45
45
  prerelease: false
46
- version_requirements: *25865424
46
+ version_requirements: *26890392
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: shoulda
49
- requirement: &25864668 !ruby/object:Gem::Requirement
49
+ requirement: &26889996 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
54
54
  version: '0'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *25864668
57
+ version_requirements: *26889996
58
58
  description: a Different aproach to Rails applications
59
59
  email:
60
60
  - mortaro@towsta.com