arrest 0.0.50 → 0.0.51

data/lib/arrest/helper/ordered_collection.rb

@@ -1,7 +1,8 @@
 module Arrest
   class OrderedCollection #< BasicObject
 
-    def initialize(context,class_or_class_name, base_url)
+    def initialize(context,class_or_class_name, base_url, filter = {})
+      @filter = filter
       @context = context
       if class_or_class_name.is_a?(String) || class_or_class_name.is_a?(Symbol)
         @clazz_name = (StringUtils.classify(class_name.to_s))
@@ -99,12 +100,13 @@ module Arrest
 
     def collection
       if @collection == nil
+        params = {}
         if @page_size
-          query_params =  (@base_url.include?('?') ? '&' : '?') + "pageSize=#{@page_size}&page=#{@page}"
-        else
-          query_params = ''
+          params[:pageSize] = @page_size
+          params[:page] = @page
         end
-        url = @base_url + query_params
+        params.merge!(@filter) # override with params that got passed in
+        url = build_url(@base_url, params)
         response = resolved_class.by_url(@context, url)
         @total_count = response[:result_count]
         @collection = response[:collection]
@@ -112,6 +114,12 @@ module Arrest
       @collection
     end
 
+    def build_url(base_url, params_hash)
+      query_str = (base_url.include?('?') ? '&' : '?') 
+      query_str += params_hash.map{|k,v| "#{k}=#{v}"}.join('&')
+      base_url + query_str
+    end
+
     def resolved_class
       @clazz ||= Source.mod.const_get(@clazz_name)
     end

data/lib/arrest/root_resource.rb

@@ -38,7 +38,7 @@ module Arrest
       end
 
       def all(context, filter={})
-        Arrest::OrderedCollection.new(context, self, self.resource_path)
+        Arrest::OrderedCollection.new(context, self, self.resource_path, filter)
       end
 
       def find(context, id)

data/lib/arrest/version.rb

@@ -1,3 +1,3 @@
 module Arrest
-  VERSION = "0.0.50"
+  VERSION = "0.0.51"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.50
+  version: 0.0.51
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &8844920 !ruby/object:Gem::Requirement
+  requirement: &2169148120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8844920
+  version_requirements: *2169148120
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &8839500 !ruby/object:Gem::Requirement
+  requirement: &2169147580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *8839500
+  version_requirements: *2169147580
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &8889900 !ruby/object:Gem::Requirement
+  requirement: &2169147060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *8889900
+  version_requirements: *2169147060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &10680020 !ruby/object:Gem::Requirement
+  requirement: &2169146600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *10680020
+  version_requirements: *2169146600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &10695600 !ruby/object:Gem::Requirement
+  requirement: &2169146220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10695600
+  version_requirements: *2169146220
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &10700420 !ruby/object:Gem::Requirement
+  requirement: &2169145760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10700420
+  version_requirements: *2169145760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &10707620 !ruby/object:Gem::Requirement
+  requirement: &2169144840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *10707620
+  version_requirements: *2169144840
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &11478380 !ruby/object:Gem::Requirement
+  requirement: &2169144420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11478380
+  version_requirements: *2169144420
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &12979520 !ruby/object:Gem::Requirement
+  requirement: &2169143960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12979520
+  version_requirements: *2169143960
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &13647440 !ruby/object:Gem::Requirement
+  requirement: &2169143480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13647440
+  version_requirements: *2169143480
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com
@@ -196,4 +196,13 @@ rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Another ruby rest client
-test_files: []
+test_files:
+- spec/arrest_spec.rb
+- spec/spec_helper.rb
+- spec/support/models/user.rb
+- test/context.rb
+- test/has_attributed.rb
+- test/models.rb
+- test/nested_resource.rb
+- test/unit.rb
+- test/validations.rb