rubapi 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2597f56a8187b718cceece6bf7712d999d0cc662
-  data.tar.gz: fb49c215d90deb47b3ef40756c63dd8ff50e3eb8
+  metadata.gz: 704f4477b893928e583d280a116813857aa95a57
+  data.tar.gz: c98bdcc21e38870f23da11e6f8e895992fcec647
 SHA512:
-  metadata.gz: 718826ba798f16f4ca39419809ebf9f3c0f4612c4f1142a71a8f5e68391fd17ccc0a6f21c754feb0050cff549dbd2cfd3398639549b78a70c31b683c11c56919
-  data.tar.gz: 551b8cdbf3b9624161d144c87ff3b0402044c078c31ecb6aa6035cd04abdb4181175eadd29d7a917708ece39e53ca65f8af7950973c503bf747d09288c6be718
+  metadata.gz: 0bb28b1fd4d41b7335a2ea80b9059ebb3cc2c3574c0d3c46889dedfbb08c4215ed6dfc21da68e733024355908ec7b0a429af56f70754855e52df8b1b5b5c9185
+  data.tar.gz: 07f330a8c4d8229fe4b3126e1c217cffb0ba43449a97ef488991170d1f5ec17efb66269f9d53a2bffc205b1a1921d4d7c4e22e2f448b7e2de0b1f2ee6e8d19a3

data/lib/rubapi/controller.rb

@@ -60,6 +60,7 @@ module Rubapi
       route[:controller] ||= self.class
       controller = route[:controller].new(self.response)
       controller.request = self.request
+      controller.request.pagination = route[:pagination] unless route[:pagination].nil?
       controller.send(route[:method])
     end
 
@@ -77,12 +78,12 @@ module Rubapi
       EM.defer get_conn, callback
     end
 
-  # If you try to respond with a reql.expr, it ensures that will return if a Hash(Dict) format
-  def format_response(response)
-    response.map {|re|
-      { :"#{re.first}" => re.last }
-    }.inject({}) {|sum, re| sum.merge!(re)}
-  end
+    # If you try to respond with a reql.expr, it ensures that will return with a Hash(Dict) format
+    def format_response(response)
+      response.map {|re|
+        { :"#{re.first}" => re.last }
+      }.inject({}) {|sum, re| sum.merge!(re)}
+    end
 
     def attach_data(data)
       @content ||= { errors: [] }

data/lib/rubapi/request.rb

@@ -2,14 +2,22 @@ module Rubapi
   class Request
     attr_accessor :params,
                   :errors,
-                  :route
+                  :route,
+                  :pagination
 
     def initialize
       self.params = {}
+      self.pagination = default_pagination
     end
 
     def parse(param_string)
       self.params = self.params.merge(Rack::Utils.parse_nested_query(param_string))
     end
+
+    def default_pagination
+      {
+        per_page: 10
+      }
+    end
   end
 end

data/lib/rubapi/router.rb

@@ -27,11 +27,9 @@ module Rubapi
         resources[:actions][verb].each do |re|
           resource_path = re[:path].split("/")
           if paths.count == resource_path.count
-            params = resource_path.select{|pa| /:([a-z_]+)/.match pa }
-
             request = re.clone
-            request[:params] = extract_params(paths, params)
             request[:controller] = resources[:controller]
+            request[:pagination] = resources[:pagination]
             return request
           end
         end
@@ -80,7 +78,8 @@ module Rubapi
             delete:[]
           }, 
           nested: [],
-          controller: nil
+          controller: nil,
+          pagination: nil
         }
       end
 
@@ -109,6 +108,10 @@ module Rubapi
       def controller(klass)
         @current_resource[:controller] = klass
       end
+
+      def pagination(options)
+        @current_resource[:pagination] = options
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubapi
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Ricardo K. Sasaki