arrest 0.0.62 → 0.0.63

data/lib/arrest.rb

@@ -19,7 +19,6 @@ require "arrest/handler"
 require "arrest/source"
 require "arrest/helper/filter"
 require "arrest/helper/child_collection"
-require "arrest/helper/has_many_collection"
 require "arrest/helper/ordered_collection"
 require "arrest/helper/has_many"
 require "arrest/helper/has_view"

data/lib/arrest/helper/has_many.rb

@@ -15,14 +15,14 @@ module Arrest
         foreign_key = clazz_name + "_id"
         sub_resource = false
         read_only = false
-        url_part = method_name.to_s
+        url_part = "/" + method_name.to_s
         if options
           clazz_name = options[:class_name].to_s unless options[:class_name] == nil
           foreign_key = "#{StringUtils.underscore(clazz_name)}_id"
           foreign_key = options[:foreign_key].to_s unless options[:foreign_key] == nil
           sub_resource = !!options[:sub_resource]
           read_only = options[:read_only]
-          url_part = options[:url_part].to_s unless options[:url_part] == nil
+          url_part = "/" + options[:url_part].to_s unless options[:url_part] == nil
         end
 
         hm_attr = create_has_many_attribute(sub_resource, # e.g. 'team_ids' attribute for 'has_many :teams'
@@ -33,9 +33,8 @@ module Arrest
                                             foreign_key,
                                             read_only)
         add_attribute(hm_attr)
-
-        send :define_method, method_name do # e.g. define 'teams' method for notation 'has_many :teams'
-          HasManyCollection.new(self, hm_attr)
+        send :define_method, method_name do |filter = {}|# e.g. define 'teams' method for notation 'has_many :teams'
+          OrderedCollection.new(self.context, clazz_name, self.resource_location + url_part.to_s, filter)
         end
       end
 

data/lib/arrest/helper/ordered_collection.rb

@@ -1,43 +1,39 @@
 module Arrest
   class OrderedCollection #< BasicObject
 
-    def initialize(context,class_or_class_name, base_url, filter = {})
+    def initialize(context, class_or_class_name, base_url, filter = {})
+      reset_params()
       @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))
+        @clazz_name = (StringUtils.classify(class_or_class_name.to_s))
       else
         @clazz = class_or_class_name
       end
       @base_url = base_url
-      @collection = nil
-      @page = 1
-      @page_size = nil
-      @per_page = 5
+      define_filters
     end
 
     def method_missing(*args, &block)
        collection.send(*args, &block)
     end
 
+    def inspect
+      collection.inspect
+    end
+
     def limit(count)
-      if count != @page_size
-        @collection = nil
-      end
-      @page_size = count
+      page(count)
       self
     end
 
     def offset(count)
-      if @page_size
-        new_page = count / @page_size
+      if @page_hash[:pageSize]
+        new_page = count / @page_hash[:pageSize]
       else
         new_page = 1
       end
-      if new_page != @page
-        @collection = nil
-      end
-      @page = new_page
+      page(new_page)
       self
     end
 
@@ -50,11 +46,11 @@ module Arrest
     # TODO: move to external module
 
     def limit_value #:nodoc:
-      @page_size || 0
+      @page_hash[:pageSize] || 0
     end
 
     def offset_value #:nodoc:
-      ((@page_size || 0) * (@page - 1)) || 0
+      ((@page_hash[:pageSize] || 0) * (@page - 1)) || 0
     end
 
     def current_page
@@ -62,8 +58,8 @@ module Arrest
     end
 
     def num_pages
-      if @page_size
-        (total_count.to_f / @page_size).ceil
+      if @page_hash[:pageSize]
+        (total_count.to_f / (@page_hash[:pageSize])).ceil
       else
         1
       end
@@ -82,21 +78,19 @@ module Arrest
     end
 
     def per(num)
-      @per_page = num.to_i
+      @page_size = num.to_i
+      @page_hash.merge!({:pageSize => @page_size, :page => @page})
       self
     end
 
     def page(num)
       num ||= 1
-      if @page_size != @per_page || @page != num
-        @collection = nil
-      end
-      @page_size = @per_page
       @page = num.to_i
+      @page_hash.merge!({:pageSize => @page_size, :page => @page})
       self
     end
 
-    def sort_by(field, order = :asc)
+    def order_by(field, order = :asc)
       @sort_hash = {:sort => field.to_sym, :order => order.to_sym}
       self
     end
@@ -104,22 +98,26 @@ module Arrest
     private
 
     def collection
-      if @collection == nil
-        params = {}
-        if @page_size
-          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)
-        @total_count = response[:result_count]
-        @collection = response[:collection]
-      end
-      @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)
+
+      response = resolved_class.by_url(@context, url)
+      @total_count = response[:result_count]
+
+      reset_params()
+
+      response[:collection]
+    end
+
+    def reset_params
+      @page = 1
+      @page_size = 5
+      @page_hash = {}
+      @sort_hash = {}
     end
 
     def build_url(base_url, params_hash)
@@ -133,6 +131,17 @@ module Arrest
       @clazz ||= Source.mod.const_get(@clazz_name)
     end
 
+    def define_filters
+      resolved_class.all_filters.each do |filter|
+        self.instance_eval <<-"end_eval"
+          def #{filter.name} *args
+            real_args = [collection] + args
+            #{resolved_class.name}.FILTER_#{filter.name}(real_args)
+          end
+        end_eval
+      end
+    end
+
   end
 end
 

data/lib/arrest/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.62
+  version: 0.0.63
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &11596480 !ruby/object:Gem::Requirement
+  requirement: &20728140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11596480
+  version_requirements: *20728140
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &11595980 !ruby/object:Gem::Requirement
+  requirement: &20727640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *11595980
+  version_requirements: *20727640
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &11595480 !ruby/object:Gem::Requirement
+  requirement: &20727140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *11595480
+  version_requirements: *20727140
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &11595020 !ruby/object:Gem::Requirement
+  requirement: &20726680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *11595020
+  version_requirements: *20726680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &11594640 !ruby/object:Gem::Requirement
+  requirement: &20726300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11594640
+  version_requirements: *20726300
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &11594180 !ruby/object:Gem::Requirement
+  requirement: &20725840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11594180
+  version_requirements: *20725840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &11593680 !ruby/object:Gem::Requirement
+  requirement: &20725340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *11593680
+  version_requirements: *20725340
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &11593260 !ruby/object:Gem::Requirement
+  requirement: &20724920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11593260
+  version_requirements: *20724920
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &11592800 !ruby/object:Gem::Requirement
+  requirement: &20724460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11592800
+  version_requirements: *20724460
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &11609400 !ruby/object:Gem::Requirement
+  requirement: &20724040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11609400
+  version_requirements: *20724040
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com
@@ -152,7 +152,6 @@ files:
 - lib/arrest/helper/child_collection.rb
 - lib/arrest/helper/filter.rb
 - lib/arrest/helper/has_many.rb
-- lib/arrest/helper/has_many_collection.rb
 - lib/arrest/helper/has_view.rb
 - lib/arrest/helper/logger.rb
 - lib/arrest/helper/ordered_collection.rb

data/lib/arrest/helper/has_many_collection.rb

@@ -1,163 +0,0 @@
-module Arrest
-  class HasManyCollection #< BasicObject
-
-    def initialize(abstract_resource, has_many_attribute)
-      @parent = abstract_resource
-      @clazz_name = (StringUtils.classify(has_many_attribute.clazz_name.to_s))
-      @url_part = has_many_attribute.url_part
-      @children = nil
-      @foreign_key_name = (StringUtils.underscore(@parent.class.name).gsub(/^.*\//, '') + '_id').to_sym
-      define_filters
-      @attribute = has_many_attribute
-      @page = 1
-      @page_size = nil
-      @per_page = 5
-      @sort_hash = {}
-    end
-
-    def build attributes = {}
-      extended_attrs = attributes.merge({@foreign_key_name => @parent.id})
-      resolved_class.new(@parent.context, extended_attrs)
-    end
-
-    def method_missing(*args, &block)
-       children.send(*args, &block)
-    end
-
-    def inspect
-      children.inspect
-    end
-
-    def limit(count)
-      if count != @page_size
-        @children = nil
-      end
-      @page_size = count
-      self
-    end
-
-    def offset(count)
-      if @page_size
-        new_page = count / @page_size
-      else
-        new_page = 1
-      end
-      if new_page != @page
-        @children = nil
-      end
-      @page = new_page
-      self
-    end
-
-    def total_count
-      children() # make sure request was made before
-      @total_count
-    end
-
-    # == for kaminari
-    # TODO: move to external module
-
-    def limit_value #:nodoc:
-      @page_size || 0
-    end
-
-    def offset_value #:nodoc:
-      ((@page_size || 0) * (@page - 1)) || 0
-    end
-
-    def current_page
-      @page
-    end
-
-    def num_pages
-      if @page_size
-        (total_count.to_f / @page_size).ceil
-      else
-        1
-      end
-    end
-
-    def first_page?
-      current_page == 1
-    end
-
-    def last_page?
-      current_page >= num_pages
-    end
-
-    def current_page_count #:nodoc:
-      @page
-    end
-
-    def per(num)
-      @per_page = num.to_i
-      self
-    end
-
-    def page(num)
-      num ||= 1
-      if @page_size != @per_page || @page != num
-        @children = nil
-      end
-      @page_size = @per_page
-      @page = num.to_i
-      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
-          params[:pageSize] = @page_size
-          params[:page] = @page
-        end
-        if @sort_hash
-          params.merge!(@sort_hash)
-        end
-
-        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]
-      end
-      @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)
-      end
-      @clazz
-    end
-
-
-    def define_filters
-      resolved_class.all_filters.each do |filter|
-        self.instance_eval <<-"end_eval"
-          def #{filter.name} *args
-            real_args = [children] + args
-            #{resolved_class.name}.FILTER_#{filter.name}(real_args)
-          end
-        end_eval
-      end
-    end
-
-  end
-end
-