hookercookerman-amee 0.0.4 → 0.0.5

data/README.rdoc

@@ -25,7 +25,14 @@
   will populated the fridge category automagically;
   
   Cache - Simple to Start (using Moneta)
-  Therefore if u wish you can choose your cache store even memcache via leveraging Moneta 
+  Therefore if u wish you can choose your cache store even memcache via leveraging Moneta
+
+  Pagination on data_items
+  
+  @data_category = session.get_data_category("/data/whatever_path", :query => {:itemsPerPage => 30, :page => 1})
+  @data_items = @data_category.paginate_data_items(:per_page => 30,:page => params[:page])
+  
+  You know have a pagintated data_items
 
 = TODOS
 

data/lib/amee.rb

@@ -33,5 +33,5 @@ require "amee/profile_api/profile_category"
 require "amee/profile_api/profile"
 
 module Amee
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/amee/data_api/data_category.rb

@@ -41,12 +41,7 @@ module Amee
           options[:per_page] || 10,
           options[:total] || self.pager["items"]
         ) do |pager|
-          result = session.api_call(:get, "data_category", self.full_path, 
-            :query => {:itemsPerPage => pager.per_page, :page => pager.current_page}
-          ) do |response|
-            populate_from_hash!(response)
-          end
-          pager.replace(result.data_items)
+          pager.replace(self.data_items || [])
         end
       end
       

data/lib/amee/profile_api/profile_category.rb

@@ -7,7 +7,7 @@ module Amee
       self.path_prefix = "/profiles"
       
       
-      attr_accessor :profile, :total_amount_per_month, :total_amount
+      attr_accessor :profile, :total_amount_per_month, :total_amount, :pager
       
       list_populators :profile_items => {:class => Amee::ProfileApi::ProfileItem},
                       :profile_categories => {:class => Amee::ProfileApi::ProfileCategory}
@@ -37,6 +37,16 @@ module Amee
         "#{self.class.path_prefix}/#{profile_uid}" + resource_path
       end
       
+      def paginate_profile_items(options = {})
+        profile_items = WillPaginate::Collection.create(
+          options[:page] || 1,
+          options[:per_page] || 10,
+          options[:total] || self.pager["items"]
+        ) do |pager|
+          pager.replace(self.profile_items || [])
+        end
+      end
+      
     end
     
   end

data/lib/amee/session.rb

@@ -65,7 +65,7 @@ module Amee
     def api_call_without_logging(method, parser_name, path, options, use_auth_token =true, &proc)
       result = service.send(method, parser_name, path, options)
       result = yield result if block_given?
-      store_resource(path,result, options[:cache]||{}) if method == :get && caching?
+      store_resource(path,result, options||{}) if method == :get && caching?
       result
     end
     
@@ -74,7 +74,7 @@ module Amee
     # or actually call the amee api; if the session has expired we will try 
     # to get a new one
     def api_call(method, parser_name, path, options ={}, use_auth_token =true, &proc)
-      if (cache = @cache[path]) && caching?
+      if (cache = @cache[cache_key(path, options[:query] || {})]) && caching?
         return cache
       else
         attempts = 0
@@ -214,8 +214,15 @@ module Amee
     
     # @param [String] path the path of the resource
     # @param [Hash] cache_options this is the cache options
-    def store_resource(path, result, cache_options = {})
-      @cache.store(path, result, :expires_in => cache_options[:expires_in] || Amee::Config[:expires_in])
+    def store_resource(path, result, options = {})
+      key = cache_key(path, options[:query] ||{})
+      cache_options = options[:cache] || {}
+      @cache.store(key, result, :expires_in => cache_options[:expires_in] || Amee::Config[:expires_in])
+    end
+    
+    protected
+    def cache_key(path, params = {})
+      path + params.map { |key,value| "#{key}=#{value}" }.join('/')
     end
       
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hookercookerman-amee
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Richard Hooker
@@ -62,6 +62,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: mislav-will_paginate
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.2.3
+    version: 
 description: Its a gem to interact with the amee api
 email: 
 - richard.hooker@dynamic50.com