g2_command 0.3.0 → 2.2.0

data/gemfiles/rails_6.0.gemfile

@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "fivemat"
+gem "pry"
+gem "rails", "6.0.3"
+gem "rake", "~> 12.0"
+gem "rspec", "~> 3.0"
+gem "rspec_junit_formatter"
+gem "rubocop-g2"
+gem "simplecov", "0.16.1"
+
+gemspec path: "../"

data/gemfiles/rails_6.0.gemfile.lock

@@ -0,0 +1,224 @@
+PATH
+  remote: ..
+  specs:
+    g2_command (2.2.0)
+      activemodel (>= 5.0, < 7)
+      activesupport (>= 5.0, < 7)
+      dry-initializer (~> 3.0)
+      dry-monads (~> 1.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (6.0.3)
+      actionpack (= 6.0.3)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.0.3)
+      actionpack (= 6.0.3)
+      activejob (= 6.0.3)
+      activerecord (= 6.0.3)
+      activestorage (= 6.0.3)
+      activesupport (= 6.0.3)
+      mail (>= 2.7.1)
+    actionmailer (6.0.3)
+      actionpack (= 6.0.3)
+      actionview (= 6.0.3)
+      activejob (= 6.0.3)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.0.3)
+      actionview (= 6.0.3)
+      activesupport (= 6.0.3)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.3)
+      actionpack (= 6.0.3)
+      activerecord (= 6.0.3)
+      activestorage (= 6.0.3)
+      activesupport (= 6.0.3)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.3)
+      activesupport (= 6.0.3)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.3)
+      activesupport (= 6.0.3)
+      globalid (>= 0.3.6)
+    activemodel (6.0.3)
+      activesupport (= 6.0.3)
+    activerecord (6.0.3)
+      activemodel (= 6.0.3)
+      activesupport (= 6.0.3)
+    activestorage (6.0.3)
+      actionpack (= 6.0.3)
+      activejob (= 6.0.3)
+      activerecord (= 6.0.3)
+      marcel (~> 0.3.1)
+    activesupport (6.0.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    appraisal (2.3.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.1)
+    builder (3.2.4)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.7)
+    crass (1.0.6)
+    diff-lcs (1.4.4)
+    docile (1.3.2)
+    dry-core (0.4.9)
+      concurrent-ruby (~> 1.0)
+    dry-equalizer (0.3.0)
+    dry-initializer (3.0.4)
+    dry-monads (1.3.5)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.4, >= 0.4.4)
+      dry-equalizer
+    erubi (1.9.0)
+    fivemat (1.3.7)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
+    json (2.3.1)
+    loofah (2.7.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (1.0.0)
+    mimemagic (0.3.5)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.14.2)
+    nio4r (2.5.4)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    parallel (1.19.2)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rack (2.2.3)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (6.0.3)
+      actioncable (= 6.0.3)
+      actionmailbox (= 6.0.3)
+      actionmailer (= 6.0.3)
+      actionpack (= 6.0.3)
+      actiontext (= 6.0.3)
+      actionview (= 6.0.3)
+      activejob (= 6.0.3)
+      activemodel (= 6.0.3)
+      activerecord (= 6.0.3)
+      activestorage (= 6.0.3)
+      activesupport (= 6.0.3)
+      bundler (>= 1.3.0)
+      railties (= 6.0.3)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.3)
+      actionpack (= 6.0.3)
+      activesupport (= 6.0.3)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rainbow (3.0.0)
+    rake (12.3.3)
+    regexp_parser (1.8.2)
+    rexml (3.2.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.4)
+    rspec_junit_formatter (0.4.1)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    rubocop (0.93.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 0.6.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.1.0)
+      parser (>= 2.7.1.5)
+    rubocop-g2 (1.2.1)
+      rubocop (>= 0.82)
+      rubocop-rails (>= 2.5)
+      rubocop-rspec (>= 1.39)
+    rubocop-rails (2.8.1)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 0.87.0)
+    rubocop-rspec (1.44.1)
+      rubocop (~> 0.87)
+      rubocop-ast (>= 0.7.1)
+    ruby-progressbar (1.10.1)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sprockets (4.0.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.2)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (1.0.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.7.0)
+    websocket-driver (0.7.3)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.4.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  fivemat
+  g2_command!
+  pry
+  rails (= 6.0.3)
+  rake (~> 12.0)
+  rspec (~> 3.0)
+  rspec_junit_formatter
+  rubocop-g2
+  simplecov (= 0.16.1)
+
+BUNDLED WITH
+   2.1.4

data/lib/command.rb

@@ -5,20 +5,21 @@ require 'active_model'
 require 'dry-initializer'
 require 'dry-monads'
 
+require 'gem_ext/active_model/errors' if ActiveModel.version < Gem::Version.new('5.2')
+require 'command/failure'
 require 'command/input_middleware'
 require 'command/interrupt'
 
 module Command
   extend ActiveSupport::Concern
 
-  # rubocop:disable Metrics/BlockLength
   included do
     extend Dry::Initializer
     include Dry::Monads[:result]
     include ActiveModel::Validations
 
     def initialize(inputs = {})
-      super(Command::InputMiddleware.call(inputs))
+      super(**Command::InputMiddleware.call(inputs))
     end
 
     def execute
@@ -26,7 +27,7 @@ module Command
     end
 
     def run
-      result = if valid?
+      result = if errors.empty? && valid?
                  begin
                    execute
                  rescue Command::Interrupt => e
@@ -34,13 +35,13 @@ module Command
                  end
                end
 
-      errors.empty? ? Success(result) : Failure(errors)
+      errors.empty? ? Success(result) : Failure(Command::Failure.new(result, errors))
     end
 
     def compose(command, *args)
       outcome = command.run(*args)
 
-      raise Command::Interrupt, outcome.failure if outcome.failure?
+      raise Command::Interrupt, outcome.failure.errors if outcome.failure?
 
       outcome.value!
     end
@@ -49,11 +50,10 @@ module Command
       self.class.dry_initializer.attributes(self)
     end
   end
-  # rubocop:enable Metrics/BlockLength
 
   class_methods do
     def run(inputs = {})
-      new(inputs).run
+      new(**inputs).run
     end
 
     def run!(inputs = {})

data/lib/command/failure.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Command
+  class Failure
+    attr_reader :result, :errors
+
+    def initialize(result, errors)
+      @result = result
+      @errors = errors
+    end
+  end
+end

data/lib/command/input_middleware/symbolizer.rb

@@ -8,7 +8,7 @@ module Command
       def self.call(inputs)
         return inputs unless inputs.is_a?(Hash)
 
-        inputs.to_h.deep_symbolize_keys
+        inputs.to_h.symbolize_keys
       end
     end
   end

data/lib/command/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Command
-  VERSION = '0.3.0'
+  VERSION = '2.2.0'
 end

data/lib/gem_ext/active_model/errors.rb

@@ -0,0 +1,10 @@
+require 'active_model/errors'
+
+module ActiveModel
+  class Errors
+    def merge!(other)
+      @messages.merge!(other.messages) { |_, ary1, ary2| ary1 + ary2 }
+      @details.merge!(other.details) { |_, ary1, ary2| ary1 + ary2 }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: g2_command
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Hamed Asghari
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-22 00:00:00.000000000 Z
+date: 2020-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -78,18 +78,22 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-description: 
+description:
 email:
 - hasghari@g2.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/ruby.yml"
+- ".circleci/config.yml"
+- ".github/config/rubocop_linter_action.yml"
+- ".github/workflows/linters.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".tool-versions"
+- Appraisals
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -99,20 +103,29 @@ files:
 - bin/console
 - bin/setup
 - g2_command.gemspec
+- gemfiles/.bundle/config
+- gemfiles/rails_5.1.gemfile
+- gemfiles/rails_5.1.gemfile.lock
+- gemfiles/rails_5.2.gemfile
+- gemfiles/rails_5.2.gemfile.lock
+- gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.0.gemfile.lock
 - lib/command.rb
+- lib/command/failure.rb
 - lib/command/input_middleware.rb
 - lib/command/input_middleware/rails_params.rb
 - lib/command/input_middleware/symbolizer.rb
 - lib/command/interrupt.rb
 - lib/command/version.rb
 - lib/g2_command.rb
+- lib/gem_ext/active_model/errors.rb
 homepage: https://github.com/g2crowd/g2_command
 licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/g2crowd/g2_command
   source_code_uri: https://github.com/g2crowd/g2_command
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -127,8 +140,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: An implementation of the command pattern using dry-rb
 test_files: []