RubyGems - ripper2ruby - Versions diffs - 0.0.1 → 0.0.2 - Mend

ripper2ruby 0.0.1 → 0.0.2

Files changed (7) hide show

data/lib/ripper/ruby_builder.rb +20 -9
data/lib/ruby/statements.rb +1 -1
data/test/builder/source_test.rb +35 -0
data/test/fixtures/template.iso-8859-1.html.erb +6 -0
metadata +8 -8
data/MIT-LICENSE +0 -20
data/README.markdown +0 -10

@@ -7,6 +7,8 @@ require 'core_ext/array/flush'
 require 'ripper/ruby_builder/token'
 require 'ripper/ruby_builder/stack'
+require 'erb/stripper'
 Dir[File.dirname(__FILE__) + '/ruby_builder/events/*.rb'].each { |file| require file }
 # Ripper::RubyBuilder extends Ripper's SexpBuilder and builds a rich, object
@@ -25,10 +27,16 @@ class Ripper
     class ParseError < RuntimeError
     end
+    @@filters = [lambda { |src, file| file && File.extname(file) == '.erb' ? Erb::Stripper.new.to_ruby(src) : src }]
     class << self
       def build(src, filename = nil)
         new(src, filename).parse
       end
+      def filters
+        @@filters
+      end
     end
     NEWLINE           = [:@nl, :@ignored_nl]
@@ -63,17 +71,27 @@ class Ripper
     def initialize(src, filename = nil, lineno = nil)
       @src = src ||= filename && File.read(filename) || ''
-      @src.gsub!(/([\s\n]*)\Z/) { |s| @trailing_whitespace = Ruby::Whitespace.new(s) and nil }
       @filename = filename
       @stack = []
       @stack = Stack.new
       @string_stack = []
+      src.gsub!(/([\s\n]*)\Z/) { |s| @trailing_whitespace = Ruby::Whitespace.new(s) and nil }
+      src = filter(src, filename)
       super
+    rescue ArgumentError => e
+      p filename
+      raise e
     end
     protected
+      def filter(src, filename)
+        self.class.filters.each { |filter| src = filter.call(src, filename) }
+        src
+      end
       def position
         Ruby::Node::Position.new(lineno.to_i - 1, column)
       end
@@ -129,7 +147,7 @@ class Ripper
       def pop_assignment_operator(options = {})
         pop_token(*ASSIGN_OPERATORS, options)
       end
       def pop_end_data
         token = pop_token(:@__end__)
         token.token = Ruby::Node::Text::Clip.new(src, token.position).to_s if token # TODO clean up
@@ -157,12 +175,5 @@ class Ripper
           Ruby::ExecutableString.new(nil, build_token(token))
         end
       end
-      # def extract_src(from, to)
-      #   lines = Ruby::Node::Text.split(src)
-      #   lines[from.row] = lines[from.row][from.col..-1] # || ''
-      #   lines[to.row] = lines[to.row][0, to.col]
-      #   lines[from.row..to.row].join
-      # end
   end
 end

data/lib/ruby/statements.rb CHANGED

@@ -10,7 +10,7 @@ module Ruby
     attr_accessor :filename
     attr_writer :src
-    def initialize(src, filename, statements, end_data)
+    def initialize(src, filename, statements = [], end_data = nil)
       self.src = src
       self.filename = filename if filename
       self.end_data = end_data if end_data

data/test/builder/source_test.rb ADDED

@@ -0,0 +1,35 @@
+require File.dirname(__FILE__) + '/../test_helper'
+class BuildSourceTest < Test::Unit::TestCase
+  include TestHelper
+  define_method :"test original erb source should be still available to the node" do
+    src = "<html>\n<body>\n<%= t(:foo) -%>\n</body>\n</html>"
+    node = build(src, 'foo.erb')
+    assert_equal src, node.src
+    assert_equal 't(:foo)', node.select(Ruby::Call).first.src
+    assert_equal 0, node.select(Ruby::Call).first.context(:width => 1).index('<body>')
+  end
+  define_method :"test ruby 1.9 encodings are confusing" do
+    filename = File.dirname(__FILE__) + '/../fixtures/template.iso-8859-1.html.erb'
+    src = File.read(filename)
+    assert_equal 'UTF-8', src.encoding.name
+    assert_equal false, src.valid_encoding?
+    # src = File.open('iso-8859-1.rb', 'rb:binary') { |f| f.read }
+    # p src.encoding.name
+    # p src.valid_encoding?
+    # puts src
+    # src.set_encoding('iso-8859-1')
+    # p src.encoding.name
+    # p src.valid_encoding?
+    # p src
+    # src = "<html>\n<body><h1>überschrift</h1>\n<%= t(:foo) -%>\n</body>\n</html>"
+    # src.force_encoding("iso-8859-1")
+    # build(src, 'foo.erb')
+  end
+end

data/test/fixtures/template.iso-8859-1.html.erb ADDED

@@ -0,0 +1,6 @@
+<html>
+<body>
+	<h1>�berschrift</h1>
+	<%= t(:foo) %>
+</body>
+</html>

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ripper2ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Sven Fuchs
@@ -29,7 +29,6 @@ files:
 - lib/erb/stripper.rb
 - lib/highlighters/ansi.rb
 - lib/ripper/event_log.rb
-- lib/ripper/ruby_builder.rb
 - lib/ripper/ruby_builder/buffer.rb
 - lib/ripper/ruby_builder/events/args.rb
 - lib/ripper/ruby_builder/events/array.rb
@@ -53,8 +52,8 @@ files:
 - lib/ripper/ruby_builder/queue.rb
 - lib/ripper/ruby_builder/stack.rb
 - lib/ripper/ruby_builder/token.rb
+- lib/ripper/ruby_builder.rb
 - lib/ripper2ruby.rb
-- lib/ruby.rb
 - lib/ruby/aggregate.rb
 - lib/ruby/alternation/args.rb
 - lib/ruby/alternation/hash.rb
@@ -73,13 +72,13 @@ files:
 - lib/ruby/list.rb
 - lib/ruby/literal.rb
 - lib/ruby/method.rb
-- lib/ruby/node.rb
 - lib/ruby/node/composite.rb
 - lib/ruby/node/conversions.rb
 - lib/ruby/node/position.rb
 - lib/ruby/node/source.rb
 - lib/ruby/node/text.rb
 - lib/ruby/node/traversal.rb
+- lib/ruby/node.rb
 - lib/ruby/operator.rb
 - lib/ruby/params.rb
 - lib/ruby/statements.rb
@@ -87,8 +86,7 @@ files:
 - lib/ruby/symbol.rb
 - lib/ruby/token.rb
 - lib/ruby/while.rb
-- MIT-LICENSE
-- README.markdown
+- lib/ruby.rb
 has_rdoc: false
 homepage: http://github.com/svenfuchs/ripper2ruby
 licenses: []
@@ -119,6 +117,7 @@ specification_version: 2
 summary: Ripper2Ruby builds an object-oriented representation of Ruby code that you can modify and recompile back to Ruby
 test_files:
 - test/all.rb
+- test/builder/source_test.rb
 - test/builder/stack_test.rb
 - test/builder/text_test.rb
 - test/context_test.rb
@@ -128,10 +127,11 @@ test_files:
 - test/fixtures/source_2.rb
 - test/fixtures/stuff.rb
 - test/fixtures/template.html.erb
+- test/fixtures/template.iso-8859-1.html.erb
 - test/fixtures/tmp.rb
-- test/libs.txt
 - test/lib_test.rb
 - test/lib_test_helper.rb
+- test/libs.txt
 - test/nodes/args_test.rb
 - test/nodes/array_test.rb
 - test/nodes/assignment_test.rb
@@ -149,8 +149,8 @@ test_files:
 - test/nodes/literals_test.rb
 - test/nodes/method_test.rb
 - test/nodes/namespaces_test.rb
-- test/nodes/nodes_test.rb
 - test/nodes/node_test.rb
+- test/nodes/nodes_test.rb
 - test/nodes/operator_test.rb
 - test/nodes/separators_test.rb
 - test/nodes/statements_test.rb

data/MIT-LICENSE DELETED

@@ -1,20 +0,0 @@
-Copyright (c) 2009 Sven Fuchs <svenfuchs@artweb-design.de>
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.markdown DELETED

@@ -1,10 +0,0 @@
-Ripper2Ruby
-===========
-Similar to ruby2ruby this library allows to parse Ruby code, modify and
-recompile it back to Ruby.
-Differences:
-* uses Ripper for parsing (shipped with Ruby 1.9)
-* produces a full object-oriented representation of the Ruby code