redress 0.3.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6986552c7cc241c94ed1af574a6e1a2a59f60490
-  data.tar.gz: 110a86ad5c304fb0a4ca933cf76d2e6bb1333fde
+SHA256:
+  metadata.gz: dcc21824a6395eda1bf8c8c9dab35e5ff6e87e458d3d696ec5ebf59a03c26217
+  data.tar.gz: 12969e57fc763d657da28fb4f74cc923e7932282a034741f944dc3f6664b252c
 SHA512:
-  metadata.gz: e3fa0175f61101b05f45691e48e94e24dbbbd297c9c110f979a947b7d8ef0a0a4cc572faa25ef79673d7e3bc9c91d5631b72b2e3257dc680b55ea777c6591ed3
-  data.tar.gz: 9ffccd7fadf57d2c0faec5c2b3960aca7a1627eb78f7085f3ad0eeb51ac138e734afad80cd828505ade624d405ebcc6544054d9210e3b419441390c18c543545
+  metadata.gz: cc0980ae192ae4bffe7ca1f96f2a7eea931a9120d72d3a94a90d4578f1cbfa234fb45661705bc79fa312c0724b8a61c8501a2a4fb2180cce1947337654701195
+  data.tar.gz: 026f35ad1df1922b4bb2ca06da41c0a2d158be430e85c3fda2b9eeab0231e17a82a9bd51c55a914c9a7541221797590cea696581262d0a91f86fac9af8488441

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
@@ -56,18 +61,19 @@ class ApplicationForm < Redress::Form
 end
 ```
 
-Let's define simple form:
+Let's define simple form (Built-in Types https://dry-rb.org/gems/dry-types/built-in-types/):
 
 ```ruby
 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
   end
 
   validates :name, presence: true
@@ -116,6 +122,27 @@ class OrderForm < Redress::Form
 end
 ```
 
+Form with context:
+
+```ruby
+class CommentForm < Redress::Form
+  define_schema do
+    attribute :id, Redress::Types::Coercible::Integer
+    attribute :content, Redress::Types::String
+  end
+
+  validates :content, presence: true
+  validate :unsure_order_state_waiting
+
+  private
+
+  def unsure_order_state_waiting
+    context.order.state?(:waiting)
+  end
+end
+
+CommentForm.new(content: 'Hi').with_context(order: order)
+```
 
 ### Commands
 

data/lib/redress.rb

@@ -1,10 +1,15 @@
 # frozen_string_literal: true
 
-require "redress/identity"
+require 'redress/identity'
 
 module Redress
 end
 
-require "redress/types"
-require "redress/form"
-require "redress/command"
+require 'redress/types'
+require 'redress/form'
+require 'redress/command'
+
+if defined?(ActiveModel)
+  require 'redress/hooks/active_model'
+  Redress::Form.include(Redress::Hooks::ActiveModel)
+end

data/lib/redress/command.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "wisper"
+require 'wisper'
 
 module Redress
   class Command

data/lib/redress/form.rb

@@ -1,32 +1,25 @@
 # frozen_string_literal: true
 
-require "hashie/mash"
-require "active_model"
-require "dry-struct"
+require 'hashie/mash'
+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/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 = "::"
+    DEFAULT_NAME = 'Form'
+    SPLITTER = '::'
 
     attr_reader :context
 
     transform_keys(&:to_sym)
-    transform_types { |type| type.meta(omittable: true) }
-
-    def self.model_name
-      ActiveModel::Name.new(self, nil, mimicked_model_name.to_s.camelize)
-    end
+    transform_types(&:omittable)
 
     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)
@@ -82,14 +75,17 @@ module Redress
     protected
 
     def write_attribute(name, value)
-      return unless self.class.attribute?(name)
+      return unless self.class.has_attribute?(name)
+
       @attributes[name] = safe_coercion(name, value)
     end
 
+    private
+
     def safe_coercion(name, value)
-      type = self.class.schema[name]
+      type = self.class.schema.key(name)
       type[value]
-    rescue ArgumentError
+    rescue Dry::Types::CoercionError
       nil
     end
   end

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

@@ -4,15 +4,15 @@ module Redress
   # Gem identity information.
   module Identity
     def self.name
-      "redress"
+      'redress'
     end
 
     def self.label
-      "Redress"
+      'Redress'
     end
 
     def self.version
-      "0.3.1"
+      '0.5.0'
     end
 
     def self.version_label

data/lib/redress/types.rb

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
-require "dry-types"
+require 'dry-types'
 
 module Redress
   module Types
-    include Dry::Types.module
+    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/attributes_hash.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "hashie"
+require 'hashie'
 
 module Redress
   module Utils

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/utils/parse_attributes_from_params.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "redress/utils/attributes_hash"
+require 'redress/utils/attributes_hash'
 
 module Redress
   module Utils
@@ -22,6 +22,7 @@ module Redress
 
       def prefix
         return if @options[:prefix].blank?
+
         @prefix ||= @options[:prefix].to_s
       end
 
@@ -29,11 +30,13 @@ module Redress
         @full_prefix ||= "#{prefix}_"
       end
 
-      protected
+      private
 
       def extract_attributes
         hash = model_attributes.merge!(prefix_attibutes)
-        AttributesHash.new(hash).extract!(*@klass.schema.keys)
+        declared_keys = @klass.schema.keys.map(&:name)
+
+        AttributesHash.new(hash).extract!(*declared_keys)
       end
 
       def prefix_attibutes

metadata

@@ -1,57 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: redress
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Igor Galeta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-19 00:00:00.000000000 Z
+date: 2021-02-05 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: dry-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.4
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.4
+        version: '5.2'
+- !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
@@ -234,10 +234,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:
@@ -251,7 +253,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -259,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Build maintainable Ruby apps