arrest 0.0.41 → 0.0.42

Sign up to get free protection for your applications and to get access to all the features.
@@ -33,7 +33,7 @@ module Arrest
33
33
  else
34
34
  new_page = 1
35
35
  end
36
- if new_page != @page
36
+ if new_page != @page
37
37
  @collection = nil
38
38
  end
39
39
  @page = new_page
@@ -100,11 +100,11 @@ module Arrest
100
100
  def collection
101
101
  if @collection == nil
102
102
  if @page_size
103
- query_params = "?pageSize=#{@page_size}&page=#{@page}"
103
+ query_params = (@base_url.include?('?') ? '&' : '?') + "pageSize=#{@page_size}&page=#{@page}"
104
104
  else
105
105
  query_params = ''
106
106
  end
107
- url = @base_url + '/' + @url_part.to_s + query_params
107
+ url = @base_url + query_params
108
108
  response = resolved_class.by_url(@context, url)
109
109
  @total_count = response[:result_count]
110
110
  @collection = response[:collection]
@@ -70,7 +70,7 @@ module Arrest
70
70
  return 0
71
71
  end
72
72
  end
73
-
73
+
74
74
 
75
75
  def current_page_count #:nodoc:
76
76
  count
@@ -131,7 +131,8 @@ module Arrest
131
131
  end
132
132
 
133
133
  def scoped_path scope_name
134
- resource_path + '/' + scope_name.to_s
134
+ scope_name = scope_name.to_s
135
+ resource_path + (scope_name.start_with?('?') ? '' : '/') + scope_name
135
136
  end
136
137
 
137
138
  def stub(context, stub_id)
@@ -1,3 +1,3 @@
1
1
  module Arrest
2
- VERSION = "0.0.41"
2
+ VERSION = "0.0.42"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: arrest
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.41
4
+ version: 0.0.42
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-04-03 00:00:00.000000000Z
12
+ date: 2012-04-11 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: json
16
- requirement: &8570560 !ruby/object:Gem::Requirement
16
+ requirement: &7367040 !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: *8570560
24
+ version_requirements: *7367040
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: faraday
27
- requirement: &8569360 !ruby/object:Gem::Requirement
27
+ requirement: &7365980 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - =
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 0.7.5
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *8569360
35
+ version_requirements: *7365980
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: activemodel
38
- requirement: &8568140 !ruby/object:Gem::Requirement
38
+ requirement: &7364820 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '3'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *8568140
46
+ version_requirements: *7364820
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: bundler
49
- requirement: &8566960 !ruby/object:Gem::Requirement
49
+ requirement: &7358940 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 1.0.0
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *8566960
57
+ version_requirements: *7358940
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rake
60
- requirement: &8565300 !ruby/object:Gem::Requirement
60
+ requirement: &7358480 !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: *8565300
68
+ version_requirements: *7358480
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rdoc
71
- requirement: &8563700 !ruby/object:Gem::Requirement
71
+ requirement: &7357940 !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: *8563700
79
+ version_requirements: *7357940
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: rspec
82
- requirement: &8562540 !ruby/object:Gem::Requirement
82
+ requirement: &7356840 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ~>
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '2'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *8562540
90
+ version_requirements: *7356840
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: rr
93
- requirement: &8561080 !ruby/object:Gem::Requirement
93
+ requirement: &7356360 !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: *8561080
101
+ version_requirements: *7356360
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: simplecov
104
- requirement: &8556960 !ruby/object:Gem::Requirement
104
+ requirement: &7355740 !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: *8556960
112
+ version_requirements: *7355740
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: rack
115
- requirement: &8555380 !ruby/object:Gem::Requirement
115
+ requirement: &7355060 !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: *8555380
123
+ version_requirements: *7355060
124
124
  description: Consume a rest API in a AR like fashion
125
125
  email:
126
126
  - axel.tetzlaff@fortytools.com