dsl_maker 0.1.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee345a0ba8d01c3d91f40755ba0c18ac527c57eb
-  data.tar.gz: 515dae62c2f621d2ae8c12df517231d209e460a8
+  metadata.gz: 43ac58c18299e11f3a0d0a5153b091099abd4ad4
+  data.tar.gz: 2d581831a64b7897260837b43ab095890a655bc0
 SHA512:
-  metadata.gz: 0983a84dbed2c14f98b7f1d8d2ce6c76bfe59a24f4c74c604f52e8877e830286523de6e4cf3f7747d354e313235689e84dd1fb1bebdb2f3472645740b3217b97
-  data.tar.gz: b59a9f5d5e9095e5fcddbdbbdc0df8a43488a3d9d93ab2a58dcf435f681dd1fff97c5a6ec415352464ad2c7703931b767d5b08e3c54c49bda4b5aef636e57d9e
+  metadata.gz: da69b4dfdd4603a15cf4e95c64e41cfdfa7589d86bd8d7b6d53df157a1dc16906dfaa7d992792f5f586edac8097779aa5b085f246516e7350047b949ff1dc12a
+  data.tar.gz: d6a063cabdc29e419e856c2aade33afcd5fbf88a789303789ec654e4a015aca85473cd3c2d16a34022c369260adacb4e997412f4a0a8baf10af6c56d78d50509

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 cache: bundler
 rvm:
   - ruby-head
+  - 2.3
   - 2.2
   - 2.1
   - 2.0.0

data/Changes

@@ -1,5 +1,15 @@
 Revision history for DSL::Maker (ordered by revision number).
 
+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
+   - Update minimum dependencies to address vulnerabilities
+   - Rename the following for consistency:
+      - is_alias() to is_alias?()
+      - is_array() to is_array?()
+      - is_entrypoint() to is_entrypoint?()
+   - ArrayOf types now take an Array as well as a list.
+
 0.1.1 Aug 24 2015
    - add_helper() no longer pollutes DSL::Maker::Base
    - Add remove_helper() and has_helper?()

data/LICENSE

@@ -1,340 +1,21 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    {description}
-    Copyright (C) {year}  {fullname}
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  {signature of Ty Coon}, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
-
+The MIT License (MIT)
+
+Copyright (c) 2016 greenfishbluefish
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -302,7 +302,8 @@ class FamilyTreeDSL < DSL::Maker
 end
 ```
 
-Now, we can handle an arbitrarily-deep family tree.
+Now, we can handle an arbitrarily-deep family tree. This is the DSL used in the
+multi-level spec tests.
 
 ### Handling multiple items
 

data/dsl_maker.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email   = 'rob.kinyon@gmail.com'
   s.summary = 'Easy multi-level DSLs'
   s.description = 'Easy multi-level DSLs, built on top of Docile'
-  s.license = 'GPL2'
+  s.license = 'MIT'
   s.homepage = 'https://github.com/robkinyon/ruby-dsl-maker'
 
   s.files         = `git ls-files`.split("\n")
@@ -19,20 +19,20 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.3'
 
-  s.add_dependency 'docile', '~> 1.1', '>= 1.1.0'
+  s.add_dependency 'docile'
 
   # Run rspec tests from rake
-  s.add_development_dependency 'rake', '~> 10'
-  s.add_development_dependency 'rspec', '~> 3.0.0', '>= 3.0.0'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
   s.add_development_dependency 'simplecov', '~> 0'
-  s.add_development_dependency 'rubygems-tasks', '~> 0'
+  s.add_development_dependency 'rubygems-tasks'
 
   # To limit needed compatibility with versions of dependencies, only configure
   #   yard doc generation when *not* on Travis, JRuby, or 1.8
   if !on_travis? && !on_jruby? && !on_1_8?
     # Github flavored markdown in YARD documentation
     # http://blog.nikosd.com/2011/11/github-flavored-markdown-in-yard.html
-    s.add_development_dependency 'yard', '~> 0.8'
+    s.add_development_dependency 'yard', '~> 0.9.11'
     s.add_development_dependency 'redcarpet', '~> 3'
     s.add_development_dependency 'github-markup', '~> 1.3'
   end

data/lib/dsl/maker.rb

@@ -75,7 +75,7 @@ class DSL::Maker
   def self.AliasOf(name)
     @@aliases[name] ||= Alias.new(name)
   end
-  def self.is_alias(type)
+  def self.is_alias?(type)
     type.instance_of? Alias
   end
 
@@ -88,12 +88,12 @@ class DSL::Maker
   @@arrays = {}
   ArrayOf = Class.new do
     def self.[](type)
-      raise "Cannot make an array of an alias" if DSL::Maker.is_alias(type)
+      raise "Cannot make an array of an alias" if DSL::Maker.is_alias?(type)
       raise "Unknown type provided to ArrayOf" unless @@types.has_key?(type) || DSL::Maker.is_dsl?(type)
       @@arrays[type] ||= ArrayType.new(type)
     end
   end
-  def self.is_array(type)
+  def self.is_array?(type)
     type.instance_of? ArrayType
   end
 
@@ -198,7 +198,7 @@ class DSL::Maker
   def self.add_entrypoint(name, args={}, &defn_block)
     symname = name.to_sym
 
-    if is_entrypoint(symname)
+    if is_entrypoint?(symname)
       raise "'#{name.to_s}' is already an entrypoint"
     end
 
@@ -238,7 +238,7 @@ class DSL::Maker
   #
   # @return      [Class]  The class that implements this name's DSL definition.
   def self.entrypoint(name)
-    unless is_entrypoint(name)
+    unless is_entrypoint?(name)
       raise "'#{name.to_s}' is not an entrypoint"
     end
 
@@ -311,7 +311,7 @@ class DSL::Maker
   # @return nil
   def self.add_verification(name, &block)
     raise "Block required for add_verification" unless block_given?
-    raise "'#{name.to_s}' is not an entrypoint for a verification" unless is_entrypoint(name)
+    raise "'#{name.to_s}' is not an entrypoint for a verification" unless is_entrypoint?(name)
 
     @entrypoints[name.to_sym].add_verification(&block)
   end
@@ -379,11 +379,11 @@ class DSL::Maker
           ___get(as_attr)
         end
       end
-    elsif is_alias(type)
+    elsif is_alias?(type)
       klass.class_eval do
         alias_method name, type.real_name
       end
-    elsif is_array(type)
+    elsif is_array?(type)
       as_attr = '@' + name.to_s
 
       klass.class_eval do
@@ -409,8 +409,7 @@ class DSL::Maker
             rv.push(dsl_value)
           elsif !args.empty?
             rv.concat(
-              args.map do |item|
-                # Assumption: 10x_ will never be used as an attribute name.
+              args.flatten.map do |item|
                 klass.new.instance_exec('@__________', item, &@@types[type.base_type])
               end
             )
@@ -441,7 +440,7 @@ class DSL::Maker
     proto.is_a?(Class) && proto.ancestors.include?(DSL::Maker::Base)
   end
 
-  def self.is_entrypoint(name)
+  def self.is_entrypoint?(name)
     @entrypoints && @entrypoints.has_key?(name.to_sym)
   end
 

data/lib/dsl/maker/version.rb

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

data/spec/array_type_spec.rb

@@ -7,7 +7,7 @@ describe "Packager DSL ArrayOf" do
     end
   end
 
-  it "can array a String" do
+  context "can array a String" do
     dsl_class = Class.new(DSL::Maker) do
       add_entrypoint(:pizza, {
         :cheeses => DSL::Maker::ArrayOf[String],
@@ -17,20 +17,33 @@ describe "Packager DSL ArrayOf" do
       }
     end
 
-    pizza = dsl_class.execute_dsl {
-      pizza {
-        cheeses :cheddar
-        cheeses 'mozzarrella'
+    it 'can take two invocations' do
+      pizza = dsl_class.execute_dsl {
+        pizza {
+          cheeses :cheddar
+          cheeses 'mozzarrella'
+        }
       }
-    }
-    verify_pizza(pizza[0], :cheese => %w(cheddar mozzarrella))
+      verify_pizza(pizza[0], :cheese => %w(cheddar mozzarrella))
+    end
 
-    pizza = dsl_class.execute_dsl {
-      pizza {
-        cheeses 'cheddar', 'mozzarrella'
+    it 'can take a list' do
+      pizza = dsl_class.execute_dsl {
+        pizza {
+          cheeses 'cheddar', 'mozzarrella'
+        }
       }
-    }
-    verify_pizza(pizza[0], :cheese => %w(cheddar mozzarrella))
+      verify_pizza(pizza[0], :cheese => %w(cheddar mozzarrella))
+    end
+
+    it 'can take an array' do
+      pizza = dsl_class.execute_dsl {
+        pizza {
+          cheeses [ 'cheddar', 'mozzarrella' ]
+        }
+      }
+      verify_pizza(pizza[0], :cheese => %w(cheddar mozzarrella))
+    end
   end
 
   it "can array a DSL" do

data/spec/functions_spec.rb

@@ -0,0 +1,118 @@
+describe 'Functions in the DSL' do
+  dsl_class = Class.new(DSL::Maker) do
+    add_entrypoint(:person, {
+      :name => String,
+      :child => generate_dsl({
+        :name => String,
+      }) {
+        Structs::Person.new(name)
+      },
+    }) do
+      Structs::Person.new(name, child)
+    end
+  end
+
+  it 'can call a function in the block' do
+    person = dsl_class.parse_dsl("
+      person {
+        def my_name
+          'Tom'
+        end
+        name my_name
+      }
+    ")[0]
+    expect(person).to be_instance_of(Structs::Person)
+    expect(person.name).to eq('Tom')
+    expect(person.child).to be_nil
+  end
+
+  it 'can call a function outside the DSL' do
+    person = dsl_class.parse_dsl("
+      def my_name
+        'Tom'
+      end
+      person {
+        name my_name
+      }
+    ")[0]
+    expect(person).to be_instance_of(Structs::Person)
+    expect(person.name).to eq('Tom')
+    expect(person.child).to be_nil
+  end
+
+  it 'can call a function in a parent block' do
+    person = dsl_class.parse_dsl("
+      person {
+        def my_name
+          'Tom'
+        end
+        name 'Bill'
+        child {
+          name my_name
+        }
+      }
+    ")[0]
+    expect(person).to be_instance_of(Structs::Person)
+    expect(person.child).to be_instance_of(Structs::Person)
+    expect(person.child.name).to eq('Tom')
+  end
+
+  it 'can call a function from a child outside the DSL' do
+    person = dsl_class.parse_dsl("
+      def my_name
+        'Tom'
+      end
+      person {
+        name 'Bill'
+        child {
+          name my_name
+        }
+      }
+    ")[0]
+    expect(person).to be_instance_of(Structs::Person)
+    expect(person.child).to be_instance_of(Structs::Person)
+    expect(person.child.name).to eq('Tom')
+  end
+end
+
+describe 'Including a module in the DSL' do
+  dsl_class = Class.new(DSL::Maker) do
+    add_entrypoint(:person, {
+      :name => String,
+      :child => generate_dsl({
+        :name => String,
+      }) {
+        Structs::Person.new(name)
+      },
+    }) do
+      Structs::Person.new(name, child)
+    end
+  end
+
+  it 'can call a module function in the block' do
+    person = dsl_class.parse_dsl("
+      require 'module1'
+      person {
+        name Mod1.up('tom')
+      }
+    ")[0]
+    expect(person).to be_instance_of(Structs::Person)
+    expect(person.name).to eq('TOM')
+    expect(person.child).to be_nil
+  end
+
+  it 'can call a module function from the child' do
+    person = dsl_class.parse_dsl("
+      require 'module1'
+      person {
+        name 'Bill'
+        child {
+          name Mod1.up('tom')
+        }
+      }
+    ")[0]
+    expect(person).to be_instance_of(Structs::Person)
+    expect(person.child).to be_instance_of(Structs::Person)
+    expect(person.child.name).to eq('TOM')
+  end
+end

data/spec/lib/module1.rb

@@ -0,0 +1,6 @@
+module Mod1
+  def up(str='')
+    str.upcase
+  end
+  module_function :up
+end

data/spec/multi_level_spec.rb

@@ -149,7 +149,8 @@ describe 'A multi-level DSL making family-trees' do
       end
     end
 
-    it "can handle two axes of recursion" do
+    # https://github.com/ms-ati/docile/issues/31
+    xit "can handle two axes of recursion" do
       dsl_class = Class.new(DSL::Maker) do
         person_dsl = add_entrypoint(:person, {
           :name => String,

data/spec/spec_helper.rb

@@ -46,3 +46,4 @@ module Structs
   Fruit = Struct.new(:name, :color)
 end
 
+$:.push 'spec/lib'

metadata

@@ -1,69 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: dsl_maker
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Rob Kinyon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-25 00:00:00.000000000 Z
+date: 2018-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -82,14 +70,14 @@ dependencies:
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -98,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.11
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +147,9 @@ files:
 - spec/array_type_spec.rb
 - spec/class_as_subdsl_spec.rb
 - spec/error_spec.rb
+- spec/functions_spec.rb
 - spec/helper_spec.rb
+- spec/lib/module1.rb
 - spec/multi_level_spec.rb
 - spec/multiple_invocation_spec.rb
 - spec/single_level_spec.rb
@@ -167,7 +157,7 @@ files:
 - spec/validation_spec.rb
 homepage: https://github.com/robkinyon/ruby-dsl-maker
 licenses:
-- GPL2
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -185,9 +175,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Easy multi-level DSLs
 test_files: []
-has_rdoc: