qor_dsl 0.1.5 → 0.2.0

data/README.md

@@ -78,7 +78,7 @@ Qor Dsl - DSL made easy!
     Gemfile.deep_find(:gem) do |n|
       # Find all gems used in development environment
       parent = n.parent
-      parent.root? || ((parent.config_name == :group) && parent.name == :development)
+      parent.root? || parent.is_node?(:group, :development)
     end
 
     # Qor DSL is designed to be as flexible as possible while helping you to create your DSLs.

data/example/gemfile.rb

@@ -34,7 +34,7 @@ Gemfile.deep_find(:gem)
 Gemfile.deep_find(:gem) do |n|
   # Find all gems used in development environment
   parent = n.parent
-  parent.root? || ((parent.config_name == :group) && parent.name == :development)
+  parent.root? || parent.is_node?(:group, :development)
 end
 
 # Methods for node

data/lib/qor_dsl/class_method.rb

@@ -1,6 +1,7 @@
 module Qor
   module Dsl
     module ClassMethods
+      @@lock = Mutex.new
       def node_root
         @node_root ||= Qor::Dsl::Node.new
       end
@@ -33,15 +34,17 @@ module Qor
       end
 
       def load(path=nil, opts={}, &block)
-        reset! if opts[:force] || block_given?
+        @@lock.synchronize do
+          reset! if opts[:force] || block_given?
 
-        @root ||= if block_given? # Load from block
-                    node_root.config.instance_eval(&block)
-                    node_root
-                  else # Load from file
-                    @load_path = path || @load_path || default_config
-                    load_file(@load_path)
-                  end
+          @root ||= if block_given? # Load from block
+                      node_root.config.instance_eval(&block)
+                      node_root
+                    else # Load from file
+                      @load_path = path || @load_path || default_config
+                      load_file(@load_path)
+                    end
+        end
       end
 
       def load_file(file)

data/lib/qor_dsl/node.rb

@@ -20,11 +20,8 @@ module Qor
         root == self
       end
 
-      def is_node?(*arguments)
-        result = true
-        result = (config_name.to_s == arguments[0].to_s) if arguments.length >= 1
-        result = result && (name.to_s == arguments[1].to_s) if arguments.length == 2
-        return result
+      def is_node?(cname=nil, sname=nil)
+        (cname.nil? || (config_name.to_s == cname.to_s)) && (sname.nil? || (name.to_s == sname.to_s))
       end
 
       def root
@@ -80,9 +77,7 @@ module Qor
 
       def find(type=nil, name=nil, nodes=children, &block)
         selected_children = nodes.select do |child|
-          (type.nil? ? true : (child.config_name.to_s == type.to_s)) &&
-            (name.nil? ? true : (child.name.to_s == name.to_s)) &&
-            (block.nil? ? true : block.call(child))
+          child.is_node?(type, name) && (block.nil? ? true : block.call(child))
         end
 
         return selected_children[0] if !name.nil? && selected_children.length == 1

data/lib/qor_dsl.rb

@@ -19,3 +19,11 @@ module Qor
     end
   end
 end
+
+module Qor
+  module DSL
+    def self.included(base)
+      base.send :include, Qor::Dsl
+    end
+  end
+end

data/qor_dsl.gemspec

@@ -11,5 +11,5 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "qor_dsl"
   gem.require_paths = ["lib"]
-  gem.version       = "0.1.5"
+  gem.version       = "0.2.0"
 end

data/test/configure.rb

@@ -2,7 +2,7 @@ require 'qor_dsl'
 
 module Layout
   module Configuration
-    include Qor::Dsl
+    include Qor::DSL
 
     node :template
 

data/test/layout_test.rb

@@ -2,86 +2,105 @@ require 'minitest/autorun'
 require File.join(File.dirname(__FILE__), 'configure')
 
 describe Layout do
+  def many_times
+    threads = 100.times.map do |t|
+      Thread.new do
+        yield
+      end
+    end
+    threads.map(&:join)
+  end
+
   it "layout config testing" do
-    Layout::Configuration.load('test/layout.rb', :force => true)
-    # Find by type
-    Layout::Configuration.find(:gadget).length.must_equal 2
-    Layout::Configuration.find(:template).length.must_equal 2
-    Layout::Configuration.deep_find(:template).length.must_equal 3
-    # :settings, :meta, :meta, :meta, :meta, :context, :template
-    Layout::Configuration.find(:gadget, :quick_buy).deep_find().length.must_equal 7
+    many_times do
+      Layout::Configuration.load('test/layout.rb', :force => true)
+      # Find by type
+      Layout::Configuration.find(:gadget).length.must_equal 2
+      Layout::Configuration.find(:template).length.must_equal 2
+      Layout::Configuration.deep_find(:template).length.must_equal 3
+      # :settings, :meta, :meta, :meta, :meta, :context, :template
+      Layout::Configuration.find(:gadget, :quick_buy).deep_find().length.must_equal 7
 
-    # Find by name
-    Layout::Configuration.find(:gadget, 'quick_buy').name.must_equal :quick_buy
-    Layout::Configuration.deep_find(:desc, "From Google").value.must_equal "From Google"
+      # Find by name
+      Layout::Configuration.find(:gadget, 'quick_buy').name.must_equal :quick_buy
+      Layout::Configuration.deep_find(:desc, "From Google").value.must_equal "From Google"
 
-    # Find by block
-    Layout::Configuration.first(:template) do |n|
-      n.options[:since] > "12:50"
-    end.value.must_equal 'Hello World2'
+      # Find by block
+      Layout::Configuration.first(:template) do |n|
+        n.options[:since] > "12:50"
+      end.value.must_equal 'Hello World2'
 
-    Layout::Configuration.deep_find(:desc) do |n|
-      n.parents.include?(Layout::Configuration.find(:action, :google))
-    end[0].value.must_equal 'From Google'
+      Layout::Configuration.deep_find(:desc) do |n|
+        n.parents.include?(Layout::Configuration.find(:action, :google))
+      end[0].value.must_equal 'From Google'
 
-    # Inherit
-    Layout::Configuration.find(:gadget, :product_link).find(:template)[0].value.must_equal "Hello World"
+      # Inherit
+      Layout::Configuration.find(:gadget, :product_link).find(:template)[0].value.must_equal "Hello World"
 
-    # Store any data
-    Layout::Configuration.first(:template).data.must_equal ["v1", {:since => "09:00", :to => "12:00"}]
+      # Store any data
+      Layout::Configuration.first(:template).data.must_equal ["v1", {:since => "09:00", :to => "12:00"}]
 
-    # Options
-    Layout::Configuration.find(:template)[1].options.must_equal({:since => "13:00", :to => "18:00"})
+      # Options
+      Layout::Configuration.find(:template)[1].options.must_equal({:since => "13:00", :to => "18:00"})
 
-    # Parents
-    Layout::Configuration.find(:gadget, :quick_buy).first(:template).parents.count.must_equal 2
+      # Parents
+      Layout::Configuration.find(:gadget, :quick_buy).first(:template).parents.count.must_equal 2
 
-    # Value for node
-    Layout::Configuration.find(:gadget, :quick_buy).value.must_equal :quick_buy
+      # Value for node
+      Layout::Configuration.find(:gadget, :quick_buy).value.must_equal :quick_buy
 
-    Layout::Configuration.find(:gadget, :quick_buy).value.must_equal :quick_buy
+      Layout::Configuration.find(:gadget, :quick_buy).value.must_equal :quick_buy
+    end
     # More is coming... (multi, alias_node)
   end
 
   it "test node helper" do
-    Layout::Configuration.load('test/layout.rb', :force => true)
-    node = Layout::Configuration.find(:gadget, :quick_buy)
-    node.is_node?(:gadget).must_equal true
-    node.is_node?(:gadget, 'quick_buy').must_equal true
-    node.is_node?(:template).must_equal false
-    node.is_node?('gadget').must_equal true
-    node.is_node?.must_equal true
+    many_times do
+      Layout::Configuration.load('test/layout.rb', :force => true)
+      node = Layout::Configuration.find(:gadget, :quick_buy)
+      node.is_node?(:gadget).must_equal true
+      node.is_node?(:gadget, 'quick_buy').must_equal true
+      node.is_node?(:template).must_equal false
+      node.is_node?('gadget').must_equal true
+      node.is_node?.must_equal true
+    end
   end
 
   it "force load" do
-    Layout::Configuration.load('test/layout.rb', :force => true)
-    root = Layout::Configuration.root
-    root.find(:gadget).length.must_equal 2
-    old_object_ids = root.find(:gadget).map(&:object_id).sort
+    many_times do
+      Layout::Configuration.load('test/layout.rb', :force => true)
+      root = Layout::Configuration.root
+      root.find(:gadget).length.must_equal 2
+      old_object_ids = root.find(:gadget).map(&:object_id).sort
 
-    Layout::Configuration.load('test/layout.rb')
-    root.find(:gadget).map(&:object_id).sort.must_equal old_object_ids
+      Layout::Configuration.load('test/layout.rb')
+      root.find(:gadget).map(&:object_id).sort.must_equal old_object_ids
 
-    Layout::Configuration.load('test/layout.rb', :force => true)
-    new_root = Layout::Configuration.root
+      Layout::Configuration.load('test/layout.rb', :force => true)
+      new_root = Layout::Configuration.root
 
-    new_root.find(:gadget).length.must_equal 2
-    root.find(:gadget).map(&:object_id).sort.must_equal old_object_ids
-    new_root.find(:gadget).map(&:object_id).sort.wont_be_same_as old_object_ids
+      new_root.find(:gadget).length.must_equal 2
+      root.find(:gadget).map(&:object_id).sort.must_equal old_object_ids
+      new_root.find(:gadget).map(&:object_id).sort.wont_be_same_as old_object_ids
+    end
   end
 
   it "load config from block" do
-    Layout::Configuration.load(nil, :force => true) do
-      template "new" do
-        "New Template"
+    many_times do
+      Layout::Configuration.load(nil, :force => true) do
+        template "new" do
+          "New Template"
+        end
       end
-    end
 
-    Layout::Configuration.find(:template).count.must_equal 1
-    Layout::Configuration.first(:template).value.must_equal "New Template"
+      Layout::Configuration.find(:template).count.must_equal 1
+      Layout::Configuration.first(:template).value.must_equal "New Template"
+    end
   end
 
   it "should raise exception if configuration not found" do
-    lambda { Layout::Configuration.load("non_existing_file.rb", :force => true) }.must_raise Qor::Dsl::ConfigurationNotFound
+    many_times do
+      lambda { Layout::Configuration.load("non_existing_file.rb", :force => true) }.must_raise Qor::Dsl::ConfigurationNotFound
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qor_dsl
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-24 00:00:00.000000000 Z
+date: 2012-10-27 00:00:00.000000000 Z
 dependencies: []
 description: Qor DSL is designed to be as flexible as possible while helping you to
   create your DSLs.
@@ -48,7 +48,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -139701006465928578
+      hash: 3416388606378692493
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -57,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -139701006465928578
+      hash: 3416388606378692493
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24