formally 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4024b86ffa06e7d2c4467601e0f3038f8649ca64
-  data.tar.gz: 511023d751f711b1c8e605a75b28cab2d301f4d9
+  metadata.gz: '03495aa4de454d0566e1a0eebf725504ca271e27'
+  data.tar.gz: af8d7f82f44862251357036bff15ff9c170d1003
 SHA512:
-  metadata.gz: 7bdfac920b4f1c8a06cb0bec054869abd62acedd4ffb480e724d6f385f69102b30e05654fae25930c051d5e642db072c8f223fe8e76bf0efa176545a49e085f4
-  data.tar.gz: 98b788cf129f170a8af41fd9ac77c7370b026906985efa0fba67b406d81ecc34c2c5fba9a7ff0a7c113de0e109f59429f98c2a289bf09f9ee2d34da4e80b4f0b
+  metadata.gz: f5d5a8394563961024610a0cd6d2fc66f9221236b7f5becdd8252f097b0a77e077baad4714cdf6085ee5fc2dfc9ca54327a4ee5c72703b948bd741b9fd9d371e
+  data.tar.gz: c0d732732ae3fe6c3b08257d1c68cc01e7bce64bd2811a88462556274c111c1db4172e4bc59b7302bf1d3520fd3194f290ad53f279155bf1d1d75288588c5ad4

data/lib/formally/class_methods.rb

@@ -2,12 +2,17 @@ module Formally
   module ClassMethods
     attr_writer :formally
 
-    def formally *fields, &block
+    def formally &block
       if block
         @formally.schema = block
-        @formally.fields += fields
       end
       @formally
     end
+
+    def build **opts
+      new(**opts).tap do |instance|
+        instance.formally = formally.build(**opts)
+      end
+    end
   end
 end

data/lib/formally/config.rb

@@ -1,50 +1,28 @@
 module Formally
-  class Config < Manioc.mutable(:base, :transaction, :klass, :fields)
+  class Config < Manioc.mutable(:base, :predicates, :transaction, :klass)
     attr_accessor :schema
-    attr_reader :finalized_schema
 
-    def finalize
-      return if @finalized_schema
-
-      _schema     = schema
-      _fields     = fields || []
-      _predicates = Formally::PredicateFinder.call klass
-
-      @finalized_schema = Dry::Validation.Form base do
-        configure do
-          _fields.each do |name|
-            option name
-          end
-
-          option :_self
-
-          _predicates.each do |method|
-            if method.arity == 0
-              define_method method.name do
-                method.bind(_self).call
-              end
-            else
-              define_method method.name do |arg|
-                method.bind(_self).call arg
-              end
-            end
-          end
+    def build **opts
+      Formally::State.new \
+        schema:      schema_for(**opts),
+        transaction: transaction
+    end
 
-          # class_exec(&_configure) if _configure
-        end
+    private
 
-        instance_exec(&_schema)
+    def schema_for **opts
+      if opts.none? && schema.arity.zero?
+        @_cached_schema ||= build_schema
+      else
+        build_schema opts
       end
-
-      freeze
     end
 
-    def new object
-      unless object.is_a? klass
-        raise ClassMismatch, "#{object.class} is not a #{@klass}"
+    def build_schema *args
+      _schema = schema
+      Dry::Validation.Form base do
+        instance_exec(*args, &_schema)
       end
-      finalize
-      State.new self, object
     end
   end
 end

data/lib/formally/overrides.rb

@@ -1,10 +1,5 @@
 module Formally
   module Overrides
-    def initialize *args
-      super(*args)
-      @formally = self.class.formally.new self
-    end
-
     def fill data={}
       if data.respond_to?(:permit!)
         # Assume ActionController::Parameters or similar
@@ -26,6 +21,7 @@ module Formally
       formally.transaction do
         super
       end
+      formally.callbacks(:after_commit).each(&:call)
       true
     end
 

data/lib/formally/state.rb

@@ -1,16 +1,12 @@
 module Formally
   class State
-    def initialize config, object
-      @config, @object = config, object
+    def initialize schema:, transaction:
+      @schema, @transaction = schema, transaction
+      @callbacks = { after_commit: [] }
     end
 
     def call data
-      injections = { _self: @object }
-      @config.fields.each do |name|
-        injections[name] = @object.send name
-      end
-
-      result  = @config.finalized_schema.with(injections).call data
+      result  = @schema.call data
       @data   = result.output
       @errors = result.errors
       @filled = true
@@ -29,7 +25,15 @@ module Formally
     end
 
     def transaction &block
-      @config.transaction.call(&block)
+      @transaction.call(&block)
+    end
+
+    def after_commit &block
+      @callbacks[:after_commit].push block
+    end
+
+    def callbacks key
+      @callbacks.fetch key, []
     end
   end
 end

data/lib/formally/version.rb

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

data/lib/formally.rb

@@ -7,36 +7,42 @@ require 'formally/version'
 require 'formally/class_methods'
 require 'formally/config'
 require 'formally/overrides'
-require 'formally/predicate_finder'
 require 'formally/state'
 
 require 'formally/railtie' if defined? Rails::Railtie
 
 module Formally
-  module Predicates
-  end
-
   class << self
     attr_accessor :config
 
-    def predicates &block
-      Predicates.class_exec(&block)
-    end
-
     def included base
       base.extend  Formally::ClassMethods
       base.prepend Formally::Overrides
       base.formally = Formally.config.with(klass: base)
     end
+
+    def predicates with: []
+      _predicates = config.predicates
+      Module.new do
+        include Dry::Logic::Predicates
+        (_predicates + with).each do |predicate|
+          instance_exec(&predicate)
+        end
+      end
+    end
   end
 
   self.config = Formally::Config.new \
     klass: nil, # will be completed at include time
     base:  nil,
-    fields: [],
+    predicates: [],
     transaction: ->(&block) { block.call }
 
-  attr_reader :formally
+  attr_writer :formally
+
+  def formally
+    @formally ||= self.class.formally.build
+  end
 
   extend Forwardable
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formally
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - James Dabbs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2017-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-validation
@@ -131,7 +131,6 @@ files:
 - lib/formally/config.rb
 - lib/formally/errors.rb
 - lib/formally/overrides.rb
-- lib/formally/predicate_finder.rb
 - lib/formally/railtie.rb
 - lib/formally/state.rb
 - lib/formally/version.rb

data/lib/formally/predicate_finder.rb

@@ -1,21 +0,0 @@
-module Formally
-  module PredicateFinder
-    def self.all_method_names klass
-      (klass.instance_methods + klass.private_instance_methods).grep(/\?$/)
-    end
-
-    IGNORED_METHODS = all_method_names Object
-
-    def self.call klass
-      predicates = []
-      (all_method_names(klass) - IGNORED_METHODS).each do |name|
-        method = klass.instance_method name
-        predicates.push method if method.arity == 0 || method.arity == 1
-      end
-      Formally::Predicates.instance_methods.each do |name|
-        predicates.push Formally::Predicates.instance_method name
-      end
-      predicates
-    end
-  end
-end