tickly 2.1.0 → 2.1.2

data/test/test_benchmark.rb

@@ -0,0 +1,21 @@
+require 'helper'
+require 'benchmark'
+
+class TestParserEvaluator < Test::Unit::TestCase
+  
+  class Tracker3
+    def initialize(n); end
+  end
+
+  def test_parses_huge
+    pe = Tickly::NodeProcessor.new
+    pe.add_node_handler_class(Tracker3)
+    
+    Benchmark.bm do | runner |
+      runner.report("Parsing a huge Nuke script:") do
+        counter = 0
+        pe.parse(HUGE_SCRIPT) { counter += 1 }
+      end
+    end
+  end
+end

data/test/test_emitter.rb

@@ -0,0 +1,20 @@
+require "helper"
+
+class TestEmitter < Test::Unit::TestCase
+  def test_emitter_e
+    assert_equal ["2", "2"], e("2", "2")
+  end
+  
+  def test_emitter_le
+    assert_equal [:c, "2", "2"], le("2", "2")
+  end
+  
+  def test_emitter_be
+    assert_equal [:b, "2", "2"], se("2", "2")
+  end
+  
+  def test_emitter_be
+    assert_equal [:b, [:c,"2", "2"]], se(le("2", "2"))
+  end
+  
+end

data/test/test_evaluator.rb

@@ -1,9 +1,8 @@
 require 'helper'
 
 class TestEvaluator < Test::Unit::TestCase
-  include Tickly::Emitter
   
-  should "not do anything without handlers" do
+  def test_does_nothing_without_handlers
     stack = le("Tracker4", le(le("enabled", "true")))
     e = Tickly::Evaluator.new
     e.evaluate(stack)

data/test/test_node_processor.rb

@@ -1,8 +1,8 @@
 require 'helper'
 
 class TestParserEvaluator < Test::Unit::TestCase
-  include Tickly::Emitter
   
+  HUGE_SCRIPT = File.open(File.dirname(__FILE__) + "/test-data/huge_nuke_tcl.tcl")
   NUKE7_SCRIPT = File.open(File.dirname(__FILE__) + "/test-data/nuke7_tracker_2tracks.nk")
   
   class Tracker4
@@ -33,4 +33,5 @@ class TestParserEvaluator < Test::Unit::TestCase
     pe = Tickly::NodeProcessor.new
     assert_raise(LocalJumpError) { pe.parse(NUKE7_SCRIPT) }
   end
+
 end

data/test/test_parser.rb

@@ -1,23 +1,22 @@
-require 'helper'
+require File.dirname(__FILE__) + '/helper'
 
 class TestParser < Test::Unit::TestCase
   P = Tickly::Parser.new
-  include Tickly::Emitter
   
-  should "parse a single int as a stack with a string" do
+  def test_parse_single_int_as_a_stack_with_string_token
     assert_equal e(e("2")), P.parse('2')
   end
 
-  should "parse a single int and discard whitespace" do
+  def test_parse_single_int_and_discard_whitespace
     p = P.parse('   2 ')
     assert_equal e(e("2")), p
   end
 
-  should "parse multiple ints and strings as a stack of subexpressions" do
+  def test_parse_multiple_ints_and_strings_as_stack_of_expressions
     assert_equal e(e("2", "foo", "bar", "baz")), P.parse('2 foo bar baz')
   end
   
-  should "parse and expand a string in double quotes" do
+  def test_parse_and_expand_a_string_in_double_quotes
     p = P.parse('"This is a string literal with spaces"')
     assert_equal e(e("This is a string literal with spaces")), p
     
@@ -25,11 +24,11 @@ class TestParser < Test::Unit::TestCase
     assert_equal e(e("This is a string literal \"escaped\" with spaces")), p
   end
   
-  should "parse a string expression" do
+  def test_parse_string_expression
     assert_equal e(e(se("1", "2", "3"))),  P.parse("[1 2 3]")
   end
   
-  should "parse multiple string expressions" do
+  def test_parse_multiple_string_expressions_in_one_expression
     p = P.parse("[1 2 3] [3 4 5 foo]")
     assert_equal e(e(se("1", "2", "3"), se("3", "4", "5", "foo"))), p
   end
@@ -45,6 +44,25 @@ class TestParser < Test::Unit::TestCase
     assert_equal e(e(le("4", "+", "5"))), p
   end
   
+  def test_raises_on_unterminated_string
+    expr = '"Literal with no closing quote'
+    assert_raise(Tickly::Parser::Error) { P.parse(expr) }
+  end
+
+  def test_raises_on_unterminated_subexpressions
+    expr = 'a {b'
+    assert_raise(Tickly::Parser::Error) { P.parse(expr) }
+    
+    expr = 'a [b'
+    assert_raise(Tickly::Parser::Error) { P.parse(expr) }
+  end
+   
+  def test_curlies_after_expr
+    expr = 'a{4 + 5}b'
+    p = P.parse(expr)
+    assert_equal [["a", [:c, "4", "+", "5"], "b"]], p
+  end
+  
   def test_parsing_a_nuke_node
     f = File.open(File.dirname(__FILE__) + "/test-data/nukenode.txt")
     p = P.parse(f)
@@ -70,7 +88,7 @@ class TestParser < Test::Unit::TestCase
     assert_equal script, p
   end
   
-  should 'parse a simple Nuke script and internalize the RotoPaint in it' do
+  def test_parse_a_simple_Nuke_script_and_internalize_the_RotoPaint
     f = File.open(File.dirname(__FILE__) + "/test-data/three_nodes_and_roto.txt")
     p = P.parse(f)
     # Should pass through the rotopaint node and get to the blur properly
@@ -115,6 +133,13 @@ class TestParser < Test::Unit::TestCase
     assert_equal [], p
   end
   
+  def test_parsing_nuke_script_with_shitdows_line_breaks
+    f = File.open(File.dirname(__FILE__) + "/test-data/windows_linebreaks.nk")
+    p = P.parse(f)
+    
+    first_expr = p[0]
+    assert_equal ["set", "cut_paste_input", [:b, "stack", "0"]], first_expr, "Should have chopped off the <CR>"
+  end
   
   def test_parsing_nuke_script_with_indentations
     f = File.open(File.dirname(__FILE__) + "/test-data/nuke_group.txt")

data/tickly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "tickly"
-  s.version = "2.1.0"
+  s.version = "2.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2013-03-23"
+  s.date = "2013-08-15"
   s.description = "Parses the subset of the TCL grammar needed for Nuke scripts"
   s.email = "me@julik.nl"
   s.extra_rdoc_files = [
@@ -39,7 +39,10 @@ Gem::Specification.new do |s|
     "test/test-data/three_nodes_and_roto.txt",
     "test/test-data/tracker_with_differing_gaps.nk",
     "test/test-data/tracker_with_repeating_gaps.nk",
+    "test/test-data/windows_linebreaks.nk",
+    "test/test_benchmark.rb",
     "test/test_curve.rb",
+    "test/test_emitter.rb",
     "test/test_evaluator.rb",
     "test/test_node_processor.rb",
     "test/test_parser.rb",
@@ -48,7 +51,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/julik/tickly"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.25"
   s.summary = "Assists in parsing Nuke scripts in TCL"
 
   if s.respond_to? :specification_version then
@@ -57,14 +60,12 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<bychar>, ["~> 2"])
       s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_development_dependency(%q<ruby-prof>, [">= 0"])
     else
       s.add_dependency(%q<bychar>, ["~> 2"])
       s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_dependency(%q<ruby-prof>, [">= 0"])
@@ -72,7 +73,6 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<bychar>, ["~> 2"])
     s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     s.add_dependency(%q<ruby-prof>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tickly
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bychar
@@ -43,22 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +121,10 @@ files:
 - test/test-data/three_nodes_and_roto.txt
 - test/test-data/tracker_with_differing_gaps.nk
 - test/test-data/tracker_with_repeating_gaps.nk
+- test/test-data/windows_linebreaks.nk
+- test/test_benchmark.rb
 - test/test_curve.rb
+- test/test_emitter.rb
 - test/test_evaluator.rb
 - test/test_node_processor.rb
 - test/test_parser.rb
@@ -157,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -720429447261605785
+      hash: 1232326070308292090
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -166,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Assists in parsing Nuke scripts in TCL