dsl_maker 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43ac58c18299e11f3a0d0a5153b091099abd4ad4
-  data.tar.gz: 2d581831a64b7897260837b43ab095890a655bc0
+  metadata.gz: 85f97d8d73eceeca3b40c4ad156e69b236ffa5f5
+  data.tar.gz: 603975a69ba6f163e24928aac73ef12c5cdfcb1a
 SHA512:
-  metadata.gz: da69b4dfdd4603a15cf4e95c64e41cfdfa7589d86bd8d7b6d53df157a1dc16906dfaa7d992792f5f586edac8097779aa5b085f246516e7350047b949ff1dc12a
-  data.tar.gz: d6a063cabdc29e419e856c2aade33afcd5fbf88a789303789ec654e4a015aca85473cd3c2d16a34022c369260adacb4e997412f4a0a8baf10af6c56d78d50509
+  metadata.gz: 37fd0149a8290377dbc7033b5ffa0fcd9b5c771c5649120c9c1746c4b063f757c8b3b00e5e2383f5fcb3442276035feac06ab82c87e95eb793ea37a3a9c56d7d
+  data.tar.gz: 129b55c93089a927e022904d9683c050f9da2351eabd8654ccef2d81b969e23247d1dacba920e84a45a4bf86815fb65cf472071a18c17ede686120b32c55e0ac

data/.travis.yml

@@ -2,20 +2,9 @@ language: ruby
 cache: bundler
 rvm:
   - ruby-head
+  - 2.4
   - 2.3
   - 2.2
   - 2.1
   - 2.0.0
   - 1.9.3
-  - rbx-2
-matrix:
-  include:
-    - rvm: jruby-head
-      env: JRUBY_OPTS="$JRUBY_OPTS -Xcli.debug=true --debug"  # for simplecov
-    - rvm: jruby-21mode
-      env: JRUBY_OPTS="$JRUBY_OPTS -Xcli.debug=true --debug"  # for simplecov
-    - rvm: jruby-20mode
-      env: JRUBY_OPTS="$JRUBY_OPTS -Xcli.debug=true --debug"  # for simplecov
-    - rvm: jruby-19mode
-      env: JRUBY_OPTS="$JRUBY_OPTS -Xcli.debug=true --debug"  # for simplecov
-  fast_finish: true

data/Changes

@@ -1,5 +1,8 @@
 Revision history for DSL::Maker (ordered by revision number).
 
+1.0.1 Nov 25 2018
+   - Add support for Hash
+
 1.0.0 Aug 24 2018
    - The license has changed from GPLv2 to MIT
       - This is a breaking change, hence the increment to 1.0.0

data/README.md

@@ -57,9 +57,9 @@ Then, use it as so:
 ```ruby
 #!/usr/bin/env ruby
 
-require ‘vehicle/dsl’
+require 'vehicle/dsl'
 
-filename = ARGV.shift || raise “No filename provided.”
+filename = ARGV.shift || raise 'No filename provided.'
 
 # This raises the error
 vehicles = Vehicle::DSL.parse_dsl(
@@ -408,13 +408,14 @@ encountered.
 
 ### Type Coercions
 
-There are four pre-defined standard type coercions available for `generate_dsl()`:
+There are five pre-defined standard type coercions available for `generate_dsl()`:
 
   Standard coercions:
     * Any - This takes whatever you give it and returns it back.
     * String - This takes whatever you give it and returns the string within it.
     * Integer - This takes whatever you give it and returns the integer within it.
     * Boolean - This takes whatever you give it and returns the truthiness of it.
+    * Hash - This takes a block and returns a Hash of the method calls.
 
 You can add additional standard type coercions using `add_type()` as described
 above.

data/lib/dsl/maker.rb

@@ -97,6 +97,20 @@ class DSL::Maker
     type.instance_of? ArrayType
   end
 
+  class HashType
+    def initialize(rv)
+      @rv = rv
+    end
+
+    def respond_to_missing?(*args)
+      true
+    end
+
+    def method_missing(methname, *args)
+      @rv[methname.to_s] = args[0] unless methname.to_s =~ /__.*__/
+    end
+  end
+
   # Parse the DSL provided in the parameter.
   #
   # @param dsl [String] The DSL to be parsed by this class.
@@ -350,6 +364,28 @@ class DSL::Maker
           instance_exec('@' + name.to_s, *args, &@@types[type])
         end
       end
+    elsif is_hash?(type)
+      as_attr = '@' + name.to_s
+
+      klass.class_eval do
+        define_method(name.to_sym) do |*args, &dsl_block|
+          if (!args.empty? || dsl_block)
+            rv = {}
+            Docile.dsl_eval(HashType.new(rv), &dsl_block) if dsl_block
+
+            # This is the one place where we pull out the entrypoint results and
+            # put them into the control class.
+            if klass.parent_class
+              # Use the full instance_variable_get() in order to avoid having to
+              # create accessors that could be misused outside this class.
+              klass.parent_class.instance_variable_get(:@accumulator).push(rv)
+            end
+
+            ___set(as_attr, rv)
+          end
+          ___get(as_attr)
+        end
+      end
     elsif is_dsl?(type)
       as_attr = '@' + name.to_s
       klass.class_eval do
@@ -426,9 +462,9 @@ class DSL::Maker
   end
 
   def self.run_dsl()
-    # build_dsl_element() will use @accumulator to handle multiple entrypoints if
-    # the class in question is a root DSL class. Reset it here so that we're only
-    # handling the values from this run.
+    # build_dsl_element() will use @accumulator to handle multiple entrypoints
+    # if the class in question is a root DSL class. Reset it here so that we're
+    # only handling the values from this run.
     @accumulator = []
 
     yield
@@ -436,6 +472,10 @@ class DSL::Maker
     return @accumulator
   end
 
+  def self.is_hash?(proto)
+    proto == Hash
+  end
+
   def self.is_dsl?(proto)
     proto.is_a?(Class) && proto.ancestors.include?(DSL::Maker::Base)
   end

data/lib/dsl/maker/version.rb

@@ -1,6 +1,6 @@
 module DSL
   class Maker
     # The current version of this library
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/spec/spec_helper.rb

@@ -44,6 +44,8 @@ module Structs
 
   Color = Struct.new(:name)
   Fruit = Struct.new(:name, :color)
+
+  Taggable = Struct.new(:name, :tags)
 end
 
 $:.push 'spec/lib'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dsl_maker
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Rob Kinyon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-19 00:00:00.000000000 Z
+date: 2018-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile