redress 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 772e4827f0e4284c62be00daaf8f95f99f03757f777807c1f21665c9507dc0aa
-  data.tar.gz: c0fb8aa632d6ba383d9aac4cc46ea156557c29064d794d391b55d2ff51e7bf26
+  metadata.gz: dcc21824a6395eda1bf8c8c9dab35e5ff6e87e458d3d696ec5ebf59a03c26217
+  data.tar.gz: 12969e57fc763d657da28fb4f74cc923e7932282a034741f944dc3f6664b252c
 SHA512:
-  metadata.gz: 978d2dbfceb765a99f50f56f430ac8cdce00573954ba3c9fb1b98995f42095ce66e916ede4c1ea0890743d3585abc72f2b8e1b755f3c71662002170018058347
-  data.tar.gz: cb5cae4a7de7d7a19ae8b8f0c570c08ceab79d2c3679c752adbba4adab9f3b7ac38d6dbd1c41734fd453a6beb6b2c5358cff4bf27fba460c842aa096919677d9
+  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

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

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.2'
+      '0.5.0'
     end
 
     def self.version_label

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

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: redress
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Igor Galeta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-28 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
@@ -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:
@@ -258,7 +260,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Build maintainable Ruby apps