textpow1x 1.2.4 → 1.2.5

data/.travis.yml

@@ -1,4 +1,4 @@
-before_script:
+before_install:
   - sudo apt-get install -y libonig-dev && bundle install
 script: "bundle exec rake"
 rvm:

data/Gemfile.lock

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

data/README.rdoc

@@ -76,6 +76,7 @@ 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
+* smart + mel + applescript have some invalid utf8 characters that are currently ignored (search for INVALID_UTF8))
 * fix markdown and php syntax
 * parse text plist files {example}[https://raw.github.com/kangax/textmate-js-language-syntax-file/master/JavaScript.plist]
 * update more languages via github urls

data/lib/textpow/syntax.rb

@@ -90,17 +90,7 @@ module Textpow
       table.each do |key, value|
         case key
         when "firstLineMatch", "foldingStartMarker", "foldingStopMarker", "match", "begin"
-          begin
-            regex = if Textpow::RUBY_19
-              value.force_encoding("ASCII-8BIT")
-              Regexp.new(value)
-            else
-              Oniguruma::ORegexp.new(value, :options => Oniguruma::OPTION_CAPTURE_GROUP)
-            end
-            instance_variable_set("@#{key}", regex)
-          rescue RegexpError, ArgumentError => e
-            raise ParsingError, "Parsing error in #{value}: #{e.to_s}"
-          end
+          instance_variable_set("@#{key}", parse_regex(value))
         when "content", "fileTypes", "name", "contentName", "end", "scopeName", "keyEquivalent"
           instance_variable_set("@#{key}", value)
         when "captures", "beginCaptures", "endCaptures"
@@ -116,6 +106,27 @@ module Textpow
       end
     end
 
+    def parse_regex(value)
+      if Textpow::RUBY_19
+        parse_regex_with_invalid_chars(value)
+      else
+        Oniguruma::ORegexp.new(value, :options => Oniguruma::OPTION_CAPTURE_GROUP)
+      end
+    rescue RegexpError, ArgumentError => e
+      raise ParsingError, "Parsing error in #{value}: #{e.to_s}"
+    end
+
+    def parse_regex_with_invalid_chars(value)
+      Regexp.new(value.force_encoding('UTF-8'))
+    rescue RegexpError => e
+      if e.message =~ /UTF-8/ or e.message =~ /invalid multibyte escape/
+        puts "Ignored utf8 regex error #{$!}"
+        /INVALID_UTF8/
+      else
+        raise e
+      end
+    end
+
     # register in global syntax list -> can be found by include
     def register_in_syntaxes(scope)
       @@syntaxes[@name_space] ||= {}
@@ -124,7 +135,6 @@ module Textpow
 
     def self.convert_file_to_table(file)
       raise "File not found: #{file}" unless File.exist?(file)
-
       case file
       when /(\.tmSyntax|\.plist)$/
         require 'plist'

data/lib/textpow/version.rb

@@ -1,3 +1,3 @@
 module Textpow
-  VERSION = Version = "1.2.4"
+  VERSION = Version = "1.2.5"
 end

data/spec/fixtures/utf8.txt

@@ -0,0 +1 @@
+ü

data/spec/textpow/syntax_files_spec.rb

@@ -10,9 +10,13 @@ describe "syntax files" do
   end
 
   Dir["#{Textpow.syntax_path}/*.syntax"].each do |syntax|
-    it "#{syntax} can parse" do
+    it "can parse with #{syntax}" do
       Textpow.syntax(syntax).parse("xxx\n1 + 1\n### xxx")
     end
+
+    it "can parse UTF-8 with #{syntax}" do
+      Textpow.syntax(syntax).parse(File.read("spec/fixtures/utf8.txt"))
+    end
   end
 
   xit "parses markdown" do

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: textpow1x
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 1.2.5
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 4
-  version: 1.2.4
 platform: ruby
-authors: 
+authors:
 - Dizan Vasquez
 - Spox
 - Chris Hoffman
@@ -17,37 +12,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-02 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-05-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: !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
-  name: plist
-  version_requirements: *id001
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.1
 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
@@ -231,46 +222,51 @@ files:
 - lib/textpow/syntax/text.xml.xsl.syntax
 - lib/textpow/version.rb
 - spec/fixtures/objeck.plist
+- spec/fixtures/utf8.txt
 - spec/spec_helper.rb
 - spec/textpow/score_manager_spec.rb
 - spec/textpow/syntax_files_spec.rb
 - 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: -742741068401622208
+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: -742741068401622208
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A library for parsing TextMate bundles on ruby 1.x
-test_files: []
-
+test_files:
+- spec/fixtures/objeck.plist
+- spec/fixtures/utf8.txt
+- spec/spec_helper.rb
+- spec/textpow/score_manager_spec.rb
+- spec/textpow/syntax_files_spec.rb
+- spec/textpow/syntax_spec.rb
+- spec/textpow_spec.rb