arrest 0.0.64 → 0.0.65

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.
@@ -1,27 +1,34 @@
1
1
  module Arrest
2
2
  class OrderedCollection #< BasicObject
3
3
 
4
- def initialize(context, class_or_class_name, base_url, filter = {})
5
- reset_params()
6
- @filter = filter
4
+ def initialize(context, class_or_class_name, base_url, query_params = {})
5
+ @collection = nil
7
6
  @context = context
7
+
8
8
  if class_or_class_name.is_a?(String) || class_or_class_name.is_a?(Symbol)
9
9
  @clazz_name = (StringUtils.classify(class_or_class_name.to_s))
10
10
  else
11
11
  @clazz = class_or_class_name
12
12
  end
13
13
  @base_url = base_url
14
+
15
+ @default_page = 1
16
+ @default_page_size = 5
17
+
18
+ @page_hash = {}
19
+ @sort_hash = {}
20
+ @query_params = query_params
21
+
14
22
  define_filters
15
23
  end
16
24
 
17
-
18
25
  def build(attributes = {})
19
26
  resolved_class.new(@context, attributes)
20
27
  end
21
28
 
22
29
 
23
30
  def method_missing(*args, &block)
24
- collection.send(*args, &block)
31
+ collection.send(*args, &block)
25
32
  end
26
33
 
27
34
  def inspect
@@ -56,11 +63,11 @@ module Arrest
56
63
  end
57
64
 
58
65
  def offset_value #:nodoc:
59
- ((@page_hash[:pageSize] || 0) * (@page - 1)) || 0
66
+ ((@page_hash[:pageSize] || 0) * (current_page - 1)) || 0
60
67
  end
61
68
 
62
69
  def current_page
63
- @page
70
+ @page_hash[:page] || @default_page
64
71
  end
65
72
 
66
73
  def num_pages
@@ -80,23 +87,29 @@ module Arrest
80
87
  end
81
88
 
82
89
  def current_page_count #:nodoc:
83
- @page
90
+ @page_hash[:page] || @default_page
84
91
  end
85
92
 
86
93
  def per(num)
87
- @page_size = num.to_i
88
- @page_hash.merge!({:pageSize => @page_size, :page => @page})
94
+ @collection = nil unless @page_hash[:pageSize] == num.to_i
95
+
96
+ @page_hash[:pageSize] = num.to_i
97
+ @page_hash[:page] ||= @default_page
89
98
  self
90
99
  end
91
100
 
92
101
  def page(num)
102
+ @collection = nil unless @page_hash[:page] == num.to_i
103
+
93
104
  num ||= 1
94
- @page = num.to_i
95
- @page_hash.merge!({:pageSize => @page_size, :page => @page})
105
+ @page_hash[:page] = num.to_i
106
+ @page_hash[:pageSize] ||= @default_page_size
96
107
  self
97
108
  end
98
109
 
99
110
  def order_by(field, order = :asc)
111
+ @collection = nil if @sort_hash[:sort] != field.to_sym || @sort_hash[:order] != order.to_sym
112
+
100
113
  @sort_hash = {:sort => field.to_sym, :order => order.to_sym}
101
114
  self
102
115
  end
@@ -104,27 +117,23 @@ module Arrest
104
117
  private
105
118
 
106
119
  def collection
107
- params = {}
108
- params.merge!(@page_hash)
109
- params.merge!(@sort_hash)
110
120
 
111
- params.merge!(@filter) # override with params that got passed in
112
- url = build_url(@base_url, params)
121
+ unless @collection
122
+ params = {}
123
+ params.merge!(@page_hash)
124
+ params.merge!(@sort_hash)
113
125
 
114
- response = resolved_class.by_url(@context, url)
115
- @total_count = response[:result_count]
126
+ params.merge!(@query_params) # override with params that got passed in
127
+ url = build_url(@base_url, params)
116
128
 
117
- reset_params()
129
+ response = resolved_class.by_url(@context, url)
130
+ @total_count = response[:result_count]
118
131
 
119
- response[:collection]
132
+ @collection = response[:collection]
133
+ end
134
+ @collection
120
135
  end
121
136
 
122
- def reset_params
123
- @page = 1
124
- @page_size = 5
125
- @page_hash = {}
126
- @sort_hash = {}
127
- end
128
137
 
129
138
  def build_url(base_url, params_hash)
130
139
  return base_url if params_hash.empty?
@@ -1,3 +1,3 @@
1
1
  module Arrest
2
- VERSION = "0.0.64"
2
+ VERSION = "0.0.65"
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.64
4
+ version: 0.0.65
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-06-13 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: json
16
- requirement: &25854200 !ruby/object:Gem::Requirement
16
+ requirement: &15353400 !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: *25854200
24
+ version_requirements: *15353400
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: faraday
27
- requirement: &25853700 !ruby/object:Gem::Requirement
27
+ requirement: &15352900 !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: *25853700
35
+ version_requirements: *15352900
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: activemodel
38
- requirement: &25853200 !ruby/object:Gem::Requirement
38
+ requirement: &15352400 !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: *25853200
46
+ version_requirements: *15352400
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: bundler
49
- requirement: &25852740 !ruby/object:Gem::Requirement
49
+ requirement: &15351940 !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: *25852740
57
+ version_requirements: *15351940
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rake
60
- requirement: &25852360 !ruby/object:Gem::Requirement
60
+ requirement: &15351560 !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: *25852360
68
+ version_requirements: *15351560
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rdoc
71
- requirement: &25851900 !ruby/object:Gem::Requirement
71
+ requirement: &15351100 !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: *25851900
79
+ version_requirements: *15351100
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: rspec
82
- requirement: &25851400 !ruby/object:Gem::Requirement
82
+ requirement: &15350600 !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: *25851400
90
+ version_requirements: *15350600
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: rr
93
- requirement: &25871460 !ruby/object:Gem::Requirement
93
+ requirement: &15350180 !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: *25871460
101
+ version_requirements: *15350180
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: simplecov
104
- requirement: &25871000 !ruby/object:Gem::Requirement
104
+ requirement: &15349720 !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: *25871000
112
+ version_requirements: *15349720
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: rack
115
- requirement: &25870580 !ruby/object:Gem::Requirement
115
+ requirement: &15349300 !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: *25870580
123
+ version_requirements: *15349300
124
124
  description: Consume a rest API in a AR like fashion
125
125
  email:
126
126
  - axel.tetzlaff@fortytools.com