snippets_converter 0.1.2 → 0.1.3

data/README.rdoc

@@ -1,30 +1,42 @@
 = Snippets Converter
 
-Convert TextMate Snippets into Gedit, NetBeans and Ruble (Aptana RadRails 3) snippets.
+Convert TextMate Snippets into Gedit, NetBeans and Ruble (Aptana Studio/RadRails 3) snippets.
 
 == Install the gem
  sudo gem snippets_converter
 
-== How to use (for Ubuntu)
-* Open a terminal and go in your TextMate Bundle directory. Then run :
+== How to use (for Ubuntu and Ruby snippets)
+* Open a terminal and go in your TextMate Bundle directory. Then run
+
  snippets_converter netbeans|gedit|ruble
-* This will convert all your Snippets in a XML file into the "out" folder of your current directory.
+
+This will convert all your Snippets in a XML file into the "out" folder of your current directory.
 
 === Gedit
-Put the gedit_snippets.xml file into
+* Put the <language>.xml file into
 
  /home/username/.gnome2/gedit/snippets
 
+==== If you used GMate (http://github.com/gmate/gmate)
+
+* Open your <language>.xml file and check if the "language" attribute of "snippets" tag is correct
+
+ <snippets language="rubyonrails">
+
 === NetBeans
-Put the org-netbeans-modules-editor-settings-CustomCodeTemplates.xml file into
+* Put the org-netbeans-modules-editor-settings-CustomCodeTemplates.xml file into
 
- /home/username/.netbeans/6.8/config/Editors/text/x-ruby/CodeTemplates
+ /home/username/.netbeans/6.9/config/Editors/text/x-ruby/CodeTemplates
 
-=== Ruble
-Put the ruble_snippets.rb file into
+=== Ruble (Aptana Studio/RadRails 3)
+* Put the <language>_snippets.rb file into
 
  /home/username/Documents/Aptana Rubles/my_ruble.ruble/snippets
 
+* Open your <language>_snippets.rb file and check if the value of "scope" is correct
+
+ with_defaults :scope => "source.ruby" do |bundle|
+
 More info at https://radrails.tenderapp.com/faqs/radrails-3/ruble-programming-guide
 
 == Note on Patches/Pull Requests

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/snippets_converter/editors/netbeans.rb

@@ -5,8 +5,8 @@ module SnippetsConverter
       def editor_conversion(trigger, description, code)
         code.gsub!(/\$0/, '${cursor}')
         code.gsub!(/\$\{([0-9]{1,5}):((?>[^{}]+)|(\1))+\}/m, '${\1 default="\2"}')
+        code.gsub!(/(\$\{([0-9]{1,5}) default\=\".+\"\}.+)\$(\2)/m, '\1${\3}')
         code.gsub!(/\$([0-9]{1,5})/, '${tabStop\1 default=""}')
-
         return <<-CODE
   <codetemplate abbreviation='#{trigger}' xml:space='preserve'>
     <description><![CDATA[#{description}]]></description>

data/lib/snippets_converter.rb

@@ -84,25 +84,42 @@ module SnippetsConverter
 
     # Nested tab stops and place holders remover, e.g '${1: ${3:cool} $2 }' become ' ${3:cool} $2 '
     def transform_snippet(code)
-
-      # Nested tab stops, e.g '${1: $2 }'
-      nested_tab_stop = /((\$\{[0-9]{1,5}:[^${}]*)\$([0-9]{1,5})([^${}]*\}))+/m
-      code.gsub!(nested_tab_stop, '\2:nested_tab_stop\3:\4')
-
-      code.gsub!(/\$([0-9]{1,5})/, ':tab_stop\1:') # Tab Stop, e.g '$0'
-      code.gsub!(/\$([^{][^0-9]+[^:])/, ':dollar:\1') # Dollar, e.g. '$titi'
-
-      # Place holders, e.g. '${1: cool }'
-      place_holders = /\$\{((?>[^${}]+)|(\1))+\}/m
-      place_holders_matches = code.scan(place_holders)
-      place_holders_matches.flatten.each do |place_holder|
-        if place_holder
-          idx = place_holder.gsub(/([0-9]{1,5}):.+/,'\1')
-          code.gsub!(/\$\{#{place_holder}\}/m, ":place_holders#{idx}:")
+      # Transform TextMate snippets syntax into snippets converter internal codes, e.g. '$' become ':dollar:'
+      
+        # Nested tab stops, e.g '${1: $2 }'
+        nested_tab_stop = /((\$\{[0-9]{1,5}:[^${}]*)\$([0-9]{1,5})([^${}]*\}))+/m
+        code.gsub!(nested_tab_stop, '\2:nested_tab_stop\3:\4')
+
+        code.gsub!(/\$([0-9]{1,5})/, ':tab_stop\1:') # Tab Stop, e.g '$0'
+
+       # Unescape "$", "`" and "}" if there are in plain text or in the value of a variable
+        # More info at http://manual.macromates.com/en/snippets#plain_text and http://manual.macromates.com/en/snippets#variables
+        code.gsub!(/\\`/, ':escape_backtick:')
+        code.gsub!(/\\\$/, ':escape_dollar:')
+
+        i = 0
+        loop do
+          i += 1
+          break if !code.gsub!(/\{([^{}]*|[^{}]*\{[^{}]*\}[^{}]*)\\\}/, ':escape_bracket:\1:escape_close_bracket:') || i > 20
+        end        
+
+        code.gsub!(/\$([^{][^0-9]+[^:])/, ':dollar:\1') # Dollar, e.g. '$titi'
+
+        # Place holders, e.g. '${1: cool }'
+        place_holders = /\$\{((?>[^${}]+)|(\1))+\}/m
+        place_holders_matches = code.scan(place_holders)
+        place_holders_matches.flatten.each do |place_holder|
+          if place_holder
+            idx = place_holder.gsub(/([0-9]{1,5}):.+/,'\1')
+            code.gsub!(/\$\{#{place_holder}\}/m, ":place_holders#{idx}:")
+          end
         end
-      end
+        
 
-      # Nested place holders, e.g. '${1: ${3:cool} }'
+      #TODO Check if the regular expression in variables are correctly converted/supported
+      # More info at http://manual.macromates.com/en/regular_expressions.html
+
+      # Removed Nested place holders, e.g. '${1: ${3:cool} }' become ' ${3:cool} '
       nested_place_holders = /(\$\{[0-9]{1,5}:(([^${}]*(\$\{[0-9]{1,5}:|\{)[^${}]+\}[^${}]*)|[^${}]+)\})/m
       i = 0
       loop do
@@ -110,24 +127,37 @@ module SnippetsConverter
         break if !code.gsub!(nested_place_holders, '\2') || i > 20
       end
 
-      place_holders_matches.flatten.each do |place_holder|
-        if place_holder
-          idx = place_holder.gsub(/([0-9]{1,5}):.+/,'\1')
-          code.gsub!(/:place_holders#{idx}:/m, "\$\{#{place_holder}\}")
+      # Transform snippets converter internal codes into characters, e.g. ':dollar:' become '$'
+      
+        place_holders_matches.flatten.each do |place_holder|
+          if place_holder
+            idx = place_holder.gsub(/([0-9]{1,5}):.+/,'\1')
+            code.gsub!(/:place_holders#{idx}:/m, "\$\{#{place_holder}\}")
+          end
+        end
+     
+        # Nested tab stops
+        code.gsub!(/:nested_tab_stop([0-9]{1,5}):/, '$\1')
+        nested_tab_stop = /(\$\{[0-9]{1,5}:([^${}]*\$[0-9]{1,5}[^${}]*)\})+/m
+        i = 0
+        loop do
+          i += 1
+          break if !code.gsub!(nested_tab_stop, '\2') || i > 20
         end
-      end
 
-      # Nested tab stops
-      code.gsub!(/:nested_tab_stop([0-9]{1,5}):/, '$\1')
-      nested_tab_stop = /(\$\{[0-9]{1,5}:([^${}]*\$[0-9]{1,5}[^${}]*)\})+/m
-      i = 0
-      loop do
-        i += 1
-        break if !code.gsub!(nested_tab_stop, '\2') || i > 20
-      end
+        code.gsub!(/:tab_stop([0-9]{1,5}):/, '$\1')
+
+        code.gsub!(/:escape_backtick:/, '`')
+        code.gsub!(/:escape_dollar:/, '$')
+
+        i = 0
+        loop do
+          i += 1
+          break if !code.gsub!(/:escape_bracket:(.*):escape_close_bracket:/, '{\1}') || i > 20
+        end
 
-      code.gsub!(/:tab_stop([0-9]{1,5}):/, '$\1')
-      code.gsub!(/:dollar:/, '$')
+        code.gsub!(/:dollar:/, '$')      
+     
     end
 
     # Dummy methods, the current Editor module must override them

data/snippets_converter.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{snippets_converter}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nowhere Man"]
-  s.date = %q{2010-05-07}
+  s.date = %q{2010-06-17}
   s.default_executable = %q{snippets_converter}
   s.description = %q{Quick and dirty code to transform TextMate Snippets into Gedit, NetBeans and Ruble (Aptana Studio) snippets}
   s.email = %q{nowhereman@open_office}
@@ -41,19 +41,19 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/nowhereman/snippets_converter}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Convert TextMate Snippets Gedit, NetBeans and Ruble (Aptana Studio) Snippets.}
   s.test_files = [
-    "test/test_helper.rb",
+    "test/test_parse_tm_snippet.rb",
      "test/test_snippets_converter.rb",
-     "test/test_parse_tm_snippet.rb"
+     "test/test_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, ["< 3.0.0"])
     else
       s.add_dependency(%q<activesupport>, ["< 3.0.0"])
@@ -62,4 +62,3 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activesupport>, ["< 3.0.0"])
   end
 end
-

data/test/test_snippets_converter.rb

@@ -14,6 +14,9 @@ class TestSnippetsConverter < Test::Unit::TestCase
     @snippets << [ "${1: [ ${2: cool} ${3: guy { ${4:tralala} } } ] }", " [ ${2: cool}  guy { ${4:tralala} }  ] "]
     @snippets << [ 'should_have_db_column :${1:name}${2:, :${3:type} =&gt; ${4:"${5:string}"}${6:, :${7:default} =&gt; ${8:nil}}}', 'should_have_db_column :${1:name}, :${3:type} =&gt; "${5:string}", :${7:default} =&gt; ${8:nil}']
     @snippets << [ "should_have_db_indices :${1:object_id}${2:, [:${3:commentable_type}, :${4:commentable_id}]}$0", "should_have_db_indices :${1:object_id}, [:${3:commentable_type}, :${4:commentable_id}]$0" ]
+    @snippets << [ "${1: ${2: {:global => \\$COOL\\} } ${3: && \\`cd /\\`} }", " ${2: {:global => $COOL} } ${3: && `cd /`} "]
+    @snippets << [ "${1: cool} ${2: {:global => ${3:\\`cd /\\`} \\} }", "${1: cool}  {:global => ${3:`cd /`} } "]
+    @snippets << [ "${1: ${2: {:global => { :hash1 => \\`cd /\\` \\} \\} } }", " ${2: {:global => { :hash1 => `cd /` } } } "]
 
     snippet = 'context "${1:description}" do
   ${2:setup do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: snippets_converter
 version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Nowhere Man
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-07 00:00:00 +02:00
+date: 2010-06-17 00:00:00 +02:00
 default_executable: snippets_converter
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - <
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
@@ -69,27 +72,31 @@ 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"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Convert TextMate Snippets Gedit, NetBeans and Ruble (Aptana Studio) Snippets.
 test_files: 
-- test/test_helper.rb
-- test/test_snippets_converter.rb
 - test/test_parse_tm_snippet.rb
+- test/test_snippets_converter.rb
+- test/test_helper.rb