qor_dsl 0.1.1 → 0.1.3

data/.gitignore

@@ -15,3 +15,4 @@ capybara-*.html
 rerun.txt
 pickle-email-*.html
 pkg/
+Gemfile.lock

data/README.md

@@ -35,7 +35,7 @@ Qor Dsl - DSL made easy!
 
 3, Defining config (Sample Gemfile file used for above config)
 
-    # Gemfile
+    # Using default config file `Gemfile`
     source 'http://rubygems.org'
 
     gem 'rails', '3.2.8'
@@ -50,7 +50,15 @@ Qor Dsl - DSL made easy!
       gem 'rspec'
     end
 
-4, Querying config (Please checkout the source code and play with examples under the /example directory for more details)
+    # Or using code block
+    Gemfile.load do
+      source 'http://rubygems.org'
+
+      gem 'rails', '3.2.8'
+      gem 'unicorn'
+    end
+
+4, Querying config (Please checkout the source code and play with examples under the `example` directory for more details)
 
     # Find by type
     Gemfile.find(:gem)

data/lib/qor_dsl/class_method.rb

@@ -5,6 +5,13 @@ module Qor
         @node_root ||= Qor::Dsl::Node.new
       end
 
+      def reset!
+        node_config = node_root.config
+        @node_root = Qor::Dsl::Node.new
+        @node_root.add_config(node_config)
+        @root = nil
+      end
+
       def node(type, options={}, &blk)
         node_root.node(type, options, &blk)
       end
@@ -25,18 +32,21 @@ module Qor
         end
       end
 
-      def load(path=nil, opts={})
-        @load_path, @root = nil, nil if opts[:force]
+      def load(path=nil, opts={}, &block)
+        reset! if opts[:force] || block_given?
 
-        @load_path = path || @load_path || default_config
-        @root ||= load_file(@load_path)
-        @root
+        @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
 
       def load_file(file)
         return unless File.exist?(file.to_s)
-        content = File.read(file)
-        node_root.config.instance_eval(content)
+        node_root.config.instance_eval(File.read(file))
         node_root
       end
 

data/lib/qor_dsl/config.rb

@@ -44,7 +44,7 @@ module Qor
         result = [
           ['name',    __name],
           ['parent',  __parent && __parent.__name],
-          ['__children', __children.keys],
+          ['children', __children.keys],
           ['options', __options],
           ['block',   __block]
         ].inject({}) do |s, value|

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.1"
+  gem.version       = "0.1.3"
 end

data/test/layout_test.rb

@@ -2,12 +2,8 @@ require 'minitest/autorun'
 require File.join(File.dirname(__FILE__), 'configure')
 
 describe Layout do
-  before do
-    Layout::Configuration.load('test/layout.rb')
-    @root = Layout::Configuration.root
-  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
@@ -45,4 +41,32 @@ describe Layout do
 
     # More is coming... (multi, alias_node)
   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
+
+    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
+
+    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
+
+  it "load config from block" do
+    Layout::Configuration.load(nil, :force => true) do
+      template "new" do
+        "New Template"
+      end
+    end
+
+    Layout::Configuration.find(:template).count.must_equal 1
+    Layout::Configuration.first(:template).value.must_equal "New Template"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qor_dsl
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-21 00:00:00.000000000 Z
+date: 2012-10-22 00:00:00.000000000 Z
 dependencies: []
 description: Qor DSL is designed to be as flexible as possible while helping you to
   create your DSLs.
@@ -21,7 +21,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - example/Gemfile

data/Gemfile.lock

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