qor_dsl 0.2.1 → 0.3.0

data/README.md

@@ -69,7 +69,7 @@ Qor Dsl - DSL made easy!
     Gemfile.find(:gem)
 
     # Find by type and name also chain query
-    Gemfile.find(:group, 'development').find(:gem)
+    Gemfile.first(:group, 'development').find(:gem)
 
     # Get all gems
     Gemfile.deep_find(:gem)

data/example/gemfile.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'qor_dsl'
+require File.expand_path(File.join(File.dirname(__FILE__), '../lib/qor_dsl'))
 
 class Gemfile
   include Qor::Dsl
@@ -31,7 +31,7 @@ Gemfile.find(:gem) do |n|
   !!n.options[:git].nil?
 end
 
-Gemfile.find(:group, 'development').find(:gem)
+Gemfile.first(:group, 'development').find(:gem)
 
 Gemfile.deep_find(:gem)
 Gemfile.deep_find(:gem) do |n|

data/lib/qor_dsl/config.rb

@@ -40,7 +40,7 @@ module Qor
         self.instance_eval method_defination
       end
 
-      def to_s
+      def inspect
         obj_options = {
           'name' => __name,
           'parent' => __parent && __parent.__name,

data/lib/qor_dsl/node.rb

@@ -1,7 +1,7 @@
 module Qor
   module Dsl
     class Node
-      attr_accessor :name, :config, :parent, :children, :data, :options, :block, :all_nodes, :dummy
+      attr_accessor :name, :config, :parent, :children, :data, :block, :all_nodes, :dummy
 
       def initialize(name=nil, options={})
         self.name   = name
@@ -9,6 +9,23 @@ module Qor
         self.dummy = options[:dummy]
       end
 
+      def node(type, options={}, &blk)
+        config.node(type, options, &blk)
+      end
+
+      def add_config(config)
+        self.config = config
+        config.__node = self
+      end
+
+      def add_child(child)
+        child.parent = self
+        children << child
+        root.all_nodes ||= []
+        root.all_nodes << child
+      end
+
+
       ## Node Config
       def config_name
         config.__name
@@ -18,71 +35,68 @@ module Qor
         config.__options || {} rescue {}
       end
 
-      def child_config(type)
-        config.__children[type] || nil
-      end
 
-      def child_config_options(type)
-        child_config(type).__options || {} rescue {}
+      ## Node
+      def parents
+        parent ? [parent, parent.parents].flatten : []
       end
 
-      def dummy?
-        dummy
+      def children
+        @children ||= []
+        @children = @children.flatten.compact
+        @children
       end
 
-      def is_node?(cname=nil, sname=nil)
-        (cname.nil? || (config_name.to_s == cname.to_s)) && (sname.nil? || (name.to_s == sname.to_s))
+      def root
+        parent ? parent.root : self
       end
 
       def root?
         root == self
       end
 
-      def root
-        parent ? parent.root : self
+      def dummy?
+        !!dummy
       end
 
-      def parents
-        parent ? [parent, parent.parents].flatten : []
+      def is_node?(node_type=nil, name_str=nil)
+        (node_type.nil? || (config_name.to_s == node_type.to_s)) && (name_str.nil? || (name.to_s == name_str.to_s))
       end
 
-      def options
-        return @options if @options.is_a?(Hash)
-        return data[-1] if data.is_a?(Array) && data[-1].is_a?(Hash)
-        return data if data.is_a?(Hash)
-        return config_options[:default_options] || {} if dummy?
-        {}
+
+      ## Node Data
+      def default_value
+        config_options[:default_value]
       end
 
       def value
-        ((config.__children.size > 0 || block.nil?) ? (options[:value] || name) : block.call) ||
-          (dummy? ? config_options[:default_value] : nil)
+        ((config.__children.size > 0 || block.nil?) ? (options[:value] || name) : block.call) || default_value
       end
 
-      def block
-        @block || (dummy? ? config_options[:default_block] : nil)
+      def default_options
+        config_options[:default_options]
       end
 
-      def add_config(config)
-        self.config = config
-        config.__node = self
+      def options
+        return data[-1] if data.is_a?(Array) && data[-1].is_a?(Hash)
+        return data if data.is_a?(Hash)
+        return name if name.is_a?(Hash)
+        return default_options || {}
       end
 
-      def node(type, options={}, &blk)
-        config.node(type, options, &blk)
+      def default_block
+        config_options[:default_block]
       end
 
-      def children
-        @children ||= []
-        @children = @children.flatten.compact
-        @children
+      def block
+        @block || default_block
       end
 
-      def add_child(child)
-        child.parent = self
-        children << child
-        root.all_nodes ||= []
-        root.all_nodes << child
+
+      ## Query
+      def first(type=nil, name=nil, &block)
+        selected_children = find(type, name, &block)
+        selected_children.is_a?(Array) ? selected_children[0] : selected_children
       end
 
       def deep_find(type=nil, name=nil, &block)
@@ -97,28 +111,15 @@ module Qor
         end
 
         results = parent.find(type, name, &block) if results.length == 0 && child_config_options(type)[:inherit]
-        results = process_find_results(results, type)
-
-        return results[0] if !name.nil? && results.is_a?(Array) && results.length == 1
-
-        results
-      end
-
-      def first(type=nil, name=nil, &block)
-        selected_children = find(type, name, &block)
-        selected_children.is_a?(Array) ? selected_children[0] : selected_children
+        process_find_results(results, type)
       end
 
-      ## Inspect
-      def inspect_name
-        "{#{config_name}: #{name || 'nil'}}"
-      end
 
-      def to_s
+      def inspect
         obj_options = {
           'name' => name,
-          'parent' => parent && parent.inspect_name,
           'config' => config_name,
+          'parent' => parent && parent.inspect_name,
           'children' => children.map(&:inspect_name),
           'data' => data,
           'block' => block
@@ -126,6 +127,7 @@ module Qor
         Qor::Dsl.inspect_object(self, obj_options)
       end
 
+
       private
       def process_find_results(results, type)
         if results.length == 0 &&
@@ -134,6 +136,18 @@ module Qor
         end
         results
       end
+
+      def child_config(type)
+        config.__children[type] || nil
+      end
+
+      def child_config_options(type)
+        child_config(type).__options || {} rescue {}
+      end
+
+      def inspect_name
+        "{#{config_name}: #{name || 'nil'}}"
+      end
     end
   end
 end

data/lib/qor_dsl.rb

@@ -11,7 +11,11 @@ module Qor
 
     def self.inspect_object(obj, options)
       options = options.inject({}) do |summary, value|
-        summary[value[0]] = value[1] if value[1] && value[1].to_s.length > 0
+        unless [:nil?, :empty?, :blank?].any? { |method|
+          value[1].respond_to?(method) && value[1].send(method)
+        }
+          summary[value[0]] = value[1]
+        end
         summary
       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.2.1"
+  gem.version       = "0.3.0"
 end

data/test/layout_test.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'configure')
 
 describe Layout do
   def many_times
-    threads = 20.times.map do |t|
+    threads = 100.times.map do |t|
       Thread.new do
         yield
       end
@@ -19,11 +19,11 @@ describe Layout do
       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
+      Layout::Configuration.first(: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"
+      Layout::Configuration.first(:gadget, 'quick_buy').name.must_equal :quick_buy
+      Layout::Configuration.deep_find(:desc, "From Google")[0].value.must_equal "From Google"
 
       # Find by block
       Layout::Configuration.first(:template) do |n|
@@ -31,11 +31,11 @@ describe Layout do
       end.value.must_equal 'Hello World2'
 
       Layout::Configuration.deep_find(:desc) do |n|
-        n.parents.include?(Layout::Configuration.find(:action, :google))
+        n.parents.include?(Layout::Configuration.first(:action, :google))
       end[0].value.must_equal 'From Google'
 
       # Inherit
-      Layout::Configuration.find(:gadget, :product_link).find(:template)[0].value.must_equal "Hello World"
+      Layout::Configuration.first(: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"}]
@@ -44,12 +44,10 @@ describe Layout do
       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
+      Layout::Configuration.first(:gadget, :quick_buy).first(:template).parents.count.must_equal 2
 
       # 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.first(:gadget, :quick_buy).value.must_equal :quick_buy
     end
     # More is coming... (multi, alias_node)
   end
@@ -57,7 +55,7 @@ describe Layout do
   it "test node helper" do
     many_times do
       Layout::Configuration.load('test/layout.rb', :force => true)
-      node = Layout::Configuration.find(:gadget, :quick_buy)
+      node = Layout::Configuration.first(: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
@@ -104,12 +102,42 @@ describe Layout do
     end
   end
 
-  it "default value should works" do
+  it "default value" do
     many_times do
-      Layout::Configuration.load('test/layout.rb', :force => true)
-      Layout::Configuration.first(:layout).first(:description).value.must_equal 'TODO'
-      Layout::Configuration.first(:layout).first(:description_block).value.must_equal 'FIXME'
-      refute_nil Layout::Configuration.first(:layout).first(:description_block).block
+      config = Layout::Configuration.load(nil, :force => true) do
+        layout "new" do
+          description
+        end
+      end
+      # default value
+      config.first(:layout).first(:description).value.must_equal 'TODO'
+      config.first(:layout).first(:description).dummy?.must_equal false
+
+      # default block
+      config.first(:layout).first(:description_block).value.must_equal 'FIXME'
+      refute_nil config.first(:layout).first(:description_block).block
+    end
+  end
+
+  it "find dummy nodes" do
+    many_times do
+      config = Layout::Configuration.load(nil, :force => true) do
+        layout "new"
+      end
+      config.first(:layout).first(:description).value.must_equal 'TODO'
+      config.first(:layout).first(:description).dummy?.must_equal true
+      config.first(:layout).find(:description).count.must_equal 1
+    end
+  end
+
+  it "name as options" do
+    many_times do
+      config = Layout::Configuration.load(nil, :force => true) do
+        layout "new" do
+          description :hello => true
+        end
+      end
+      config.first(:layout).first(:description).options.must_equal({:hello => true})
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qor_dsl
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-27 00:00:00.000000000 Z
+date: 2012-11-08 00:00:00.000000000 Z
 dependencies: []
 description: Qor DSL is designed to be as flexible as possible while helping you to
   create your DSLs.
@@ -46,18 +46,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2719584306054087370
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2719584306054087370
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24