parascope 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc98be2a5b2713d248126d205faadbc007153c7a
-  data.tar.gz: 8f0dadd459a841defd277566b14740f9d7c7dc52
+  metadata.gz: 3195e544c77f3024607110d86b36783250643f85
+  data.tar.gz: 22d0aaf9e030c782dd1cd5bcae862dc59642918c
 SHA512:
-  metadata.gz: 02fe0357a9573f7e6d9f9e02506d6c30d50c724050a5786c20ddf5981a8a304cf19a9e7b8c971998977cf97a4ee5e3f2bf33b1173cdfe42513c7024f6d8e2482
-  data.tar.gz: 630a5784a2c1e339945639a45e8a3cdf03e4749c5714f725a8e126788f1ec0c84064c68e79b9e2535fbb6108afd5b91e3fea50fcf33fdf1ad39abc5479bbc2b8
+  metadata.gz: 7a95450b4483a64760710e5bd5bfcec52730b7c5b523097080a94a41ad33dcd4dd2c2bda9673294c91cf9139ad2012de9710d01d9118c3a0dae72eff3d3465a1
+  data.tar.gz: fd83e9f6f76a1e8396621621898cac2ab10f1adeed9f2a352d97afe7f10014b1cdae1512df9faa9df25e66871582fc84a5a7c23e1bc1d008b2b7ed3f53acd6e0

data/CHANGELOG

@@ -0,0 +1,11 @@
+=== master
+
+=== 1.0.1
+
+Fix base scope application on sifted instance
+
+Add [github release] badge to README
+
+Update README, add CHANGELOG
+
+=== 1.0.0

data/README.md

@@ -1,9 +1,10 @@
 # Parascope
 
-[![Build Status](https://secure.travis-ci.org/akuzko/parascope.png)](http://travis-ci.org/akuzko/parascope)
-
 Param-based scope generation.
 
+[![build status](https://secure.travis-ci.org/akuzko/parascope.png)](http://travis-ci.org/akuzko/parascope)
+[![github release](https://img.shields.io/github/release/akuzko/parascope.svg)](https://github.com/akuzko/parascope/releases)
+
 --
 
 This gem provides a `Parascope::Query` class with a declarative and convenient API
@@ -71,7 +72,9 @@ query_by(only_active: 'true') { scope.active }
 
 # executes block only when *both* params[:first_name] and params[:last_name]
 # are present:
-query_by(:first_name, :last_name) { |first_name, last_name| /* ... */ }
+query_by(:first_name, :last_name) do |first_name, last_name|
+  scope.where(first_name: first_name, last_name: last_name)
+end
 
 # if query block returns nil, scope will remain intact:
 query { scope.active if only_active? }
@@ -163,21 +166,27 @@ sift_by(:sort_col, :sort_dir) do |scol, sdir|
 end
 ```
 
+- `build(scope: nil, **attributes)` initializes a query with empty params. Handy when
+  query depends only passed attributes and internal logic. Also useful in specs.
+
+  *Examples:*
+
+
+```ruby
+query = UsersQuery.build(scope: users_scope)
+# the same as UsersQuery.new({}, scope: users_scope)
+```
+
 #### Instance Methods
 
 - `initialize(params, scope: nil, **attributes)` initializes a query with `params`,
   an optional scope (that if passed, is used instead of `base_scope`). All additionally
   passed options are accessible via reader methods in query blocks and elsewhere.
 
-- `build(scope: nil, **attributes)` initializes a query with empty params. Handy when
-  query depends only passed attributes and internal logic. Also useful in specs.
-
 *Examples:*
 
 ```ruby
 query = UsersQuery.new(query_params, company: company)
-
-query = UsersQuery.build(scope: users_scope)
 ```
 
 - `params` returns a parameters passed in initialization. Is a `Hashie::Mash` instance,
@@ -221,7 +230,7 @@ base_scope { company.users }
 query_by(:only_active) { scope.active }
 
 sifter :with_departments do
-  scope.joins(:departments)
+  base_scope { scope.joins(:departments) }
 
   query_by(:department_name) { |name| scope.where(departments: {name: name}) }
 end

data/lib/parascope/query.rb

@@ -96,6 +96,9 @@ 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.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parascope
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Artem Kuzko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -107,6 +107,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG
 - Gemfile
 - LICENSE.txt
 - README.md