cadenza 0.7.1 → 0.7.2

data/bin/cadenza

@@ -7,4 +7,4 @@ require 'cadenza/cli'
 options = Cadenza::Cli::Options.parse!
 path = ARGV[0]
 
-STDOUT.puts Cadenza::Cli.run!(path, options[:context])
+STDOUT.puts Cadenza::Cli.run!(path, options)

data/lib/cadenza/cli.rb

@@ -1,38 +1,29 @@
 require 'optparse'
+require 'cadenza/cli/options'
 require 'multi_json'
 
 module Cadenza
-  class Cli
-    class Options < OptionParser
-      attr_reader :options
-
-      def self.parse!
-        parser = new("Cadenza")
-        parser.set_opts.parse!
-        parser.options
-      end
-
-      def initialize(*args)
-        @options = {}
-        super
-      end
+  module Cli
 
-      def context_option(context)
-        @options[:context] = MultiJson.load(context)
-      end
+    def self.run!(path, options={})
 
-      def set_opts
-        on("--context json") do |value|
-          context_option value
+      load_paths =
+        if options[:root]
+          [options[:root]]
+        elsif options.key?(:load_paths) && [:load_paths].any?
+          options[:load_paths]
+        else
+          [Dir.pwd]
         end
+
+      load_paths.each do |path|
+        Cadenza::BaseContext.add_load_path path
       end
-    end
 
-    def self.run!(path, context)
-      Cadenza::BaseContext.add_loader Cadenza::FilesystemLoader.new(File.expand_path('.'))
       Cadenza::BaseContext.whiny_template_loading = true
 
-      Cadenza.render_template path, context
+      Cadenza.render_template path, options[:context]
+
     end
 
   end

data/lib/cadenza/cli/options.rb

@@ -0,0 +1,47 @@
+module Cadenza::Cli
+
+    class Options < OptionParser
+      attr_reader :options
+
+      def self.parse!
+        parser = new("Cadenza")
+        parser.set_opts.parse!
+        parser.options
+      end
+
+      def initialize(*args)
+        @options = {}
+        super
+      end
+
+      def context_option(context)
+        if File.exist?(context)
+          context = File.read(context)
+        end
+        @options[:context] = MultiJson.load(context)
+      end
+
+      def add_load_path(path)
+        @options[:load_paths] ||= []
+        @options[:load_paths] << path
+      end
+
+      def set_opts
+        on("--context json") do |value|
+          context_option value
+        end
+        on("-c json") do |value|
+          context_option value
+        end
+        on("--root path") do |value|
+          @options[:root] = value
+        end
+        on("-I", "--load-path PATH", "Add a path for the filesystem loader") do |path|
+          add_load_path(path)
+        end
+
+      end
+
+    end
+
+end

data/lib/cadenza/context.rb

@@ -195,18 +195,23 @@ module Cadenza
          block.call(self, nodes, parameters)
       end
 
-      # adds the given loader to the end of the loader list.  If the argument 
-      # passed is a string then a {FilesystemLoader} will be constructed with
-      # the string given as a path for it.
+      # constructs a {FilesystemLoader} with the string given as its path and
+      # adds the loader to the end of the loader list.
       #
-      # @param [Loader,String] loader the loader to add
+      # @param [String] path to use for loader
+      # @return [Loader] the loader that was created
+      def add_load_path(path)
+        loader = FilesystemLoader.new(path)
+        add_loader(loader)
+        loader
+      end
+
+      # adds the given loader to the end of the loader list.
+      #
+      # @param [Loader] loader the loader to add
       # @return nil
       def add_loader(loader)
-         if loader.is_a?(String)
-            @loaders.push FilesystemLoader.new(loader)
-         else
-            @loaders.push loader
-         end
+          @loaders.push loader
          nil
       end
 
@@ -337,4 +342,4 @@ module Cadenza
 
    end
 
-end
+end

data/lib/cadenza/text_renderer.rb

@@ -36,7 +36,7 @@ module Cadenza
       end
 
       def render_block(node, context, blocks)
-         (blocks[node.name] || node).children.each {|x| render(x, context) }
+         (blocks[node.name] || node).children.each {|x| render(x, context, blocks) }
       end
 
       def render_text(node, context, blocks)
@@ -48,7 +48,7 @@ module Cadenza
       end
 
       def render_if(node, context, blocks)
-         node.evaluate_expression_for_children(context).each {|x| render(x, context) }
+         node.evaluate_expression_for_children(context).each {|x| render(x, context, blocks) }
       end
 
       def render_for(node, context, blocks)

data/lib/cadenza/version.rb

@@ -3,7 +3,7 @@ module Cadenza
   module Version
      MAJOR = 0
      MINOR = 7
-     PATCH = 1
+     PATCH = 2
      BUILD = nil
     
      STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cadenza
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   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-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -170,6 +170,7 @@ files:
 - lib/cadenza/functional_variables/standard_functional_variables.rb
 - lib/cadenza/version.rb
 - lib/cadenza/text_renderer.rb
+- lib/cadenza/cli/options.rb
 - lib/cadenza/parser.rb
 - lib/cadenza/base_renderer.rb
 - lib/cadenza/token.rb