alki-dsl 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74a68f3b18db59488fcbe8c2037b3933f33aef5d
-  data.tar.gz: '070150789ebbd1bc8b2615395c3e803c0b259913'
+  metadata.gz: 4d2cf31784168eb5de6e6fd04ac4d6d7763aa16a
+  data.tar.gz: '0299ce32b0c21d2567c6a201696262a0442af954'
 SHA512:
-  metadata.gz: 420aa794f86a9c2339e784cabd08260d304f500e4c6d6b9731e4b66c7d607153f89a6e1fb3f570a54040a475b7c16e0dbed658f237fd5bab1ee163cbc1e84742
-  data.tar.gz: 2a8a0cc25a0fe87a36fe278f5c3ee4768d4816650ead0354dda92e4861ff15e418e5b263ac04e78ef009db02303da87cacc6d996cf667e252dda54d5c2ec2eea
+  metadata.gz: b306403e0261d49b4d4f5f16203d7599cc8468d5b1cb9cfa57e546dbc7be2f872590c4bc0d444037370d6a863b47358e1dda0027aecf7b3f532aeeb892a41feb
+  data.tar.gz: 525dfdbe6892594eda9330edfde6c7b77bf63ccfec42915f20fd7495d89f22dc459a5140ccc20a9566975616a75feb9a7b5bc08d49de7966ba75ebfd7d37a82a

data/alki-dsl.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'alki-support', '~> 0.7'
-  spec.add_dependency 'alki-loader', '~> 0.1'
+  spec.add_dependency 'alki-loader', '~> 0.2'
   spec.add_development_dependency 'minitest', '~> 5.9', '>= 5.9.1'
 end

data/lib/alki/class_builder.rb

@@ -85,12 +85,12 @@ module Alki
 
       if data[:modules]
         data[:modules].each do |mod|
-          klass.include mod
+          klass.include Alki.load mod
         end
       end
       if data[:class_modules]
         data[:class_modules].each do |mod|
-          klass.extend mod
+          klass.extend Alki.load mod
         end
       end
 

data/lib/alki/dsl.rb

@@ -1,7 +1,12 @@
 require 'alki/loader'
+require 'alki/dsl/merge'
 
 module Alki
   module Dsl
+    def self.merge(*dsls)
+      Alki::Dsl::Merge.new *dsls
+    end
+
     def self.build(name,data={},&blk)
       Alki.load(name).build data, &blk
     end

data/lib/alki/dsl/base.rb

@@ -1,12 +1,10 @@
 require 'alki/support'
-require 'alki/dsl/evaluator'
+require 'alki/dsl/builder'
 
 module Alki
   module Dsl
     class Base
-      def self.build(data={},&blk)
-        Alki::Dsl::Evaluator.evaluate self, data, &blk
-      end
+      extend Alki::Dsl::Builder
 
       def self.generate(ctx)
         obj = new(ctx)
@@ -16,7 +14,6 @@ module Alki
         result[:init] = obj.method(info[:init]) if info[:init]
         result[:finish] = obj.method(info[:finish]) if info[:finish]
         result[:requires] = info[:requires] if info[:requires]
-        result[:helpers] = info[:helpers] if info[:helpers]
 
         if info[:methods]
           info[:methods].each do |method|
@@ -35,6 +32,14 @@ module Alki
         {}
       end
 
+      def self.helpers
+        if defined? self::Helpers
+          [self::Helpers]
+        else
+          []
+        end
+      end
+
       def initialize(ctx)
         @ctx = ctx
       end
@@ -42,4 +47,4 @@ module Alki
       attr_reader :ctx
     end
   end
-end
+end

data/lib/alki/dsl/builder.rb

@@ -0,0 +1,11 @@
+require 'alki/dsl/evaluator'
+
+module Alki
+  module Dsl
+    module Builder
+      def build(data={},&blk)
+        Alki::Dsl::Evaluator.evaluate self, data, &blk
+      end
+    end
+  end
+end

data/lib/alki/dsl/class_helpers.rb

@@ -48,13 +48,11 @@ module Alki
       end
 
       def add_helper(name,&blk)
-        class_builder('Helpers')[:type] = :module
         add_method name, &blk
         add_method name, subclass: 'Helpers', &blk
       end
 
       def add_helper_module(mod)
-        class_builder('Helpers')[:type] = :module
         add_module mod
         add_module mod, subclass: 'Helpers'
       end

data/lib/alki/dsl/evaluator.rb

@@ -16,6 +16,9 @@ module Alki
         process_dsl dsl, data
 
         @inits.each(&:call)
+        define_dsl_method mod, :method_missing do |meth,*args,&b|
+          blk.binding.receiver.send meth, *args, &b
+        end
         dsl_exec mod, &blk
         @finishers.reverse_each(&:call)
         clear_dsl_methods mod

data/lib/alki/dsl/merge.rb

@@ -0,0 +1,26 @@
+require 'alki/dsl/builder'
+
+module Alki
+  module Dsl
+    class Merge
+      include Alki::Dsl::Builder
+
+      def initialize(*dsls)
+        @dsls = dsls
+        @requires = dsls.map{|dsl| [dsl,:before]}.freeze
+      end
+
+      def generate(_ctx)
+        {
+          requires: @requires
+        }
+      end
+
+      def helpers
+        @helpers ||= @dsls.inject([]) do |helpers, dsl|
+          helpers.push *Alki.load(dsl).helpers
+        end
+      end
+    end
+  end
+end

data/lib/alki/dsl/version.rb

@@ -1,5 +1,5 @@
 module Alki
   module Dsl
-    VERSION = '0.4.0'
+    VERSION = '0.4.2'
   end
 end

data/lib/alki/dsls/dsl.rb

@@ -50,11 +50,11 @@ module Alki
       end
 
       def require_dsl(dsl, order=:before)
-        dsl_class = Alki.load(dsl)
-        @info[:requires] << [dsl_class,order]
-        if defined? dsl_class::Helpers
-          add_module dsl_class::Helpers
-          add_helper_module dsl_class::Helpers
+        dsl_class = Alki.load dsl
+        @info[:requires] << [dsl,order]
+        dsl_class.helpers.each do |helper|
+          add_module helper
+          add_helper_module helper
         end
       end
 
@@ -68,6 +68,10 @@ module Alki
 
       def finish
         set_super_class 'alki/dsl/base'
+        class_builder('Helpers')[:type] = :module
+        add_class_method :helpers do
+          [self::Helpers]
+        end
         info = @info.freeze
         add_class_method :dsl_info do
           info

data/test/feature/config_test.rb

@@ -16,4 +16,9 @@ describe 'dsl configuration' do
     require 'alki_test/numbers/three'
     AlkiTest::Numbers::Three.new.must_equal 3
   end
+
+  it 'should allow using Alki::Dsl.merge to merge dsls together' do
+    require 'alki_test/numbers/three'
+    AlkiTest::Numbers::Three.simple.must_equal true
+  end
 end

data/test/fixtures/example/lib/alki_loader.rb

@@ -1,2 +1,3 @@
-Alki::Loader.register '../numbers', builder: 'alki_test/dsls/number', name: 'alki_test/numbers'
+number_dsl = Alki::Dsl.merge 'alki_test/dsls/number', 'alki_test/dsls/simple'
+Alki::Loader.register '../numbers', builder: number_dsl, name: 'alki_test/numbers'
 Alki::Loader.register 'alki_test/dsls', builder: 'alki/dsls/dsl'

data/test/fixtures/example/lib/alki_test/dsls/simple.rb

@@ -0,0 +1,9 @@
+Alki do
+  require_dsl 'alki/dsls/class'
+
+  finish do
+    add_class_method :simple do
+      true
+    end
+  end
+end

data/test/integration/class_builder_test.rb

@@ -60,7 +60,9 @@ describe Alki::ClassBuilder do
 
     it 'should allow setting super class by name' do
       class AlkiTestClass; end
-      build(super_class: 'alki_test_class').superclass.must_equal AlkiTestClass
+      Alki.stub(:load,AlkiTestClass) do
+        build(super_class: 'alki_test_class').superclass.must_equal AlkiTestClass
+      end
       Object.send :remove_const, :AlkiTestClass
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alki-dsl
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Matt Edlefsen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-29 00:00:00.000000000 Z
+date: 2017-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alki-support
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,17 @@ files:
 - lib/alki/class_builder.rb
 - lib/alki/dsl.rb
 - lib/alki/dsl/base.rb
+- lib/alki/dsl/builder.rb
 - lib/alki/dsl/class_helpers.rb
 - lib/alki/dsl/evaluator.rb
+- lib/alki/dsl/merge.rb
 - lib/alki/dsl/version.rb
 - lib/alki/dsls/class.rb
 - lib/alki/dsls/dsl.rb
 - test/feature/config_test.rb
 - test/fixtures/example/lib/alki_loader.rb
 - test/fixtures/example/lib/alki_test/dsls/number.rb
+- test/fixtures/example/lib/alki_test/dsls/simple.rb
 - test/fixtures/example/lib/alki_test/dsls/value.rb
 - test/fixtures/example/numbers/three.rb
 - test/integration/class_builder_test.rb
@@ -113,6 +116,7 @@ test_files:
 - test/feature/config_test.rb
 - test/fixtures/example/lib/alki_loader.rb
 - test/fixtures/example/lib/alki_test/dsls/number.rb
+- test/fixtures/example/lib/alki_test/dsls/simple.rb
 - test/fixtures/example/lib/alki_test/dsls/value.rb
 - test/fixtures/example/numbers/three.rb
 - test/integration/class_builder_test.rb