filtered 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d893c9bc84dbc584724e5ebb0e64b6b44a67a0d4b56cbfce897db6ff3ee2b69
-  data.tar.gz: 43bc59830b13a4e4ea72e5c540575e312f408f9064beafc341c2f8bd7159189e
+  metadata.gz: 7fd8d853511d646c6e86d81560915c8a86cdd7f5cbfb3806c1fa65d12572c6e8
+  data.tar.gz: 8368e29206b271979c4390f766e38483265420c8b38896bba60f92b26158d44f
 SHA512:
-  metadata.gz: 6f80acf6e14e43d402313493c5ca0ec78bd66afbd359782594efbbf3824a39bbc1460f037f17d707b15ce7dc5ae368319388337e0c0d571af7b8c9a60c0c0197
-  data.tar.gz: 58a5d0b3fc5da81bac6deda3ce9417e557b7fbb93a1b685a44f91c5b1cb2eb81d340923307b580e1eb4b26263725e44e1c69a14479997117f7937ef65a8c95d7
+  metadata.gz: 673323fbecc678b4c0b521623cd605f9b9a7b6e66dbcdcddee58e1fffab87c9d58da713883a07c727f67613511a0b03fb5fff80fe3a4af380132ba14f7b5cd89
+  data.tar.gz: 434e027c34e922ef4566d8c201a236a000c71216a056fe7b6ae8cd048ef03fb3cef3f1fe35f7760db8c48728f0c728436bfa72ae1c1657604bac444568b4080e

data/.travis.yml

@@ -5,7 +5,11 @@ cache: bundler
 addons:
   postgresql: "9.6"
 rvm:
-  - 2.3.5
+  # TODO fix build set up
+  # - 2.0.0-p648
+  # - 2.1.10
+  # - 2.2.6
+  - 2.3.7
   - 2.4.2
   - 2.5.1
   - 2.6.3
@@ -30,7 +34,7 @@ matrix:
   exclude:
   - rvm: 2.2.6
     gemfile: gemfiles/activerecord_6.0rc1.gemfile
-  - rvm: 2.3.5
+  - rvm: 2.3.7
     gemfile: gemfiles/activerecord_6.0rc1.gemfile
   - rvm: 2.4.2
     gemfile: gemfiles/activerecord_6.0rc1.gemfile
@@ -47,7 +51,7 @@ matrix:
     - rvm: jruby-head
 
 before_install:
-  - gem update --system
+  #- gem update --system
   - gem install bundler
 script:
   - bundle exec rake

data/README.md

@@ -1,9 +1,9 @@
-[![Build Status](https://travis-ci.org/dubadub/filtered.svg?branch=master)](https://travis-ci.org/dubadub/filtered)
+[![Gem Version](https://badge.fury.io/rb/filtered.svg)](https://badge.fury.io/rb/filtered)[![Build Status](https://travis-ci.org/dubadub/filtered.svg?branch=master)](https://travis-ci.org/dubadub/filtered)
 
 
 # Filtered - add filter to ActiveRecord queries
 
-It gives freedom of using any names, columns, scopes or associations behind fields. Also, it allows you to reuse queries or even compose them from reusable parts. Nice part about it is that it ingerates with Rails forms out of the box.
+The gem helps to create filters for Rails’ ActiveRecord in an old-fashion way. It makes your controller simpler and forms effortless.
 
 ## Installation
 
@@ -30,7 +30,7 @@ To create a new filter with a generator:
 
 ```bash
     $ rails generate filter car make model year body # fields can be added later
-          create app/filiters/car_filter.rb
+          create app/filters/car_filter.rb
 ```
 
 
@@ -50,7 +50,7 @@ class NoiseMeasurementsController < ApplicationController
 
   def set_filter
     # it can take an optional block if you need to set an auxilary variable:
-    @filter = CarsFilter.new(filter_params) do |f|
+    @filter = CarFilter.new(filter_params) do |f|
       f.user = current_user
     end
   end
@@ -180,6 +180,11 @@ To use the same `@filter` object in views (it will automatically set all the rel
 
 Filtered uses API provided by ActiveRecord [merge method](https://api.rubyonrails.org/classes/ActiveRecord/SpawnMethods.html#method-i-merge). There are a few open issues in ActiveRecord related to that method, please, have a look through it [here](https://github.com/rails/rails/search?q=activerecord+merge&state=open&type=Issues).
 
+## Ruby/Rails versions supported
+
+Ruby: 2.3.x, 2.4.x, 2.5.x, 2.6.x, jruby-9.1.x, jruby-9.2.x.
+Rails: 4.0.x, 4.1.x, 4.2.x, 5.0.x, 5.1.x, 5.2.x, 6.0.0rc.
+
 ## Credits
 
 This gem woudn't exist without original ideas of [@caJaeger](https://github.com/caJaeger).

data/filtered.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|examples|docs|gemfiles)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|examples|docs|gemfiles|Appraisals)/}) }
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

data/lib/filtered/base.rb

@@ -188,6 +188,12 @@ module Filtered
       end
 
       yield self if block_given?
+
+      fields.each do |name, value, definition|
+        next if value || !definition.default_computer
+
+        fields[name] = definition.default_computer.(self)
+      end
     end
 
 
@@ -221,8 +227,6 @@ module Filtered
       return enum_for(:entitled_fields) unless block_given?
 
       fields.each do |name, value, definition|
-        value = definition.default_computer.(self) if !value && definition.default_computer
-
         value_accepted = eval_option_proc(definition.acceptance_computer, value)
         value_declined = eval_option_proc(definition.decline_computer, value)
 

data/lib/filtered/version.rb

@@ -1,3 +1,3 @@
 module Filtered
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filtered
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Alexey Dubovskoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-06 00:00:00.000000000 Z
+date: 2019-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler