partitional 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fd2f509c71ca5e46903b81b24ac78a5bae441130453c5b8dce4208a3a9e3b3a
-  data.tar.gz: b20b06d9749591270b536cd0121ccb642878d3cd40f76f812649681793a945bf
+  metadata.gz: c74db8079513aa01fad882503d4b72a9ea92e144b39c7c5f1f482455a101d73a
+  data.tar.gz: 78dbf9d752bf0fdd1acccf5b06669ecef4ce1233c584de3b70a1c698b742e75f
 SHA512:
-  metadata.gz: c597de88ee4d116423b411d0c82460116bb2d69007d55d0e19cfcfe9d16299c9b5b336467b09a37818f5f06e48f04477a0fd8deea7082fb71427551d70116e51
-  data.tar.gz: d8c0369ac52fc5d8cb6a909929e2df2424fa8e58c636bc6ee1467ffd0016a1054bbdd3889f9fbcc9f41cec191a838af29481cc0269343ce724111c2b00aa5b46
+  metadata.gz: e122df258ba7f0773b3888f87060e54b7fc267d40e6cd7aa9c30a0de9ccbd553f7b468dff57efe3d454df3adaf4418303616540f5312b5cbf2494ecf8b3ae969
+  data.tar.gz: c193c62458ba3b65534793b2ba09bd7332c2ce2008e11b6f0a5ceefec08812cb4ca396d5ef247dd708b4ce24d9c6e924c75dcf292924954145e947a2c2694caf

data/lib/partitional.rb

@@ -1,5 +1,6 @@
 require 'active_support/concern'
 require 'partitional/version'
+require 'partitional/validator'
 
 module Partitional
   extend ActiveSupport::Concern
@@ -49,14 +50,7 @@ module Partitional
     end
 
     def define_partial_validator(name, mapping)
-      validate do
-        partial = send(name)
-        partial.validate
-
-        partial.errors.each do |attr, message|
-          errors.add(mapping[attr], message)
-        end
-      end
+      validates name, partitional: true
     end
   end
 end

data/lib/partitional/model.rb

@@ -4,7 +4,8 @@ module Partitional
   class Model
     include ActiveModel::Model
 
-    attr_accessor :record, :mapping
+    attr_accessor :record
+    attr_writer :mapping
 
     def self.attributes
       @attributes ||= []
@@ -42,13 +43,13 @@ module Partitional
 
     def [](attr)
       attr = attr.to_s.to_sym
-      reader = (mapping || {}).fetch(attr) { attr }
+      reader = mapping.fetch(attr) { attr }
       record ? record_send(reader) : instance_variable_get(:"@#{attr}")
     end
 
     def []=(attr, val)
       attr = attr.to_s.to_sym
-      writer = (mapping || {}).fetch(attr) { attr }
+      writer = mapping.fetch(attr) { attr }
       record ? record_send(:"#{writer}=", val) : instance_variable_set(:"@#{attr}", val)
     end
 
@@ -60,6 +61,10 @@ module Partitional
       Hash[attrs]
     end
 
+    def mapping
+      @mapping || {}
+    end
+
     protected
 
     def record_send(method, *args)

data/lib/partitional/validator.rb

@@ -0,0 +1,40 @@
+require 'active_model'
+
+class PartitionalValidator < ActiveModel::EachValidator
+  ALLOWED_OPTIONS = %i[
+    allow_nil
+    allow_blank
+    if
+    unless
+    message
+    attributes
+  ]
+
+  def check_validity!
+    invalid_keys = []
+    options.except(*ALLOWED_OPTIONS).each_pair do |key, value|
+      invalid_keys.push("#{key}: #{value}")
+    end
+    raise ArgumentError, "#{invalid_keys.join(', ')} is invalid options." unless invalid_keys.empty?
+  end
+
+  def validate_each(record, attribute, value)
+    return if options[:if].present? && !to_value(record, options[:if])
+    return if options[:unless].present? && to_value(record, options[:unless])
+
+    value.validate
+    mapping = value.mapping
+
+    value.errors.each do |attr, message|
+      record.errors.add(mapping[attr], message)
+    end
+  end
+
+  protected
+
+  def to_value(record, value)
+    return record.send(value) if value.is_a?(Symbol)
+    return value.call(record) if value.is_a?(Proc)
+    value
+  end
+end

data/lib/partitional/version.rb

@@ -1,3 +1,3 @@
 module Partitional
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: partitional
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Sho Kusano
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-25 00:00:00.000000000 Z
+date: 2018-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,6 +112,7 @@ files:
 - bin/setup
 - lib/partitional.rb
 - lib/partitional/model.rb
+- lib/partitional/validator.rb
 - lib/partitional/version.rb
 - partitional.gemspec
 homepage: https://github.com/rosylilly/partitional