cadenza 0.7.0 → 0.7.1

data/bin/cadenza

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+$: << File.expand_path(File.dirname(__FILE__) + '/../lib')
+
+require 'cadenza'
+require 'cadenza/cli'
+
+options = Cadenza::Cli::Options.parse!
+path = ARGV[0]
+
+STDOUT.puts Cadenza::Cli.run!(path, options[:context])

data/lib/cadenza.rb

@@ -4,6 +4,7 @@ require 'cadenza/lexer'
 require 'cadenza/racc_parser'
 require 'cadenza/parser'
 require 'cadenza/context'
+require 'cadenza/context_object'
 require 'cadenza/base_renderer'
 require 'cadenza/text_renderer'
 require 'cadenza/filesystem_loader'

data/lib/cadenza/cli.rb

@@ -0,0 +1,39 @@
+require 'optparse'
+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
+
+      def context_option(context)
+        @options[:context] = MultiJson.load(context)
+      end
+
+      def set_opts
+        on("--context json") do |value|
+          context_option value
+        end
+      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
+    end
+
+  end
+end

data/lib/cadenza/context.rb

@@ -301,6 +301,7 @@ module Cadenza
          sym_identifier = identifier.to_sym
 
          # allow looking up array indexes with dot notation, example: alphabet.0 => "a"
+         #TODO: the /\d+/ regex doesn't have the \A\z terminators, could that allow expected calling? example: alpabet.a0
          if scope.respond_to?(:[]) and scope.is_a?(Array) and identifier =~ /\d+/
             return scope[identifier.to_i]
          end
@@ -310,6 +311,21 @@ module Cadenza
             return scope[identifier] || scope[sym_identifier]
          end
 
+         #TODO: security vulnerability below, we use #send on an object which can
+         # allow us to call private or protected methods on an object.
+         # 
+         # We could use #public_send but it is only available in Ruby 1.9.x so 
+         # we would have to drop 1.8.7 support.
+         #
+         # Alternatively we could forbid binding regular objects to contexts
+         # entirely and require that any bound object is a subclass of Cadenza::Drop
+         # Knowing this we could take public methods defined on the object
+         # and subtract public methods defined on the drop to get a list of 
+         # safely callable methods. And it will work in 1.8.7
+         #
+         # This won't happen until Cadenza 0.8.0 however as it will possibly break
+         # backwards compatibility.
+
          # if the identifier is a callable method then call that
          return scope.send(sym_identifier) if scope.respond_to?(sym_identifier)
 

data/lib/cadenza/context_object.rb

@@ -0,0 +1,10 @@
+
+module Cadenza
+   class ContextObject < Object # intentionally declared, since we cannot 
+                                # subclass BasicObject in 1.8.7
+
+      # this class is intentionally left blank as a placeholder, see 
+      # context_object_spec.rb under spec/ for details.
+      
+   end
+end

data/lib/cadenza/text_renderer.rb

@@ -72,7 +72,7 @@ module Cadenza
             })
 
             # render each of the child nodes with the context
-            node.children.each {|x| render(x, context) }
+            node.children.each {|x| render(x, context, blocks) }
 
             # pop the inner context off
             context.pop

data/lib/cadenza/version.rb

@@ -3,7 +3,7 @@ module Cadenza
   module Version
      MAJOR = 0
      MINOR = 7
-     PATCH = 0
+     PATCH = 1
      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.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000 Z
+date: 2012-10-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &81908300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +37,15 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *81908300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &81908010 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +53,15 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *81908010
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: racc
-  requirement: &81907760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +69,15 @@ dependencies:
         version: 1.4.6
   type: :development
   prerelease: false
-  version_requirements: *81907760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.6
 - !ruby/object:Gem::Dependency
   name: nokogiri-diff
-  requirement: &81907510 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +85,15 @@ dependencies:
         version: 0.1.0
   type: :development
   prerelease: false
-  version_requirements: *81907510
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &81907290 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81907290
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &81906850 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81906850
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-shell
-  requirement: &81906530 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,40 +133,49 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81906530
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - whoward.tke@gmail.com
-executables: []
+executables:
+- cadenza
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/cadenza/nodes/generic_block_node.rb
+- lib/cadenza/lexer.rb
+- lib/cadenza/context.rb
+- lib/cadenza/filesystem_loader.rb
+- lib/cadenza/cli.rb
+- lib/cadenza/blocks/standard_blocks.rb
+- lib/cadenza/context_object.rb
+- lib/cadenza/filters/standard_filters.rb
+- lib/cadenza/error.rb
+- lib/cadenza/nodes/document_node.rb
 - lib/cadenza/nodes/operation_node.rb
-- lib/cadenza/nodes/filter_node.rb
-- lib/cadenza/nodes/if_node.rb
 - lib/cadenza/nodes/text_node.rb
-- lib/cadenza/nodes/variable_node.rb
-- lib/cadenza/nodes/document_node.rb
 - lib/cadenza/nodes/for_node.rb
-- lib/cadenza/nodes/boolean_inverse_node.rb
+- lib/cadenza/nodes/if_node.rb
+- lib/cadenza/nodes/generic_block_node.rb
 - lib/cadenza/nodes/inject_node.rb
+- lib/cadenza/nodes/variable_node.rb
 - lib/cadenza/nodes/constant_node.rb
 - lib/cadenza/nodes/block_node.rb
-- lib/cadenza/token.rb
+- lib/cadenza/nodes/boolean_inverse_node.rb
+- lib/cadenza/nodes/filter_node.rb
 - lib/cadenza/functional_variables/standard_functional_variables.rb
-- lib/cadenza/parser.rb
-- lib/cadenza/filters/standard_filters.rb
+- lib/cadenza/version.rb
 - lib/cadenza/text_renderer.rb
-- lib/cadenza/filesystem_loader.rb
-- lib/cadenza/racc_parser.rb
-- lib/cadenza/blocks/standard_blocks.rb
+- lib/cadenza/parser.rb
 - lib/cadenza/base_renderer.rb
-- lib/cadenza/version.rb
-- lib/cadenza/lexer.rb
-- lib/cadenza/context.rb
-- lib/cadenza/error.rb
+- lib/cadenza/token.rb
+- lib/cadenza/racc_parser.rb
 - lib/cadenza.rb
+- bin/cadenza
 homepage: http://github.com/whoward/Cadenza
 licenses: []
 post_install_message: 
@@ -141,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Powerful text templating language similar to Smarty/Liquid/Django