normalizr 0.3.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '068b8f6b2685d273ee884c7a8c0f751da02fd254fe56f0ee6366f304910f81f6'
-  data.tar.gz: 9edd590a85219a2ea44651412e32fced140dad016b3035acadcd1ebc43df2408
+  metadata.gz: 4ad46e009a59073eae3f65cfd60449c60fbc1570c5dde582de56f04a449416fa
+  data.tar.gz: 4b83cf27a15fcf5b1d2087dbada0ecad50a4d807be26e2fb6a2c91c6705adef6
 SHA512:
-  metadata.gz: eb22312649da1951b0fe9d0d1214851ebeb62d408217156a0427a55b442814505e68786a513898e8ca8b095701cd47d4880e5c82ba943993b1516cbfd8b04774
-  data.tar.gz: 06c555da8af5e30f7527927518e28186577ac1baf2c36b0a0ae9ce3a4596c6cc15eb13c08f9a361e833e84665eb4ed769c9f3ff9d3d4f725db2d8cfa5eb82e37
+  metadata.gz: 76b3b482de58da7f8af729c3d8392f0ef074ae9a7a05bbea55e3cd19d02c4297c6fa1bf01e924ec14aaa9666ad8689c1d91076e5588647b77341a39554e106d9
+  data.tar.gz: 1e8a7051bf44e55fbc1a81459670c4ec6b4d463adaa04b5a5179a40727cc17a3365c222c0bd8a657562d0f3d133ab442464a95787d0dc49ef1b877d02d6365d2

data/.travis.yml

@@ -1,18 +1,16 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.0.0
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
+  - 2.5.7
+  - 2.6.5
+  - 2.7.0
 gemfile:
-  - gemfiles/activerecord-3.2.x.gemfile
-  - gemfiles/activerecord-4.0.x.gemfile
-  - gemfiles/activerecord-4.1.x.gemfile
-  - gemfiles/activerecord-4.2.x.gemfile
+  - gemfiles/activerecord-5.2.x.gemfile
+  - gemfiles/activerecord-6.0.x.gemfile
 addons:
   code_climate:
-    repo_token: 1cac54041089115a5bf218169b62c76c8b87a5896f5aa973f89637a8553c0376
+    repo_token:
+      secure: Dn+nXUOFHTRUhYqYM1NYSxYSyoDhFaB2EHvlhBJ/FK3QxCy4a0beSLhs+YnDl8kI1DOrZQMl7HDrh9AHlfYvu5fX4zADD5g7JkTA2mIx1Rk3yazAUuy1j1ftX/UaowzoUAR5t0qwYm344Nnqoh+O1FujvWbiGVuZvWa6vfjFbXA=
 matrix:
   fast_finish: true
 before_install:

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+### 0.6.0 / 2021-07-29
+
+* Use on_load hook for integration with ActiveRecord (@sikachu)
+* Use update instead of update_attributes (@sikachu)
+
+### 0.5.0 / 2020-07-27
+
+* Add ability to use default and custom normalizers together (@subbbotin)
+
+### 0.4.0 / 2020-01-20
+
+* Support Ruby 2.7 (@badlamer)
+
+### 0.3.1 / 2018-03-22
+
+* Fix conditional normalization
+
 ### 0.3.0 / 2018-03-21
 
 * Add a possibility to use if/unless cases for normalizer options (@TheTharin)

data/README.md

@@ -1,9 +1,9 @@
 ## Normalizr
 
 [![Gem Version](https://badge.fury.io/rb/normalizr.svg)](https://badge.fury.io/rb/normalizr)
-[![Build Status](https://travis-ci.org/dimko/normalizr.svg?branch=master)](https://travis-ci.org/dimko/normalizr)
-[![Code Climate](https://codeclimate.com/github/dimko/normalizr/badges/gpa.svg)](https://codeclimate.com/github/dimko/normalizr)
-[![Test Coverage](https://codeclimate.com/github/dimko/normalizr/badges/coverage.svg)](https://codeclimate.com/github/dimko/normalizr/coverage)
+[![Build Status](https://travis-ci.org/dmeremyanin/normalizr.svg?branch=master)](https://travis-ci.org/dmeremyanin/normalizr)
+[![Code Climate](https://codeclimate.com/github/dmeremyanin/normalizr/badges/gpa.svg)](https://codeclimate.com/github/dmeremyanin/normalizr)
+[![Test Coverage](https://codeclimate.com/github/dmeremyanin/normalizr/badges/coverage.svg)](https://codeclimate.com/github/dmeremyanin/normalizr/coverage)
 
 The [attribute_normalizer](https://github.com/mdeering/attribute_normalizer) replacement.
 
@@ -88,6 +88,9 @@ class User < ActiveRecord::Base
   normalize :first_name, :last_name, :about # with default normalizers
   normalize :email, with: :downcase
 
+  # you can use default and custom normalizers together
+  normalize :middle_name, with: [:default, :titleize]
+
   # supports `normalize_attribute` and `normalize_attributes` as well
   normalize_attribute :skype
 
@@ -95,13 +98,15 @@ class User < ActiveRecord::Base
   normalize :skills
 end
 
-user = User.new(first_name: '', last_name: '', skills: [nil, '', ' ruby'])
+user = User.new(first_name: '', last_name: '', middle_name: 'elizabeth ', skills: [nil, '', ' ruby'])
 user.email = "ADDRESS@example.com"
 
 user.first_name
 #=> nil
 user.last_name
 #=> nil
+user.middle_name
+#=> "Elizabeth"
 user.email
 #=> "address@example.com"
 user.skills
@@ -140,8 +145,8 @@ class Book
 
   normalize :author, if: :author_should_be_normalized?
   normalize :description, unless: :description_should_not_be_normalized?
-  
-  normalize :author, if: proc { date.today? }
+
+  normalize :author, if: -> { date.today? }
 end
 ```
 

data/gemfiles/{activerecord-3.2.x.gemfile → activerecord-5.2.x.gemfile}

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 3.2.0'
-gem 'mongoid',      '~> 3.0'
+gem 'activerecord', '~> 5.2.0'
+gem 'mongoid',      '~> 6.0'
 gem 'codeclimate-test-reporter', require: false
 
 gemspec path: '../'

data/gemfiles/{activerecord-4.0.x.gemfile → activerecord-6.0.x.gemfile}

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 4.0.0'
-gem 'mongoid',      '~> 4.0'
+gem 'activerecord', '~> 6.0.0'
+gem 'mongoid',      '~> 7.0'
 gem 'codeclimate-test-reporter', require: false
 
 gemspec path: '../'

data/lib/normalizr.rb

@@ -15,8 +15,12 @@ module Normalizr
     @configuration ||= Configuration.new
   end
 
-  def configure
-    configuration.instance_eval &Proc.new
+  def configure(&block)
+    unless block_given?
+      raise ArgumentError, '.configure must be called with a block'
+    end
+
+    configuration.instance_eval(&block)
   end
 
   def find(name)
@@ -38,12 +42,21 @@ module Normalizr
   end
 
   def normalize(obj, *normalizers)
-    normalizers = configuration.default_normalizers if normalizers.empty?
-    normalizers.each do |name|
+    normalizers_with_default(normalizers).reduce(obj) do |memo, name|
       name, options = name.first if Hash === name
-      obj = process(obj, name, options)
+
+      process(memo, name, options)
     end
-    obj
+  end
+
+  private
+
+  def normalizers_with_default(normalizers)
+    default_index = normalizers.index(:default)
+
+    normalizers[default_index.to_i] = configuration.default_normalizers if normalizers.empty? || default_index
+    normalizers.flatten!
+    normalizers
   end
 end
 

data/lib/normalizr/concern.rb

@@ -11,8 +11,10 @@ module Normalizr
         prepend Module.new {
           options.attributes.each do |method|
             define_method :"#{method}=" do |value|
-              positive = options.positive_condition.all?  { |condition| instance_eval(&condition) }
-              negative = options.negative_condition.none? { |condition| instance_eval(&condition) }
+              condition_lambda = -> condition { Proc === condition ? instance_exec(&condition) : send(condition) }
+
+              positive = options.positive_condition.all?(&condition_lambda)
+              negative = options.negative_condition.none?(&condition_lambda)
 
               if positive && negative
                 value = Normalizr.normalize(value, *options.before)

data/lib/normalizr/configuration.rb

@@ -14,8 +14,12 @@ module Normalizr
       self.default_normalizers = normalizers
     end
 
-    def add(name)
-      normalizers[name] = Proc.new
+    def add(name, &block)
+      unless block_given?
+        raise ArgumentError, '#add must be called with a block'
+      end
+
+      normalizers[name] = block
     end
   end
 end

data/lib/normalizr/integrations/active_record.rb

@@ -1 +1,3 @@
-ActiveRecord::Base.send(:include, Normalizr::Concern)
+ActiveSupport.on_load(:active_record) do
+  include Normalizr::Concern
+end

data/lib/normalizr/version.rb

@@ -1,3 +1,3 @@
 module Normalizr
-  VERSION = '0.3.0'
+  VERSION = '0.6.0'
 end

data/normalizr.gemspec

@@ -5,11 +5,11 @@ require 'normalizr/version'
 Gem::Specification.new do |spec|
   spec.name          = 'normalizr'
   spec.version       = Normalizr::VERSION
-  spec.authors       = ['Dimko']
+  spec.authors       = ['Dmitriy Meremyanin']
   spec.email         = ['deemox@gmail.com']
   spec.description   = 'Writer methods parameters normalization'
   spec.summary       = 'Writer methods parameters normalization'
-  spec.homepage      = 'https://github.com/dimko/normalizr'
+  spec.homepage      = 'https://github.com/dmeremyanin/normalizr'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.0'
 
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'bundler',      '~> 1.5'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec',        '~> 3.0'
   spec.add_development_dependency 'rspec-its'

data/spec/lib/normalizr/configuration_spec.rb

@@ -5,17 +5,27 @@ describe Normalizr::Configuration do
   subject { configuration }
 
   describe '#default' do
-    before { configuration.default(:blank) }
-    its(:default_normalizers) { should == [:blank] }
+    it 'accpets default normalizers' do
+      subject.default(:blank)
+      expect(subject.default_normalizers).to eq([:blank])
+    end
   end
 
   describe '#normalizer_names' do
-    before { allow(configuration).to receive(:normalizers) {{ blank: proc {}}}}
-    its(:normalizer_names) { should == [:blank] }
+    it 'returns normalized names' do
+      allow(subject).to receive(:normalizers) {{ blank: proc {}}}
+      expect(subject.normalizer_names).to eq([:blank])
+    end
   end
 
   describe '#add' do
-    before { configuration.add(:blank) {}}
-    its(:normalizer_names) { should include(:blank) }
+    it 'requires block' do
+      expect { subject.add(:blank) }.to raise_error(ArgumentError)
+    end
+
+    it 'accepts block' do
+      subject.add(:blank) {}
+      expect(subject.normalizer_names).to include(:blank)
+    end
   end
 end

data/spec/lib/normalizr_spec.rb

@@ -119,5 +119,26 @@ describe Normalizr do
         end
       end
     end
+
+    context 'normalizers are default and custom' do
+      let(:normalizers) { [:default, { truncate: { length: 8, omission: '...' }}, proc { |v| v.first(6) }] }
+      let(:value) { ' Lorem ipsum dolor sit amet' }
+
+      context 'string' do
+        let(:value) { ' Lorem ipsum dolor sit amet' }
+
+        it 'uses the default normalizers, then truncates and slices the value' do
+          expect(subject).to eq('Lorem.')
+        end
+      end
+
+      context 'array' do
+        let(:value) { [' Lorem ipsum dolor sit amet', '    One more sentence', ''] }
+
+        it 'strips, truncates and then slices the value' do
+          expect(subject).to eq(['Lorem.', 'One m.'])
+        end
+      end
+    end
   end
 end

data/spec/models/article_spec.rb

@@ -21,7 +21,7 @@ describe Article do
     before do
       @article = Article.create!(title: 'Original Title')
       @article2 = Article.find(@article.id)
-      @article2.update_attributes(title: 'New Title')
+      @article2.update(title: 'New Title')
     end
 
     it "should reflect the change when the record is reloaded" do

data/spec/models/book_spec.rb

@@ -25,7 +25,7 @@ describe Book do
     before do
       @book = Book.create!(title: 'Original Title')
       @book2 = Book.find(@book.id)
-      @book2.update_attributes(title: 'New Title')
+      @book2.update(title: 'New Title')
     end
 
     it "should reflect the change when the record is reloaded" do

data/spec/support/models/user.rb

@@ -3,7 +3,9 @@ class User < Person
 
   normalize :lastname, if: :should_normalize_lastname?
   normalize :maidenname, if: :should_normalize_maidenname_positive?, unless: :should_normalize_maidenname_negative?
-  normalize :favouritebook, if: proc { true }
+  normalize :favouritebook, if: -> { true }
+
+  private
 
   def should_normalize_lastname?
     true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: normalizr
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.6.0
 platform: ruby
 authors:
-- Dimko
-autorequire: 
+- Dmitriy Meremyanin
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-21 00:00:00.000000000 Z
+date: 2021-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -151,10 +151,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/activerecord-3.2.x.gemfile
-- gemfiles/activerecord-4.0.x.gemfile
-- gemfiles/activerecord-4.1.x.gemfile
-- gemfiles/activerecord-4.2.x.gemfile
+- gemfiles/activerecord-5.2.x.gemfile
+- gemfiles/activerecord-6.0.x.gemfile
 - lib/normalizr.rb
 - lib/normalizr/concern.rb
 - lib/normalizr/configuration.rb
@@ -193,11 +191,11 @@ files:
 - spec/support/models/publisher.rb
 - spec/support/models/user.rb
 - spec/support/schema.rb
-homepage: https://github.com/dimko/normalizr
+homepage: https://github.com/dmeremyanin/normalizr
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -212,9 +210,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Writer methods parameters normalization
 test_files:

data/gemfiles/activerecord-4.1.x.gemfile

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 4.1.0'
-gem 'mongoid',      '~> 4.0'
-gem 'codeclimate-test-reporter', require: false
-
-gemspec path: '../'

data/gemfiles/activerecord-4.2.x.gemfile

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 4.2.0'
-gem 'mongoid',      '~> 4.0'
-gem 'codeclimate-test-reporter', require: false
-
-gemspec path: '../'