alki-dsl 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90429495e92b8775651aac719580cdac47e97e14
-  data.tar.gz: 3084f05b8ca664ad0e4df95a85ba7623d39a2952
+  metadata.gz: e7b46619195a15b77b5c230989b6c6962962ecc8
+  data.tar.gz: 9c447613711f688a2edb558b05528d3ae9bb6fa8
 SHA512:
-  metadata.gz: 64c345261de3bebc73b2f1bc76528794e634ed569736480477f8892d728e1c9ec14859d4af249efa72187d5f07b63fe3f981b32e35469093eedf1de087f229a6
-  data.tar.gz: 8120abd9422fdc9bb658637dd0d0e9fa7d40a346562d6a4ad5bb3ebdb9388a13ce8cc4effad0b81c6be8ae900a30707fa987c51335e05528cf87b40b2bb11a59
+  metadata.gz: 3cd54ade2ff7c3dc76abced31938f4732eb963ddb5c1ea2a1f57dcd26e1a2853fc2746b9a5e7b960c378ea04b0010d5158237e1899d7840dbd16be840d558e3b
+  data.tar.gz: 599afb4c7e3854b83b5a0b2d78f877820328da9d019e0481c3dad31ae98d5721762ecb48590a2afdcd8ed622aeaf789abd489c57953bb0304ed78d0a52fc8977

data/.gitignore

@@ -47,6 +47,7 @@ build-iPhoneSimulator/
 Gemfile.lock
 # .ruby-version
 # .ruby-gemset
+/bin/
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.1.10
+  - 2.5.1
+  - jruby

data/README.adoc

@@ -1,5 +1,7 @@
 # Alki::Dsl
 
+image:https://travis-ci.org/alki-project/alki-dsl.svg?branch=master["Build Status", link="https://travis-ci.org/alki-project/alki-dsl"]
+
 Alki::Dsl is a library for building DSLs. The resulting DSL buliders can be used standalone or as builders for
 https://github.com/alki-project/alki-loader[Alki::Loader].
 

data/alki-dsl.gemspec

@@ -8,8 +8,9 @@ Gem::Specification.new do |spec|
   spec.email         = ["matt.edlefsen@gmail.com"]
   spec.summary       = %q{Alki dsl library}
   spec.description   = %q{Library for defining and using DSLs}
-  spec.homepage      = "https://github.com/medlefsen/alki-dsl"
+  spec.homepage      = "http://alki.io/projects/alki-dsl"
   spec.license       = "MIT"
+  spec.required_ruby_version = '>= 2.1.0'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -17,6 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'alki-support', '~> 0.7'
-  spec.add_dependency 'alki-loader', '~> 0.2', '>= 0.2.2'
+  spec.add_dependency 'alki-support', '~> 0.7', ">= 0.7.1"
+  spec.add_dependency 'alki-loader', '~> 0.2', '>= 0.2.4'
 end

data/lib/alki/dsl/evaluator.rb

@@ -36,11 +36,11 @@ module Alki
       end
 
       def context
-        Thread.current[:__alki_dsl_context]
+        @context
       end
 
       def evaluate(&blk)
-        Thread.current[:__alki_dsl_context] = @data[:context] || blk.binding.receiver
+        @context = @data[:context] || block_context(blk)
         @mod.class_exec &blk
       end
 
@@ -95,6 +95,15 @@ module Alki
           @mod.singleton_class.send :remove_method, m
         end
       end
+
+      def block_context(blk)
+        b = blk.binding
+        if b.respond_to? :receiver
+          b.receiver
+        else
+          b.eval('self')
+        end
+      end
     end
   end
 end

data/lib/alki/dsl/version.rb

@@ -1,5 +1,5 @@
 module Alki
   module Dsl
-    VERSION = '0.5.1'
+    VERSION = '0.6.0'
   end
 end

data/test/feature/build_context_test.rb

@@ -0,0 +1,19 @@
+require 'alki/feature_test'
+
+describe 'Build Context' do
+  def foo
+    :foo
+  end
+
+  before do
+    @dsl = Alki::Dsl.build('alki/dsls/dsl') do
+      dsl_method :result do |v|
+        ctx[:result] = v
+      end
+    end
+  end
+
+  it 'should be accessable when evaluating a dsl' do
+    @dsl.build { result foo }.must_equal :foo
+  end
+end

data/test/feature/runtime_requires_test.rb

@@ -0,0 +1,30 @@
+require 'alki/feature_test'
+
+describe 'Runtime requires' do
+  before do
+    foo_dsl = Alki::Dsl.build('alki/dsls/dsl') do
+      dsl_method :foo do
+        ctx[:result] = :foo
+      end
+    end
+
+    @dsl = Alki::Dsl.build('alki/dsls/dsl') do
+      dsl_method :load_foo do
+        require_dsl foo_dsl
+      end
+    end
+  end
+
+  it 'should add the dsl methods to the running dsl' do
+    @dsl.build do
+      load_foo
+      foo
+    end.must_equal :foo
+  end
+
+  it 'should not add the dsl methods before it is required' do
+    assert_raises NoMethodError do
+      @dsl.build { foo }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alki-dsl
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Matt Edlefsen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-30 00:00:00.000000000 Z
+date: 2018-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alki-support
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: alki-loader
   requirement: !ruby/object:Gem::Requirement
@@ -33,7 +39,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +49,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.4
 description: Library for defining and using DSLs
 email:
 - matt.edlefsen@gmail.com
@@ -52,12 +58,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - README.adoc
 - Rakefile
 - alki-dsl.gemspec
-- bin/bundler
-- bin/rake
 - lib/alki/class_builder.rb
 - lib/alki/dsl.rb
 - lib/alki/dsl/base.rb
@@ -69,9 +74,10 @@ files:
 - lib/alki/dsl/version.rb
 - lib/alki/dsls/class.rb
 - lib/alki/dsls/dsl.rb
+- test/feature/build_context_test.rb
 - test/feature/config_test.rb
 - test/feature/merge_test.rb
-- test/feature/runtime_requires.rb
+- test/feature/runtime_requires_test.rb
 - test/feature_test_helper.rb
 - test/fixtures/example/lib/alki_loader.rb
 - test/fixtures/example/lib/alki_test/dsls/number.rb
@@ -81,8 +87,7 @@ files:
 - test/fixtures/example/numbers/three.rb
 - test/integration/class_builder_test.rb
 - test/test_helper.rb
-- test/unit/evaluator_test.rb
-homepage: https://github.com/medlefsen/alki-dsl
+homepage: http://alki.io/projects/alki-dsl
 licenses:
 - MIT
 metadata: {}
@@ -94,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -102,14 +107,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Alki dsl library
 test_files:
+- test/feature/build_context_test.rb
 - test/feature/config_test.rb
 - test/feature/merge_test.rb
-- test/feature/runtime_requires.rb
+- test/feature/runtime_requires_test.rb
 - test/feature_test_helper.rb
 - test/fixtures/example/lib/alki_loader.rb
 - test/fixtures/example/lib/alki_test/dsls/number.rb
@@ -119,4 +125,3 @@ test_files:
 - test/fixtures/example/numbers/three.rb
 - test/integration/class_builder_test.rb
 - test/test_helper.rb
-- test/unit/evaluator_test.rb

data/bin/bundler

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'bundler' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("bundler", "bundler")

data/bin/rake

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'rake' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rake", "rake")

data/test/feature/runtime_requires.rb

@@ -1,5 +0,0 @@
-require 'alki/feature_test'
-
-describe 'Runtime requires' do
-  it 'should be allowed at '
-end

data/test/unit/evaluator_test.rb

@@ -1,6 +0,0 @@
-require 'alki/test'
-require 'alki/dsl/evaluator'
-
-describe Alki::Dsl::Evaluator do
-
-end