normalize_attributes 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a24b07529124afe4d9fda460e8f10e3eabfe9ac824fe56174502d27d19780a3
-  data.tar.gz: 0aff6b7f98fb50480d3d933d3623ac39bf6e50b772b77baf32a78cb589e85742
+  metadata.gz: d02d2f9fd6b4e46578d0aa42b7d88600319f141d0b344ee9099cfc1f55c2ade3
+  data.tar.gz: 1f2ad30cb3c68301d103cbf9f3e2f0b98b1907b9610d78c370ee124a36c948cc
 SHA512:
-  metadata.gz: 570f5a329e89d4e82241abbf1310e05c17d2650959ad206fa099fa120431dd18fcc8304e50b652329b21a9ca7884713abf0115f5272c207cf929ec3fe39fe863
-  data.tar.gz: 25593e6b295b4662443f0ad150d3a90fa41b7d5eac10c4fdb63feec5e50246c8c586d72d025a9847184c35bd2cc475a80696a5cca5b5541c83b542c74c7713ff
+  metadata.gz: 442645e30d41a53d349c2a8ae4277e2170cc19ed0044bb02176553ab5b5cbfa5b5c3474643b336a58712e94ba8d3531e72998c078322866b43275eb553fea5ba
+  data.tar.gz: 7c3910ebb292d98268509bf04bd50880cbb1688d33e2e5f464de3a2379d12917992d93b0692a302ce9db08175aec09b1d3a5a136218138e02a989d63ce3a1c53

data/.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 pkg
 /coverage
+*.lock

data/.rubocop.yml

@@ -0,0 +1,6 @@
+---
+inherit_gem:
+  rubocop-fnando: .rubocop.yml
+
+AllCops:
+  TargetRubyVersion: 2.7

data/.travis.yml

@@ -1,19 +1,19 @@
+---
 language: ruby
 sudo: false
 cache: bundler
 notifications:
   email: false
 rvm:
-- 2.5.2
+  - 2.7.0
 before_install:
-- gem install bundler
+  - gem install bundler
 before_script:
-- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64
-  > ./cc-test-reporter
-- chmod +x ./cc-test-reporter
-- "./cc-test-reporter before-build"
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - "./cc-test-reporter before-build"
 after_script:
-- "./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT"
+  - "./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT"
 env:
   global:
     secure: U80HNhPVE+IUJaxOPxMJc0CqlQSsl23EOOsqcnuXUjrlcjvfeCnQU58rxFOUCBeKxmno4tatfZXdwBa+FvQ3PcnOXXnesMfCR0UAPdGmaA6ScSMyL+KijC1wGI0N80ccBZRaBA4quR02XTMiJt1saTrBT1cuOCsWs2gjOB4EwoA=

data/Gemfile

@@ -1,2 +1,4 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
+
+source "https://rubygems.org"
 gemspec

data/README.md

@@ -6,7 +6,9 @@
 [![Gem](https://img.shields.io/gem/v/normalize_attributes.svg)](https://rubygems.org/gems/normalize_attributes)
 [![Gem](https://img.shields.io/gem/dt/normalize_attributes.svg)](https://rubygems.org/gems/normalize_attributes)
 
-Sometimes you want to normalize data before saving it to the database like downcasing e-mails, removing spaces and so on. This Rails plugin allows you to do so in a simple way.
+Sometimes you want to normalize data before saving it to the database like
+downcasing e-mails, removing spaces and so on. This Rails plugin allows you to
+do so in a simple way.
 
 ## Usage
 
@@ -22,7 +24,8 @@ class User < ActiveRecord::Base
 end
 ```
 
-The example above will normalize your `:email` attribute on the `before_save` callback.
+The example above will normalize your `:email` attribute on the `before_save`
+callback.
 
 You can specify multiple attributes
 
@@ -46,13 +49,15 @@ normalize :name, with: :downcase do |value|
 end
 ```
 
-The `squish` method is the default normalizer for strings. All you need to is specify the attribute:
+The `squish` method is the default normalizer for strings. All you need to is
+specify the attribute:
 
 ```ruby
 normalize :content
 ```
 
-The `compact` method is the default normalizer for arrays (when using `serialize` method):
+The `compact` method is the default normalizer for arrays (when using
+`serialize` method):
 
 ```ruby
 class User < ActiveRecord::Base
@@ -61,14 +66,29 @@ class User < ActiveRecord::Base
 end
 ```
 
-The `normalize` method is aliased as `normalize_attributes`, `normalize_attribute`, `normalize_attr`, and `normalize_attrs`.
+The `normalize` method is aliased as `normalize_attributes`,
+`normalize_attribute`, `normalize_attr`, and `normalize_attrs`.
 
-You can normalize the attribute before type casting; this is specially useful for normalizing
-dates and numbers.
+You can normalize the attribute before type casting; this is specially useful
+for normalizing dates and numbers.
 
 ```ruby
 class Product
-  normalize(:price, raw: true) {|v| Money.new(v).to_f}
+  normalize(:price, raw: true) {|v| Money.new(v).to_f }
+end
+```
+
+You can also use it with `ActiveModel::Model` classes.
+
+```ruby
+class UserForm
+  include ActiveModel::Model
+  include ActiveModel::Attributes
+  include ActiveModel::Validations::Callbacks
+  include NormalizeAttributes::Callbacks
+
+  attribute :username
+  normalize :username
 end
 ```
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rake/testtask"
 

data/lib/normalize_attributes.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require "active_record"
 
 ActiveSupport.on_load(:active_record) do
   require "active_support/core_ext/string/filters"
   require "normalize_attributes/version"
-  require "normalize_attributes/active_record"
+  require "normalize_attributes/callbacks"
 
-  ActiveRecord::Base.send :include, NormalizeAttributes::ActiveRecord
+  ActiveRecord::Base.include NormalizeAttributes::Callbacks
 end

data/lib/normalize_attributes/{active_record.rb → callbacks.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module NormalizeAttributes
   def self.retrieve_value(record, attribute, raw)
     before_type_cast_method = "#{attribute}_before_type_cast"
@@ -37,13 +39,13 @@ module NormalizeAttributes
     end
 
     begin
-      record.write_attribute(attribute, value)
+      record.send(:write_attribute, attribute, value)
     rescue ActiveModel::MissingAttributeError
       record.public_send("#{attribute}=", value)
     end
   end
 
-  module ActiveRecord
+  module Callbacks
     def self.included(base)
       base.instance_eval do
         extend ClassMethods
@@ -66,21 +68,22 @@ module NormalizeAttributes
 
           normalize_options.tap do |o|
             o[attr_name] ||= []
-            o[attr_name] << [[block, options[:with]].flatten.compact, options.except(:with)]
+            o[attr_name] << [
+              [block, options[:with]].flatten.compact,
+              options.except(:with)
+            ]
           end
         end
       end
 
-      alias_method :normalize_attributes, :normalize
-      alias_method :normalize_attribute, :normalize
-      alias_method :normalize_attr, :normalize
-      alias_method :normalize_attrs, :normalize
+      alias normalize_attributes normalize
+      alias normalize_attribute normalize
+      alias normalize_attr normalize
+      alias normalize_attrs normalize
     end
 
     module InstanceMethods
-      private
-
-      def normalize_attributes
+      private def normalize_attributes
         return unless self.class.normalize_options
 
         self.class.normalize_options.each do |attribute, items|

data/lib/normalize_attributes/version.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module NormalizeAttributes
   module Version
     MAJOR = 0
     MINOR = 3
-    PATCH = 0
+    PATCH = 1
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/normalize_attributes.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "./lib/normalize_attributes/version"
 
 Gem::Specification.new do |s|
@@ -13,14 +15,16 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map {|f| File.basename(f) }
+  s.executables   = `git ls-files -- bin/*`
+                    .split("\n")
+                    .map {|f| File.basename(f) }
   s.require_paths = ["lib"]
 
   s.add_dependency "activerecord"
+  s.add_development_dependency "actionpack"
   s.add_development_dependency "bundler"
-  s.add_development_dependency "rake"
   s.add_development_dependency "minitest-utils"
-  s.add_development_dependency "sqlite3"
-  s.add_development_dependency "actionpack"
+  s.add_development_dependency "rake"
   s.add_development_dependency "simplecov"
+  s.add_development_dependency "sqlite3"
 end

data/test/normalize_attributes_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class NormalizeAttributesTest < Minitest::Test
@@ -51,7 +53,7 @@ class NormalizeAttributesTest < Minitest::Test
   end
 
   test "combine both method names and procs as normalization methods" do
-    User.normalize(:email, with: :downcase) {|v| v.reverse }
+    User.normalize(:email, with: :downcase, &:reverse)
     user = User.create(email: "JOHN@DOE.COM")
 
     assert_equal "moc.eod@nhoj", user.email
@@ -74,7 +76,10 @@ class NormalizeAttributesTest < Minitest::Test
 
   test "apply default filter on strings" do
     User.normalize :email
-    user = User.create(email: "    \n\t    john@doe.com    \t\t\n\r\n", username: "john")
+    user = User.create(
+      email: "    \n\t    john@doe.com    \t\t\n\r\n",
+      username: "john"
+    )
 
     assert_equal "john@doe.com", user.email
   end
@@ -109,4 +114,21 @@ class NormalizeAttributesTest < Minitest::Test
 
     assert_equal "johnny d", user.nickname
   end
+
+  test "normalize ActiveModel::Model objects" do
+    model = Class.new do
+      include ActiveModel::Model
+      include ActiveModel::Attributes
+      include ActiveModel::Validations::Callbacks
+      include NormalizeAttributes::Callbacks
+
+      attribute :username
+      normalize :username
+    end
+
+    instance = model.new(username: "      john      ")
+    instance.valid?
+
+    assert_equal "john", instance.username
+  end
 end

data/test/schema.rb

@@ -1,8 +1,10 @@
-ActiveRecord::Schema.define(:version => 0) do
+# frozen_string_literal: true
+
+ActiveRecord::Schema.define(version: 0) do
   create_table :users do |t|
     t.string :email, :username
     t.text :preferences
-    t.integer :age, :null => false, :default => 0
+    t.integer :age, null: false, default: 0
   end
 
   create_table :tokens do |t|

data/test/support/token.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Token < ActiveRecord::Base
   belongs_to :user
 end

data/test/support/user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class User < ActiveRecord::Base
   has_many :tokens
   serialize :preferences

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "simplecov"
 SimpleCov.start
 
@@ -13,4 +15,4 @@ ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
 # Load database schema
 load "schema.rb"
 
-Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f }
+Dir[File.dirname(__FILE__) + "/support/**/*.rb"].sort.each {|f| require f }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: normalize_attributes
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-27 00:00:00.000000000 Z
+date: 2020-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -116,13 +116,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - lib/normalize_attributes.rb
-- lib/normalize_attributes/active_record.rb
+- lib/normalize_attributes/callbacks.rb
 - lib/normalize_attributes/version.rb
 - normalize_attributes.gemspec
 - test/normalize_attributes_test.rb
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Normalize ActiveRecord attributes

data/Gemfile.lock

@@ -1,84 +0,0 @@
-PATH
-  remote: .
-  specs:
-    normalize_attributes (0.3.0)
-      activerecord
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (5.2.2)
-      actionview (= 5.2.2)
-      activesupport (= 5.2.2)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.2)
-      activesupport (= 5.2.2)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activemodel (5.2.2)
-      activesupport (= 5.2.2)
-    activerecord (5.2.2)
-      activemodel (= 5.2.2)
-      activesupport (= 5.2.2)
-      arel (>= 9.0)
-    activesupport (5.2.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
-    builder (3.2.3)
-    concurrent-ruby (1.1.4)
-    crass (1.0.4)
-    docile (1.1.5)
-    erubi (1.8.0)
-    i18n (1.3.0)
-      concurrent-ruby (~> 1.0)
-    json (2.1.0)
-    loofah (2.2.3)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    minitest-utils (0.4.4)
-      minitest
-    nokogiri (1.9.1)
-      mini_portile2 (~> 2.4.0)
-    rack (2.0.6)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    rake (12.3.2)
-    simplecov (0.13.0)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sqlite3 (1.3.13)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  actionpack
-  bundler
-  minitest-utils
-  normalize_attributes!
-  rake
-  simplecov
-  sqlite3
-
-BUNDLED WITH
-   1.17.3