u-attributes 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e37bcd7fa7880973930c3a455850708bf22962266c5d2b09f69885dc0c7b9a8d
-  data.tar.gz: ed08290e3bca0a590a88a7720deb3c6e94eae93d64a12884eb108806ce2a13ce
+  metadata.gz: 72e9cbaceb087cd97c5cf3a46b705f52d3664d96018851fda83d455dc59aaa36
+  data.tar.gz: 36238187591d0662c2212ea7fd3e1e5192d5785c2f1f59f57731d2f704e2a78b
 SHA512:
-  metadata.gz: 031f5deb4ece3c5be0004290675a4bbd72e90a8b1436068054dc1acf8d949e7b4957e6b20d4f53112136cd35d15ede29d648576e7b3fe52fe0216e73012afad7
-  data.tar.gz: 6191e30d97bdf5cdeb06a5ece5db65877ca14304af432dc8f69077cb691fc0458a4adb1124ebf1acdbdeae4eae2682944770cb1268708680ebafd0062165a38c
+  metadata.gz: f00dd1f663f7364c28743e33c8812f683a8a4837c42636b2289a179ca9a11a3935f4c7a443e688d0ecd57181f970afb4d37c7b06c823100a79c481ecc6cabae4
+  data.tar.gz: d86e8e5b6689e524fdfb72133e1f209d946726a109574df20a2aaa92a239fd123e973636c50bb4ca45c0de72533b107ca95b197f95bcde6520afeb37deaa7e42

data/.travis.yml

@@ -3,7 +3,7 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.2.0
+  - 2.2.2
   - 2.3.0
   - 2.4.0
   - 2.5.0
@@ -11,5 +11,8 @@ rvm:
 before_install:
   - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
   - gem install bundler -v '< 2'
+install: bundle install --jobs=3 --retry=3
 env:
   - DISABLE_SIMPLECOV=true
+script: ./run-tests.sh
+

data/Gemfile

@@ -1,6 +1,28 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gem 'simplecov', require: false, group: :test
 
+activemodel_version = ENV.fetch('ACTIVEMODEL_VERSION', '6.1')
+
+activemodel = case activemodel_version
+              when '3.2' then '3.2.22'
+              when '4.0' then '4.0.13'
+              when '4.1' then '4.1.16'
+              when '4.2' then '4.2.11'
+              when '5.0' then '5.0.7'
+              when '5.1' then '5.1.7'
+              when '5.2' then '5.2.3'
+              when '6.0' then '6.0.0.rc1'
+              end
+
+if activemodel_version < '6.1'
+  gem 'activemodel', activemodel
+  gem 'activesupport', activemodel
+end
+
+minitest = activemodel_version < '4.1' ? '~> 4.2' : '~> 5.0'
+
+gem 'minitest', minitest
+
 # Specify your gem's dependencies in u-attributes.gemspec
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    u-attributes (0.10.0)
+    u-attributes (0.11.0)
 
 GEM
   remote: https://rubygems.org/
@@ -10,7 +10,7 @@ GEM
     json (2.2.0)
     minitest (5.11.3)
     rake (10.5.0)
-    simplecov (0.16.1)
+    simplecov (0.17.0)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)

data/README.md

@@ -270,11 +270,7 @@ You can use the method `Micro::Attributes.features()` to combine and require onl
 
 Note: The method `Micro::Attributes.with()` is an alias for `Micro::Attributes.features()`.
 
-### Diff extension
-
-Provides a way to track changes in your object attributes.
-
-#### How to enable?
+### Usage
 
 ```ruby
 #----------------------------------#
@@ -283,17 +279,17 @@ Provides a way to track changes in your object attributes.
 class Job
   include Micro::Attributes.features(:diff)
 
-  attributes :id, state: 'sleeping'
+  attribute :id
+  attribute :state, 'sleeping'
 
   def initialize(options)
-    self.options = options
+    self.attributes = options
   end
 end
 
 # --------------------------------------------------------------------#
 # Using the .with() method alias and adding the initialize extension. #
 # --------------------------------------------------------------------#
-
 class Job
   include Micro::Attributes.with(:initialize, :diff)
 
@@ -304,19 +300,49 @@ end
 # Via Micro::Attributes.to_initialize() #
 #---------------------------------------#
 class Job
-  include Micro::Attributes.to_initialize(diff: true)
+  include Micro::Attributes.to_initialize(diff: false, activemodel_validations: true)
 
-  attribute :id
-  attribute :state, 'sleeping'
+  attributes :id, state: 'sleeping'
+  validates! :id, :state, presence: true
 end
 ```
 
+### ActiveModel::Validations extension
+
+If your application uses ActiveModel as a dependency (like a regular Rails app). You will be enabled to use the `actimodel_validations` extension.
+
+#### Usage
+
+```ruby
+class Job
+  # include Micro::Attributes.with(:initialize, :activemodel_validations)
+  # include Micro::Attributes.features(:initialize, :activemodel_validations)
+  include Micro::Attributes.to_initialize(activemodel_validations: true)
+
+  attributes :id, state: 'sleeping'
+  validates! :id, :state, presence: true
+end
+
+Job.new({}) # ActiveModel::StrictValidationFailed (Id can't be blank)
+
+job = Job.new(id: 1)
+
+p job.id    # 1
+p job.state # "sleeping"
+```
+
+### Diff extension
+
+Provides a way to track changes in your object attributes.
+
 #### Usage
 
 ```ruby
 require 'securerandom'
 
 class Job
+  # include Micro::Attributes.with(:initialize, :diff)
+  # include Micro::Attributes.to_initialize(diff: true)
   include Micro::Attributes.features(:initialize, :diff)
 
   attributes :id, state: 'sleeping'

data/lib/micro/attributes.rb

@@ -22,9 +22,10 @@ module Micro
       end
     end
 
-    def self.to_initialize(diff: false)
+    def self.to_initialize(diff: false, activemodel_validations: false)
       options = [:initialize]
       options << :diff if diff
+      options << :activemodel_validations if activemodel_validations
       features(*options)
     end
 

data/lib/micro/attributes/features.rb

@@ -2,6 +2,7 @@
 
 require "micro/attributes/features/diff"
 require "micro/attributes/features/initialize"
+require "micro/attributes/features/activemodel_validations"
 
 module Micro
   module Attributes
@@ -13,10 +14,38 @@ module Micro
         end
       end
 
+      module ActiveModelValidationsAndDiff
+        def self.included(base)
+          base.send(:include, ::Micro::Attributes::Features::Diff)
+          base.send(:include, ::Micro::Attributes::Features::ActiveModelValidations)
+        end
+      end
+
+      module ActiveModelValidationsAndInitialize
+        def self.included(base)
+          base.send(:include, ::Micro::Attributes::Features::Initialize)
+          base.send(:include, ::Micro::Attributes::Features::ActiveModelValidations)
+        end
+      end
+
+      module ActiveModelValidationsAndDiffAndInitialize
+        def self.included(base)
+          base.send(:include, ::Micro::Attributes::Features::Initialize)
+          base.send(:include, ::Micro::Attributes::Features::Diff)
+          base.send(:include, ::Micro::Attributes::Features::ActiveModelValidations)
+        end
+      end
+
       OPTIONS = {
+        # Features
         'diff' => Diff,
         'initialize' => Initialize,
-        'diff:initialize' => InitializeAndDiff
+        'activemodel_validations' => ActiveModelValidations,
+        # Combinations
+        'diff:initialize' => InitializeAndDiff,
+        'activemodel_validations:diff' => ActiveModelValidationsAndDiff,
+        'activemodel_validations:initialize' => ActiveModelValidationsAndInitialize,
+        'activemodel_validations:diff:initialize' => ActiveModelValidationsAndDiffAndInitialize
       }.freeze
 
       private_constant :OPTIONS
@@ -24,7 +53,7 @@ module Micro
       def self.fetch(names)
         option = OPTIONS[names.map { |name| name.to_s.downcase }.sort.join(':')]
         return option if option
-        raise ArgumentError, 'Invalid feature name! Available options: diff, initialize'
+        raise ArgumentError, 'Invalid feature name! Available options: diff, initialize, activemodel_validations'
       end
     end
   end

data/lib/micro/attributes/features/activemodel_validations.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Micro::Attributes
+  module Features
+    module ActiveModelValidations
+      @@__active_model_load_error = false
+      @@__active_model_required = false
+
+      def self.included(base)
+        if !@@__active_model_load_error && !@@__active_model_required
+          begin
+            require 'active_model'
+          rescue LoadError => e
+            @@__active_model_load_error = true
+          end
+          @@__active_model_required = true
+        end
+
+        unless @@__active_model_load_error
+          base.send(:include, ::ActiveModel::Validations)
+
+          if ::ActiveModel::VERSION::STRING >= '3.2'
+            base.class_eval(<<-RUBY)
+              def initialize(options)
+                self.attributes=(options)
+                run_validations!
+              end
+            RUBY
+          end
+        end
+      end
+    end
+  end
+end

data/lib/micro/attributes/version.rb

@@ -2,6 +2,6 @@
 
 module Micro
   module Attributes
-    VERSION = "0.10.0"
+    VERSION = "0.11.0"
   end
 end

data/run-tests.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+ACTIVEMODEL_VERSION='3.2' bundle update
+ACTIVEMODEL_VERSION='3.2' bundle exec rake test
+
+ACTIVEMODEL_VERSION='4.0' bundle update
+ACTIVEMODEL_VERSION='4.0' bundle exec rake test
+
+ACTIVEMODEL_VERSION='4.1' bundle update
+ACTIVEMODEL_VERSION='4.1' bundle exec rake test
+
+ACTIVEMODEL_VERSION='4.2' bundle update
+ACTIVEMODEL_VERSION='4.2' bundle exec rake test
+
+ACTIVEMODEL_VERSION='5.0' bundle update
+ACTIVEMODEL_VERSION='5.0' bundle exec rake test
+
+ACTIVEMODEL_VERSION='5.1' bundle update
+ACTIVEMODEL_VERSION='5.1' bundle exec rake test
+
+ACTIVEMODEL_VERSION='5.2' bundle update
+ACTIVEMODEL_VERSION='5.2' bundle exec rake test

data/u-attributes.gemspec

@@ -25,5 +25,4 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.2.0'
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: u-attributes
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Rodrigo Serradura
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 description: This gem allows defining read-only attributes, that is, your objects
   will have only getters to access their attributes data.
 email:
@@ -59,11 +45,13 @@ files:
 - lib/micro/attributes.rb
 - lib/micro/attributes/attributes_utils.rb
 - lib/micro/attributes/features.rb
+- lib/micro/attributes/features/activemodel_validations.rb
 - lib/micro/attributes/features/diff.rb
 - lib/micro/attributes/features/initialize.rb
 - lib/micro/attributes/macros.rb
 - lib/micro/attributes/version.rb
 - lib/u-attributes.rb
+- run-tests.sh
 - u-attributes.gemspec
 homepage: https://github.com/serradura/u-attributes
 licenses: