pair-kit-dsl-factory 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48396edf98fe1d900b089952ad7b7fb9817ad3c53ac247c32ce4814e9a455883
-  data.tar.gz: ba752937c41de3c94bdac73eb325398c74aa1f3d6297a8ca3d3e3de944e0fb72
+  metadata.gz: 9b927088c9b61b8fc67ab0b3f956842c130e1df1595dbe2eedbf571f03d3385a
+  data.tar.gz: 3475eca97235dab7bbefb94756900b3c02c450bd5e9ba21f6dab7adaadb5f80a
 SHA512:
-  metadata.gz: 536ea00e45e1d6f10188d5dfef00bfb11407841dc285af7a1bb0ac2ccc8c752ea247a26b478eb3d0e2e9e3386daa5d98968d8f96a2deede23a098bd743bbd03c
-  data.tar.gz: 568c3fbdb77270564e04e0e7d3c3eb76f39edbe3505644e5fccf81f4a3ab0ad74d0ba6e5c8628a13b6d0658216d9d58e308f88c522c815c35b619193cdff2d48
+  metadata.gz: 16c502c9f582e05578fff8258d20231710a8dbb6feeae03013d652a3e0a057f3b30e86770ced58edface8a1eafd1afc3757b0c28830674ae9599922b8c59f3b4
+  data.tar.gz: '0284179927efd225a276ff0201a3d1a828cf4a4b9e49de8022068f943605d6091d845b26dee09e18646e5701012f78844d9e2b45126e70f598060d1e32855a47'

data/README.md

@@ -71,41 +71,40 @@ class ApplicationModel < ActiveRecord::Model
       private
       
       def _schema
-        subject
+        @subject
       end
     end
     
     configure_builder(:struct, SchemaDsl) do
       def prop(name, &block)
         name = name.to_sym
-        subject[:properties][name] = {}
+        @subject[:properties][name] = {}
 
-        build(subject, builder: :property, name: name, &block)
+        @dsl.(@subject, builder: :property, name: name, &block)
       end
     end
     
     configure_builder(:array, SchemaDsl) do
       def item(&block)
-        build(subject[:item], builder: :schema &block)
+        @dsl.(@subject[:item], builder: :schema &block)
       end
 
       private
 
       def _schema
-        subject[:item]
+        @subject[:item]
       end
     end
     
     configure_builder(:property, SchemaDsl) do
-
       def required
-        (subject[:required] ||= []) << options[:name]
+        (@subject[:required] ||= []) << @options[:name]
       end
 
       private
 
       def _schema
-        subject[:properties][options[:name]]
+        @subject[:properties][@options[:name]]
       end
     end
   end
@@ -113,8 +112,8 @@ class ApplicationModel < ActiveRecord::Model
   class_attribute :json_schema 
   
   def self.draw_schema(&block)
-    self.json_schema = {}
-    JSON_SCHEMA_BUILDER.build(json_schema).struct(&block)
+    self.json_schema ||= {}
+    JSON_SCHEMA_BUILDER.builder(json_schema).struct(&block)
   end
 end
 

data/lib/pair_kit/dsl_factory/builder.rb

@@ -1,19 +1,11 @@
 module PairKit
   class DslFactory
     class Builder
-      def initialize(factory, subject, **options)
-        @factory = factory
+      def initialize(dsl, subject, **options)
+        @dsl = dsl
         @subject = subject
         @options = options
       end
-
-      private
-
-      attr_accessor :subject, :factory, :options
-
-      def build(new_thing, **options, &block)
-        factory.build(new_thing, **options, &block)
-      end
     end
   end
 end

data/lib/pair_kit/dsl_factory/version.rb

@@ -2,6 +2,6 @@
 
 module PairKit
   class DslFactory
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end

data/lib/pair_kit/dsl_factory.rb

@@ -4,7 +4,7 @@ module PairKit
     require_relative 'dsl_factory/builder'
     require_relative 'dsl_factory/wrapper'
 
-    attr_reader :builders, :default_builder
+    attr_reader :builders
 
     def initialize(&block)
       @builders = {}
@@ -21,19 +21,27 @@ module PairKit
     end
 
     def build(thing, **options, &block)
-      builder_name = options[:builder] || @default_builder
+      call(thing, **options, &block)
+      thing
+    end
+
+    def call(thing, **options, &block)
+      builder_name = (options[:builder] = options[:builder]&.to_sym || default_builder)
+
       builder_class = builders[builder_name] || raise("Unknown builder #{builder_name}")
 
       Wrapper.new(builder_name, builder_class.new(self, thing, **options))
              .tap { |x| x.instance_exec(&block) if block }
     end
 
+    def default_builder
+      builders.keys.first
+    end
+
     def branch(&block)
       self.class.new
           .tap { |x| builders.each { |k, v| x.builders[k] = Class.new(v) } }
-          .tap { |x| x.default_builder = default_builder }
           .tap { |x| x.instance_exec(&block) if block }
-
     end
 
     protected

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pair-kit-dsl-factory
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Dmitry Sharkov