redress 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41402aaf89ea4b30ca985c6748259e94f43a3bf0
-  data.tar.gz: f38303010581b1cc238927768afe86e48bbab4ba
+  metadata.gz: 9f35ba289da039ddbe9b65ba1b27384d6dcb25bf
+  data.tar.gz: 3182c116ee253aa615d3aba5e950fa6357278641
 SHA512:
-  metadata.gz: 372b234a3fc2d5723938e4486aa1cde2876013c67b6e3d2195ed89ead3928c6504a724262cdcb81e4149dc495d1c36b632d4018483010f8ecdb8ed20d34e2518
-  data.tar.gz: 4f51c86618c0e981532cdb4728a9910d8692a0011d77397c7ff316bc35091e09249cf362c18c5229b2c6125e7e484950b1983da220c3969b7539bbf164fc03e3
+  metadata.gz: 0a1ae51dd6951cda34468e64fc5f08eddb8d2a86471ee132885dd9ea04b4e626112d04245029adf952da6bb4948959d2192f795d7f334efaf5e94098851af557
+  data.tar.gz: 885f68704511aaa6165cf00b10e2d05cbe2c306a27c2b53178db6512b9b0597f0e22880ad16cdb29b46351f2623e80a553825229a4c2caae678451642ee14efd

data/README.md

@@ -31,7 +31,7 @@ The command pattern is sometimes called a service object, an operation, an actio
 
 0. [Ruby 2.3](https://www.ruby-lang.org)
 1. wisper
-2. fast_attributes
+2. dry-struct
 3. hashie
 4. activemodel
 
@@ -63,10 +63,12 @@ Let's define simple form:
 class SimpleForm < ApplicationForm
   mimic :user
 
-  schema do
+  define_schema do
+    attribute :nickname, Redress::Types::Strict::String.default("superman")
     attribute :name, String
     attribute :email, String
     attribute :name_with_email, String
+    attribute :age, Redress::Types::Form::Int
   end
 
   validates :name, presence: true

data/lib/redress/form.rb

@@ -1,18 +1,15 @@
 # frozen_string_literal: true
 
-require "fast_attributes"
 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_builder"
-require "redress/utils/attribute_set"
 require "redress/utils/attributes_hash"
 
 module Redress
-  class Form
-    extend FastAttributes
+  class Form < Dry::Struct
     include ActiveModel::Validations
 
     DEFAULT_NAME = "Form"
@@ -20,6 +17,12 @@ module Redress
 
     attr_reader :context
 
+    # https://github.com/dry-rb/dry-struct/blob/master/lib/dry/struct.rb
+    # schema - missing keys will result in setting them using default values,
+    # unexpected keys will be ignored.
+    #
+    constructor_type :schema
+
     def self.model_name
       ActiveModel::Name.new(self, nil, mimicked_model_name.to_s.camelize)
     end
@@ -47,21 +50,19 @@ module Redress
       Redress::Utils::BuildFormFromModel.new(self, model).build
     end
 
-    def self.schema(options = {}, &block)
-      options = {
-        initialize: true,
-        attributes: true
-      }.merge!(options)
+    def self.define_schema(options = nil)
+      options.each { |key, value| public_send(key, value) } if options
 
-      builder = Redress::Utils::AttributesBuilder.new(self, options)
-      builder.instance_eval(&block)
-      builder.compile!
+      yield
 
-      @raw_attributes = builder.attributes
-    end
+      attribute_names.each do |name|
+        method_name = :"#{name}="
+        next if instance_methods.include?(method_name)
 
-    def self.attribute_set
-      @attribute_set ||= Redress::Utils::AttributeSet.new(@raw_attributes || [])
+        define_method(method_name) do |value|
+          writer_attribute(name, value)
+        end
+      end
     end
 
     def to_model
@@ -76,11 +77,21 @@ module Redress
       @context = Hashie::Mash.new(options)
     end
 
-    def properties
-      @properties ||= Redress::Utils::AttributesHash.new(attributes)
+    def attributes
+      @attributes ||= Redress::Utils::AttributesHash.new(to_hash)
     end
+    alias properties attributes
 
     def map_model(model)
     end
+
+    protected
+
+    def writer_attribute(name, value)
+      return unless self.class.attribute?(name)
+
+      type = self.class.schema[name]
+      instance_variable_set("@#{name}", type[value])
+    end
   end
 end

data/lib/redress/identity.rb

@@ -12,7 +12,7 @@ module Redress
     end
 
     def self.version
-      "0.1.1"
+      "0.2.0"
     end
 
     def self.version_label

data/lib/redress/types.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require "dry-types"
+
+module Redress
+  module Types
+    include Dry::Types.module
+  end
+end

data/lib/redress/utils/build_form_from_model.rb

@@ -9,24 +9,24 @@ module Redress
       end
 
       def build
-        form.tap do
-          matching_attributes.each do |name, _|
-            model_value = @model.public_send(name)
-            form.public_send("#{name}=", model_value)
-          end
-
-          form.map_model(@model)
-        end
+        form.map_model(@model)
+        form
       end
 
       private
 
       def form
-        @form ||= @form_class.new
+        @form ||= @form_class.new(model_attributes)
+      end
+
+      def model_attributes
+        matching_attributes.each_with_object({}) do |name, hash|
+          hash[name] = @model.public_send(name)
+        end
       end
 
       def matching_attributes
-        form.attributes.select { |name, _| @model.respond_to?(name) }
+        @form_class.attribute_names.select { |name| @model.respond_to?(name) }
       end
     end
   end

data/lib/redress/utils/parse_attributes_from_params.rb

@@ -33,7 +33,7 @@ module Redress
 
       def extract_attributes
         hash = model_attributes.merge!(prefix_attibutes)
-        AttributesHash.new(hash).extract!(*@klass.attribute_set.names)
+        AttributesHash.new(hash).extract!(*@klass.schema.keys)
       end
 
       def prefix_attibutes

data/lib/redress.rb

@@ -5,5 +5,6 @@ require "redress/identity"
 module Redress
 end
 
+require "redress/types"
 require "redress/form"
 require "redress/command"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redress
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Igor Galeta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-05 00:00:00.000000000 Z
+date: 2017-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wisper
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.6.1
 - !ruby/object:Gem::Dependency
-  name: fast_attributes
+  name: dry-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -207,9 +207,7 @@ files:
 - lib/redress/command.rb
 - lib/redress/form.rb
 - lib/redress/identity.rb
-- lib/redress/utils/attribute_node.rb
-- lib/redress/utils/attribute_set.rb
-- lib/redress/utils/attributes_builder.rb
+- lib/redress/types.rb
 - lib/redress/utils/attributes_hash.rb
 - lib/redress/utils/build_form_from_model.rb
 - lib/redress/utils/parse_attributes_from_params.rb

data/lib/redress/utils/attribute_node.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Redress
-  module Utils
-    class AttributeNode
-      attr_reader :name, :type, :options
-
-      def initialize(item)
-        @name = Array(item[0])[0]
-        @type = item[1]
-        @options = item[2]
-      end
-    end
-  end
-end

data/lib/redress/utils/attribute_set.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require "redress/utils/attribute_node"
-
-module Redress
-  module Utils
-    class AttributeSet
-      include Enumerable
-
-      def initialize(raw_attributes)
-        @raw_attributes = Array(raw_attributes)
-
-        @attributes = @raw_attributes.map { |item| AttributeNode.new(item) }
-      end
-
-      def each(&block)
-        @attributes.each(&block)
-      end
-
-      def names
-        @names ||= map(&:name)
-      end
-    end
-  end
-end

data/lib/redress/utils/attributes_builder.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require "fast_attributes"
-
-module Redress
-  module Utils
-    class AttributesBuilder < FastAttributes::Builder
-      attr_reader :attributes
-
-      def compile!
-        super
-        self
-      end
-    end
-  end
-end