open_dsl 0.3.2 → 0.3.3

data/lib/open_dsl.rb

@@ -8,7 +8,7 @@ require 'open_dsl/context'
 require 'open_dsl/eval_stack'
 
 module OpenDsl
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end
 
 def open_dsl(&blk)

data/lib/open_dsl/context.rb

@@ -5,12 +5,7 @@ module OpenDsl
 
     def initialize(const_name, &blk)
       @stack = EvalStack.new(self)
-      if constant_or_constant_name?(const_name)
-        @toplevel_object_already_exists = existing_class?(const_name)
-        @toplevel_object = new_instance(const_name)
-      else
-        @toplevel_object = Array.new
-      end
+      @toplevel_object = constant_or_constant_name?(const_name) ? new_instance(const_name) : mark_as_created_by_open_dsl(Array.new)
       @stack.eval_and_keep(@toplevel_object, &blk)
     end
 
@@ -49,7 +44,7 @@ module OpenDsl
     end
 
     def assign_attribute_with_block(name, &blk)
-      struct = OpenStruct.new
+      struct = mark_as_created_by_open_dsl(OpenStruct.new)
       assign_attribute(name, struct)
       @stack.eval(struct, &blk)
     end
@@ -65,7 +60,7 @@ module OpenDsl
         @stack.bottom << (values.size == 1 ? values.first : values)
       else
         define_getter_and_setter_if_needed(name)
-        if @toplevel_object_already_exists && values.size == 0
+        if !created_by_open_dsl?(@stack.bottom) && values.size == 0
           @stack.bottom.send("#{name}=", true)
         else
           @stack.bottom.send("#{name}=", *values)
@@ -75,7 +70,7 @@ module OpenDsl
 
     def define_getter_and_setter_if_needed(name)
       return if @stack.bottom.respond_to?("#{name}=")
-      raise "Expected #{@toplevel_object.class.name} to have defined a setter method for '#{name}'" if @toplevel_object_already_exists
+      raise "Expected #{@stack.bottom.class.name} to have defined a setter method for '#{name}'" unless created_by_open_dsl?(@stack.bottom)
 
       @stack.bottom.class.instance_eval do
         define_method("#{name}=") do |value|
@@ -92,14 +87,19 @@ module OpenDsl
       get_or_define_const(const_name).new
     end
 
-    def existing_class?(name_or_const)
-      return true if name_or_const.is_a?(Class)
-      Object.const_defined?(name_or_const)
+    def created_by_open_dsl?(stack_object)
+      stack_object.class.class_variables.include?("@@created_by_open_dsl")
+    end
+
+    def mark_as_created_by_open_dsl(object)
+      object_class = object.class == Class ? object : object.class
+      object_class.instance_eval { class_variable_set("@@created_by_open_dsl", true) }
+      object
     end
 
     def get_or_define_const(name_or_const)
       return name_or_const if name_or_const.is_a?(Class)
-      Object.const_defined?(name_or_const) ? Object.const_get(name_or_const) : Object.const_set(name_or_const, Class.new)
+      Object.const_defined?(name_or_const) ? Object.const_get(name_or_const) : mark_as_created_by_open_dsl(Object.const_set(name_or_const, Class.new))
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: open_dsl
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Ian Leitch