dsl_companion 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a771786f0b6091fa9cf21cc3c3f0c938c9749d33
-  data.tar.gz: 9ece4271be1ef921319f8caaff12a441f2349695
+  metadata.gz: 86c270416e190f0d2abad7baf7edd7797b3c80dd
+  data.tar.gz: 240f9b639fd103970119f2a838d152041eb25bcb
 SHA512:
-  metadata.gz: 47b386ac4117767be63f3c311acbb809161d1f17d6703ff9dcec086ca22deb8d91a20d92a54c8369e8808a31b5794fc5dd23938a9b3db15bf84e64fed9354741
-  data.tar.gz: c407a5193ffa37f8979367ba99b26f91bb9ed7d3ecfbb421c6275c957ba3fafd0125d81e2f02517c8f0511d54f58ea881d74deac85b941cf225f756915a977cd
+  metadata.gz: f4fabd2022cd6018231feedfdaec4987752ec57f80df34d568d3fc323e9124781971a14af62cbec56446c601af1a45d0dc1626dde13dc98e1572808af1aadfff
+  data.tar.gz: f0bccac6aabdd6db860d798319824efa3e0c7083a7c81a19381fae4f23c741fb40050ce6177a21925679a17e74e92d3ef05d1a281459386178da460c202b175e

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'

data/dsl_companion.gemspec

@@ -4,21 +4,21 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'dsl_companion/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "dsl_companion"
+  spec.name          = 'dsl_companion'
   spec.version       = DSLCompanion::VERSION
-  spec.authors       = ["Laurent B."]
-  spec.email         = ["lbnetid+gh@gmail.com"]
+  spec.authors       = ['Laurent B.']
+  spec.email         = ['lbnetid+gh@gmail.com']
   spec.summary       = %q{Provides a customizable interpreter to run your own internal DSLs.}
   spec.description   = %q{The goal of this gem is to provide a versatile DSL interpreter.}
-  spec.homepage      = ""
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/lbriais/dsl_companion'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency 'bundler', '~> 1.5'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
 end

data/lib/dsl_companion/features/basic.rb

@@ -3,14 +3,14 @@ module DSLCompanion
 
     module Basic
 
-      include MetaHelper
+      include DSLCompanion::MetaHelper
 
       # If any method named define_<something>(*args) is in the DSL, then it provides an alternate
       # generic syntax of define(:something, *args)
       # @param [Object[]] args
       # @param [Proc] block
       # @return [Anything returned by the method]
-      def define *args, &block
+      def define(*args, &block)
         extra = args.shift
         method_name = "define_#{extra}"
         if respond_to? method_name.to_sym
@@ -23,25 +23,25 @@ module DSLCompanion
       def execute_within_context(context=@context, &block)
         # Execute the block if any
         if block_given?
-          last_saved_context = @context
-          @context = context
+          last_saved_context = @current_context
+          @current_context = context
           begin
-            logger "Switching to context: #{@context} (from #{last_saved_context})"
-            @context.send :instance_variable_set, '@interpreter', @interpreter
-            @context.instance_eval(&block)
+            logger "Switching to context: #{@current_context} (from #{last_saved_context})"
+            MetaHelper.inject_variable @current_context, :interpreter, @interpreter
+            @current_context.instance_eval(&block)
           ensure
-            @context = last_saved_context
-            logger "Back to context: #{@context}"
+            @current_context = last_saved_context
+            logger "Back to context: #{@current_context}"
           end
         end
       end
 
       def interpreter?
-        self.is_a? DSLHelper::Interpreter
+        self.is_a? DSLCompanion::Interpreter
       end
 
       def interpreter
-        self
+        self if interpreter?
       end
 
       def logger(msg, level=:info)
@@ -52,8 +52,6 @@ module DSLCompanion
         end
       end
 
-
-
     end
 
   end

data/lib/dsl_companion/interpreter.rb

@@ -5,17 +5,18 @@ module DSLCompanion
     include DSLCompanion::Features::Basic
 
     attr_writer :logger
+    attr_reader :current_context
 
     DEFAULT_EXEC_MODE=:lazy
 
     def initialize(exec_mode=DEFAULT_EXEC_MODE)
       @interpreter = self
       self.exec_mode = exec_mode
+      @current_context = self
     end
 
 
-    def run file=nil, &block
-      @context = self
+    def run(file=nil, &block)
       if file.nil?
         self.instance_eval &block
       else
@@ -28,7 +29,7 @@ module DSLCompanion
       @source_code_file = nil
     end
 
-    def self.run file=nil, exec_mode=DEFAULT_EXEC_MODE, &block
+    def self.run(file=nil, exec_mode=DEFAULT_EXEC_MODE, &block)
       new(exec_mode).run file, &block
     end
 
@@ -42,7 +43,7 @@ module DSLCompanion
         @exec_mode = :lazy
         return @exec_mode
       end
-      raise "DSL Interpreter: Invalid execution mode !"
+      raise 'DSL Interpreter: Invalid execution mode !'
     end
     attr_reader :exec_mode
 

data/lib/dsl_companion/meta_helper.rb

@@ -1,38 +1,44 @@
-module MetaHelper
+module DSLCompanion
+  module MetaHelper
 
-  def metaclass
-    class << self
-      self
+    def metaclass
+      class << self
+        self
+      end
     end
-  end
 
-  def meta_eval &block
-    metaclass.instance_eval &block
-  end
+    def meta_eval(&block)
+      metaclass.instance_eval &block
+    end
 
-  # Adds method to metaclass
-  def meta_def( name, &block )
-    meta_eval { define_method name, &block }
-  end
+    # Adds method to metaclass
+    def meta_def( name, &block )
+      meta_eval { define_method name, &block }
+    end
 
-  # Defines an instance method within a class
-  def class_def( name, &block )
-    class_eval { define_method name, &block }
-  end
+    # Defines an instance method within a class
+    def class_def( name, &block )
+      class_eval { define_method name, &block }
+    end
 
-  def inject_variable(name, value)
-    # Inject instance variable in the current context
-    injected_accessor = name.to_s.to_sym
-    injected_instance_variable = "@#{injected_accessor}"
-    already_defined = self.instance_variable_defined? injected_instance_variable
-    logger("DSL Interpreter overriding existing variable '#{injected_instance_variable}'", :warn) if already_defined
-    self.instance_variable_set injected_instance_variable, value
-
-    # Defines the method that returns the instance variable and inject into the interpreter's context
-    meta_def "#{injected_accessor}" do
-      self.instance_variable_get injected_instance_variable
+    def inject_variable(name, value)
+      MetaHelper.inject_variable self, name, value
     end
 
-  end
+    def self.inject_variable(target, name, value)
+      # Inject instance variable in the target context
+      injected_accessor = name.to_s.to_sym
+      injected_instance_variable = "@#{injected_accessor}"
+      already_defined = target.instance_variable_defined? injected_instance_variable
+      logger("DSL Interpreter overriding existing variable '#{injected_instance_variable}'", :warn) if already_defined
+      target.extend MetaHelper
+      target.instance_variable_set injected_instance_variable, value
+
+      # Defines the method that returns the instance variable and inject into the interpreter's context
+      target.meta_def "#{injected_accessor}" do
+        target.instance_variable_get injected_instance_variable
+      end
+    end
 
-end
+  end
+end

data/lib/dsl_companion/version.rb

@@ -1,3 +1,3 @@
 module DSLCompanion
-  VERSION = "0.1.1"
+  VERSION = '0.1.2'
 end

data/spec/interpreter_spec.rb

@@ -37,7 +37,7 @@ describe DSLCompanion::Interpreter do
   it 'should give the same result for define_<something>(*args) and define(:something, *args)' do
 
     module ExtraFeatureModule
-      def define_stuff stuff_name, value
+      def define_stuff(stuff_name, value)
         interpreter.inject_variable stuff_name, value
       end
     end
@@ -62,7 +62,7 @@ describe DSLCompanion::Interpreter do
   it 'should be able to inject new variables in interpreter' do
 
     module ExtraFeatureModule
-      def define_stuff stuff_name, value
+      def define_stuff(stuff_name, value)
         interpreter.inject_variable stuff_name, value
       end
     end

data/spec/spec_helper.rb

@@ -9,7 +9,7 @@ require 'dsl_companion'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[File.expand_path("../../spec/support/**/*.rb", __FILE__)].each { |f| require f }
+Dir[File.expand_path('../../spec/support/**/*.rb', __FILE__)].each { |f| require f }
 
 RSpec.configure do |config|
   # ## Mock Framework
@@ -25,7 +25,7 @@ RSpec.configure do |config|
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
-  config.order = "random"
+  config.order = 'random'
 
   config.color = true
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dsl_companion
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Laurent B.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-05 00:00:00.000000000 Z
+date: 2015-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,7 +74,7 @@ files:
 - lib/dsl_companion/version.rb
 - spec/interpreter_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/lbriais/dsl_companion
 licenses:
 - MIT
 metadata: {}