arrest 0.0.61 → 0.0.62

data/lib/arrest/abstract_resource.rb

@@ -255,7 +255,6 @@ module Arrest
     end
 
     def reload
-      @has_many_collections = {}
       @child_collections = {}
       @views = {}
       hash = internal_reload

data/lib/arrest/helper/has_many.rb

@@ -35,9 +35,7 @@ module Arrest
         add_attribute(hm_attr)
 
         send :define_method, method_name do # e.g. define 'teams' method for notation 'has_many :teams'
-          @has_many_collections ||= {}
-          @has_many_collections[method_name] ||= HasManyCollection.new(self, hm_attr)
-          @has_many_collections[method_name]
+          HasManyCollection.new(self, hm_attr)
         end
       end
 

data/lib/arrest/helper/has_many_collection.rb

@@ -12,6 +12,7 @@ module Arrest
       @page = 1
       @page_size = nil
       @per_page = 5
+      @sort_hash = {}
     end
 
     def build attributes = {}
@@ -103,16 +104,27 @@ module Arrest
       self
     end
 
+    def sort_by(field, order = :asc)
+      @sort_hash = {:sort => field.to_sym, :order => order.to_sym}
+      self
+    end
+
     private
 
     def children
       if @children == nil
+        params = {}
         if @page_size
-          query_params = "?pageSize=#{@page_size}&page=#{@page}"
-        else
-          query_params = ''
+          params[:pageSize] = @page_size
+          params[:page] = @page
+        end
+        if @sort_hash
+          params.merge!(@sort_hash)
         end
-        url = @parent.resource_location + '/' + @url_part.to_s + query_params
+
+        base_url = @parent.resource_location + '/' + @url_part.to_s
+        url = build_url(base_url, params)
+
         response = resolved_class.by_url(@parent.context, url)
         @total_count = response[:result_count]
         @children = response[:collection]
@@ -120,6 +132,13 @@ module Arrest
       @children
     end
 
+    def build_url(base_url, params_hash)
+      return base_url if params_hash.empty?
+      query_str = (base_url.include?('?') ? '&' : '?')
+      query_str += params_hash.map{|k,v| "#{k}=#{v}"}.join('&')
+      base_url + query_str
+    end
+
     def resolved_class
       if @clazz == nil
         @clazz = Source.mod.const_get(@clazz_name)

data/lib/arrest/helper/ordered_collection.rb

@@ -96,6 +96,11 @@ module Arrest
       self
     end
 
+    def sort_by(field, order = :asc)
+      @sort_hash = {:sort => field.to_sym, :order => order.to_sym}
+      self
+    end
+
     private
 
     def collection
@@ -105,6 +110,9 @@ module Arrest
           params[:pageSize] = @page_size
           params[:page] = @page
         end
+        if @sort_hash
+          params.merge!(@sort_hash)
+        end
         params.merge!(@filter) # override with params that got passed in
         url = build_url(@base_url, params)
         response = resolved_class.by_url(@context, url)
@@ -116,7 +124,7 @@ module Arrest
 
     def build_url(base_url, params_hash)
       return base_url if params_hash.empty?
-      query_str = (base_url.include?('?') ? '&' : '?') 
+      query_str = (base_url.include?('?') ? '&' : '?')
       query_str += params_hash.map{|k,v| "#{k}=#{v}"}.join('&')
       base_url + query_str
     end

data/lib/arrest/version.rb

@@ -1,3 +1,3 @@
 module Arrest
-  VERSION = "0.0.61"
+  VERSION = "0.0.62"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.61
+  version: 0.0.62
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-07 00:00:00.000000000Z
+date: 2012-06-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2158154080 !ruby/object:Gem::Requirement
+  requirement: &11596480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158154080
+  version_requirements: *11596480
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &2158153580 !ruby/object:Gem::Requirement
+  requirement: &11595980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *2158153580
+  version_requirements: *11595980
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2158153080 !ruby/object:Gem::Requirement
+  requirement: &11595480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *2158153080
+  version_requirements: *11595480
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2158152620 !ruby/object:Gem::Requirement
+  requirement: &11595020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2158152620
+  version_requirements: *11595020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2158152240 !ruby/object:Gem::Requirement
+  requirement: &11594640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158152240
+  version_requirements: *11594640
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2158151780 !ruby/object:Gem::Requirement
+  requirement: &11594180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158151780
+  version_requirements: *11594180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2158151280 !ruby/object:Gem::Requirement
+  requirement: &11593680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *2158151280
+  version_requirements: *11593680
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2158150860 !ruby/object:Gem::Requirement
+  requirement: &11593260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158150860
+  version_requirements: *11593260
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2158150400 !ruby/object:Gem::Requirement
+  requirement: &11592800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158150400
+  version_requirements: *11592800
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2158149980 !ruby/object:Gem::Requirement
+  requirement: &11609400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158149980
+  version_requirements: *11609400
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com
@@ -198,13 +198,4 @@ rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Another ruby rest client
-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
+test_files: []