redress 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48dca657c066cb4fa1396fb346f8863da7b4f8f25c0220f63689751a23539403
-  data.tar.gz: fa0c17d8bd9907b671297e38cf3fc31b9f6d5107eb443b766e39b45d7a5783b3
+  metadata.gz: 5428edcfea11f2b2ee5b5c46aadb3aae63ce35dade3cd6a208d1a38700c26b39
+  data.tar.gz: 54655c9cd0ead71f5283ede04efcf58e6cb2f8817202c297d37310c627258531
 SHA512:
-  metadata.gz: b7fbe56267bb3af7b7ed25a49754aca0f95035f572fcbf6464ea5d05324d0b653ad63156427563d0ee3686806b5bc90c7ebdb8934e5399820f5152c9e1383d6b
-  data.tar.gz: 1fed4838fbdfcdc0313098e96e1d641321b9b76b9cd97a4abac203591f3a5734840e1d5f8770e7dd08a4fdfcb220bf1caa4c113242bb064674935e1eb9d27910
+  metadata.gz: 3bf394b4eaa4307db11cf8004dd5e045e6893c149cbaddf9e5baea1cb9c0e904e8702786ed78aac5fc2d111a91eb0887fb7333b9f3afe2a503169bd28464ace2
+  data.tar.gz: 0f80ac598c7da343a815f57279ca887d4a94aac2343717eb7cd5f3e6255e3f82f3b284b61ef5602e5f50ade520c41e0ac0eabfe5fa36ddec3d8230b8c3b27d03

data/README.md

@@ -32,6 +32,11 @@ The command pattern is sometimes called a service object, an operation, an actio
 1. wisper
 2. dry-struct
 3. hashie
+
+### Optional
+
+To support validations just add activemodel to your project
+
 4. activemodel
 
 ## Setup
@@ -63,12 +68,12 @@ class SimpleForm < ApplicationForm
   mimic :user
 
   define_schema do
-    attribute :nickname, Redress::Types::Strict::String.default("superman")
-    attribute :name, String
-    attribute :email, String
+    attribute :nickname, Redress::Types::Strict::String.default('superman')
+    attribute :name, Redress::Types::StrippedString
+    attribute :email, Redress::Types::StrippedString
     attribute :name_with_email, String
     attribute :age, Redress::Types::Coercible::Integer
-    atttibute :terms_of_service, Redress::Types::Bool
+    attribute :terms_of_service, Redress::Types::Bool
   end
 
   validates :name, presence: true
@@ -145,20 +150,7 @@ CommentForm.new(content: 'Hi').with_context(order: order)
 # app/commands/application_command.rb
 require 'redress/command'
 
-class ApplicationCommand < Redress::Commad
-end
-```
-
-Or if you are using ActiveRecord:
-
-```ruby
-# app/commands/application_command.rb
-require 'redress/command'
-
-class ApplicationCommand < Redress::Commad
-  def transaction(&block)
-    ActiveRecord::Base.transaction(&block) if block_given?
-  end
+class ApplicationCommand < Redress::Command
 end
 ```
 
@@ -173,11 +165,15 @@ module Users
     end
 
     def call
-      return broadcast(:invalid, @form) if @form.invalid?
+      return Failure(@form) if @form.invalid?
 
-      user = User.create(@form.attributes)
+      user = User.new(@form.attributes)
 
-      broadcast(:ok, user)
+      if user.save
+        Success(user)
+      else
+        Failure(user)
+      end
     end
   end
 end
@@ -198,8 +194,8 @@ class UsersController < Account::BaseController
     @user_form = SimpleForm.from_params(params)
 
     Users::CreateCommand.call(@user_form) do |c|
-      c.on(:ok) { head status: 201 }
-      c.on(:invalid) { |form| render status: 422, json: { errors: form.errors } }
+      c.success { head status: 201 }
+      c.failure { |form| render status: 422, json: { errors: form.errors } }
     end
   end
 end

data/lib/redress/command.rb

@@ -1,21 +1,32 @@
 # frozen_string_literal: true
 
-require 'wisper'
+require 'dry/monads'
+require 'dry/monads/do'
+require 'dry/matcher/result_matcher'
 
 module Redress
   class Command
-    include Wisper::Publisher
+    include Dry::Monads[:result]
 
     def self.call(*args, &block)
-      run(*args, &block)
-      nil
+      result = new(*args).call
+      return result unless block_given?
+
+      Dry::Matcher::ResultMatcher.call(result, &block)
     end
 
-    def self.run(*args)
+    def self.run(*args, &block)
       command = new(*args)
-      yield command if block_given?
-      command.call
+      result = command.call
+      return command unless block_given?
+
+      Dry::Matcher::ResultMatcher.call(result, &block)
+
       command
     end
+
+    def call
+      raise NotImplementedError
+    end
   end
 end

data/lib/redress/form.rb

@@ -1,18 +1,15 @@
 # frozen_string_literal: true
 
 require 'hashie/mash'
-require 'active_model'
 require 'dry-struct'
 
 require 'redress/utils/parse_attributes_from_params'
 require 'redress/utils/build_form_from_model'
 require 'redress/utils/attributes_hash'
+require 'redress/utils/model_name_string'
 
 module Redress
   class Form < Dry::Struct
-    include ActiveModel::Validations
-    include ActiveModel::Conversion
-
     DEFAULT_NAME = 'Form'
     SPLITTER = '::'
 
@@ -21,12 +18,8 @@ module Redress
     transform_keys(&:to_sym)
     transform_types(&:omittable)
 
-    def self.model_name
-      ActiveModel::Name.new(self, nil, mimicked_model_name.to_s.camelize)
-    end
-
     def self.mimic(model_name)
-      @model_name = model_name.to_s.underscore.to_sym
+      @model_name = Redress::Utils::ModelNameString.new(model_name).to_sym
     end
 
     def self.mimicked_model_name
@@ -37,7 +30,7 @@ module Redress
       class_name = name.split(SPLITTER).last
       return :form if class_name == DEFAULT_NAME
 
-      class_name.chomp(DEFAULT_NAME).underscore.to_sym
+      Redress::Utils::ModelNameString.new(class_name.chomp(DEFAULT_NAME)).to_sym
     end
 
     def self.from_params(params, options = nil)

data/lib/redress/hooks/active_model.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'active_model'
+
+module Redress
+  module Hooks
+    module ActiveModel
+      def self.included(base)
+        base.extend(ClassMethods)
+        base.include(::ActiveModel::Validations)
+        base.include(::ActiveModel::Conversion)
+      end
+
+      module ClassMethods
+        def model_name
+          ::ActiveModel::Name.new(self, nil, mimicked_model_name.to_s.camelize)
+        end
+      end
+    end
+  end
+end

data/lib/redress/identity.rb

@@ -12,7 +12,7 @@ module Redress
     end
 
     def self.version
-      '0.4.0'
+      '1.0.0'
     end
 
     def self.version_label

data/lib/redress/types.rb

@@ -5,5 +5,9 @@ require 'dry-types'
 module Redress
   module Types
     include Dry::Types()
+
+    StrippedString = Coercible::String.constructor do |value|
+      value.to_s.strip.empty? ? nil : value.to_s.strip
+    end
   end
 end

data/lib/redress/utils/model_name_string.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Redress
+  module Utils
+    class ModelNameString
+      attr_reader :original
+
+      def initialize(original)
+        @original = original.to_s
+      end
+
+      def to_sym
+        underscore_original.to_sym
+      end
+
+      private
+
+      def underscore_original
+        if original.respond_to?(:underscore)
+          original.underscore
+        else
+          underscore(original)
+        end
+      end
+
+      # File activesupport/lib/active_support/inflector/methods.rb, line 92
+      def underscore(camel_cased_word)
+        return camel_cased_word unless /[A-Z-]|::/.match?(camel_cased_word)
+
+        word = camel_cased_word.to_s.gsub('::', '/')
+        word.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2')
+        word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+        word.tr!('-', '_')
+        word.downcase!
+        word
+      end
+    end
+  end
+end

data/lib/redress.rb

@@ -8,3 +8,8 @@ end
 require 'redress/types'
 require 'redress/form'
 require 'redress/command'
+
+if defined?(ActiveModel)
+  require 'redress/hooks/active_model'
+  Redress::Form.include(Redress::Hooks::ActiveModel)
+end

metadata

@@ -1,225 +1,239 @@
 --- !ruby/object:Gem::Specification
 name: redress
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Igor Galeta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-24 00:00:00.000000000 Z
+date: 2022-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: dry-matcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: dry-struct
+  name: dry-monads
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
-  name: dry-types
+  name: dry-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.7
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.7
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
-  name: wisper
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.4
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.4
+        version: '6.1'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.21
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.21
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-state
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0'
 description: 
 email:
 - galeta.igor@gmail.com
@@ -234,10 +248,12 @@ files:
 - lib/redress.rb
 - lib/redress/command.rb
 - lib/redress/form.rb
+- lib/redress/hooks/active_model.rb
 - lib/redress/identity.rb
 - lib/redress/types.rb
 - lib/redress/utils/attributes_hash.rb
 - lib/redress/utils/build_form_from_model.rb
+- lib/redress/utils/model_name_string.rb
 - lib/redress/utils/parse_attributes_from_params.rb
 homepage: https://github.com/galetahub/redress
 licenses:
@@ -249,16 +265,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.2.26
 signing_key: 
 specification_version: 4
 summary: Build maintainable Ruby apps