arrest 0.0.64 → 0.0.65

data/lib/arrest/helper/ordered_collection.rb

@@ -1,27 +1,34 @@
 module Arrest
   class OrderedCollection #< BasicObject
 
-    def initialize(context, class_or_class_name, base_url, filter = {})
-      reset_params()
-      @filter = filter
+    def initialize(context, class_or_class_name, base_url, query_params = {})
+      @collection = nil
       @context = context
+
       if class_or_class_name.is_a?(String) || class_or_class_name.is_a?(Symbol)
         @clazz_name = (StringUtils.classify(class_or_class_name.to_s))
       else
         @clazz = class_or_class_name
       end
       @base_url = base_url
+
+      @default_page = 1
+      @default_page_size = 5
+
+      @page_hash = {}
+      @sort_hash = {}
+      @query_params = query_params
+
       define_filters
     end
 
-
     def build(attributes = {})
       resolved_class.new(@context, attributes)
     end
 
 
     def method_missing(*args, &block)
-       collection.send(*args, &block)
+      collection.send(*args, &block)
     end
 
     def inspect
@@ -56,11 +63,11 @@ module Arrest
     end
 
     def offset_value #:nodoc:
-      ((@page_hash[:pageSize] || 0) * (@page - 1)) || 0
+      ((@page_hash[:pageSize] || 0) * (current_page - 1)) || 0
     end
 
     def current_page
-      @page
+      @page_hash[:page] || @default_page
     end
 
     def num_pages
@@ -80,23 +87,29 @@ module Arrest
     end
 
     def current_page_count #:nodoc:
-      @page
+      @page_hash[:page] || @default_page
     end
 
     def per(num)
-      @page_size = num.to_i
-      @page_hash.merge!({:pageSize => @page_size, :page => @page})
+      @collection = nil unless @page_hash[:pageSize] == num.to_i
+
+      @page_hash[:pageSize] = num.to_i
+      @page_hash[:page] ||= @default_page
       self
     end
 
     def page(num)
+      @collection = nil unless @page_hash[:page] == num.to_i
+
       num ||= 1
-      @page = num.to_i
-      @page_hash.merge!({:pageSize => @page_size, :page => @page})
+      @page_hash[:page] = num.to_i
+      @page_hash[:pageSize] ||= @default_page_size
       self
     end
 
     def order_by(field, order = :asc)
+      @collection = nil if @sort_hash[:sort] != field.to_sym || @sort_hash[:order] != order.to_sym
+
       @sort_hash = {:sort => field.to_sym, :order => order.to_sym}
       self
     end
@@ -104,27 +117,23 @@ module Arrest
     private
 
     def collection
-      params = {}
-      params.merge!(@page_hash)
-      params.merge!(@sort_hash)
 
-      params.merge!(@filter) # override with params that got passed in
-      url = build_url(@base_url, params)
+      unless @collection
+        params = {}
+        params.merge!(@page_hash)
+        params.merge!(@sort_hash)
 
-      response = resolved_class.by_url(@context, url)
-      @total_count = response[:result_count]
+        params.merge!(@query_params) # override with params that got passed in
+        url = build_url(@base_url, params)
 
-      reset_params()
+        response = resolved_class.by_url(@context, url)
+        @total_count = response[:result_count]
 
-      response[:collection]
+        @collection = response[:collection]
+      end
+      @collection
     end
 
-    def reset_params
-      @page = 1
-      @page_size = 5
-      @page_hash = {}
-      @sort_hash = {}
-    end
 
     def build_url(base_url, params_hash)
       return base_url if params_hash.empty?

data/lib/arrest/version.rb

@@ -1,3 +1,3 @@
 module Arrest
-  VERSION = "0.0.64"
+  VERSION = "0.0.65"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.64
+  version: 0.0.65
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &25854200 !ruby/object:Gem::Requirement
+  requirement: &15353400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25854200
+  version_requirements: *15353400
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &25853700 !ruby/object:Gem::Requirement
+  requirement: &15352900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *25853700
+  version_requirements: *15352900
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &25853200 !ruby/object:Gem::Requirement
+  requirement: &15352400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *25853200
+  version_requirements: *15352400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &25852740 !ruby/object:Gem::Requirement
+  requirement: &15351940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *25852740
+  version_requirements: *15351940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &25852360 !ruby/object:Gem::Requirement
+  requirement: &15351560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25852360
+  version_requirements: *15351560
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &25851900 !ruby/object:Gem::Requirement
+  requirement: &15351100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25851900
+  version_requirements: *15351100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &25851400 !ruby/object:Gem::Requirement
+  requirement: &15350600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *25851400
+  version_requirements: *15350600
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &25871460 !ruby/object:Gem::Requirement
+  requirement: &15350180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25871460
+  version_requirements: *15350180
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &25871000 !ruby/object:Gem::Requirement
+  requirement: &15349720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25871000
+  version_requirements: *15349720
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &25870580 !ruby/object:Gem::Requirement
+  requirement: &15349300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25870580
+  version_requirements: *15349300
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com