dsl_maker 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a86f0dfab03af6d1b25904ef7c7dd0ef4090b33
-  data.tar.gz: f63cd7dd2beaa1850851dba11a42d19ac67300a0
+  metadata.gz: 4dcf7e27a270d732f50700ad02cc0e2df6410d31
+  data.tar.gz: 67af6f9d5095417301601997d3f4244d6887a329
 SHA512:
-  metadata.gz: bb2d7b7e998e65c35b595904fe49fb0b42c549d8796d303a5ac9b5faa366f7b6fb12e4ba3a74fef8517c961eb5a9086b44fde8a1080481a4028e2eb6a9deeffb
-  data.tar.gz: 8a9aafadbc5c3c4a99e071609e49abf2b95f115b8106431e272500b96fad7afa26e913bd465fc762ff5525b1718dec33edcf1c8e83283c89cdf84a3cca43429a
+  metadata.gz: c3c69f7f5890b5266ec5a00a6e2c7d3238f50839ee5f527887024d63b90d146c4959b11f69575753d77ba1f6f3add5f8bbb6957533d8960428c0cdcd0c7c92c5
+  data.tar.gz: 3a78ff0dfce77a4c3e358400864110c068f102698a7aace6741315369f0956f80b55fb92431302ad8d262eb877fe48c955d08960c70dce0a6dac50c2b5d6a8c5

data/Changes

@@ -1,9 +1,15 @@
 Revision history for DSL::Maker (ordered by revision number).
 
+0.0.3 Jul 28 2015
+   - Added entrypoint() that returns the DSL implementing an entrypoint
+   - Several refactorings to improve maintainability:
+      - DSL::Maker::Boolean is now a mixin, not a base class
+      - DSL::Maker::Base is now the base class for all the DSL classes
+
 0.0.2 Jul 22 2015
    - Allow add_entrypoint() to take a DSL class instead of args
    - Added execute_dsl() that takes a block
-   - Several refactorings to improve maintainability
+   - Several refactorings to improve maintainability:
       - Recursive DSLs are now simpler to define and maintain
 
 0.0.1 Jul 21 2015

data/Rakefile

@@ -12,7 +12,7 @@ task :default => [:spec]
 RSpec::Core::RakeTask.new
 
 # Configure `rake clobber` to delete all generated files
-CLOBBER.include('pkg', 'doc', 'coverage')
+CLOBBER.include('pkg', 'doc', 'coverage', '*.gem')
 
 if !on_travis? && !on_jruby? && !on_1_8?
   require 'github/markup'

data/lib/dsl/maker/version.rb

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

data/lib/dsl/maker.rb

@@ -4,15 +4,8 @@ require 'docile'
 
 # This is the base class we provide.
 class DSL::Maker
-  # This is a useful class that contains all the Boolean handling we have.
-  class Boolean
-    {
-      :yes => true, :no  => false,
-      :on  => true, :off => false,
-    }.each do |name, result|
-      define_method(name) { result }
-    end
-
+  # This is the base class for all DSL-parsing classes.
+  class Base
     # 21 character method names are obscene. Make it easier to read.
     alias :___set :instance_variable_set
 
@@ -34,18 +27,26 @@ class DSL::Maker
       return
     end
   end
-  Yes = On = True = true
-  No = Off = False = false
-  $to_bool = lambda do |value|
-    if value
-      return false if %w(no off false nil).include? value.to_s.downcase
+
+  # This is a useful module that contains all the Boolean handling we need.
+  module Boolean
+    {
+      :yes => true, :no  => false,
+      :on  => true, :off => false,
+    }.each do |name, result|
+      define_method(name) { result }
     end
-    # The bang-bang boolean-izes the value. We want this to be lossy.
-    !!value
-  end
 
-  # TODO: Is this safe if the invoker doesn't use parse_dsl()?
-  @@accumulator = []
+    def self.coerce(value)
+      if value
+        return false if %w(no off false nil).include? value.to_s.downcase
+      end
+      # The bang-bang boolean-izes the value. We want this to be lossy.
+      !!value
+    end
+  end
+  Yes = On = True = true
+  No = Off = False = false
 
   # Parse the DSL provided in the parameter.
   #
@@ -56,14 +57,14 @@ class DSL::Maker
   #
   # @return    [Object] Whatever is returned by the block defined in this class.
   def self.parse_dsl(dsl)
-    # add_entrypoint() will use @@accumulator to handle multiple entrypoints.
+    # add_entrypoint() will use @accumulator to handle multiple entrypoints.
     # Reset it here so that we're only handling the values from this run.
-    @@accumulator = []
+    @accumulator = []
     eval dsl, self.get_binding
-    if @@accumulator.length <= 1
-      return @@accumulator[0]
+    if @accumulator.length <= 1
+      return @accumulator[0]
     end
-    return @@accumulator
+    return @accumulator
   end
 
   # Execute the DSL provided in the block.
@@ -75,14 +76,23 @@ class DSL::Maker
   #
   # @return    [Object] Whatever is returned by &block
   def self.execute_dsl(&block)
-    @@accumulator = []
+    @accumulator = []
     instance_eval(&block)
-    if @@accumulator.length <= 1
-      return @@accumulator[0]
+    if @accumulator.length <= 1
+      return @accumulator[0]
     end
-    return @@accumulator
+    return @accumulator
   end
 
+  # Returns the binding as needed by parse_dsl() and execute_dsl()
+  #
+  # @return [Binding] The binding of the invoking class.
+  def self.get_binding
+    binding
+  end
+
+  # FIXME: This may have to be changed when the elements can be altered because
+  # it is global to the hierarchy. But, that may be desirable.
   @@dsl_elements = {
     String => ->(klass, name, type) {
       as_attr = '@' + name.to_s
@@ -93,11 +103,11 @@ class DSL::Maker
         end
       end
     },
-    Boolean => ->(klass, name, type) {
+    DSL::Maker::Boolean => ->(klass, name, type) {
       as_attr = '@' + name.to_s
       klass.class_eval do
         define_method(name.to_sym) do |*args|
-          ___set(as_attr, $to_bool.call(args[0])) unless args.empty?
+          ___set(as_attr, Boolean.coerce(args[0])) unless args.empty?
           # Ensure that the default nil returns as false.
           !!___get(as_attr)
         end
@@ -105,6 +115,10 @@ class DSL::Maker
     },
   }
 
+  $is_dsl = lambda do |proto|
+    proto.is_a?(Class) && proto.ancestors.include?(DSL::Maker::Base)
+  end
+
   # Add a single element of a DSL to a class representing a level in a DSL.
   #
   # Each of the types represents a coercion - a guarantee and check of the value
@@ -123,7 +137,7 @@ class DSL::Maker
   def self.build_dsl_element(klass, name, type)
     if @@dsl_elements.has_key?(type)
       @@dsl_elements[type].call(klass, name, type)
-    elsif type.is_a?(Class) && type.ancestors.include?(Boolean)
+    elsif $is_dsl.call(type)
       as_attr = '@' + name.to_s
       klass.class_eval do
         define_method(name.to_sym) do |*args, &dsl_block|
@@ -163,7 +177,9 @@ class DSL::Maker
     # Inherit from the Boolean class to gain access to the useful methods
     # TODO: Convert DSL::Maker::Boolean into a Role
     # TODO: Create a DSL::Maker::Base class to inherit from
-    dsl_class = Class.new(Boolean) do
+    dsl_class = Class.new(DSL::Maker::Base) do
+      include DSL::Maker::Boolean
+
       # This instance method exists because we cannot seem to inline its work
       # where we call it. Could it be a problem of incorrect binding?
       # It has to be defined here because it needs access to &defn_block
@@ -201,16 +217,13 @@ class DSL::Maker
     # TODO: Provide a default block that returns the datastructure as a HoH.
     raise "Block required for add_entrypoint" unless block_given?
 
-    # Ensure that get_binding() exists in the child class. This is necessary to
-    # provide parse_dsl() so that eval works as expected. We have to do it here
-    # because this is the only place we know for certain will be called.
-    unless self.respond_to? :get_binding
-      define_singleton_method(:get_binding) { binding }
+    if self.respond_to?(name.to_sym)
+      raise "'#{name.to_s}' is already an entrypoint"
     end
 
     # FIXME: This is a wart. Really, we should be pulling out name, then
     # yielding to generate_dsl() in some fashion.
-    if args.is_a?(Class) && args.ancestors.include?(Boolean)
+    if $is_dsl.call(args)
       dsl_class = args
     else
       dsl_class = generate_dsl(args, &defn_block)
@@ -220,10 +233,24 @@ class DSL::Maker
       obj = dsl_class.new
       Docile.dsl_eval(obj, &dsl_block) if dsl_block
       rv = obj.instance_exec(*args, &defn_block)
-      @@accumulator.push(rv)
+      @accumulator.push(rv)
       return rv
     end
 
-    return dsl_class
+    @entrypoints ||= {}
+    return @entrypoints[name.to_sym] = dsl_class
+  end
+
+  # This returns the DSL corresponding to the entrypoint's name.
+  #
+  # @param name  [String] the name of the entrypoint
+  # 
+  # @return      [Class]  The class that implements this name's DSL definition.
+  def self.entrypoint(name)
+    unless self.respond_to?(name.to_sym)
+      raise "'#{name.to_s}' is not an entrypoint"
+    end
+
+    return @entrypoints[name.to_sym]
   end
 end

data/spec/args_spec.rb

@@ -1,8 +1,8 @@
 # This will use a DSL that defines fruit
 
 describe "A DSL with argument handling describing fruit" do
-  Color = Struct.new(:name)
-  Fruit = Struct.new(:name, :color)
+  $Color = Struct.new(:name)
+  $Fruit = Struct.new(:name, :color)
 
   describe "with one argument in add_entrypoint" do
     dsl_class = Class.new(DSL::Maker) do
@@ -10,7 +10,7 @@ describe "A DSL with argument handling describing fruit" do
         :name => String,
       }) do |*args|
         default(:name, args, 0)
-        Fruit.new(name, nil)
+        $Fruit.new(name, nil)
       end
     end
 
@@ -18,7 +18,7 @@ describe "A DSL with argument handling describing fruit" do
       fruit = dsl_class.parse_dsl("
         fruit
       ")
-      expect(fruit).to be_instance_of(Fruit)
+      expect(fruit).to be_instance_of($Fruit)
       expect(fruit.name).to be_nil
     end
 
@@ -26,7 +26,7 @@ describe "A DSL with argument handling describing fruit" do
       fruit = dsl_class.parse_dsl("
         fruit { name 'banana' }
       ")
-      expect(fruit).to be_instance_of(Fruit)
+      expect(fruit).to be_instance_of($Fruit)
       expect(fruit.name).to eq('banana')
     end
 
@@ -34,7 +34,7 @@ describe "A DSL with argument handling describing fruit" do
       fruit = dsl_class.parse_dsl("
         fruit 'banana'
       ")
-      expect(fruit).to be_instance_of(Fruit)
+      expect(fruit).to be_instance_of($Fruit)
       expect(fruit.name).to eq('banana')
     end
 
@@ -45,7 +45,7 @@ describe "A DSL with argument handling describing fruit" do
           name 'banana'
         end
       ")
-      expect(fruit).to be_instance_of(Fruit)
+      expect(fruit).to be_instance_of($Fruit)
       expect(fruit.name).to eq('banana')
     end
   end
@@ -59,7 +59,7 @@ describe "A DSL with argument handling describing fruit" do
         default('name', args)
         default('color', args, 1)
 
-        Fruit.new(name, color)
+        $Fruit.new(name, color)
       end
     end
 
@@ -67,7 +67,7 @@ describe "A DSL with argument handling describing fruit" do
       fruit = dsl_class.parse_dsl("
         fruit
       ")
-      expect(fruit).to be_instance_of(Fruit)
+      expect(fruit).to be_instance_of($Fruit)
       expect(fruit.name).to be_nil
       expect(fruit.color).to be_nil
     end
@@ -79,7 +79,7 @@ describe "A DSL with argument handling describing fruit" do
           color 'yellow'
         }
       ")
-      expect(fruit).to be_instance_of(Fruit)
+      expect(fruit).to be_instance_of($Fruit)
       expect(fruit.name).to eq('banana')
       expect(fruit.color).to eq('yellow')
 
@@ -89,7 +89,7 @@ describe "A DSL with argument handling describing fruit" do
           color 'green'
         end
       ")
-      expect(fruit).to be_instance_of(Fruit)
+      expect(fruit).to be_instance_of($Fruit)
       expect(fruit.name).to eq('plantain')
       expect(fruit.color).to eq('green')
     end
@@ -98,7 +98,7 @@ describe "A DSL with argument handling describing fruit" do
       fruit = dsl_class.parse_dsl("
         fruit 'banana', 'yellow'
       ")
-      expect(fruit).to be_instance_of(Fruit)
+      expect(fruit).to be_instance_of($Fruit)
       expect(fruit.name).to eq('banana')
       expect(fruit.color).to eq('yellow')
     end
@@ -112,11 +112,11 @@ describe "A DSL with argument handling describing fruit" do
           :name => String,
         }) { |*args|
           default('name', args, 0)
-          Color.new(name)
+          $Color.new(name)
         }
       }) do |*args|
         default('name', args, 0)
-        Fruit.new(name, color)
+        $Fruit.new(name, color)
       end
     end
 
@@ -128,9 +128,9 @@ describe "A DSL with argument handling describing fruit" do
           }
         end
       ")
-      expect(fruit).to be_instance_of(Fruit)
+      expect(fruit).to be_instance_of($Fruit)
       expect(fruit.name).to eq('banana')
-      expect(fruit.color).to be_instance_of(Color)
+      expect(fruit.color).to be_instance_of($Color)
       expect(fruit.color.name).to eq('yellow')
     end
 
@@ -140,9 +140,9 @@ describe "A DSL with argument handling describing fruit" do
           color 'yellow'
         end
       ")
-      expect(fruit).to be_instance_of(Fruit)
+      expect(fruit).to be_instance_of($Fruit)
       expect(fruit.name).to eq('banana')
-      expect(fruit.color).to be_instance_of(Color)
+      expect(fruit.color).to be_instance_of($Color)
       expect(fruit.color.name).to eq('yellow')
     end
 
@@ -154,9 +154,9 @@ describe "A DSL with argument handling describing fruit" do
           end
         end
       ")
-      expect(fruit).to be_instance_of(Fruit)
+      expect(fruit).to be_instance_of($Fruit)
       expect(fruit.name).to eq('banana')
-      expect(fruit.color).to be_instance_of(Color)
+      expect(fruit.color).to be_instance_of($Color)
       expect(fruit.color.name).to eq('green')
     end
   end

data/spec/class_as_subdsl_spec.rb

@@ -0,0 +1,83 @@
+# This is testing the ability to pass a class into generate_dsl and it
+# does the right thing.
+
+describe "Passing a class into generate_dsl" do
+  $Car = Struct.new(:maker, :wheel)
+  $Wheel = Struct.new(:maker, :size)
+
+  it "can do it" do
+    wheel_dsl = Class.new(DSL::Maker) do
+      add_entrypoint(:wheel, {
+        :size => String,
+        :maker => String,
+      }) do |*args|
+        default(:maker, args, 0)
+        $Wheel.new(maker, size)
+      end
+    end
+
+    dsl_class = Class.new(DSL::Maker) do
+      add_entrypoint(:car, {
+        :maker => String,
+        :wheel => wheel_dsl.entrypoint(:wheel),
+      }) do |*args|
+        default(:maker, args, 0)
+        $Car.new(maker, wheel)
+      end
+    end
+
+    car = dsl_class.execute_dsl do
+      car 'honda' do
+        wheel 'goodyear' do
+          size 26
+        end
+      end
+    end
+    expect(car).to be_instance_of($Car)
+    expect(car.maker).to eq('honda')
+    expect(car.wheel).to be_instance_of($Wheel)
+    expect(car.wheel.maker).to eq('goodyear')
+    expect(car.wheel.size).to eq('26')
+  end
+
+  # This ensures that if we create multiple entrypoints with the same name, they
+  # won't tramp on each other.
+  it "will not tramp on the entrypoints with the same name" do
+    wheel_dsl = Class.new(DSL::Maker) do
+      add_entrypoint(:wheel, {
+        :size => String,
+        :maker => String,
+      }) do |*args|
+        default(:maker, args, 0)
+        $Wheel.new(maker, size)
+      end
+    end
+
+    other_wheel_dsl = Class.new(DSL::Maker) do
+      add_entrypoint(:wheel, {}) { nil }
+    end
+
+    dsl_class = Class.new(DSL::Maker) do
+      add_entrypoint(:car, {
+        :maker => String,
+        :wheel => wheel_dsl.entrypoint(:wheel),
+      }) do |*args|
+        default(:maker, args, 0)
+        $Car.new(maker, wheel)
+      end
+    end
+
+    car = dsl_class.execute_dsl do
+      car 'honda' do
+        wheel 'goodyear' do
+          size 26
+        end
+      end
+    end
+    expect(car).to be_instance_of($Car)
+    expect(car.maker).to eq('honda')
+    expect(car.wheel).to be_instance_of($Wheel)
+    expect(car.wheel.maker).to eq('goodyear')
+    expect(car.wheel.size).to eq('26')
+  end
+end

data/spec/error_spec.rb

@@ -44,4 +44,21 @@ describe "DSL::Maker validation" do
       }.to raise_error("Illegal attribute name '#{name}'")
     end
   end
+
+  it "rejects re-using an entrypoint name in add_entrypoint()" do
+    dsl_class = Class.new(DSL::Maker) do
+      add_entrypoint(:x, {}) { nil }
+    end
+    expect {
+      dsl_class.add_entrypoint(:x, {}) { nil }
+    }.to raise_error("'x' is already an entrypoint")
+  end
+
+  it "rejects an entrypoint name that doesn't exist in entrypoint()" do
+    dsl_class = Class.new(DSL::Maker)
+
+    expect {
+      dsl_class.entrypoint(:x)
+    }.to raise_error("'x' is not an entrypoint")
+  end
 end

data/spec/multi_level_spec.rb

@@ -4,7 +4,7 @@
 # 1. Because we're creating classes on the fly, we must fully-qualify the Boolean
 # class name. If we created real classes, the context would be provided for us.
 describe 'A multi-level DSL making family-trees' do
-  Person = Struct.new(:name, :child)
+  $Person = Struct.new(:name, :child)
 
   it "can handle a simple single-level parse of a two-level DSL" do
     dsl_class = Class.new(DSL::Maker) do
@@ -13,15 +13,15 @@ describe 'A multi-level DSL making family-trees' do
         :child => generate_dsl({
           :name => String,
         }) {
-          Person.new(name)
+          $Person.new(name)
         },
       }) do
-        Person.new(name, child)
+        $Person.new(name, child)
       end
     end
 
     person = dsl_class.parse_dsl('person { name "Tom" }')
-    expect(person).to be_instance_of(Person)
+    expect(person).to be_instance_of($Person)
     expect(person.name).to eq('Tom')
     expect(person.child).to be_nil
   end
@@ -33,10 +33,10 @@ describe 'A multi-level DSL making family-trees' do
         :child => generate_dsl({
           :name => String,
         }) {
-          Person.new(name, nil)
+          $Person.new(name, nil)
         },
       }) do
-        Person.new(name, child)
+        $Person.new(name, child)
       end
     end
 
@@ -48,9 +48,9 @@ describe 'A multi-level DSL making family-trees' do
         }
       }
     ")
-    expect(person).to be_instance_of(Person)
+    expect(person).to be_instance_of($Person)
     expect(person.name).to eq('Tom')
-    expect(person.child).to be_instance_of(Person)
+    expect(person.child).to be_instance_of($Person)
     expect(person.child.name).to eq('Bill')
   end
 
@@ -63,13 +63,13 @@ describe 'A multi-level DSL making family-trees' do
           :child => generate_dsl({
             :name => String,
           }) {
-            Person.new(name, nil)
+            $Person.new(name, nil)
           },
         }) {
-          Person.new(name, child)
+          $Person.new(name, child)
         },
       }) do
-        Person.new(name, child)
+        $Person.new(name, child)
       end
     end
 
@@ -84,11 +84,11 @@ describe 'A multi-level DSL making family-trees' do
         }
       }
     ")
-    expect(person).to be_instance_of(Person)
+    expect(person).to be_instance_of($Person)
     expect(person.name).to eq('Tom')
-    expect(person.child).to be_instance_of(Person)
+    expect(person.child).to be_instance_of($Person)
     expect(person.child.name).to eq('Bill')
-    expect(person.child.child).to be_instance_of(Person)
+    expect(person.child.child).to be_instance_of($Person)
     expect(person.child.child.name).to eq('Judith')
   end
 
@@ -98,7 +98,7 @@ describe 'A multi-level DSL making family-trees' do
         person_dsl = add_entrypoint(:person, {
           :name => String,
         }) do
-          Person.new(name, child)
+          $Person.new(name, child)
         end
         build_dsl_element(person_dsl, :child, person_dsl)
       end
@@ -145,7 +145,7 @@ describe 'A multi-level DSL making family-trees' do
         'Adam', 'Seth', 'Enos', 'Cainan', 'Mahalaleel', 'Jared',
         'Enoch', 'Methuselah', 'Lamech', 'Noah', 'Shem',
       ].each do |name|
-        expect(person).to be_instance_of(Person)
+        expect(person).to be_instance_of($Person)
         expect(person.name).to eq(name)
         person = person.child
       end

data/spec/multiple_invocation_spec.rb

@@ -1,15 +1,15 @@
-# This will use a DSL that defines Cars
+# This will use a DSL that defines $Cars
 
 describe "A DSL describing cars used with multiple invocations" do
-  Car = Struct.new(:maker)
-  Truck = Struct.new(:maker)
+  $Car = Struct.new(:maker, :wheel)
+  $Truck = Struct.new(:maker, :wheel)
 
   it "returns two items in the right order" do
     dsl_class = Class.new(DSL::Maker) do
       add_entrypoint(:car, {
         :maker => String,
       }) do
-        Car.new(maker)
+        $Car.new(maker)
       end
     end
 
@@ -19,9 +19,9 @@ describe "A DSL describing cars used with multiple invocations" do
     ")
     expect(cars).to be_instance_of(Array)
     expect(cars.length).to eq(2)
-    expect(cars[0]).to be_instance_of(Car)
+    expect(cars[0]).to be_instance_of($Car)
     expect(cars[0].maker).to eq('Honda')
-    expect(cars[1]).to be_instance_of(Car)
+    expect(cars[1]).to be_instance_of($Car)
     expect(cars[1].maker).to eq('Acura')
   end
 
@@ -30,12 +30,12 @@ describe "A DSL describing cars used with multiple invocations" do
       add_entrypoint(:car, {
         :maker => String,
       }) do
-        Car.new(maker)
+        $Car.new(maker)
       end
       add_entrypoint(:truck, {
         :maker => String,
       }) do
-        Truck.new(maker)
+        $Truck.new(maker)
       end
     end
 
@@ -46,11 +46,11 @@ describe "A DSL describing cars used with multiple invocations" do
     ")
     expect(vehicles).to be_instance_of(Array)
     expect(vehicles.length).to eq(3)
-    expect(vehicles[0]).to be_instance_of(Truck)
+    expect(vehicles[0]).to be_instance_of($Truck)
     expect(vehicles[0].maker).to eq('Ford')
-    expect(vehicles[1]).to be_instance_of(Car)
+    expect(vehicles[1]).to be_instance_of($Car)
     expect(vehicles[1].maker).to eq('Honda')
-    expect(vehicles[2]).to be_instance_of(Truck)
+    expect(vehicles[2]).to be_instance_of($Truck)
     expect(vehicles[2].maker).to eq('Toyota')
   end
 
@@ -59,12 +59,12 @@ describe "A DSL describing cars used with multiple invocations" do
       add_entrypoint(:car, {
         :maker => String,
       }) do
-        Car.new(maker)
+        $Car.new(maker)
       end
       add_entrypoint(:truck, {
         :maker => String,
       }) do
-        Truck.new(maker)
+        $Truck.new(maker)
       end
     end
 
@@ -75,11 +75,11 @@ describe "A DSL describing cars used with multiple invocations" do
     end
     expect(vehicles).to be_instance_of(Array)
     expect(vehicles.length).to eq(3)
-    expect(vehicles[0]).to be_instance_of(Truck)
+    expect(vehicles[0]).to be_instance_of($Truck)
     expect(vehicles[0].maker).to eq('Ford')
-    expect(vehicles[1]).to be_instance_of(Car)
+    expect(vehicles[1]).to be_instance_of($Car)
     expect(vehicles[1].maker).to eq('Honda')
-    expect(vehicles[2]).to be_instance_of(Truck)
+    expect(vehicles[2]).to be_instance_of($Truck)
     expect(vehicles[2].maker).to eq('Toyota')
   end
 end

data/spec/single_level_spec.rb

@@ -12,10 +12,10 @@
 # class name. If we created real classes, the context would be provided for us.
 describe 'A single-level DSL for pizza' do
   $toppings = [:cheese, :pepperoni, :bacon, :sauce]
-  Pizza = Struct.new(*$toppings)
+  $Pizza = Struct.new(*$toppings)
 
   def verify_pizza(pizza, values={})
-    expect(pizza).to be_instance_of(Pizza)
+    expect(pizza).to be_instance_of($Pizza)
     $toppings.each do |topping|
       expect(pizza.send(topping)).to eq(values[topping])
     end
@@ -23,7 +23,7 @@ describe 'A single-level DSL for pizza' do
 
   it 'makes a blank pizza' do
     dsl_class = Class.new(DSL::Maker) do
-      add_entrypoint(:pizza) { Pizza.new }
+      add_entrypoint(:pizza) { $Pizza.new }
     end
 
     pizza = dsl_class.parse_dsl('pizza')
@@ -36,7 +36,7 @@ describe 'A single-level DSL for pizza' do
       add_entrypoint(:pizza, {
         :cheese => DSL::Maker::Boolean,
       }) do
-        Pizza.new(cheese, nil, nil, nil)
+        $Pizza.new(cheese, nil, nil, nil)
       end
     end
 
@@ -84,7 +84,7 @@ describe 'A single-level DSL for pizza' do
       add_entrypoint(:pizza, {
         :sauce => String,
       }) do
-        Pizza.new(nil, nil, nil, sauce)
+        $Pizza.new(nil, nil, nil, sauce)
       end
     end
 
@@ -112,7 +112,7 @@ describe 'A single-level DSL for pizza' do
 
       # This is a wart - this block should be against toppings_dsl, not here.
       add_entrypoint(:pizza, toppings_dsl) do
-        Pizza.new(cheese, pepperoni, bacon, sauce)
+        $Pizza.new(cheese, pepperoni, bacon, sauce)
       end
     end
 
@@ -143,7 +143,7 @@ describe 'A single-level DSL for pizza' do
 
       # This is a wart - this block should be against toppings_dsl, not here.
       add_entrypoint(:pizza, toppings_dsl) do
-        Pizza.new(cheese, pepperoni, bacon, sauce)
+        $Pizza.new(cheese, pepperoni, bacon, sauce)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dsl_maker
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Rob Kinyon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile
@@ -141,6 +141,7 @@ files:
 - lib/dsl/maker/version.rb
 - on_what.rb
 - spec/args_spec.rb
+- spec/class_as_subdsl_spec.rb
 - spec/error_spec.rb
 - spec/multi_level_spec.rb
 - spec/multiple_invocation_spec.rb
@@ -171,3 +172,4 @@ signing_key:
 specification_version: 4
 summary: Easy multi-level DSLs
 test_files: []
+has_rdoc: