ciesta 0.2.5 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 656823f7c7c09fca1aecc228d110781b19bac2bc0fe51dd67256f85204fbb9eb
-  data.tar.gz: 2891c4aec116941b7adba933214a6558eb9a19f9faf23ac98391e011b793a232
+  metadata.gz: 5eaf463aca332576deca118786495fe23b4c13c231e4b987061dd7b150ea4364
+  data.tar.gz: ff94edfb892a18df09df01b0bce6706557475d69b0ad07f2d11b618bbda03fc2
 SHA512:
-  metadata.gz: abfa59c30e273e11e8c8b2ad3bd824f4dc77ae3e746e1eaf29fcf88ac1d397c8236e1ed6febebd2c7c232092bb0085db281a710b26b0b1752fb3125e38a101de
-  data.tar.gz: 1686a2b5e13f86a33df36f7a76a3b500ad91f05d216475e8292fcb11c01b6aa0905c1b1d5ace9660d1470c847967b2b07a844450c0c7e6361736e1b3ebd7c037
+  metadata.gz: dec6837b70b3d3169620e121290e5bcbe61f65ed94dbd461233daa98f66bd48b53e42143481fb9cebece32b21483a87391553b52b676e0b8cc0fbd1d8b8419f2
+  data.tar.gz: 6d74105fe737dd8b202c3d995c5dbd0f43d5bca054dd2778baab3bcfc2c16844b4d26f7653719047a42493213b64a2cde9cbc6312464d798da3728ce993107ff

data/.rubocop.yml

@@ -40,6 +40,9 @@ Style/FrozenStringLiteralComment:
 Style/RegexpLiteral:
   Enabled: false
 
+Style/ModuleFunction:
+  EnforcedStyle: extend_self
+
 # Lint
 Lint/AmbiguousOperator:
   Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ciesta (0.2.5)
+    ciesta (0.3.1)
       dry-types (~> 0.12.1)
       dry-validation (~> 0.11.1)
 
@@ -24,9 +24,9 @@ GEM
     dry-container (0.6.0)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.5)
+    dry-core (0.4.6)
       concurrent-ruby (~> 1.0)
-    dry-equalizer (0.2.0)
+    dry-equalizer (0.2.1)
     dry-logic (0.4.2)
       dry-container (~> 0.2, >= 0.2.6)
       dry-core (~> 0.2)

data/README.md

@@ -1,7 +1,7 @@
 # Ciesta
 
 [![Build Status](https://travis-ci.org/nulldef/ciesta.svg?branch=master)](https://travis-ci.org/nulldef/ciesta)
-[![Coverage Status](https://coveralls.io/repos/github/nulldef/ciesta/badge.svg?branch=master&rand=22)](https://coveralls.io/github/nulldef/ciesta?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/nulldef/ciesta/badge.svg?branch=master&rand=23)](https://coveralls.io/github/nulldef/ciesta?branch=master)
 [![Gem Version](https://badge.fury.io/rb/ciesta.svg)](https://badge.fury.io/rb/ciesta)
 
 Create simple form objects
@@ -54,9 +54,15 @@ user = User.new(nil, nil)
 For setting and syncing new values let's create a form object:
 
 ```ruby
-class Form < Ciesta::Form
+class Form
+  include Ciesta
+
   field :name
   field :age
+
+  def age
+    super.to_i
+  end
 end
 
 form = Form.new(user)
@@ -64,7 +70,7 @@ form = Form.new(user)
 
 ```ruby
 form.name = "John"
-form.age = 33
+form.age = "33"
 form.sync!
 
 user.name # => "John"
@@ -85,7 +91,9 @@ Both `sync` and `sync!` provide this DSL.
 For validating incoming values you can use `validate` method:
 
 ```ruby
-class Form < Ciesta::Form
+class Form
+  include Ciesta
+
   field :name
   field :age
 

data/lib/ciesta.rb

@@ -2,10 +2,6 @@
 
 require "dry-types"
 require "dry-validation"
-
-module Ciesta
-end
-
 require "ciesta/delegator"
 require "ciesta/version"
 require "ciesta/field_list"
@@ -14,4 +10,12 @@ require "ciesta/types"
 require "ciesta/validator"
 require "ciesta/errors"
 require "ciesta/field"
-require "ciesta/form"
+require "ciesta/class_methods"
+require "ciesta/instance_methods"
+
+module Ciesta
+  def self.included(base)
+    base.extend(ClassMethods)
+    base.include(InstanceMethods)
+  end
+end

data/lib/ciesta/class_methods.rb

@@ -0,0 +1,59 @@
+module Ciesta
+  module ClassMethods
+    extend self
+
+    def form_from(**hash)
+      form = new
+      hash.each do |(k, v)|
+        form.public_send("#{k}=", v) if form.respond_to?("#{k}=")
+      end
+      form
+    end
+
+    # Declare new form field
+    #
+    # @param [Symbol] name Field name
+    # @param [Hash] options Options
+    # @option (see Ciesta::Field)
+    def field(name, **options)
+      name = name.to_sym
+      fields << Ciesta::Field.new(name, options)
+      proxy.instance_eval do 
+        define_method(name) { self.class.fields[name] }
+        define_method("#{name}=") { |value| self.class.fields[name] = value }
+      end
+    end
+
+    # Declare rules for valudation
+    #
+    # @param [Block] block Block with validation rules
+    # @see http://dry-rb.org/gems/dry-validation
+    def validate(&block)
+      validator.use(&block)
+    end
+
+    # Returns field list
+    #
+    # @api private
+    # @return [Ciesta::FieldList]
+    def fields
+      @fields ||= Ciesta::FieldList.new
+    end
+
+    # Returns form validator
+    #
+    # @api private
+    # @return [Ciesta::Validator]
+    def validator
+      @validator ||= Ciesta::Validator.new
+    end
+
+    def proxy
+      @proxy ||= begin
+        m = Module.new
+        include m
+        m
+      end
+    end
+  end
+end

data/lib/ciesta/instance_methods.rb

@@ -0,0 +1,88 @@
+module Ciesta
+  module InstanceMethods
+    extend Ciesta::Delegator
+
+    # @!method assign
+    # @!method assign!
+    # @!method attributes
+    # @see Ciesta::FieldList
+    delegate :assign, :assign!, :attributes, :clear!, to: :fields
+
+    # @!method errors
+    # @see Ciesta::Validator
+    delegate :errors, to: :validator
+
+    # @!method sync
+    # @!method sync!
+    # @see Ciesta::Syncer
+    delegate :sync, to: :syncer
+
+    attr_accessor :object
+
+    # Constructor
+    #
+    # @param [Object] object Object wich will be updated though this form
+    def initialize(object = nil)
+      @object = object
+      clear!
+
+      return if object.nil?
+
+      values = fields.keys.each_with_object({}) do |key, mem|
+        mem[key] = object.public_send(key) if object.respond_to?(key)
+      end
+
+      assign(values)
+    end
+
+    # Checks if form is valid
+    #
+    # @param [Hash] params Attrubutes to assign before validation
+    #
+    # @return [Boolean]
+    def valid?(params = nil)
+      assign(params) if params
+      validator.valid?(attributes)
+    end
+
+    # Sync form attributes to object
+    #
+    # @see Ciesta::Syncer
+    #
+    # @param [Block] block Block wich will be yielded after synfing
+    #
+    # @raise Ciesta::ModelNotPresent
+    # @raise Ciesta::FormNotValid
+    # @return [Boolean]
+    def sync!(&block)
+      raise Ciesta::FormNotValid, "Form is not valid" unless valid?
+      syncer.sync!(&block)
+    end
+
+    private
+
+    # Sync class for form
+    #
+    # @api private
+    # @return [Ciesta::Syncer]
+    def syncer
+      @syncer ||= Ciesta::Syncer.new(object, fields)
+    end
+
+    # Returns form validator
+    #
+    # @api private
+    # @see Ciesta::Form.validator
+    def validator
+      self.class.validator
+    end
+
+    # Returns field list
+    #
+    # @api private
+    # @see Ciesta::Form.fields
+    def fields
+      self.class.fields
+    end
+  end
+end

data/lib/ciesta/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ciesta
-  VERSION = "0.2.5".freeze
+  VERSION = "0.3.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ciesta
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.1
 platform: ruby
 authors:
 - Alexey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-22 00:00:00.000000000 Z
+date: 2018-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-types
@@ -144,11 +144,12 @@ files:
 - bin/setup
 - ciesta.gemspec
 - lib/ciesta.rb
+- lib/ciesta/class_methods.rb
 - lib/ciesta/delegator.rb
 - lib/ciesta/errors.rb
 - lib/ciesta/field.rb
 - lib/ciesta/field_list.rb
-- lib/ciesta/form.rb
+- lib/ciesta/instance_methods.rb
 - lib/ciesta/syncer.rb
 - lib/ciesta/types.rb
 - lib/ciesta/validator.rb

data/lib/ciesta/form.rb

@@ -1,130 +0,0 @@
-# frozen_string_literal: true
-
-# Main form class
-#
-# @attr_reader [Object] object Object of form
-class Ciesta::Form
-  extend Ciesta::Delegator
-
-  # @!method assign
-  # @!method assign!
-  # @!method attributes
-  # @see Ciesta::FieldList
-  delegate :assign, :assign!, :attributes, :clear!, to: :fields
-
-  # @!method errors
-  # @see Ciesta::Validator
-  delegate :errors, to: :validator
-
-  # @!method sync
-  # @!method sync!
-  # @see Ciesta::Syncer
-  delegate :sync, to: :syncer
-
-  class << self
-    # Declare new form field
-    #
-    # @param [Symbol] name Field name
-    # @param [Hash] options Options
-    # @option (see Ciesta::Field)
-    def field(name, options = {})
-      name = name.to_sym
-      fields << Ciesta::Field.new(name, options)
-
-      define_method(name) { fields[name] }
-      define_method("#{name}=") { |value| fields[name] = value }
-    end
-
-    # Declare rules for valudation
-    #
-    # @param [Block] block Block with validation rules
-    # @see http://dry-rb.org/gems/dry-validation
-    def validate(&block)
-      validator.use(&block)
-    end
-
-    # Returns field list
-    #
-    # @api private
-    # @return [Ciesta::FieldList]
-    def fields
-      @fields ||= Ciesta::FieldList.new
-    end
-
-    # Returns form validator
-    #
-    # @api private
-    # @return [Ciesta::Validator]
-    def validator
-      @validator ||= Ciesta::Validator.new
-    end
-  end
-
-  attr_accessor :object
-
-  # Constructor
-  #
-  # @param [Object] object Object wich will be updated though this form
-  def initialize(object = nil)
-    @object = object
-    clear!
-
-    return if object.nil?
-
-    values = fields.keys.each_with_object({}) do |key, mem|
-      mem[key] = object.public_send(key) if object.respond_to?(key)
-    end
-
-    assign(values)
-  end
-
-  # Checks if form is valid
-  #
-  # @param [Hash] params Attrubutes to assign before validation
-  #
-  # @return [Boolean]
-  def valid?(params = nil)
-    assign(params) if params
-    validator.valid?(attributes)
-  end
-
-  # Sync form attributes to object
-  #
-  # @see Ciesta::Syncer
-  #
-  # @param [Block] block Block wich will be yielded after synfing
-  #
-  # @raise Ciesta::ModelNotPresent
-  # @raise Ciesta::FormNotValid
-  # @return [Boolean]
-  def sync!(&block)
-    raise Ciesta::FormNotValid, "Form is not valid" unless valid?
-    syncer.sync!(&block)
-  end
-
-  private
-
-  # Sync class for form
-  #
-  # @api private
-  # @return [Ciesta::Syncer]
-  def syncer
-    @syncer ||= Ciesta::Syncer.new(object, fields)
-  end
-
-  # Returns form validator
-  #
-  # @api private
-  # @see Ciesta::Form.validator
-  def validator
-    self.class.validator
-  end
-
-  # Returns field list
-  #
-  # @api private
-  # @see Ciesta::Form.fields
-  def fields
-    self.class.fields
-  end
-end