arrest 0.0.41 → 0.0.42

data/lib/arrest/helper/ordered_collection.rb

@@ -33,7 +33,7 @@ module Arrest
       else
         new_page = 1
       end
-      if new_page != @page 
+      if new_page != @page
         @collection = nil
       end
       @page = new_page
@@ -100,11 +100,11 @@ module Arrest
     def collection
       if @collection == nil
         if @page_size
-          query_params = "?pageSize=#{@page_size}&page=#{@page}"
+          query_params =  (@base_url.include?('?') ? '&' : '?') + "pageSize=#{@page_size}&page=#{@page}"
         else
           query_params = ''
         end
-        url = @base_url + '/' + @url_part.to_s + query_params
+        url = @base_url + query_params
         response = resolved_class.by_url(@context, url)
         @total_count = response[:result_count]
         @collection = response[:collection]

data/lib/arrest/root_resource.rb

@@ -70,7 +70,7 @@ module Arrest
             return 0
           end
         end
-          
+
 
         def current_page_count #:nodoc:
           count
@@ -131,7 +131,8 @@ module Arrest
       end
 
       def scoped_path scope_name
-        resource_path + '/' + scope_name.to_s
+        scope_name = scope_name.to_s
+        resource_path + (scope_name.start_with?('?') ? '' : '/') + scope_name
       end
 
       def stub(context, stub_id)

data/lib/arrest/version.rb

@@ -1,3 +1,3 @@
 module Arrest
-  VERSION = "0.0.41"
+  VERSION = "0.0.42"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.41
+  version: 0.0.42
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-03 00:00:00.000000000Z
+date: 2012-04-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &8570560 !ruby/object:Gem::Requirement
+  requirement: &7367040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8570560
+  version_requirements: *7367040
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &8569360 !ruby/object:Gem::Requirement
+  requirement: &7365980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *8569360
+  version_requirements: *7365980
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &8568140 !ruby/object:Gem::Requirement
+  requirement: &7364820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *8568140
+  version_requirements: *7364820
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &8566960 !ruby/object:Gem::Requirement
+  requirement: &7358940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *8566960
+  version_requirements: *7358940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &8565300 !ruby/object:Gem::Requirement
+  requirement: &7358480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8565300
+  version_requirements: *7358480
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &8563700 !ruby/object:Gem::Requirement
+  requirement: &7357940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8563700
+  version_requirements: *7357940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &8562540 !ruby/object:Gem::Requirement
+  requirement: &7356840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *8562540
+  version_requirements: *7356840
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &8561080 !ruby/object:Gem::Requirement
+  requirement: &7356360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8561080
+  version_requirements: *7356360
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &8556960 !ruby/object:Gem::Requirement
+  requirement: &7355740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8556960
+  version_requirements: *7355740
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &8555380 !ruby/object:Gem::Requirement
+  requirement: &7355060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8555380
+  version_requirements: *7355060
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com