amfetamine 0.2.6 → 0.2.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.
@@ -83,14 +83,7 @@ module Amfetamine
83
83
 
84
84
  # Delegates the all method to child class with a nested path set
85
85
  def all(opts={})
86
- force = opts.delete(:force)
87
- request = lambda { on_class.all({ :nested_path => rest_path }.merge(opts)) }
88
-
89
- @children = if force
90
- request.call
91
- else
92
- @children || request.call
93
- end
86
+ on_class.all({ :nested_path => rest_path }.merge(opts))
94
87
  end
95
88
 
96
89
  # Delegates the find method to child class with a nested path set
@@ -1,3 +1,3 @@
1
1
  module Amfetamine
2
- VERSION = "0.2.6"
2
+ VERSION = "0.2.7"
3
3
  end
@@ -34,6 +34,16 @@ describe Amfetamine::Relationships do
34
34
  before(:each) do
35
35
  dummy.children << child
36
36
  child.instance_variable_set(:@notsaved, false)
37
+
38
+ Child.stub_responses! do |allow|
39
+ allow.get(path:"/dummies/#{dummy.id}/children") { [child] }
40
+ allow.get(path:"/dummies/#{dummy.id}/children/#{child.id}") { child }
41
+ allow.post {}
42
+ end
43
+
44
+ Dummy.stub_responses! do |allow|
45
+ allow.get { dummy }
46
+ end
37
47
  end
38
48
 
39
49
  it "should create a relationship if parent id is passed in params" do
@@ -43,8 +53,6 @@ describe Amfetamine::Relationships do
43
53
 
44
54
  it "should be possible list all children" do
45
55
  dummy.children.should include(child)
46
- Dummy.cache.flush
47
- dummy.children.should include(child)
48
56
  end
49
57
 
50
58
  it "should be possible to get all children if not in memory" do
@@ -62,17 +70,8 @@ describe Amfetamine::Relationships do
62
70
  end
63
71
 
64
72
  it "should be possible to get a single child if not in memory" do
65
- child.attributes[:dummy_id] = dummy.id # Lets fake we saved it.
66
- Dummy.cache.flush
67
- new_dummy = nil
68
- stub_single_response(dummy) do
69
- new_dummy = Dummy.find(dummy.id)
70
- end
71
-
72
- new_child = nil
73
- stub_nested_single_response(dummy,child) do
74
- new_child = new_dummy.children.find(child.id)
75
- end
73
+ new_dummy = Dummy.find(dummy.id)
74
+ new_child = new_dummy.children.find(child.id)
76
75
 
77
76
  new_child.should == child
78
77
  end
@@ -86,17 +85,18 @@ describe Amfetamine::Relationships do
86
85
  end
87
86
 
88
87
  it "should create a new child if asked" do
89
- new_child = nil
90
- stub_post_response(child) do
91
- new_child = dummy.create_child
92
- end
93
- puts new_child.inspect
88
+ Child.prevent_external_connections! do |allow|
89
+ allow.post(:code => 201) { child }
90
+ allow.get { [child] }
94
91
 
95
- new_child.should_not be_new
96
- new_child.should be_cached
97
- dummy.children.should include(new_child)
98
- Dummy.cache.flush
99
- dummy.children.should include(new_child)
92
+ new_child = dummy.create_child(child.attributes)
93
+ new_child.should_not be_new
94
+ new_child.should be_cached
95
+
96
+ dummy.children.should include(new_child)
97
+ Dummy.cache.flush
98
+ dummy.children.should include(new_child)
99
+ end
100
100
  end
101
101
  end
102
102
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: amfetamine
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.6
4
+ version: 0.2.7
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-02-05 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rspec
16
- requirement: &70274617798920 !ruby/object:Gem::Requirement
16
+ requirement: &70146243904100 !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: :development
23
23
  prerelease: false
24
- version_requirements: *70274617798920
24
+ version_requirements: *70146243904100
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: guard
27
- requirement: &70274617798500 !ruby/object:Gem::Requirement
27
+ requirement: &70146243903420 !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: *70274617798500
35
+ version_requirements: *70146243903420
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: guard-rspec
38
- requirement: &70274617798080 !ruby/object:Gem::Requirement
38
+ requirement: &70146243902840 !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: *70274617798080
46
+ version_requirements: *70146243902840
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: ruby_gntp
49
- requirement: &70274617797660 !ruby/object:Gem::Requirement
49
+ requirement: &70146243902160 !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: :development
56
56
  prerelease: false
57
- version_requirements: *70274617797660
57
+ version_requirements: *70146243902160
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: httparty
60
- requirement: &70274617797220 !ruby/object:Gem::Requirement
60
+ requirement: &70146243901740 !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: *70274617797220
68
+ version_requirements: *70146243901740
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: fakeweb
71
- requirement: &70274617796780 !ruby/object:Gem::Requirement
71
+ requirement: &70146243901320 !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: *70274617796780
79
+ version_requirements: *70146243901320
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: simplecov
82
- requirement: &70274617796360 !ruby/object:Gem::Requirement
82
+ requirement: &70146243900880 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *70274617796360
90
+ version_requirements: *70146243900880
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: simplecov-rcov
93
- requirement: &70274617795940 !ruby/object:Gem::Requirement
93
+ requirement: &70146243900460 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *70274617795940
101
+ version_requirements: *70146243900460
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: dalli
104
- requirement: &70274617795480 !ruby/object:Gem::Requirement
104
+ requirement: &70146243900040 !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: :runtime
111
111
  prerelease: false
112
- version_requirements: *70274617795480
112
+ version_requirements: *70146243900040
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: activesupport
115
- requirement: &70274617795040 !ruby/object:Gem::Requirement
115
+ requirement: &70146243899620 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: '0'
121
121
  type: :runtime
122
122
  prerelease: false
123
- version_requirements: *70274617795040
123
+ version_requirements: *70146243899620
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: activemodel
126
- requirement: &70274617794500 !ruby/object:Gem::Requirement
126
+ requirement: &70146243899200 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: '0'
132
132
  type: :runtime
133
133
  prerelease: false
134
- version_requirements: *70274617794500
134
+ version_requirements: *70146243899200
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: json
137
- requirement: &70274617793960 !ruby/object:Gem::Requirement
137
+ requirement: &70146243915160 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
142
142
  version: '0'
143
143
  type: :runtime
144
144
  prerelease: false
145
- version_requirements: *70274617793960
145
+ version_requirements: *70146243915160
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: rake
148
- requirement: &70274617825920 !ruby/object:Gem::Requirement
148
+ requirement: &70146243914740 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
153
153
  version: '0'
154
154
  type: :runtime
155
155
  prerelease: false
156
- version_requirements: *70274617825920
156
+ version_requirements: *70146243914740
157
157
  description: Wraps REST to objects, provides caching and makes your app go Bzzz!
158
158
  email:
159
159
  - timon@exvo.com