api_me 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aefa13bb6c4cb741b5b745f763b478ec279004d
-  data.tar.gz: 36d2113a88594b323d188d7f6f2812b2ae591109
+  metadata.gz: a7ed7591706028ee446e1f62690c45bc3e077552
+  data.tar.gz: afdd5788b734625ce90de8ee36a8fa706947c77f
 SHA512:
-  metadata.gz: 7e9a8cff6b5ca7301ef12b2e9b5cc6c41f7b39e3c0bb63249c26392d1f3a031c132462e1f035d2b4bcc18e364be52b90b60dbf61b318d3a7995d3b1f781e4d2a
-  data.tar.gz: 4db327ab00687bb5c1378dc8839de1d2917156919fb80a82a2008cab093f68bdcaec6697c7535cca523edf0e150a616e0e9f4f65963be00d3633389320d36824
+  metadata.gz: 864f404554ba935b25b5147bb571e08867669edaa6550dffac65d3876bbb9a7eb7f27a4952302c9c91a0b9d14154b97733f7fd1c2067a7f781b683f1901df5d2
+  data.tar.gz: c45b62cd0ace3b4935bde877715b58fb41f7ececb25cbb2fc08f1d68a796a031d987fdf29ea06396975ef3c8ce35c1f95bf2608217d579b440ee77e38df98149

data/lib/api_me/pagination.rb

@@ -29,7 +29,7 @@ module ApiMe
     protected
 
     def page
-      self.scope = Kaminari.paginate_array(scope).page(self.page_offset ? page_offset : 1)
+      self.scope = scope.page(self.page_offset ? page_offset : 1)
       self
     end
 

data/lib/api_me/sorting.rb

@@ -5,7 +5,7 @@ module ApiMe
     def initialize(scope:, sort_params:)
       self.scope = scope
       if sort_params
-        self.sort_criteria = sort_params[:criteria]
+        self.sort_criteria = sort_params[:criteria] || default_sort_criteria
         self.sort_reverse = sort_params[:reverse]
       end
     end
@@ -26,18 +26,11 @@ module ApiMe
 
     protected
 
-    def sort
-      unless sort_criteria === ""
-        sort_p = sort_criteria
-        if sort_reverse === "true"
-          self.scope = scope.sort_by {|scope| scope[sort_p]}.reverse!
-        else
-          self.scope = scope.sort_by {|scope| scope[sort_p]}
-        end
-        self.scope
+    def sort(criteria = default_sort_criteria)
+      if sort_reverse === "true"
+        self.scope = scope.order(criteria => :desc)
       else
-        default_sort_criteria
-        sort.scope
+        self.scope = scope.order(criteria => :asc)
       end
       self
     end

data/lib/api_me/version.rb

@@ -1,3 +1,3 @@
 module ApiMe
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api_me
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Sam Clopton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord