parascope 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3066d6e82e5f23716dd07cea4c449017e70bbd9d
-  data.tar.gz: 56028229436dde9aeb953c6d2a8c3422481a92a4
+  metadata.gz: 34c9b159851be5b35aad5b3dee7a5d156a7a9c43
+  data.tar.gz: 4e105d70c12be7c2787e01b56cbcd9a9154388d0
 SHA512:
-  metadata.gz: 3067309bd1f430f5aa295a76302b4cd16e23cfdc2a35ec0fccaa14f1a71df6d07663e6adbc38a90222de450c5d35df67b54f48391deb9e90580f2a0728029b93
-  data.tar.gz: 6ac678b8533decc7fabc77179d534f06e1e1c63060025572875bdfb23ca268ca90d1f36060f74f2061999044328d38f470eba184cedbae2c26a0cfc3d67682ff
+  metadata.gz: 776eff3eec074bcafa312eb497698701cfb78dbee50efb62873398dcb25539dedc70fa13df10b6cdba5e6db45eff68c107ff7582ed418d094d40b0408fcd13ed
+  data.tar.gz: 91a03a0657bc4e99340adcc5cd48ae6d8f88e227f0a09e2d01eb47adac63ef3194a896330d8cdd3c99c77da5b1f5d61eee9dee0f39e57b44bcdd269698700a49

data/README.md

@@ -148,14 +148,18 @@ sifter :with_department do
 end
 ```
 
-- `defaults(hash)` method is used to declare default query params that are reverse
-  merged with params passed on query initialization. When used in `sift_by` block,
-  hashes are merged altogether.
+- `defaults(hash, &block)` method is used to declare default query params that are
+  reverse merged with params passed on query initialization. When used in `sift_by`
+  block, hashes are merged altogether. If `block` is passed, it's return value
+  will be evaluated and merged on query object instantiation, allowing to have
+  dynamic default params values. It is also allowed to have multiple `defaults`
+  method calls.
 
 *Examples:*
 
 ```ruby
 defaults only_active: true
+defaults { {later_than: 1.week.ago} }
 
 sifter :paginated do
   # sifter defaults are merged with higher-level defaults:
@@ -163,6 +167,15 @@ sifter :paginated do
 end
 ```
 
+It is also possible to use both static arguments and block in `defaults` method call.
+Thus, the sample above can also be written with one `defaults` method call:
+
+```ruby
+defaults only_active: true do
+  {later_than: 1.week.ago}
+end
+```
+
 - `guard(message = nil, &block)` defines a guard instance method block (see instance methods
   bellow). All such blocks are executed before query object resolves scope via
   `resolve_scope` method. Optional `message` may be supplied to provide more informative

data/bin/console

@@ -9,6 +9,7 @@ class Query < Parascope::Query
   raise_on_guard_violation false
 
   defaults barbak: 'barbak'
+  defaults { {time: Time.now} }
 
   base_scope { OpenStruct.new }
 

data/lib/parascope/query.rb

@@ -10,12 +10,12 @@ module Parascope
     attr_reader :params, :violation
 
     def self.inherited(subclass)
-      subclass.raise_on_guard_violation raise_on_guard_violation?
-      subclass.query_blocks.replace query_blocks.dup
-      subclass.sift_blocks.replace sift_blocks.dup
-      subclass.guard_blocks.replace guard_blocks.dup
+      subclass.raise_on_guard_violation(raise_on_guard_violation?)
+      subclass.query_blocks.replace(query_blocks.dup)
+      subclass.sift_blocks.replace(sift_blocks.dup)
+      subclass.guard_blocks.replace(guard_blocks.dup)
       subclass.base_scope(&base_scope)
-      subclass.defaults defaults
+      subclass.defaults(defaults)
     end
 
     def self.build(**attrs)
@@ -31,7 +31,7 @@ module Parascope
     end
 
     def initialize(params, scope: nil, dataset: nil, **attrs)
-      @params = Hashie::Mash.new(klass.defaults).merge(params || {})
+      @params = Hashie::Mash.new(klass.fetch_defaults).merge(params || {})
       @scope  = scope || dataset unless scope.nil? && dataset.nil?
       @attrs  = attrs.freeze
       @base_params = @params
@@ -106,13 +106,13 @@ module Parascope
     def sifted!(query, blocks)
       @attrs = query.attrs
       define_attr_readers
-      singleton_class.query_blocks.replace query.klass.query_blocks.dup
-      singleton_class.guard_blocks.replace query.klass.guard_blocks.dup
+      singleton_class.query_blocks.replace(query.klass.query_blocks.dup)
+      singleton_class.guard_blocks.replace(query.klass.guard_blocks.dup)
       singleton_class.base_scope(&query.klass.base_scope)
       blocks.each do |block|
         singleton_class.instance_exec(*block.values_for(params), &block.block)
       end
-      params.replace(singleton_class.defaults.merge(params))
+      params.replace(singleton_class.fetch_defaults.merge(params))
       @sifted = true
     end
 

data/lib/parascope/query/api_methods.rb

@@ -7,12 +7,26 @@ module Parascope
     end
     alias_method :base_dataset, :base_scope
 
-    def defaults(params = nil)
-      @defaults ||= {}
+    def defaults(params = nil, &block)
+      return @defaults if params.nil? && !block_given?
 
-      return @defaults if params.nil?
+      if block_given? && !params.nil?
+        defaults(params)
+        defaults(&block)
+      elsif !block_given? && Proc === params
+        @defaults = params
+      elsif !block_given?
+        defaults { params }
+      elsif @defaults.nil?
+        @defaults = block
+      else
+        _defaults = @defaults
+        @defaults = -> { block.call.merge(_defaults.call) }
+      end
+    end
 
-      @defaults = @defaults.merge(params)
+    def fetch_defaults
+      defaults.nil? ? {} : defaults.call
     end
 
     def sift_by(*presence_fields, **value_fields, &block)

data/lib/parascope/version.rb

@@ -1,3 +1,3 @@
 module Parascope
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parascope
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Artem Kuzko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-24 00:00:00.000000000 Z
+date: 2019-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie