sample_filter 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ff44fc9766880a8b45d35e772878b18a58299f0
-  data.tar.gz: 231830605bfaa85837008a3d88fe04582e9932bd
+  metadata.gz: d087c8414a36e1780a6fedaed77418690299809f
+  data.tar.gz: 62924512762cedbaf4e2369b0b4110a1dcce675c
 SHA512:
-  metadata.gz: d924464af0cbf329af95928d4e9306008cec317ef299e18384add3064754fbe41186bbe407bebb39948dc719539f79303088731d81dc279d375816f72434e943
-  data.tar.gz: e1cbde05ab4f0666da76de65fd2802232a2652bd22673b6bf191f390ecaba58ae109a5859897bdddc4da02f53ba0d69951ac4912c1a3a41bc4e895d0d0ff8ea0
+  metadata.gz: 702c40f2189f5805ae4e0f984eb13ce13da2b1d8e23d0050058063449a1beb145d13351c2fe64d357ab65d9f6cb85483e0d2b49e605c419a3dfe50c047c7b685
+  data.tar.gz: e022e507b78e4bcbaaca5255c0183498fd95f4fbc139200f96571cce17a168841b6309f44819b4e1096970a36d30a354a7e8c84f596c7bb969dc7df1f01ee50d

data/README.md

@@ -5,7 +5,6 @@ SampleFilter is a Rails Engine plugin that makes to filter and sort ActiveRecord
 
 ## Installation
 Add this line to your application's Gemfile:
-
 ```ruby
 gem 'sample_filter'
 ```
@@ -24,6 +23,7 @@ Install javascripts air-datepicker dependency:
 ```bash
 $ yarn add air-datepicker
 ```
+
 Require SampleFilter javascripts with air-datepicker dependency in your `app/assets/javascripts/application.js`:
 ``` javascript
 //= require jquery
@@ -42,7 +42,6 @@ And then require styles in your `app/assets/stylesheets/application.css`:
 
 ### Configuring Models
 The SampleFilter method in your models accepts options to configure its modules. For example:
-
 ```ruby
 class Entity < ApplicationRecord
   sample_filter(
@@ -71,6 +70,13 @@ class Entity < ApplicationRecord
 end
 ```
 
+for update values on demand in list or sorting fields, call method
+```ruby
+Entity.filter_update_value(:kind, [:black, :white])
+# or hash
+Entity.filter_update_value(:kind, { black: 3, white: 4 })
+```
+
 ### Form helpers
 ```ruby
 <%= form_for_filter(Entity, as: :sample_filter, block: :after, html: { method: :get, id: :sample_filter}) do %>
@@ -95,7 +101,6 @@ In your `index` method:
 
 ### I18n
 SampleFilter uses labels with I18n:
-
 ```yaml
 en:
   sample_filter:

data/lib/sample_filter/active_record_extension.rb

@@ -24,6 +24,10 @@ module SampleFilter
       ar_rel
     end
 
+    def filter_update_value(field, values)
+      filter_params_set.update_value(field, values)
+    end
+
     private
 
     def string_query(ar_rel, field, value)

data/lib/sample_filter/params_set.rb

@@ -26,6 +26,14 @@ module SampleFilter
       end
     end
 
+    def update_value(field, values)
+      field = field.to_sym
+      raise(ArgumentError, "#{field} not found error") unless fields.include?(field)
+      raise(ArgumentError, "#{field} values error") if invalid_values?(field, values)
+
+      options[field][:values] = values
+    end
+
     def permit_params(params)
       return {} unless params.present?
       _fields = fields.map{ |f| type_of(f).eql?(:date) ? Hash[f, [:from, :to]] : f }
@@ -46,7 +54,7 @@ module SampleFilter
     def define_and_assign_attr_accessors
       fields.each do |field|
         raise(ArgumentError, "#{field} type error") if invalid_type?(field)
-        raise(ArgumentError, "#{field} values error") if invalid_values?(field)
+        raise(ArgumentError, "#{field} values error") if invalid_values?(field, values_for(field))
 
         self.class.send(:attr_reader, field)
         instance_variable_set("@#{field}", default_value_for(field))
@@ -57,11 +65,10 @@ module SampleFilter
       !FILTER_TYPES.include?(type_of(field))
     end
 
-    def invalid_values?(field)
+    def invalid_values?(field, values)
       return false unless [:list, :sorting].include?(type_of(field))
-      values = values_for(field)
-
       return true unless values.present?
+
       if type_of(field).eql?(:list)
         (!values.is_a?(Hash) && !values.is_a?(Array))
       elsif type_of(field).eql?(:sorting)

data/lib/sample_filter/version.rb

@@ -1,3 +1,3 @@
 module SampleFilter
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/spec/lib/params_set/update_value_spec.rb

@@ -0,0 +1,62 @@
+context 'update values for params set field' do
+  let(:options) do
+    {
+      title: {type: :string},
+      amount: {type: :number},
+      'created_at' => {'type' => 'date', default_value: {from: '09.11.2016', to: '17.11.2017'}},
+      kind: {
+        type: 'list',
+        values: {red: 1, 'green' => '2', red_and_green: [1, 2]},
+        default_value: [1,2]
+      },
+      status: {
+        type: :list,
+        values: [:confirm, 'unconfirm'],
+        default_value: :unconfirm
+      },
+      confirmed: {type: :boolean, default_value: false},
+      sort: {
+        type: :sorting,
+        values: [:id, :title, :amount],
+        default_value: 'id_desc'
+      }
+    }
+  end
+
+  subject { SampleFilter::ParamsSet.new(options) }
+
+  it 'should update values' do
+    expect(subject.values_for(:kind)).to eq({'red' => 1, 'green' => '2', 'red_and_green' => [1, 2]})
+    subject.update_value(:kind, {'blue' => 3, black: '4'})
+    expect(subject.values_for(:kind)).to eq({'blue' => 3, 'black' => '4'})
+  end
+
+  it 'should update array' do
+    expect(subject.values_for(:kind)).to eq({'red' => 1, 'green' => '2', 'red_and_green' => [1, 2]})
+    subject.update_value('kind', [:confirm, 'unconfirm'])
+    expect(subject.values_for(:kind)).to eq(['confirm', 'unconfirm'])
+  end
+
+  it 'should not update value' do
+    expect(subject.values_for(:title)).to be_nil
+    subject.update_value(:title, 'lalalala')
+    expect(subject.values_for(:title)).to be_nil
+  end
+
+  it { expect{ subject.update_value(:blablabla, [:confirm, 'unconfirm']) }.to raise_error(ArgumentError, 'blablabla not found error') }
+  it { expect{ subject.update_value(:kind, nil) }.to raise_error(ArgumentError, 'kind values error') }
+  it { expect{ subject.update_value(:kind, {}) }.to raise_error(ArgumentError, 'kind values error') }
+  it { expect{ subject.update_value(:kind, []) }.to raise_error(ArgumentError, 'kind values error') }
+  it { expect{ subject.update_value(:kind, 'string') }.to raise_error(ArgumentError, 'kind values error') }
+
+  it { expect{ subject.update_value(:status, nil) }.to raise_error(ArgumentError, 'status values error') }
+  it { expect{ subject.update_value(:status, {}) }.to raise_error(ArgumentError, 'status values error') }
+  it { expect{ subject.update_value(:status, []) }.to raise_error(ArgumentError, 'status values error') }
+  it { expect{ subject.update_value(:status, 'string') }.to raise_error(ArgumentError, 'status values error') }
+
+  it { expect{ subject.update_value(:sort, nil) }.to raise_error(ArgumentError, 'sort values error') }
+  it { expect{ subject.update_value(:sort, {}) }.to raise_error(ArgumentError, 'sort values error') }
+  it { expect{ subject.update_value(:sort, {test: :one}) }.to raise_error(ArgumentError, 'sort values error') }
+  it { expect{ subject.update_value(:sort, []) }.to raise_error(ArgumentError, 'sort values error') }
+  it { expect{ subject.update_value(:sort, 'string') }.to raise_error(ArgumentError, 'sort values error') }
+end

data/spec/models/entities/filter_update_value_spec.rb

@@ -0,0 +1,17 @@
+require 'ar_helper'
+
+context 'update entity field value' do
+  before do
+    class Entity < ActiveRecord::Base
+      sample_filter kind: {type: :list,values: [:confirm, 'unconfirm']}
+    end
+
+    Entity.create(title: 'text')
+  end
+
+  it 'shoud create user and define params set' do
+    expect(Entity.filter_params_set.values_for(:kind)).to eq(['confirm', 'unconfirm'])
+    Entity.filter_update_value('kind', [:black, :white])
+    expect(Entity.filter_params_set.values_for(:kind)).to eq(['black', 'white'])
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sample_filter
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - ilia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-14 00:00:00.000000000 Z
+date: 2018-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -2673,6 +2673,8 @@ files:
 - spec/dummy/yarn.lock
 - spec/lib/params_set/new_spec.rb
 - spec/lib/params_set/update_attributes_spec.rb
+- spec/lib/params_set/update_value_spec.rb
+- spec/models/entities/filter_update_value_spec.rb
 - spec/models/entities/filtered_spec.rb
 - spec/models/entities/new_spec.rb
 - spec/spec_helper.rb
@@ -5275,6 +5277,8 @@ test_files:
 - spec/dummy/yarn.lock
 - spec/lib/params_set/new_spec.rb
 - spec/lib/params_set/update_attributes_spec.rb
+- spec/lib/params_set/update_value_spec.rb
+- spec/models/entities/filter_update_value_spec.rb
 - spec/models/entities/filtered_spec.rb
 - spec/models/entities/new_spec.rb
 - spec/spec_helper.rb