tickly 0.0.2 → 0.0.3

data/lib/tickly/parser.rb

@@ -85,20 +85,6 @@ module Tickly
       return buf
     end
     
-    def expand_one_elements!(expr)
-      expr.map! do | element |
-        if expr?(element) && element.length == 1 && element[0].class == element.class
-          element[0]
-        else
-          element
-        end
-      end
-    end
-    
-    def remove_empty_elements!(expr)
-      expr.reject! {|e|  expr?(e) && e.empty? }
-    end
-    
     # Tells whether a passed object is a StringExpr or LiteralExpr
     def expr?(something)
       [StringExpr, LiteralExpr].include?(something.class)
@@ -107,18 +93,10 @@ module Tickly
     # Cleans up a subexpression stack. Currently it only removes nil objects
     # in-between items (which act as line separators)
     def cleanup(expr)
-      # Expand one-element expressions of the same class
-      #expand_one_elements!(expr)
-      
-      # Remove empty subexprs
-      #remove_empty_elements!(expr)
-      
-      # Squeeze out the leading and trailing nils
-      expr.delete_at(0) while (expr.any? && expr[0].nil?)
-      expr.delete_at(-1) while (expr.any? && expr[-1].nil?)
-      
+      # Ensure multiple consecutive line breaks are ignored
+      no_multiple_breaks = Tickly.singularize_nils_in(expr)
       # Convert line breaks into subexpressions
-      Tickly.split_array(expr)
+      Tickly.split_array(no_multiple_breaks)
     end
   
   end

data/lib/tickly.rb

@@ -3,13 +3,13 @@ require File.dirname(__FILE__) + "/tickly/evaluator"
 require 'forwardable'
 
 module Tickly
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
   
   # Represents a TCL expression with it's arguments (in curly or square braces)
   class Expr
     extend Forwardable
     
-    def_delegators :@e, :push, :<<, :any?, :reject!, :map!, :[], :delete_at, :include?, :each, :empty?, :join, :length
+    def_delegators :@e, :push, :<<, :any?, :reject!, :map!, :[], :delete_at, :include?, :each, :each_with_index, :empty?, :join, :length
     
     def initialize(elements = [])
       @e = elements
@@ -73,19 +73,39 @@ module Tickly
     end
   end
   
+  # Splits the passed Array-like object into sub-arrays of the same class,
+  # delimited by the passed separator. Note that when the separators occur at the beginning or at the end of
+  # the passed object they will be discarded
   def self.split_array(arr, separator = nil)
     return arr unless arr.include?(separator)
     
     subarrays = arr.class.new
     subarrays.push(arr.class.new)
     
-    arr.each do | element |
-      if element == separator
+    arr.each_with_index do | element, i |
+      if element == separator && subarrays.length > 0 && subarrays[-1].any? && (i < (arr.length - 1))
         subarrays.push(arr.class.new)
+      elsif element == separator
+        # toss it
       else
         subarrays[-1].push(element)
       end
     end
     return subarrays
   end
+  
+  # Removes consecutive nils from the passed Array-like object and returns a new one with all consecutive nils reduced
+  # to one nil
+  def self.singularize_nils_in(arr)
+    new_arr = arr.class.new
+    arr.each_with_index do | elem, i |
+      if elem.nil? && arr[i-1].nil? && i > 0
+        # pass
+      else
+        new_arr << elem
+      end
+    end
+    new_arr
+  end
+  
 end

data/test/test-data/one_node_with_one_param.txt

@@ -0,0 +1,3 @@
+SomeNode {
+  foo bar
+}

data/test/test_parser.rb

@@ -53,7 +53,7 @@ class TestParser < Test::Unit::TestCase
   end
   
   should 'parse a Nuke node' do
-    f = File.open(File.dirname(__FILE__) + "/nukenode.txt")
+    f = File.open(File.dirname(__FILE__) + "/test-data/nukenode.txt")
     p = P.parse(f)
     script = le(
       le("set", "cut_paste_input", se("stack", "0")),
@@ -78,7 +78,7 @@ class TestParser < Test::Unit::TestCase
   end
   
   should 'parse a simple Nuke script and internalize the RotoPaint in it' do
-    f = File.open(File.dirname(__FILE__) + "/three_nodes_and_roto.txt")
+    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
     blur = le("Blur", 
@@ -99,7 +99,7 @@ class TestParser < Test::Unit::TestCase
   end
   
   should 'parse a Nuke script with indentations' do
-    f = File.open(File.dirname(__FILE__) + "/nuke_group.txt")
+    f = File.open(File.dirname(__FILE__) + "/test-data/nuke_group.txt")
     p = P.parse(f)
     grp = le(
       le("set", "cut_paste_input", se("stack", "0")),
@@ -124,10 +124,25 @@ class TestParser < Test::Unit::TestCase
         )
       ),
       le("Output",
-        le("name", "Output1")
+        le(
+          le("name", "Output1")
+        )
       ),
       le("end_group")
     )
     assert_equal grp, p
   end
+  
+  def test_one_node_parsing
+    f = File.open(File.dirname(__FILE__) + "/test-data/one_node_with_one_param.txt")
+    p = P.parse(f)
+    ref = le("SomeNode",
+        le(
+          le("foo", "bar")
+        )
+    )
+    
+    assert_equal ref, p
+  end
+  
 end

data/test/test_split_array.rb

@@ -9,6 +9,10 @@ class TestSplitArray < Test::Unit::TestCase
     assert_equal [[1, 2],  [3, 4]], Tickly.split_array([1, 2, nil,  3, 4])
   end
   
+  should "only generate sub-elements where they make sense" do
+    assert_equal [[1, 2]], Tickly.split_array([nil, 1, 2, nil])
+  end
+  
   class Jock < Array; end
   
   should "properly use subclasses" do
@@ -17,4 +21,8 @@ class TestSplitArray < Test::Unit::TestCase
     assert_kind_of Jock, s[0]
   end
   
+  should 'squeeze nils out' do
+    s = Tickly.singularize_nils_in([nil, nil, 1,2,3,4, nil, nil, 456, nil, 9,nil,nil])
+    assert_equal [nil, 1,2,3,4, nil, 456, nil, 9, nil], s
+  end
 end

data/tickly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "tickly"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2013-03-02"
+  s.date = "2013-03-11"
   s.description = "Parses the subset of the TCL grammar needed for Nuke scripts"
   s.email = "me@julik.nl"
   s.extra_rdoc_files = [
@@ -27,23 +27,24 @@ Gem::Specification.new do |s|
     "lib/tickly/evaluator.rb",
     "lib/tickly/parser.rb",
     "test/helper.rb",
-    "test/nuke7_tracker_2tracks.nk",
-    "test/nuke_group.txt",
-    "test/nukenode.txt",
-    "test/one_tracker_with_break.nk",
-    "test/one_tracker_with_break_in_grp.nk",
+    "test/test-data/nuke7_tracker_2tracks.nk",
+    "test/test-data/nuke_group.txt",
+    "test/test-data/nukenode.txt",
+    "test/test-data/one_node_with_one_param.txt",
+    "test/test-data/one_tracker_with_break.nk",
+    "test/test-data/one_tracker_with_break_in_grp.nk",
+    "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_evaluator.rb",
     "test/test_parser.rb",
     "test/test_split_array.rb",
-    "test/three_nodes_and_roto.txt",
-    "test/tracker_with_differing_gaps.nk",
-    "test/tracker_with_repeating_gaps.nk",
     "tickly.gemspec"
   ]
   s.homepage = "http://github.com/julik/tickly"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "1.8.24"
   s.summary = "Assists in parsing Nuke scripts in TCL"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,91 +1,88 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: tickly
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.0.3
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-02 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: shoulda
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rdoc
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 3
-        - 12
-        version: "3.12"
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '3.12'
   type: :development
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
+- !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: jeweler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 1
-        - 8
-        - 3
+      - !ruby/object:Gem::Version
         version: 1.8.3
-  prerelease: false
   type: :development
-  requirement: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.3
 description: Parses the subset of the TCL grammar needed for Nuke scripts
 email: me@julik.nl
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - .travis.yml
 - Gemfile
@@ -96,50 +93,45 @@ files:
 - lib/tickly/evaluator.rb
 - lib/tickly/parser.rb
 - test/helper.rb
-- test/nuke7_tracker_2tracks.nk
-- test/nuke_group.txt
-- test/nukenode.txt
-- test/one_tracker_with_break.nk
-- test/one_tracker_with_break_in_grp.nk
+- test/test-data/nuke7_tracker_2tracks.nk
+- test/test-data/nuke_group.txt
+- test/test-data/nukenode.txt
+- test/test-data/one_node_with_one_param.txt
+- test/test-data/one_tracker_with_break.nk
+- test/test-data/one_tracker_with_break_in_grp.nk
+- 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_evaluator.rb
 - test/test_parser.rb
 - test/test_split_array.rb
-- test/three_nodes_and_roto.txt
-- test/tracker_with_differing_gaps.nk
-- test/tracker_with_repeating_gaps.nk
 - tickly.gemspec
 homepage: http://github.com/julik/tickly
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 592217362083330592
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Assists in parsing Nuke scripts in TCL
 test_files: []
-