qor_dsl 0.0.4 → 0.0.5

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,14 @@
+PATH
+  remote: .
+  specs:
+    qor_dsl (0.0.5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  qor_dsl!

data/lib/qor_dsl/class_method.rb

@@ -40,12 +40,12 @@ module Qor
         node_root
       end
 
-      def find(*arguments)
-        root.find(*arguments)
+      def find(*arguments, &block)
+        root.find(*arguments, &block)
       end
 
-      def first(*arguments)
-        root.first(*arguments)
+      def first(*arguments, &block)
+        root.first(*arguments, &block)
       end
     end
   end

data/lib/qor_dsl/config.rb

@@ -26,11 +26,11 @@ module Qor
         self.__children[type.to_sym] = child
 
         method_defination = <<-DOC
-          def #{type}(name=nil, opts={}, &blk)
+          def #{type}(name=nil, *data, &blk)
             config = __children['#{type}'.to_sym]
             node = Qor::Dsl::Node.new(name)
             node.add_config(config)
-            node.options = opts
+            node.data = *data
             node.block = blk
             node.config.instance_eval(&blk) if block_given? && (config.__children.size > 0)
             __node.add_child(node)

data/lib/qor_dsl/node.rb

@@ -1,7 +1,7 @@
 module Qor
   module Dsl
     class Node
-      attr_accessor :name, :config, :parent, :children, :options, :block
+      attr_accessor :name, :config, :parent, :children, :data, :options, :block
 
       def initialize(name=nil, options={})
         self.name   = name
@@ -12,6 +12,17 @@ module Qor
         "{#{config.__name}: #{name || 'nil'}}"
       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)
+        {}
+      end
+
+      def value
+        block.nil? ? (options[:value] || name) : block.call
+      end
+
       def add_config(config)
         self.config = config
         config.__node = self
@@ -36,10 +47,11 @@ module Qor
         children << child
       end
 
-      def find(type=nil, name=nil)
+      def find(type=nil, name=nil, &block)
         selected_children = children.select do |child|
           (type.nil? ? true : (child.config.__name.to_s == type.to_s)) &&
-            (name.nil? ? true : (child.name.to_s == name.to_s))
+            (name.nil? ? true : (child.name.to_s == name.to_s)) &&
+            (block.nil? ? true : block.call(child))
         end
 
         return selected_children[0] if !name.nil? && selected_children.length == 1
@@ -47,22 +59,18 @@ module Qor
         selected_children
       end
 
-      def first(type=nil, name=nil)
-        selected_children = find(type, name)
+      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 value
-        options[:value] || (block.nil? ? name : block.call)
-      end
-
       def inspect
         result = [
           ['name',     name],
           ['parent',   parent && parent.inspect_name],
           ['config',   config.__name],
           ['children', children.map(&:inspect_name)],
-          ['options',  options],
+          ['data',     data],
           ['block',    block]
         ].inject({}) do |s, value|
           s[value[0]] = value[1] if value[1] && value[1].to_s.length > 0

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.0.4"
+  gem.version       = "0.0.5"
 end

data/test/layout.rb

@@ -1,7 +1,11 @@
-template do
+template "daytime", "v1", :since => "09:00", :to => "12:00" do
   "Hello World"
 end
 
+template "daytime", "v2", :since => "13:00", :to => "18:00" do
+  "Hello World2"
+end
+
 gadget :product_link, :floating => true
 
 gadget :quick_buy, :floating => true do

data/test/layout_test.rb

@@ -7,14 +7,27 @@ describe Layout do
     @root = Layout::Configuration.root
   end
 
-  it "has four children" do
-    # test query
+  it "layout config testing" do
+    # Find by type
     Layout::Configuration.find(:gadget).length.must_equal 2
-    # test normal find
+
+    # Find by name
     Layout::Configuration.find(:gadget, 'quick_buy').name.must_equal :quick_buy
-    # test Inherit
+
+    # Find by block
+    Layout::Configuration.first(:template) do |n|
+      n.options[:since] > "12:50"
+    end.value.must_equal 'Hello World2'
+
+    # Inherit
     Layout::Configuration.find(:gadget, :product_link).find(:template)[0].value.must_equal "Hello World"
 
-    # More is coming... (test multi, alias_node)
+    # 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"})
+
+    # More is coming... (multi, alias_node)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qor_dsl
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -19,6 +19,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - lib/qor_dsl.rb