fetcha 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ebc8467167a5e4c410a1bd8fb25b18b91cb01dc
-  data.tar.gz: afd3177dd301cf47fc8297429f1030d24d51cd9d
+  metadata.gz: 61d61933364bc8cb1c81431a9c5ba0fc4224c670
+  data.tar.gz: 422b38441617e39ed53166ff55f87578539dbacd
 SHA512:
-  metadata.gz: d30b34874c92fefe9345633b75db8d0cae7b4a1dbd50d8e792a14c03e3a8ac4deb31c3064a30b6e478f2b3ec4129b624ef8b70e6a5a64fb2b8455abb31fcc9b6
-  data.tar.gz: 1b1bc791bc2e57cb366d84df5da99ca3980e7bb08472c97685303d991d04b7756a5d4bde35e1850ea9d1cc8bedff3c6ddb3d9248cc08dfc5ceb9b572a028e7aa
+  metadata.gz: f931681d3c2bab0b4609c07f6f1abdee6ef15c62f4e31ca2a0afe8dd4aa4192eca694fa087fe68761c37916a4ce058465bcf2c6a3cae77428db01c2cbb3ad58c
+  data.tar.gz: 47f49b64deb5b1c414c5673151a199df55ae2f69371ef885a099ab58d71aa3893bf7480efc019216f5262d145abaa8ac5b7e93e444414e5c437977a148ce8092

data/lib/fetcha.rb

@@ -18,7 +18,28 @@ module Fetcha
       results = process_sorting(results, sorting) if sorting
       results = process_pagination!(results, pages) if pages
       results = process_search(results, search) if search
-      results
+      results.extending(PaginationTotalCount)
+    end
+
+    module PaginationTotalCount
+      def reset
+        @total_count = nil
+        super
+      end
+
+      def total_count(column_name = :all, _options = nil)
+        @total_count ||= 
+          begin
+            c = except(:offset, :limit, :order)
+            c = c.count(column_name)
+
+            if c.is_a?(Hash) || c.is_a?(ActiveSupport::OrderedHash)
+              c.count
+            else
+              c.respond_to?(:count) ? c.count(column_name) : c
+            end
+          end
+      end
     end
 
     private
@@ -63,8 +84,7 @@ module Fetcha
     end
 
     def process_scope(datasource, query_scope)
-      return datasource unless fetchable_opts[:scopes].include? query_scope
-      datasource.send(query_scope)
+      datasource.send(query_scope) if (fetchable_opts[:scopes].include? query_scope.to_sym)
     end
 
     def process_search(datasource, search)

data/lib/fetcha/version.rb

@@ -1,3 +1,3 @@
 module Fetcha
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fetcha
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Vincenzo Ferrara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Enable api to respond to jsonapi query string