personify 1.0.0 → 1.1.0

data/lib/personify.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../vendor/treetop/lib/treetop'
+require 'treetop'
 require File.dirname(__FILE__) + '/personify/parser/personify_node_classes'
 require File.dirname(__FILE__) + '/personify/parser/personify'
 require File.dirname(__FILE__) + '/personify/template'

data/test/context_test.rb

@@ -1,6 +1,6 @@
-require 'test_helper'
-require File.dirname(__FILE__) + "/../vendor/treetop/lib/treetop"
-Treetop.load "../lib/personify/parser/personify"
+require File.dirname(__FILE__) + '/test_helper'
+require 'treetop'
+Treetop.load  File.dirname(__FILE__) + "/../lib/personify/parser/personify"
 # require File.dirname(__FILE__) + "/../personify"
 
 class ContextTest < Test::Unit::TestCase

data/test/parse_runner.rb

@@ -1,5 +1,4 @@
-require File.dirname(__FILE__) + "/../vendor/treetop/lib/treetop"
-
+require 'treetop'
 require '../lib/parser/personify_node_classes'
 require '../lib/context'
 Treetop.load "../lib/parser/personify"

data/test/parser_test.rb

@@ -1,6 +1,6 @@
-require 'test_helper'
-require File.dirname(__FILE__) + "/../vendor/treetop/lib/treetop"
-Treetop.load "../lib/personify/parser/personify"
+require File.dirname(__FILE__) + '/test_helper'
+require 'treetop'
+Treetop.load File.dirname(__FILE__) + "/../lib/personify/parser/personify"
 # require File.dirname(__FILE__) + "/../personify"
 
 class ParserTest < Test::Unit::TestCase

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: personify
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  hash: 19
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Flurin Egger
@@ -9,19 +15,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 +01:00
+date: 2011-08-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: treetop
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 description: Personfify is meant for use in environments where templates just need to be personalized.
 email: flurin@digitpaint.nl
 executables: []
@@ -33,6 +59,7 @@ extra_rdoc_files:
 - README.md
 files: 
 - .gitignore
+- .rvmrc
 - LICENSE
 - README.md
 - Rakefile
@@ -50,117 +77,6 @@ files:
 - test/parse_runner.rb
 - test/parser_test.rb
 - test/test_helper.rb
-- vendor/treetop/.gitignore
-- vendor/treetop/History.txt
-- vendor/treetop/README
-- vendor/treetop/Rakefile
-- vendor/treetop/Treetop.tmbundle/Snippets/grammar ___ end.tmSnippet
-- vendor/treetop/Treetop.tmbundle/Snippets/rule ___ end.tmSnippet
-- vendor/treetop/Treetop.tmbundle/Syntaxes/Treetop Grammar.tmLanguage
-- vendor/treetop/Treetop.tmbundle/info.plist
-- vendor/treetop/bin/tt
-- vendor/treetop/doc/contributing_and_planned_features.markdown
-- vendor/treetop/doc/grammar_composition.markdown
-- vendor/treetop/doc/index.markdown
-- vendor/treetop/doc/pitfalls_and_advanced_techniques.markdown
-- vendor/treetop/doc/semantic_interpretation.markdown
-- vendor/treetop/doc/site.rb
-- vendor/treetop/doc/sitegen.rb
-- vendor/treetop/doc/syntactic_recognition.markdown
-- vendor/treetop/doc/using_in_ruby.markdown
-- vendor/treetop/examples/lambda_calculus/arithmetic.rb
-- vendor/treetop/examples/lambda_calculus/arithmetic.treetop
-- vendor/treetop/examples/lambda_calculus/arithmetic_node_classes.rb
-- vendor/treetop/examples/lambda_calculus/arithmetic_test.rb
-- vendor/treetop/examples/lambda_calculus/lambda_calculus
-- vendor/treetop/examples/lambda_calculus/lambda_calculus.rb
-- vendor/treetop/examples/lambda_calculus/lambda_calculus.treetop
-- vendor/treetop/examples/lambda_calculus/lambda_calculus_node_classes.rb
-- vendor/treetop/examples/lambda_calculus/lambda_calculus_test.rb
-- vendor/treetop/examples/lambda_calculus/test_helper.rb
-- vendor/treetop/lib/treetop.rb
-- vendor/treetop/lib/treetop/bootstrap_gen_1_metagrammar.rb
-- vendor/treetop/lib/treetop/compiler.rb
-- vendor/treetop/lib/treetop/compiler/grammar_compiler.rb
-- vendor/treetop/lib/treetop/compiler/lexical_address_space.rb
-- vendor/treetop/lib/treetop/compiler/metagrammar.rb
-- vendor/treetop/lib/treetop/compiler/metagrammar.treetop
-- vendor/treetop/lib/treetop/compiler/node_classes.rb
-- vendor/treetop/lib/treetop/compiler/node_classes/anything_symbol.rb
-- vendor/treetop/lib/treetop/compiler/node_classes/atomic_expression.rb
-- vendor/treetop/lib/treetop/compiler/node_classes/character_class.rb
-- vendor/treetop/lib/treetop/compiler/node_classes/choice.rb
-- vendor/treetop/lib/treetop/compiler/node_classes/declaration_sequence.rb
-- vendor/treetop/lib/treetop/compiler/node_classes/grammar.rb
-- vendor/treetop/lib/treetop/compiler/node_classes/inline_module.rb
-- vendor/treetop/lib/treetop/compiler/node_classes/nonterminal.rb
-- vendor/treetop/lib/treetop/compiler/node_classes/optional.rb
-- vendor/treetop/lib/treetop/compiler/node_classes/parenthesized_expression.rb
-- vendor/treetop/lib/treetop/compiler/node_classes/parsing_expression.rb
-- vendor/treetop/lib/treetop/compiler/node_classes/parsing_rule.rb
-- vendor/treetop/lib/treetop/compiler/node_classes/predicate.rb
-- vendor/treetop/lib/treetop/compiler/node_classes/repetition.rb
-- vendor/treetop/lib/treetop/compiler/node_classes/sequence.rb
-- vendor/treetop/lib/treetop/compiler/node_classes/terminal.rb
-- vendor/treetop/lib/treetop/compiler/node_classes/transient_prefix.rb
-- vendor/treetop/lib/treetop/compiler/node_classes/treetop_file.rb
-- vendor/treetop/lib/treetop/compiler/ruby_builder.rb
-- vendor/treetop/lib/treetop/ruby_extensions.rb
-- vendor/treetop/lib/treetop/ruby_extensions/string.rb
-- vendor/treetop/lib/treetop/runtime.rb
-- vendor/treetop/lib/treetop/runtime/compiled_parser.rb
-- vendor/treetop/lib/treetop/runtime/interval_skip_list.rb
-- vendor/treetop/lib/treetop/runtime/interval_skip_list/head_node.rb
-- vendor/treetop/lib/treetop/runtime/interval_skip_list/interval_skip_list.rb
-- vendor/treetop/lib/treetop/runtime/interval_skip_list/node.rb
-- vendor/treetop/lib/treetop/runtime/syntax_node.rb
-- vendor/treetop/lib/treetop/runtime/terminal_parse_failure.rb
-- vendor/treetop/lib/treetop/runtime/terminal_syntax_node.rb
-- vendor/treetop/lib/treetop/version.rb
-- vendor/treetop/script/generate_metagrammar.rb
-- vendor/treetop/script/svnadd
-- vendor/treetop/script/svnrm
-- vendor/treetop/spec/compiler/and_predicate_spec.rb
-- vendor/treetop/spec/compiler/anything_symbol_spec.rb
-- vendor/treetop/spec/compiler/character_class_spec.rb
-- vendor/treetop/spec/compiler/choice_spec.rb
-- vendor/treetop/spec/compiler/circular_compilation_spec.rb
-- vendor/treetop/spec/compiler/failure_propagation_functional_spec.rb
-- vendor/treetop/spec/compiler/grammar_compiler_spec.rb
-- vendor/treetop/spec/compiler/grammar_spec.rb
-- vendor/treetop/spec/compiler/nonterminal_symbol_spec.rb
-- vendor/treetop/spec/compiler/not_predicate_spec.rb
-- vendor/treetop/spec/compiler/one_or_more_spec.rb
-- vendor/treetop/spec/compiler/optional_spec.rb
-- vendor/treetop/spec/compiler/parenthesized_expression_spec.rb
-- vendor/treetop/spec/compiler/parsing_rule_spec.rb
-- vendor/treetop/spec/compiler/sequence_spec.rb
-- vendor/treetop/spec/compiler/terminal_spec.rb
-- vendor/treetop/spec/compiler/terminal_symbol_spec.rb
-- vendor/treetop/spec/compiler/test_grammar.treetop
-- vendor/treetop/spec/compiler/test_grammar.tt
-- vendor/treetop/spec/compiler/test_grammar_do.treetop
-- vendor/treetop/spec/compiler/zero_or_more_spec.rb
-- vendor/treetop/spec/composition/a.treetop
-- vendor/treetop/spec/composition/b.treetop
-- vendor/treetop/spec/composition/c.treetop
-- vendor/treetop/spec/composition/d.treetop
-- vendor/treetop/spec/composition/grammar_composition_spec.rb
-- vendor/treetop/spec/ruby_extensions/string_spec.rb
-- vendor/treetop/spec/runtime/compiled_parser_spec.rb
-- vendor/treetop/spec/runtime/interval_skip_list/delete_spec.rb
-- vendor/treetop/spec/runtime/interval_skip_list/expire_range_spec.rb
-- vendor/treetop/spec/runtime/interval_skip_list/insert_and_delete_node.rb
-- vendor/treetop/spec/runtime/interval_skip_list/insert_spec.rb
-- vendor/treetop/spec/runtime/interval_skip_list/interval_skip_list_spec.graffle
-- vendor/treetop/spec/runtime/interval_skip_list/interval_skip_list_spec.rb
-- vendor/treetop/spec/runtime/interval_skip_list/palindromic_fixture.rb
-- vendor/treetop/spec/runtime/interval_skip_list/palindromic_fixture_spec.rb
-- vendor/treetop/spec/runtime/interval_skip_list/spec_helper.rb
-- vendor/treetop/spec/runtime/syntax_node_spec.rb
-- vendor/treetop/spec/spec_helper.rb
-- vendor/treetop/spec/spec_suite.rb
-- vendor/treetop/treetop.gemspec
 has_rdoc: true
 homepage: http://github.com/digitpaint/personify
 licenses: []
@@ -171,21 +87,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A personalisation template language

data/vendor/treetop/.gitignore

@@ -1,5 +0,0 @@
-*.gem
-*.iml
-*.iws
-*.ipr
-doc/site/*.*

data/vendor/treetop/History.txt

@@ -1,9 +0,0 @@
-== 1.2.5 2009-03-10
-
-* 1 minor enhancement:
-  * Extensions may always be modules, instead of sometimes modules, sometimes classes
-
-== 0.0.1 2008-05-21
-
-* 1 major enhancement:
-  * Initial release

data/vendor/treetop/README

@@ -1,164 +0,0 @@
-Tutorial
-========
-Languages can be split into two components, their *syntax* and their *semantics*. It's your understanding of English syntax that tells you the stream of words "Sleep furiously green ideas colorless" is not a valid sentence. Semantics is deeper. Even if we rearrange the above sentence to be "Colorless green ideas sleep furiously", which is syntactically correct, it remains nonsensical on a semantic level. With Treetop, you'll be dealing with languages that are much simpler than English, but these basic concepts apply. Your programs will need to address both the syntax and the semantics of the languages they interpret.
-
-Treetop equips you with powerful tools for each of these two aspects of interpreter writing. You'll describe the syntax of your language with a *parsing expression grammar*. From this description, Treetop will generate a Ruby parser that transforms streams of characters written into your language into *abstract syntax trees* representing their structure. You'll then describe the semantics of your language in Ruby by defining methods on the syntax trees the parser generates.
-
-Parsing Expression Grammars, The Basics
-=======================================
-The first step in using Treetop is defining a grammar in a file with the `.treetop` extension. Here's a grammar that's useless because it's empty:
-    
-    # my_grammar.treetop
-    grammar MyGrammar
-    end
-
-Next, you start filling your grammar with rules. Each rule associates a name with a parsing expression, like the following:
-
-    # my_grammar.treetop
-    # You can use a .tt extension instead if you wish
-    grammar MyGrammar
-      rule hello
-        'hello chomsky'
-      end
-    end
-
-The first rule becomes the *root* of the grammar, causing its expression to be matched when a parser for the grammar is fed a string. The above grammar can now be used in a Ruby program. Notice how a string matching the first rule parses successfully, but a second nonmatching string does not.
-
-    # use_grammar.rb
-    require 'rubygems'
-    require 'treetop'
-    Treetop.load 'my_grammar'
-    # or just:
-    # require 'my_grammar'                     # This works because Polyglot hooks "require" to find and load Treetop files
-    
-    parser = MyGrammarParser.new
-    puts parser.parse('hello chomsky')         # => Treetop::Runtime::SyntaxNode
-    puts parser.parse('silly generativists!')  # => nil
-
-Users of *regular expressions* will find parsing expressions familiar. They share the same basic purpose, matching strings against patterns. However, parsing expressions can recognize a broader category of languages than their less expressive brethren. Before we get into demonstrating that, lets cover some basics. At first parsing expressions won't seem much different. Trust that they are.
-
-Terminal Symbols
-----------------
-The expression in the grammar above is a terminal symbol. It will only match a string that matches it exactly. There are two other kinds of terminal symbols, which we'll revisit later. Terminals are called *atomic expressions* because they aren't composed of smaller expressions.
-
-Ordered Choices
----------------
-Ordered choices are *composite expressions*, which allow for any of several subexpressions to be matched. These should be familiar from regular expressions, but in parsing expressions, they are delimited by the `/` character. Its important to note that the choices are prioritized in the order they appear. If an earlier expression is matched, no subsequent expressions are tried. Here's an example:
-
-    # my_grammar.treetop
-    grammar MyGrammar
-      rule hello
-        'hello chomsky' / 'hello lambek'
-      end
-    end
-    
-    # fragment of use_grammar.rb
-    puts parser.parse('hello chomsky')         # => Treetop::Runtime::SyntaxNode
-    puts parser.parse('hello lambek')          # => Treetop::Runtime::SyntaxNode
-    puts parser.parse('silly generativists!')  # => nil
-
-Note that once a choice rule has matched the text using a particular alternative at a particular location in the input and hence has succeeded, that choice will never be reconsidered, even if the chosen alternative causes another rule to fail where a later alternative wouldn't have. It's always a later alternative, since the first to succeed is final - why keep looking when you've found what you wanted? This is a feature of PEG parsers that you need to understand if you're going to succeed in using Treetop. In order to memoize success and failures, such decisions cannot be reversed. Luckily Treetop provides a variety of clever ways you can tell it to avoid making the wrong decisions. But more on that later.
-
-Sequences
----------
-Sequences are composed of other parsing expressions separated by spaces. Using sequences, we can tighten up the above grammar.
-
-    # my_grammar.treetop
-    grammar MyGrammar
-      rule hello
-        'hello ' ('chomsky' / 'lambek')
-      end
-    end
-
-Note the use of parentheses to override the default precedence rules, which bind sequences more tightly than choices.
-
-Once the whole sequence has been matched, the result is memoized and the details of the match will not be reconsidered for that location in the input.
-
-Nonterminal Symbols
--------------------
-Here we leave regular expressions behind. Nonterminals allow expressions to refer to other expressions by name. A trivial use of this facility would allow us to make the above grammar more readable should the list of names grow longer.
-
-    # my_grammar.treetop
-    grammar MyGrammar
-      rule hello
-        'hello ' linguist
-      end
-      
-      rule linguist
-        'chomsky' / 'lambek' / 'jacobsen' / 'frege'
-      end
-    end
-
-The true power of this facility, however, is unleashed when writing *recursive expressions*. Here is a self-referential expression that can match any number of open parentheses followed by any number of closed parentheses. This is theoretically impossible with regular expressions due to the *pumping lemma*.
-
-    # parentheses.treetop
-    grammar Parentheses
-      rule parens
-        '(' parens ')' / ''
-      end
-    end
-
-
-The `parens` expression simply states that a `parens` is a set of parentheses surrounding another `parens` expression or, if that doesn't match, the empty string. If you are uncomfortable with recursion, its time to get comfortable, because it is the basis of language. Here's a tip: Don't try and imagine the parser circling round and round through the same rule. Instead, imagine the rule is *already* defined while you are defining it. If you imagine that `parens` already matches a string of matching parentheses, then its easy to think of `parens` as an open and closing parentheses around another set of matching parentheses, which conveniently, you happen to be defining. You know that `parens` is supposed to represent a string of matched parentheses, so trust in that meaning, even if you haven't fully implemented it yet.
-
-Repetition
-----------
-Any item in a rule may be followed by a '+' or a '*' character, signifying one-or-more and zero-or-more occurrences of that item. Beware though; the match is greedy, and if it matches too many items and causes subsequent items in the sequence to fail, the number matched will never be reconsidered. Here's a simple example of a rule that will never succeed:
-
-    # toogreedy.treetop
-    grammar TooGreedy
-      rule a_s
-      	'a'* 'a'
-      end
-    end
-
-The 'a'* will always eat up any 'a's that follow, and the subsequent 'a' will find none there, so the whole rule will fail. You might need to use lookahead to avoid matching too much.
-
-Negative Lookahead
-------------------
-
-When you need to ensure that the following item *doesn't* match in some case where it might otherwise, you can use negat!ve lookahead, which is an item preceeded by a ! - here's an example:
-
-    # postcondition.treetop
-    grammar PostCondition
-      rule conditional_sentence
-        ( !conditional_keyword word )+ conditional_keyword [ \t]+ word*
-      end
-
-      rule word
-        ([a-zA-Z]+ [ \t]+) 
-      end
-
-      rule conditional_keyword
-        'if' / 'while' / 'until'
-      end
-    end
-
-Even though the rule `word` would match any of the conditional keywords, the first words of a conditional_sentence must not be conditional_keywords. The negative lookahead prevents that matching, and prevents the repetition from matching too much input. Note that the lookahead may be a grammar rule of any complexity, including one that isn't used elsewhere in your grammar.
-
-Positive lookahead
-------------------
-
-Sometimes you want an item to match, but only if the *following* text would match some pattern. You don't want to consume that following text, but if it's not there, you want this rule to fail. You can append a positive lookahead like this to a rule by appending the lookahead rule preceeded by an & character.
-
-
-
-Features to cover in the talk
-=============================
-
-* Treetop files
-* Grammar definition
-* Rules
-* Loading a grammar
-* Compiling a grammar with the `tt` command
-* Accessing a parser for the grammar from Ruby
-* Parsing Expressions of all kinds
-? Left recursion and factorization
-  - Here I can talk about function application, discussing how the operator
-    could be an arbitrary expression
-* Inline node class eval blocks
-* Node class declarations
-* Labels
-* Use of super within within labels
-* Grammar composition with include
-* Use of super with grammar composition

data/vendor/treetop/Rakefile

@@ -1,20 +0,0 @@
-dir = File.dirname(__FILE__)
-require 'rubygems'
-require 'rake'
-$LOAD_PATH.unshift(File.join(dir, 'vendor', 'rspec', 'lib'))
-require 'spec/rake/spectask'
-
-Gem::manage_gems
-require 'rake/gempackagetask'
-
-task :default => :spec
-
-Spec::Rake::SpecTask.new do |t|
-  t.pattern = 'spec/**/*spec.rb'
-end
-
-load "./treetop.gemspec"
-
-Rake::GemPackageTask.new($gemspec) do |pkg|
-  pkg.need_tar = true
-end

data/vendor/treetop/Treetop.tmbundle/Snippets/grammar ___ end.tmSnippet

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>grammar ${1:GrammarName}
-   rule ${2:rule_name}
-      $0
-   end
-end</string>
-	<key>name</key>
-	<string>grammar ... end</string>
-	<key>scope</key>
-	<string>source.treetop</string>
-	<key>tabTrigger</key>
-	<string>g</string>
-	<key>uuid</key>
-	<string>2AE73FBB-88B9-4049-B208-D2440A146164</string>
-</dict>
-</plist>

data/vendor/treetop/Treetop.tmbundle/Snippets/rule ___ end.tmSnippet

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>content</key>
-	<string>rule ${1:rule_name}
-	$0
-end</string>
-	<key>name</key>
-	<string>rule ... end</string>
-	<key>scope</key>
-	<string>meta.grammar.treetop</string>
-	<key>tabTrigger</key>
-	<string>r</string>
-	<key>uuid</key>
-	<string>498A1881-498E-4BDA-9303-7E42B425C5EE</string>
-</dict>
-</plist>