parascope 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3195e544c77f3024607110d86b36783250643f85
-  data.tar.gz: 22d0aaf9e030c782dd1cd5bcae862dc59642918c
+  metadata.gz: 148749dbca46560b2b152377b8095d27fec8a1a1
+  data.tar.gz: a449da808e60361c33b60b4ba524f272a5b83173
 SHA512:
-  metadata.gz: 7a95450b4483a64760710e5bd5bfcec52730b7c5b523097080a94a41ad33dcd4dd2c2bda9673294c91cf9139ad2012de9710d01d9118c3a0dae72eff3d3465a1
-  data.tar.gz: fd83e9f6f76a1e8396621621898cac2ab10f1adeed9f2a352d97afe7f10014b1cdae1512df9faa9df25e66871582fc84a5a7c23e1bc1d008b2b7ed3f53acd6e0
+  metadata.gz: 9f876d869db3495232e67154fa0bcdb6089f62cc855112deb986b019f6e112c2782cc0158ffd899a1139c095c2ee0bd602e55ee6d3b7557e663a67d9caf4413c
+  data.tar.gz: 000864ff20232cf0d0f85bc74f29febc476dfc6eb668324640962caed100578d7900cc2011b0790978d88be992eaaf80292ec729fdb7c5a46b2e17306eb9dcca

data/CHANGELOG

@@ -1,5 +1,9 @@
 === master
 
+=== 1.0.2
+
+Remove base_scope application on sifted instance
+
 === 1.0.1
 
 Fix base scope application on sifted instance

data/README.md

@@ -306,6 +306,26 @@ query.project_users # => this is the same as:
 #   .order("CONCAT(first_name, ' ', last_name) DESC")
 ```
 
+### A Note on `base_scope` Blocks
+
+Keep in mind that _all_ `base_scope` blocks are
+**applied only if query object was initialized without explicit scope option**,
+i.e. if your Query class has a sifter with mandatory scope modification, and
+you initialize your query objects with explicit scope, you most likely want
+to use unoptional `query` block within sifter definition. For example,
+
+```rb
+class MyQuery < Parascope::Query
+  sifter :with_projects do
+    query { scope.joins(:projects) }
+
+    # ...
+  end
+end
+
+query = MyQuery.new(params, scope: some_scope)
+```
+
 ### Hints and Tips
 
 - Keep in mind that query classes are just plain Ruby classes. All `sifter`,

data/lib/parascope/query.rb

@@ -96,9 +96,6 @@ module Parascope
         singleton_class.instance_exec(*block.values_for(params), &block.block)
       end
       params.replace(singleton_class.defaults.merge(params))
-      if instance_variable_defined?('@scope') && !singleton_class.base_scope.nil?
-        @scope = instance_exec(@scope, &singleton_class.base_scope)
-      end
       @sifted = true
     end
 

data/lib/parascope/version.rb

@@ -1,3 +1,3 @@
 module Parascope
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parascope
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Artem Kuzko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie