textpow1x 1.2.1 → 1.2.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    textpow1x (1.2.1)
+    textpow1x (1.2.2)
       plist (>= 3.0.1)
 
 GEM

data/README.rdoc

@@ -43,12 +43,12 @@ Install oniguruma
 
 Syntax files are written with {Textmate grammer}[http://macromates.com/textmate/manual/language_grammars#language_grammars].
 They are written in text/binary/xml/yaml format (all can be translated into each other).
-Textpow can understand the yaml form (ending in .syntax) and the xml form (ending in .tmSyntax or .plist) via plist library, but not the text or binary form.
+Textpow can understand the yaml form (ending in .syntax) and the xml form (ending in .tmSyntax or .plist or tmLanguage) via plist library, but not the text or binary form.
 All syntax files shipped with textpow are in the yaml form, since its easiest to read and less verbose.
 
 Adding a new syntax:
-* use <tt>rake convert[filename]</tt> to convert it into yaml format
-* drop it into the lib/textpow/syntax folder
+* add download location and scopeName to update_syntax task in Rakefile
+* <tt>rake update_syntax</tt>
 * run tests <tt>rake</tt> to see if the syntax is parseable
 
 === Processors
@@ -76,10 +76,9 @@ having <tt>name="text.string", position=10</tt> and the second having
 <tt>"markup.string"</tt> tag is inside the <tt>"text.string"</tt> tag.
 
 == TODO
-
+* fix markdown and php syntax
 * parse text plist files {example}[https://raw.github.com/kangax/textmate-js-language-syntax-file/master/JavaScript.plist]
-* parse tmLanguage files {example}[https://github.com/mattfarina/Ruby-Sass/blob/master/Ruby%20Sass.tmLanguage]
-* document / spec / fix include languages (they dont work very well)
+* update more languages via github urls
 
 == LICENSE: MIT
 

data/lib/textpow/syntax.rb

@@ -56,14 +56,14 @@ module Textpow
     attr_accessor :repository
     attr_accessor :patterns
 
-    def self.load(file, name_space = :default)
+    def self.load(file, options={})
       table = convert_file_to_table(file)
-      SyntaxNode.new(table, nil, name_space)
+      SyntaxNode.new(table, options)
     end
 
-    def initialize(table, syntax = nil, name_space = :default)
-      @syntax = syntax || self
-      @name_space = name_space
+    def initialize(table, options={})
+      @syntax = options[:syntax] || self
+      @name_space = options[:name_space]
 
       register_in_syntaxes(table["scopeName"])
       parse_and_store_syntax_info(table)
@@ -134,23 +134,23 @@ module Textpow
       end
     end
 
-    def parse_repository repository
+    def parse_repository(repository)
       @repository = {}
       repository.each do |key, value|
         if value["include"]
           @repository[key] = SyntaxProxy.new(value["include"], syntax)
         else
-          @repository[key] = SyntaxNode.new(value, syntax, @name_space)
+          @repository[key] = SyntaxNode.new(value, :syntax => syntax, :name_space => @name_space)
         end
       end
     end
 
-    def create_children patterns
+    def create_children(patterns)
       @patterns = patterns.map do |pattern|
         if pattern["include"]
           SyntaxProxy.new(pattern["include"], syntax)
         else
-          SyntaxNode.new(pattern, syntax, @name_space)
+          SyntaxNode.new(pattern, :syntax => syntax, :name_space => @name_space)
         end
       end
     end

data/lib/textpow/version.rb

@@ -1,3 +1,3 @@
 module Textpow
-  VERSION = Version = "1.2.1"
+  VERSION = Version = "1.2.2"
 end

data/spec/textpow/syntax_files_spec.rb

@@ -5,22 +5,18 @@ describe "syntax files" do
     STDERR.stub!(:puts)
   end
 
-  let(:processor){ Textpow::DebugProcessor.new }
-
   it "has syntax files" do
     Dir["#{Textpow.syntax_path}/*.syntax"].should_not == []
   end
 
   Dir["#{Textpow.syntax_path}/*.syntax"].each do |syntax|
     it "#{syntax} can parse" do
-      node = Textpow::SyntaxNode.load(syntax)
-      node.parse("xxx\n1 + 1\n### xxx", processor)
+      Textpow.syntax(syntax).parse("xxx\n1 + 1\n### xxx")
     end
   end
 
-  # syntax broken in 1.9
   xit "parses markdown" do
-    node = Textpow::SyntaxNode.load("#{Textpow.syntax_path}/broken/markdown.syntax")
-    node.parse("### xxx\nabc\n    xxx\n    yyy\n - abc\n - ac", processor)
+    node = Textpow.syntax("lib/textpow/syntax/broken/markdown.syntax")
+    node.parse("### xxx\nabc\n    xxx\nyyy\n - abc\n - ac").stack.should_not == []
   end
 end

data/spec/textpow/syntax_spec.rb

@@ -52,7 +52,7 @@ describe Textpow::SyntaxNode do
     end
 
     it "stores given parent" do
-      node = Textpow::SyntaxNode.new({}, 1)
+      node = Textpow::SyntaxNode.new({}, :syntax => 1)
       node.syntax.should == 1
     end
 
@@ -63,9 +63,9 @@ describe Textpow::SyntaxNode do
     end
 
     it "stores itself in scoped global namespace under scopeName" do
-      node = Textpow::SyntaxNode.new({"scopeName" => 'xxx'}, nil, 'foo')
+      node = Textpow::SyntaxNode.new({"scopeName" => 'xxx'}, :name_space => 'foo')
       node.syntaxes['xxx'].should == node
-      Textpow::SyntaxNode.new({},nil,'foo').syntaxes['xxx'].should == node
+      Textpow::SyntaxNode.new({},:name_space => 'foo').syntaxes['xxx'].should == node
       Textpow::SyntaxNode.new({}).syntaxes['xxx'].should == nil
     end
   end

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: textpow1x
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 1.2.2
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 1
-  version: 1.2.1
 platform: ruby
-authors: 
+authors:
 - Dizan Vasquez
 - Spox
 - Chris Hoffman
@@ -17,37 +12,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-08 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2011-10-08 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: &84372580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 0
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.1
   type: :runtime
-  name: plist
-  version_requirements: *id001
   prerelease: false
+  version_requirements: *84372580
 description: A library for parsing TextMate bundles on ruby 1.x
-email: 
+email:
 - michael@grosser.it
-executables: 
+executables:
 - plist2yaml
 - plist2syntax
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .travis.yml
 - Gemfile
 - Gemfile.lock
@@ -237,40 +223,37 @@ files:
 - spec/textpow/syntax_spec.rb
 - spec/textpow_spec.rb
 - textpow1x.gemspec
-has_rdoc: true
 homepage: http://github.com/grosser/textpow
-licenses: 
+licenses:
 - MIT
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-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: -225371251
+required_rubygems_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"
+      hash: -225371251
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A library for parsing TextMate bundles on ruby 1.x
 test_files: []
-