generic_controller 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae2943e8da1b0ecfc4f14dd322fe1e30e6ef4f47
-  data.tar.gz: 2fabdff692eb2e2fcd5dc3253df6379e0c0e07c7
+  metadata.gz: 8316f347388ea0e165f7d16de4f477e2b45908e3
+  data.tar.gz: 804166ffc45278ee8e4856dc82faf68678804b80
 SHA512:
-  metadata.gz: 1e15d536349a170dcb8374a1d7c2ff877e51a89ea729da478597e6abf69e9f10d958afed1f124d4b3aa2ba9fde76fe402bac40f0202cd196044d9f7682e8162f
-  data.tar.gz: 11aed9c46035d6c6a5852349d248411519ed3aa95e82f4d46810d5c00ddfd185f10bf0217e9a236e3763c88ffd633b9c39c93af21efabb7e789aafa61135eb8b
+  metadata.gz: 3fc95df1f58a9c956dfce64c1bebcefe0d75114ace1890a9f59d9195f5e6623094990d30253fd0e42f1d08cef35679715118290f651631db921d88c67b2645d3
+  data.tar.gz: a17a154ad4e2c365a983a8fa4f23f1c331d0e208ca285a5b9f6d8383bb3dffa758f6b7ce40d2daf12d6e2742480bb19c0c0c847a88bd7e7d0c76a6c59e88497f

data/lib/generic_controller.rb

@@ -57,17 +57,22 @@ class GenericController < ActionController::Base
     l = limit.to_i
     p = page.to_i
     o = order_by.to_sym
+    off = offset.to_sym
     s = sort.to_sym
     respond_to do |f|
       f.any do
         render({
-                 json: query.order(o => s).page(p).per(l),
+                 json: query.order(o => s)
+                   .page(p)
+                   .per(l)
+                   .offset(off),
                  meta: {
                    total: query.count(:all),
                    page: p,
                    limit: l,
                    order_by: o,
-                   sort: s
+                   sort: s,
+                   offset: off
                  },
                  each_serializer: each_sez,
                  status: :ok
@@ -86,20 +91,24 @@ class GenericController < ActionController::Base
     "#{norm_controller_name}Serializer".constantize
   end
 
-  def page
-    params[:page] ||= 1
-  end
-
   def limit
     params[:limit] ||= 20
   end
 
+  def offset
+    params[:offset] ||= 0
+  end
+
   def order_by
     return params[:order_by] if model.column_names.include?(params[:order_by])
 
     'id'
   end
 
+  def page
+    params[:page] ||= 1
+  end
+
   def sort
     params[:sort].in?(VALID_SORT) ? params[:sort] : VALID_SORT[0]
   end
@@ -117,7 +126,14 @@ class GenericController < ActionController::Base
   end
 
   def cscope
-    model
+    cs = model
+    cs = cs.where(['updated_at >= ?', parse_time(params[:updated_since])]) if params[:updated_since]
+    cs = cs.where(['created_at >= ?', parse_time(params[:created_since])]) if params[:created_since]
+    cs
+  end
+
+  def parse_time(s)
+    Time.zone.parse(s)
   end
 
   def attach_resource

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: generic_controller
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - James Meldrum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: An opinionated generic resource-oriented controller for rails.
@@ -77,7 +77,8 @@ files:
 - spec/lib/generic_controller_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/htmldrum/generic_controller
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -85,19 +86,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: generic_controller
-rubygems_version: 2.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: ActionController subclass with conveience
 test_files: []
-has_rdoc: