facet 0.16.3 → 0.17.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cebdf9f0321fc7a009f565a791ba1f55d1bdb7577c6aa724440c29ace8c1e5aa
-  data.tar.gz: 2f8f252c205d3b14f27d7788ae0fb4b904fd804a73536e3dc0b4abc6e37b5b17
+  metadata.gz: 040065d48def1cb14c2df4ac357a6f0b94376cc643b408e9a7582a5d99cfd2dd
+  data.tar.gz: 47689ae773aef5787988305704dc23f9417a7c9b47bab63b0cfa9b24c3b67a49
 SHA512:
-  metadata.gz: 1747b4920eb84bdf768518975642625ed33a5206d5c1844045966b1f57e466d7def160fe4e76d5ba9b5ac2d693e8c34b69aec250d9893abf01b85d8b70a05e9f
-  data.tar.gz: ea179d76cda544852e0fb7be1291bf6131df66cc2d84df72887471d87330716c2b6b652598fadb6c98bb6da737aaf6ddb1e9c9a47e5e49755d8dbdbcb97c86fd
+  metadata.gz: 833a9ab8ca87f34851cfb22e8b74ceefa0bf189aefc3d99ae450be961ca6eaa500e7dc8ecc51b06015954a65bf65c4d83befb99f944c967bb1b24ca01b4839e9
+  data.tar.gz: 5f1f2991e1cb887ef91679ca1c3663d00256523c4ec1f840815390389c4d329c908197ab958c2ee696e1281c9376f26312416d3b6a9759d413084e957d4dee46

data/lib/facet/concerns/collection.rb

@@ -15,7 +15,7 @@ module Facet
     end
 
     def collection
-      record_class.public_send(record_scope)
+      (source? ? source.public_send(self_scope) : record_class).public_send(record_scope)
     end
 
     def output

data/lib/facet/concerns/core.rb

@@ -6,13 +6,14 @@ module Facet
     extend ActiveSupport::Concern
 
     included do
-      attr_reader :current_page, :filter_by, :sort_by
+      attr_reader :current_page, :filter_by, :sort_by, :source
     end
 
-    def initialize(current_page: nil, filter_by: nil, sort_by: nil, all: false, paginate: true)
+    def initialize(current_page: nil, filter_by: nil, sort_by: nil, all: false, paginate: true, source: nil)
       @current_page = page_for(current_page, paginate)
       @filter_by = filter_for(filter_by, all)
       @sort_by = sort_for(sort_by)
+      @source = source
     end
 
     def paginated?
@@ -27,6 +28,10 @@ module Facet
       sort_by.present?
     end
 
+    def source?
+      source.present?
+    end
+
     private
 
     def page_for(current_page, paginate)

data/lib/facet/concerns/record.rb

@@ -6,7 +6,7 @@ module Facet
     extend ActiveSupport::Concern
 
     included do
-      delegate :record_class, :record_scope, to: :class
+      delegate :record_class, :record_scope, :self_scope, to: :class
     end
 
     class_methods do
@@ -14,6 +14,10 @@ module Facet
         name.chomp("Facet").constantize
       end
 
+      def self_scope
+        record_class.model_name.collection.to_sym
+      end
+
       def record_scope
         scoped? ? @record_scope : :all
       end

data/lib/facet/version.rb

@@ -2,5 +2,5 @@
 
 module Facet
   # This constant is managed by spicerack
-  VERSION = "0.16.3"
+  VERSION = "0.17.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facet
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 0.17.4
 platform: ruby
 authors:
 - Eric Garside
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-19 00:00:00.000000000 Z
+date: 2019-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.3
+        version: 0.17.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.3
+        version: 0.17.4
 - !ruby/object:Gem::Dependency
   name: short_circu_it
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.3
+        version: 0.17.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.3
+        version: 0.17.4
 description: Create cacheable collections of filtered, sorted, and paginated ActiveRecord
   objects
 email:
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A filterable, sortable, pageable, and Rails cacheable ActiveRecord::Relation