formalist 0.5.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1323fdd5950cdc3185d1f5c97095c2b6b5a4c895122eb56e422a65a583b116cf
-  data.tar.gz: bf631eb58ccd943f01099a551cb5dc390897e96e84bee193054adb07d0c35e11
+  metadata.gz: 812b680bec83258e220c4ad7e003db7aacc7f333cee556cd93079c22aeebbca6
+  data.tar.gz: fc45315295d88673cb31220b0e2dddd299f5ec2804f6230b9ee99135fcaba1f7
 SHA512:
-  metadata.gz: d3846cadc6cafa398dbb644ed6963e793d644e28e0e4a428bf285a4d369c27285bbd77f99cf7a0f889dfd37665b0bdfaa70da4ebde74394400ff0d4954eacd53
-  data.tar.gz: 41a5a177e35653ce0afc4ea48d5760dc80b9ff35728bdd558b2163d9530acf1a84741983bb571372f61116e1caa29879d56f23d2cb6dcf32b4d26bea32a63138
+  metadata.gz: dd154e92d8e422108e4c46005a68c3072b41dee80781499da1c3c521e82bc5aeda5471466c30ee1ed021bdab703215bd589c92b042b35936503e1dc740884575
+  data.tar.gz: b8d7a67e86633126f6d5a0620018ea4698742e52d511be24bd9eaaffa85c1bebcdf62d0d0b7cda4cb6b4fdf68d46052d9bd2d29dfd0bdda1531221126128d30e

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.6.0 / 2020-05-06
+
+### Changed
+
+- Removed dry-types dependency from core gem
+
 # 0.5.4 / 2018-11-28
 
 ### Fixed

data/formalist.gemspec

@@ -22,11 +22,10 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "dry-configurable", "~> 0.7"
   spec.add_runtime_dependency "dry-core", "~> 0.4"
   spec.add_runtime_dependency "dry-container", "~> 0.6"
-  spec.add_runtime_dependency "dry-types", "~> 0.13"
   spec.add_runtime_dependency "inflecto"
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.4.2"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake", "~> 10.4"
   spec.add_development_dependency "rspec", "~> 3.3.0"
   spec.add_development_dependency "simplecov", "~> 0.13.0"
   spec.add_development_dependency "yard"

data/lib/formalist/element.rb

@@ -1,6 +1,5 @@
 require "formalist/element/attributes"
 require "formalist/element/class_interface"
-require "formalist/types"
 
 module Formalist
   class Element
@@ -21,19 +20,13 @@ module Formalist
 
     # @api private
     def initialize(name: nil, attributes: {}, children: [], input: nil, errors: [])
-      @name = Types::ElementName[name]
+      @name = name&.to_sym
 
-      # Set supplied attributes or their defaults
-      all_attributes = self.class.attributes_schema.each_with_object({}) { |(name, defn), memo|
+      @attributes = self.class.attributes_schema.each_with_object({}) { |(name, defn), hsh|
         value = attributes.fetch(name) { defn[:default] }
-        memo[name] = value unless value.nil?
+        hsh[name] = value unless value.nil?
       }
 
-      # Then run them through the schema
-      @attributes = Types::Hash.weak(
-        self.class.attributes_schema.map { |name, defn| [name, defn[:type]] }.to_h
-      )[all_attributes]
-
       @children = children
       @input = input
       @errors = errors

data/lib/formalist/element/class_interface.rb

@@ -4,63 +4,14 @@ module Formalist
   class Element
     # Class-level API for form elements.
     module ClassInterface
-      # Returns the element's type, which is a symbolized, underscored
-      # representation of the element's class name.
-      #
-      # This is important for form rendering when using custom form elements,
-      # since the type in this case will be based on the name of form element's
-      # sublass.
-      #
-      # @example Basic element Formalist::Elements::Field.type # => :field
-      #
-      # @example Custom element class MyField < Formalist::Elements::Field end
-      #
-      #   MyField.type # => :my_field
-      #
-      # @!scope class @return [Symbol] the element type.
       def type
         Inflecto.underscore(Inflecto.demodulize(name)).to_sym
       end
 
-      # Define a form element attribute.
-      #
-      # Form element attributes can be set when the element is defined, and
-      # can be further populated by the form element object itself, when the
-      # form is being built, using both the user input and any dependencies
-      # passed to the element via the form.
-      #
-      # Attributes are the way to ensure the form renderer has all the
-      # information it needs to render the element appropriately. Attributes
-      # are type-checked in order to ensure they're being passed appropriate
-      # values. Attributes can hold any type of value as long as it can be
-      # reduced to an abstract syntax tree representation by
-      # `Form::Element::Attributes#to_ast`.
-      #
-      # @see Formalist::Element::Attributes#to_ast
-      #
-      # @!scope class
-      # @param name [Symbol] attribute name
-      # @param type [Dry::Data::Type, #call] value type coercer/checker
-      # @param default default value (applied when the attribute is not explicitly populated)
-      # @return void
-      def attribute(name, type, default: nil)
-        attributes(name => {type: type, default: default})
+      def attribute(name, default: nil)
+        attributes(name => {default: default})
       end
 
-      # Returns the attributes schema for the form element.
-      #
-      # Each item in the schema includes a type definition and a default value
-      # (`nil` if none specified).
-      #
-      # @example
-      #   Formalist::Elements::Field.attributes_schema
-      #   # => {
-      #     :name => {:type => #<Dry::Data::Type>, :default => "Default name"},
-      #     :email => {:type => #<Dry::Data::Type>, :default => "default email"}
-      #   }
-      #
-      # @!scope class
-      # @return [Hash<Symbol, Hash>] the attributes schema
       def attributes_schema
         super_schema = superclass.respond_to?(:attributes_schema) ? superclass.attributes_schema : {}
         super_schema.merge(@attributes_schema || {})
@@ -68,8 +19,6 @@ module Formalist
 
       private
 
-      # @!scope class
-      # @api private
       def attributes(new_schema)
         prev_schema = @attributes_schema || {}
         @attributes_schema = prev_schema.merge(new_schema)

data/lib/formalist/elements/attr.rb

@@ -1,10 +1,9 @@
 require "formalist/element"
-require "formalist/types"
 
 module Formalist
   class Elements
     class Attr < Element
-      attribute :label, Types::String
+      attribute :label
 
       def fill(input:, errors:)
         input = input[name] || {}

data/lib/formalist/elements/compound_field.rb

@@ -1,5 +1,4 @@
 require "formalist/element"
-require "formalist/types"
 
 module Formalist
   class Elements

data/lib/formalist/elements/field.rb

@@ -1,14 +1,13 @@
 require "formalist/element"
-require "formalist/types"
 
 module Formalist
   class Elements
     class Field < Element
-      attribute :label, Types::String
-      attribute :hint, Types::String
-      attribute :placeholder, Types::String
-      attribute :inline, Types::Bool
-      attribute :validation, Types::Validation
+      attribute :label
+      attribute :hint
+      attribute :placeholder
+      attribute :inline
+      attribute :validation
 
       def fill(input: {}, errors: {})
         super(

data/lib/formalist/elements/group.rb

@@ -1,10 +1,9 @@
 require "formalist/element"
-require "formalist/types"
 
 module Formalist
   class Elements
     class Group < Element
-      attribute :label, Types::String
+      attribute :label
 
       def fill(input: {}, errors: {})
         children = self.children.map { |child|

data/lib/formalist/elements/many.rb

@@ -1,15 +1,14 @@
 require "formalist/element"
-require "formalist/types"
 
 module Formalist
   class Elements
     class Many < Element
-      attribute :action_label, Types::String
-      attribute :sortable, Types::Bool
-      attribute :label, Types::String
-      attribute :max_height, Types::String
-      attribute :placeholder, Types::String
-      attribute :validation, Types::Validation
+      attribute :action_label
+      attribute :sortable
+      attribute :label
+      attribute :max_height
+      attribute :placeholder
+      attribute :validation
 
       # @api private
       attr_reader :child_template

data/lib/formalist/elements/section.rb

@@ -1,10 +1,9 @@
 require "formalist/element"
-require "formalist/types"
 
 module Formalist
   class Elements
     class Section < Element
-      attribute :label, Types::String
+      attribute :label
 
       def fill(input: {}, errors: {})
         super(

data/lib/formalist/elements/standard/check_box.rb

@@ -1,11 +1,10 @@
 require "formalist/element"
 require "formalist/elements"
-require "formalist/types"
 
 module Formalist
   class Elements
     class CheckBox < Field
-      attribute :question_text, Types::String
+      attribute :question_text
 
       def initialize(*)
         super

data/lib/formalist/elements/standard/date_field.rb

@@ -1,6 +1,5 @@
 require "formalist/element"
 require "formalist/elements"
-require "formalist/types"
 
 module Formalist
   class Elements

data/lib/formalist/elements/standard/date_time_field.rb

@@ -1,12 +1,11 @@
 require "formalist/element"
 require "formalist/elements"
-require "formalist/types"
 
 module Formalist
   class Elements
     class DateTimeField < Field
-      attribute :time_format, Types::String
-      attribute :human_time_format, Types::String
+      attribute :time_format
+      attribute :human_time_format
     end
 
     register :date_time_field, DateTimeField

data/lib/formalist/elements/standard/multi_selection_field.rb

@@ -1,16 +1,15 @@
 require "formalist/element"
 require "formalist/elements"
-require "formalist/types"
 
 module Formalist
   class Elements
     class MultiSelectionField < Field
-      attribute :sortable, Types::Bool
-      attribute :max_height, Types::String
-      attribute :options, Types::SelectionsList
-      attribute :render_option_as, Types::String
-      attribute :render_selection_as, Types::String
-      attribute :selector_label, Types::String
+      attribute :sortable
+      attribute :max_height
+      attribute :options
+      attribute :render_option_as
+      attribute :render_selection_as
+      attribute :selector_label
     end
 
     register :multi_selection_field, MultiSelectionField

data/lib/formalist/elements/standard/multi_upload_field.rb

@@ -1,22 +1,21 @@
 require "formalist/element"
 require "formalist/elements"
-require "formalist/types"
 
 module Formalist
   class Elements
     class MultiUploadField < Field
-      attribute :initial_attributes_url, Types::String
-      attribute :sortable, Types::Bool
-      attribute :max_file_size_message, Types::String
-      attribute :max_file_size, Types::String
-      attribute :max_height, Types::String
-      attribute :permitted_file_type_message, Types::String
-      attribute :permitted_file_type_regex, Types::String
-      attribute :presign_options, Types::Hash
-      attribute :presign_url, Types::String
-      attribute :render_uploaded_as, Types::String
-      attribute :upload_action_label, Types::String
-      attribute :upload_prompt, Types::String
+      attribute :initial_attributes_url
+      attribute :sortable
+      attribute :max_file_size_message
+      attribute :max_file_size
+      attribute :max_height
+      attribute :permitted_file_type_message
+      attribute :permitted_file_type_regex
+      attribute :presign_options
+      attribute :presign_url
+      attribute :render_uploaded_as
+      attribute :upload_action_label
+      attribute :upload_prompt
     end
 
     register :multi_upload_field, MultiUploadField

data/lib/formalist/elements/standard/number_field.rb

@@ -1,15 +1,12 @@
 require "formalist/element"
 require "formalist/elements"
-require "formalist/types"
 
 module Formalist
   class Elements
     class NumberField < Field
-      Number = Types::Integer | Types::Float
-
-      attribute :step, Number
-      attribute :min, Number
-      attribute :max, Number
+      attribute :step
+      attribute :min
+      attribute :max
     end
 
     register :number_field, NumberField

data/lib/formalist/elements/standard/radio_buttons.rb

@@ -1,11 +1,10 @@
 require "formalist/element"
 require "formalist/elements"
-require "formalist/types"
 
 module Formalist
   class Elements
     class RadioButtons < Field
-      attribute :options, Types::OptionsList
+      attribute :options
     end
 
     register :radio_buttons, RadioButtons

data/lib/formalist/elements/standard/rich_text_area.rb

@@ -1,15 +1,14 @@
 require "formalist/element"
 require "formalist/elements"
-require "formalist/types"
 require "formalist/rich_text/embedded_form_compiler"
 
 module Formalist
   class Elements
     class RichTextArea < Field
-      attribute :box_size, Types::String.enum("single", "small", "normal", "large", "xlarge"), default: "normal"
-      attribute :inline_formatters, Types::Array
-      attribute :block_formatters, Types::Array
-      attribute :embeddable_forms, Types::Dependency.constrained(respond_to: :to_h)
+      attribute :box_size, default: "normal"
+      attribute :inline_formatters
+      attribute :block_formatters
+      attribute :embeddable_forms
 
       # FIXME: it would be tidier to have a reader method for each attribute
       def attributes

data/lib/formalist/elements/standard/search_multi_selection_field.rb

@@ -1,22 +1,21 @@
 require "formalist/element"
 require "formalist/elements"
-require "formalist/types"
 
 module Formalist
   class Elements
     class SearchMultiSelectionField < Field
-      attribute :clear_query_on_selection, Types::Bool
-      attribute :sortable, Types::Bool
-      attribute :max_height, Types::String
-      attribute :render_option_as, Types::String
-      attribute :render_option_control_as, Types::String
-      attribute :render_selection_as, Types::String
-      attribute :search_params, Types::Hash
-      attribute :search_per_page, Types::Integer
-      attribute :search_threshold, Types::Integer
-      attribute :search_url, Types::String
-      attribute :selections, Types::Array
-      attribute :selector_label, Types::String
+      attribute :clear_query_on_selection
+      attribute :sortable
+      attribute :max_height
+      attribute :render_option_as
+      attribute :render_option_control_as
+      attribute :render_selection_as
+      attribute :search_params
+      attribute :search_per_page
+      attribute :search_threshold
+      attribute :search_url
+      attribute :selections
+      attribute :selector_label
     end
 
     register :search_multi_selection_field, SearchMultiSelectionField

data/lib/formalist/elements/standard/search_selection_field.rb

@@ -1,19 +1,18 @@
 require "formalist/element"
 require "formalist/elements"
-require "formalist/types"
 
 module Formalist
   class Elements
     class SearchSelectionField < Field
-      attribute :selector_label, Types::String
-      attribute :render_option_as, Types::String
-      attribute :render_option_control_as, Types::String
-      attribute :render_selection_as, Types::String
-      attribute :search_url, Types::String
-      attribute :search_per_page, Types::Integer
-      attribute :search_params, Types::Hash
-      attribute :search_threshold, Types::Integer
-      attribute :selection, Types::Hash
+      attribute :selector_label
+      attribute :render_option_as
+      attribute :render_option_control_as
+      attribute :render_selection_as
+      attribute :search_url
+      attribute :search_per_page
+      attribute :search_params
+      attribute :search_threshold
+      attribute :selection
     end
 
     register :search_selection_field, SearchSelectionField

data/lib/formalist/elements/standard/select_box.rb

@@ -1,11 +1,10 @@
 require "formalist/element"
 require "formalist/elements"
-require "formalist/types"
 
 module Formalist
   class Elements
     class SelectBox < Field
-      attribute :options, Types::OptionsList
+      attribute :options
     end
 
     register :select_box, SelectBox

data/lib/formalist/elements/standard/selection_field.rb

@@ -1,14 +1,13 @@
 require "formalist/element"
 require "formalist/elements"
-require "formalist/types"
 
 module Formalist
   class Elements
     class SelectionField < Field
-      attribute :options, Types::SelectionsList
-      attribute :selector_label, Types::String
-      attribute :render_option_as, Types::String
-      attribute :render_selection_as, Types::String
+      attribute :options
+      attribute :selector_label
+      attribute :render_option_as
+      attribute :render_selection_as
     end
 
     register :selection_field, SelectionField

data/lib/formalist/elements/standard/tags_field.rb

@@ -1,14 +1,13 @@
 require "formalist/element"
 require "formalist/elements"
-require "formalist/types"
 
 module Formalist
   class Elements
     class TagsField < Field
-      attribute :search_url, Types::String
-      attribute :search_per_page, Types::Integer
-      attribute :search_params, Types::Hash
-      attribute :search_threshold, Types::Integer
+      attribute :search_url
+      attribute :search_per_page
+      attribute :search_params
+      attribute :search_threshold
     end
 
     register :tags_field, TagsField

data/lib/formalist/elements/standard/text_area.rb

@@ -1,13 +1,12 @@
 require "formalist/element"
 require "formalist/elements"
-require "formalist/types"
 
 module Formalist
   class Elements
     class TextArea < Field
-      attribute :text_size, Types::String.enum("xsmall", "small", "normal", "large", "xlarge"), default: "normal"
-      attribute :box_size, Types::String.enum("single", "small", "normal", "large", "xlarge"), default: "normal"
-      attribute :code, Types::Bool
+      attribute :text_size, default: "normal"
+      attribute :box_size, default: "normal"
+      attribute :code
     end
 
     register :text_area, TextArea

data/lib/formalist/elements/standard/text_field.rb

@@ -1,13 +1,12 @@
 require "formalist/element"
 require "formalist/elements"
-require "formalist/types"
 
 module Formalist
   class Elements
     class TextField < Field
-      attribute :password, Types::Bool
-      attribute :code, Types::Bool
-      attribute :disabled, Types::Bool
+      attribute :password
+      attribute :code
+      attribute :disabled
     end
 
     register :text_field, TextField

data/lib/formalist/elements/standard/upload_field.rb

@@ -1,20 +1,19 @@
 require "formalist/element"
 require "formalist/elements"
-require "formalist/types"
 
 module Formalist
   class Elements
     class UploadField < Field
-      attribute :initial_attributes_url, Types::String
-      attribute :presign_url, Types::String
-      attribute :presign_options, Types::Hash
-      attribute :render_uploaded_as, Types::String
-      attribute :upload_prompt, Types::String
-      attribute :upload_action_label, Types::String
-      attribute :max_file_size, Types::String
-      attribute :max_file_size_message, Types::String
-      attribute :permitted_file_type_message, Types::String
-      attribute :permitted_file_type_regex, Types::String
+      attribute :initial_attributes_url
+      attribute :presign_url
+      attribute :presign_options
+      attribute :render_uploaded_as
+      attribute :upload_prompt
+      attribute :upload_action_label
+      attribute :max_file_size
+      attribute :max_file_size_message
+      attribute :permitted_file_type_message
+      attribute :permitted_file_type_regex
     end
 
     register :upload_field, UploadField

data/lib/formalist/version.rb

@@ -1,3 +1,3 @@
 module Formalist
-  VERSION = "0.5.4".freeze
+  VERSION = "0.6.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formalist
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
 platform: ruby
 authors:
 - Tim Riley
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-28 00:00:00.000000000 Z
+date: 2020-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: dry-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: inflecto
   requirement: !ruby/object:Gem::Requirement
@@ -84,30 +70,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -208,7 +194,6 @@ files:
 - lib/formalist/rich_text/rendering/html_compiler.rb
 - lib/formalist/rich_text/rendering/html_renderer.rb
 - lib/formalist/rich_text/validity_check.rb
-- lib/formalist/types.rb
 - lib/formalist/version.rb
 homepage: https://github.com/icelab/formalist
 licenses:
@@ -229,8 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Flexible form builder

data/lib/formalist/types.rb

@@ -1,31 +0,0 @@
-# coding: utf-8
-require "dry/types"
-
-# TODO: Find a way to avoid registering this globally
-Dry::Logic::Predicates.predicate :respond_to? do |method_name, value|
-  value.respond_to?(method_name)
-end
-
-module Formalist
-  module Types
-    include Dry::Types.module
-
-    ElementName = Types::Strict::Symbol.constrained(min_size: 1).optional
-    OptionsList = Types::Array.of(Formalist::Types::Array.of(Formalist::Types::Strict::String).constrained(size: 2))
-
-    # The SelectionField and MultiSelectionField require a _somewhat_ specific
-    # data structure:
-    #
-    #     {id: 123, label: 'foo'}
-    #
-    # It’s expected that `id` is the relational representation of the object.
-    # And label could/should be optional if the form defines a custom
-    # `render_as` attribute
-    SelectionsList = Formalist::Types::Strict::Array.of(Formalist::Types::Strict::Hash)
-
-    Validation = Types::Strict::Hash
-
-    Dependency = Types::Object
-    Function = Dependency.constrained(respond_to: :call)
-  end
-end