haml2erb 0.2.1 → 0.3.0.pre

data/.gitignore

@@ -0,0 +1,4 @@
+*.gem
+.bundle
+Gemfile.lock
+pkg/*

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in haml2erb.gemspec
+gemspec

data/{LICENSE → MIT_LICENSE}

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2011 Chris Goddard, Louis Sivillo
+Copyright (c) 2006-2011 Elia Schito
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -0,0 +1,40 @@
+# haml2erb
+
+haml2erb is a tool for converting [Haml](http://haml-lang.com/) to Erb markup.
+
+
+## Installing and loading haml2erb
+
+haml2erb is currently distributed as a Rails plugin.
+
+Simply move the main haml2erb directory into the vendor/plugins directory of your Rails application.
+
+
+## Using haml2erb
+
+Use the `haml2erb` command line or from Ruby call the `Haml2Erb.convert` method to have Haml markup translated into Erb.
+
+### Example: Simple conversion
+
+```bash
+  echo '.foo' | haml2erb
+  # <div class='foo'></div>
+```
+
+```ruby
+  Haml2Erb.convert('.foo')
+  # => "<div class='foo'></div>\n"
+```
+
+
+## License
+
+[MIT_LICENSE](/elia/haml2erb/blob/master/MIT_LICENSE)
+
+
+## Credits
+
+For the [original implementation](https://github.com/c1sgo/haml2erb): 
+
+[Chris Goddard](https://github.com/cgoddard)
+[Louis Sivillo](https://github.com/BeaconInteractive)

data/Rakefile

@@ -0,0 +1 @@
+require "bundler/gem_tasks"

data/bin/haml2erb

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+# coding: utf-8
+
+require 'haml2erb'
+
+if ARGV.any? {|arg| not File.file? arg}
+  puts <<-USAGE
+Usage:
+  #{$0} <input-file> <output-file>  # overwrites <output-file>
+  #{$0} <input-file>                # output to stdout
+  #{$0}                             # input from stdin, output to stdout
+  USAGE
+end
+
+haml_file, erb_file = *ARGV
+input  = haml_file ? File.open(haml_file)     : $stdin
+output = erb_file  ? File.open(erb_file, 'w') : $stdout
+
+output.write Haml2Erb.convert(input.read)

data/haml2erb.gemspec

@@ -1,23 +1,28 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib/', __FILE__)
-$:.unshift lib unless $:.include?(lib)
-
+# coding: utf-8
+$:.push File.expand_path('../lib', __FILE__)
 require 'haml2erb/version'
 
 Gem::Specification.new do |s|
-  s.name = "haml2erb"
-  s.version = Haml2Erb::VERSION
-  s.platform = Gem::Platform::RUBY
-  s.authors = 'Louis Sivillo'
-  s.email = ['louis.sivillo@gmail.com']
+  s.name        = 'haml2erb'
+  s.version     = Haml2Erb::VERSION
+  s.authors     = ['Elia Schito']
+  s.email       = ['perlelia@gmail.com']
+  s.homepage    = ''
+  s.summary     = %q{Convert Haml templates to Erb!}
+  s.description = %q{Converts Haml templates to Erb templates using the official Haml::Engine}
+
+  s.rubyforge_project = 'haml2erb'
 
-  s.summary = 'Haml to ERB Converter'
-  s.description = 'Haml to ERB Converter'
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ['lib']
 
-  s.required_rubygems_version = ">= 1.3.6"
+  # specify any dependencies here; for example:
+  # s.add_development_dependency "rspec"
+  # s.add_runtime_dependency "rest-client"
 
-  s.files = `git ls-files`.split("\n")
-  s.require_paths = ["lib"]
-  
-  s.add_dependency 'mixology'
+  s.add_runtime_dependency     'haml', '~> 3.1.3'
+  s.add_development_dependency 'rspec', '~> 2.0'
+  s.add_development_dependency 'rake'
 end

data/lib/haml2erb.rb

@@ -1,15 +1,8 @@
-require 'haml2erb/railtie' if defined?(Rails::Railtie)
-require 'haml2erb/erb_writer'
-require 'haml2erb/parser'
 require 'haml2erb/version'
+require 'haml2erb/engine'
 
 module Haml2Erb
-    
-  def self.convert(text)
-    parser = Haml2Erb::HamlParser.new
-    writer = Haml2Erb::ErbWriter.new
-    parser.parse(text, writer)
-    writer.output_to_string
+  def self.convert template, options = {}
+    Engine.new(template, {:format => :html5}.merge(options)).to_erb
   end
-  
-end
+end

data/lib/haml2erb/engine.rb

@@ -0,0 +1,145 @@
+require 'haml'
+
+module Haml2Erb
+
+  # puts RUBY_VERSION
+
+  class Engine < Haml::Engine
+    def push_silent(text, can_suppress = false)
+      flush_merged_text
+      return if can_suppress && options[:suppress_eval]
+      # WAS:
+      # @precompiled << "#{resolve_newlines}#{text}\n"
+      # @output_line += text.count("\n") + 1
+
+      push_script(text,
+        :preserve_script => @node.value[:preserve],
+        :escape_html => @node.value[:escape_html],
+        :silent => true)
+    end
+
+    def compile_haml_comment
+      text = @node.value[:text]
+      return if text.empty?
+
+      push_script(text,
+        :preserve_script => @node.value[:preserve],
+        :escape_html => @node.value[:escape_html],
+        :silent => true, :comment => true)
+    end
+
+    def compile_silent_script
+      return if @options[:suppress_eval]
+      keyword = @node.value[:keyword]
+      @output_tabs -= 1 if Haml::Parser::MID_BLOCK_KEYWORDS.include?(keyword)
+
+      push_silent(@node.value[:text])
+      ruby_block = block_given? && !keyword
+
+
+      if block_given?
+        # Store these values because for conditional statements,
+        # we want to restore them for each branch
+        @node.value[:dont_indent_next_line] = @dont_indent_next_line
+        @node.value[:dont_tab_up_next_text] = @dont_tab_up_next_text
+
+        @output_tabs += 1
+        yield
+        @output_tabs -= 1
+
+        push_silent("end", :can_suppress) unless @node.value[:dont_push_end]
+      elsif keyword == "end"
+        if @node.parent.children.last.equal?(@node)
+          # Since this "end" is ending the block,
+          # we don't need to generate an additional one
+          @node.parent.value[:dont_push_end] = true
+        end
+        # Don't restore dont_* for end because it isn't a conditional branch.
+      elsif Haml::Parser::MID_BLOCK_KEYWORDS.include?(keyword)
+        @output_tabs += 1
+
+        # Restore dont_* for this conditional branch
+        @dont_indent_next_line = @node.parent.value[:dont_indent_next_line]
+        @dont_tab_up_next_text = @node.parent.value[:dont_tab_up_next_text]
+      end
+    end
+
+    def push_script text, opts={}
+      tag_lead = opts[:silent] ? '' : '='
+      tag_lead << '#' if opts[:comment]
+      erb_tag = "<%#{tag_lead} #{text.strip} %>"
+
+      # USED TO START HERE:
+      return if options[:suppress_eval]
+
+      args = %w[preserve_script in_tag preserve_tag escape_html nuke_inner_whitespace]
+      args.map! {|name| opts[name.to_sym]}
+      args << !block_given? << @options[:ugly]
+
+      no_format = @options[:ugly] &&
+        !(opts[:preserve_script] || opts[:preserve_tag] || opts[:escape_html])
+      output_expr = "(#{text}\n)"
+      static_method = "_hamlout.#{static_method_name(:format_script, *args)}"
+
+      # Prerender tabulation unless we're in a tag
+      push_merged_text '' unless opts[:in_tag]
+
+      unless block_given?
+        # WAS: push_generated_script(no_format ? "#{text}\n" : "#{static_method}(#{output_expr});")
+        push_generated_script(erb_tag.inspect)
+
+        concat_merged_text("\n") unless opts[:in_tag] || opts[:nuke_inner_whitespace]
+
+        # push_generated_script(erb_tag.inspect)
+        # 
+        # concat_merged_text("\n") unless opts[:in_tag] || opts[:nuke_inner_whitespace]
+
+        # @output_tabs += 1
+        return
+      end
+
+      flush_merged_text
+      push_generated_script erb_tag.inspect
+      concat_merged_text("\n") unless opts[:in_tag] || opts[:nuke_inner_whitespace]
+      
+      # push_silent text
+
+      @output_tabs += 1 unless opts[:nuke_inner_whitespace]
+      yield
+      @output_tabs -= 1 unless opts[:nuke_inner_whitespace]
+
+      push_silent('end', :can_suppress) unless @node.value[:dont_push_end]
+      # COMMENTED: @precompiled << "_hamlout.buffer << #{no_format ? "haml_temp.to_s;" : "#{static_method}(haml_temp);"}"
+      concat_merged_text("\n") unless opts[:in_tag] || opts[:nuke_inner_whitespace] || @options[:ugly]
+    end
+
+    def to_erb(scope = Object.new, locals = {}, &block)
+      buffer = Haml::Buffer.new(scope.instance_variable_get('@haml_buffer'), options_for_buffer)
+
+      if scope.is_a?(Binding) || scope.is_a?(Proc)
+        scope_object = eval("self", scope)
+        scope = scope_object.instance_eval{binding} if block_given?
+      else
+        scope_object = scope
+        scope = scope_object.instance_eval{binding}
+      end
+
+      set_locals(locals.merge(:_hamlout => buffer, :_erbout => buffer.buffer), scope, scope_object)
+
+      scope_object.instance_eval do
+        extend Haml::Helpers
+        @haml_buffer = buffer
+      end
+
+      eval(precompiled + ";" + precompiled_method_return_value,
+        scope, @options[:filename], @options[:line])
+    ensure
+      # Get rid of the current buffer
+      scope_object.instance_eval do
+        @haml_buffer = buffer.upper if buffer
+      end
+    end
+
+  end
+
+end

data/lib/haml2erb/version.rb

@@ -1,3 +1,3 @@
 module Haml2Erb
-  VERSION = "0.2.1"
-end
+  VERSION = '0.3.0.pre'
+end

data/spec/haml2erb_spec.rb

@@ -0,0 +1,83 @@
+require 'spec_helper'
+
+haml = %{
+!!!
+%html(lang="en")
+  %head
+    - ciao
+    - if 3
+      = pippo
+    - else
+      = caio
+
+    %meta(charset="utf-8")
+    %meta(content="IE=edge,chrome=1" http-equiv="X-UA-Compatible")
+    = csrf_meta_tags
+
+    %title Doomboard!
+
+    / Mobile viewport optimized: j.mp/bplateviewport
+    %meta(content="width=device-width,initial-scale=1" name="viewport")
+
+    = javascript_include_tag 'http://js.pusherapp.com/1.9/pusher.min.js'
+    = stylesheet_link_tag    'application'
+    = javascript_include_tag 'application'
+
+  %body
+    %aside.left
+      %section#leaderboard(data-widget="leaderboard")
+      %section#dr_doomboard(data-widget="dr_doomboard")
+
+    %section#projects
+      - [1,2,3].each do |n|
+        = n
+      - 1234
+    %aside.right
+      %section#tweets(data-widget="twitter")
+      %section#hammurabi
+}
+
+erb = %{<!DOCTYPE html>
+<html lang='en'>
+  <head>
+    <% ciao %>
+    <% if 3 %>
+      <%= pippo %>
+    <% else %>
+      <%= caio %>
+    <% end %>
+    <meta charset='utf-8'>
+    <meta content='IE=edge,chrome=1' http-equiv='X-UA-Compatible'>
+    <%= csrf_meta_tags %>
+    <title>Doomboard!</title>
+    <!-- Mobile viewport optimized: j.mp/bplateviewport -->
+    <meta content='width=device-width,initial-scale=1' name='viewport'>
+    <%= javascript_include_tag 'http://js.pusherapp.com/1.9/pusher.min.js' %>
+    <%= stylesheet_link_tag    'application' %>
+    <%= javascript_include_tag 'application' %>
+  </head>
+  <body>
+    <aside class='left'>
+      <section data-widget='leaderboard' id='leaderboard'></section>
+      <section data-widget='dr_doomboard' id='dr_doomboard'></section>
+    </aside>
+    <section id='projects'>
+      <% [1,2,3].each do |n| %>
+        <%= n %>
+      <% end %>
+      <% 1234 %>
+    </section>
+    <aside class='right'>
+      <section data-widget='twitter' id='tweets'></section>
+      <section id='hammurabi'></section>
+    </aside>
+  </body>
+</html>
+}
+
+
+describe 'haml2erb' do
+  it 'converts to ERB' do
+    Haml2Erb.convert(haml).should eq(erb)
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,3 @@
+$:.push File.expand_path('../../lib')
+
+require 'haml2erb'

metadata

@@ -1,59 +1,91 @@
 --- !ruby/object:Gem::Specification 
 name: haml2erb
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 961915996
+  prerelease: 6
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  - pre
+  version: 0.3.0.pre
 platform: ruby
 authors: 
-- Louis Sivillo
+- Elia Schito
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-04-08 00:00:00 -04:00
-default_executable: 
+date: 2011-11-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: mixology
-  prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        - 1
+        - 3
+        version: 3.1.3
+  prerelease: false
+  name: haml
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  prerelease: false
+  name: rspec
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
-description: Haml to ERB Converter
+  prerelease: false
+  name: rake
+  version_requirements: *id003
+description: Converts Haml templates to Erb templates using the official Haml::Engine
 email: 
-- louis.sivillo@gmail.com
-executables: []
-
+- perlelia@gmail.com
+executables: 
+- haml2erb
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
-- LICENSE
-- README.rdoc
+- .gitignore
+- Gemfile
+- MIT_LICENSE
+- README.md
+- Rakefile
+- bin/haml2erb
 - haml2erb.gemspec
 - lib/haml2erb.rb
-- lib/haml2erb/erb_writer.rb
-- lib/haml2erb/lexer.rb
-- lib/haml2erb/mixins/comerging.rb
-- lib/haml2erb/parser.rb
-- lib/haml2erb/railtie.rb
-- lib/haml2erb/tokens.rb
+- lib/haml2erb/engine.rb
 - lib/haml2erb/version.rb
-- tasks/haml2erb.rake
-has_rdoc: true
-homepage: 
+- spec/haml2erb_spec.rb
+- spec/spec_helper.rb
+homepage: ""
 licenses: []
 
 post_install_message: 
@@ -66,25 +98,28 @@ required_ruby_version: !ruby/object:Gem::Requirement
   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: 25
       segments: 
       - 1
       - 3
-      - 6
-      version: 1.3.6
+      - 1
+      version: 1.3.1
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubyforge_project: haml2erb
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Haml to ERB Converter
-test_files: []
-
+summary: Convert Haml templates to Erb!
+test_files: 
+- spec/haml2erb_spec.rb
+- spec/spec_helper.rb

data/README.rdoc

@@ -1,58 +0,0 @@
-= haml2erb Rails Plugin
-
-haml2erb is a tool for converting {Haml markup}[http://haml-lang.com/] to Erb markup.
-
-<b>Latest version:</b> 0.2.0
-
-* API documentation (coming soon)
-* {Source code} [http://github.com/cgoddard/haml2erb/]
-* {Bug tracker} [http://github.com/cgoddard/haml2erb/issues]
-
-Tested on Ruby 1.9.1 and Ruby 1.8.7
-
-=== Installing and loading haml2erb
-
-haml2erb is currently distributed as a Rails plugin.
-
-Simply move the main haml2erb directory into the vendor/plugins directory of your Rails application.
-
-=== Using haml2erb
-
-From the Rails console or application, call the Haml2Erb.convert method to have haml
-markup translated into erb.
-
-==== Example: Simple conversion
-  Haml2Erb.convert('.foo')
-  # => "<div class='foo'>\n</div>\n"
-
-=== Not supported yet
-
-Parsing of tag internal string interpolations, such as:
-#my_div{ class: "box #{extra_classes}" }
-
-Coming soon though ...
-
-== Licenses
-
-==== haml2erb code and documentation (MIT license)
-
-  Copyright (c) 2010 Chris Goddard
-  
-  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/lib/haml2erb/erb_writer.rb

@@ -1,51 +0,0 @@
-module Haml2Erb
-  class ErbWriter
-
-    def initialize
-      @processed = ''
-      @tag_stack = [ ]
-    end
-
-    def <<(line_options)
-
-      close_tags(line_options[:indent])
-      @tag_stack.push(line_options[:element_type]) if line_options[:element_type]
-
-      @processed << ("  " * line_options[:indent]) if line_options[:indent]
-      @processed << "<#{line_options[:element_type].to_s}" if line_options[:element_type]
-      @processed << " id='#{line_options[:element_id].to_s}'" if line_options[:element_id]
-      @processed << " class='#{[*line_options[:element_class]].join(' ')}'" if line_options[:element_class]
-      line_options[:element_attributes] && line_options[:element_attributes].keys.each do |attribute_key|
-        @processed << " #{attribute_key}='#{line_options[:element_attributes][attribute_key]}'"
-      end
-      @processed << ">" if line_options[:element_type]
-
-      case(line_options[:content_type])
-      when :text
-        @processed << (line_options[:contents] || "")
-      when :ruby
-        @processed << ("<%= " + line_options[:contents] + " %>")
-      when :mixed
-        @processed << ('<%= "' + line_options[:contents] + '" %>')
-      end
-
-      close_tags(line_options[:indent], :separate_line => false) if line_options[:contents]
-      @processed << "\n"
-    end
-
-    def output_to_string
-      close_tags(0)
-      @processed
-    end
-
-    private
-
-    def close_tags(current_indent, options = { :separate_line => true })
-      while(@tag_stack.size > current_indent)
-        @processed << ("  " * (@tag_stack.size - 1)) if options[:separate_line] == true
-        @processed << "</#{@tag_stack.pop.to_s}>"
-        @processed << "\n" if options[:separate_line] == true
-      end
-    end
-  end
-end

data/lib/haml2erb/lexer.rb

@@ -1,28 +0,0 @@
-require 'haml2erb/tokens'
-
-module Haml2Erb
-  class HamlLexer
-
-    attr_reader :input
-
-    def load_input(text)
-      @input = text
-    end
-
-    def peek(klass)
-      #puts "peek #{klass} #{@input}"
-      klass.match(@input)
-    end
-
-    def pop(klass)
-      #puts "pop #{klass} #{@input}"
-      token = klass.match(@input)
-      @input.gsub!(/^#{Regexp.escape(token.matched)}/, '') # removed matched portion from the string
-      token
-    end
-
-    def end_input?
-      @input.strip.empty? ? true : false
-    end
-  end
-end

data/lib/haml2erb/mixins/comerging.rb

@@ -1,22 +0,0 @@
-module Haml2Erb
-  module Mixins
-    module CoMerging
-      def comerge
-        # NOT IMPLEMENTED YET
-        fail "comerge command not implemented yet"
-      end
-
-      # inclusive merge that combines results of two hashes when merging
-      def comerge! hash_b
-        hash_a = self
-        hash_b.respond_to?(:each_pair) && hash_b.each_pair do |k,v|
-          hash_a[k] = hash_a[k] ?
-            (hash_a[k].respond_to?(:push) ?
-              hash_a[k].push(v) :
-              [ hash_a[k], v ]) :
-            v
-        end
-      end
-    end
-  end
-end

data/lib/haml2erb/parser.rb

@@ -1,69 +0,0 @@
-require 'haml2erb/lexer'
-require 'haml2erb/tokens'
-require 'haml2erb/mixins/comerging'
-require 'mixology'
-
-module Haml2Erb
-  class HamlParser
-
-    ParsingError = Class.new(StandardError)
-
-    def initialize
-      @lexer = Haml2Erb::HamlLexer.new
-    end
-
-    def parse(unprocessed, writer)
-      @line_number = 0
-      # process incoming text one line at a time
-      unprocessed.each_line do |line|
-        @line_number += 1
-        options = { }.mixin Haml2Erb::Mixins::CoMerging
-        @lexer.load_input(line)
-
-        # handle indent
-        if(@lexer.peek(Haml2Erb::Tokens::Indent))
-          options.merge!(@lexer.pop(Haml2Erb::Tokens::Indent).options)
-        end
-        options.merge!(:indent => 0) unless options[:indent]
-
-        # handle initial tag attributes
-        while(@lexer.peek(Haml2Erb::Tokens::InitialAttribute))
-          options.comerge!(@lexer.pop(Haml2Erb::Tokens::InitialAttribute).options)
-        end
-        options[:element_type] = :div if((options[:element_id] || options[:element_class]) && !options[:element_type])
-
-        # handle interior element attributes
-        if(@lexer.peek(Haml2Erb::Tokens::AttributesStart))
-          @lexer.pop(Haml2Erb::Tokens::AttributesStart)
-          options[:element_attributes] = { }
-          while(!@lexer.peek(Haml2Erb::Tokens::AttributesEnd))
-            if(@lexer.peek(Haml2Erb::Tokens::InnerAttributeQuoted))
-              options[:element_attributes].merge!(@lexer.pop(Haml2Erb::Tokens::InnerAttributeQuoted).options[:element_attribute])
-            elsif(@lexer.peek(Haml2Erb::Tokens::InnerAttributeRuby))
-              options[:element_attributes].merge!(@lexer.pop(Haml2Erb::Tokens::InnerAttributeRuby).options[:element_attribute])
-            elsif(@lexer.peek(Haml2Erb::Tokens::InnerAttributeNumber))
-              options[:element_attributes].merge!(@lexer.pop(Haml2Erb::Tokens::InnerAttributeNumber).options[:element_attribute])
-            else
-              raise 'unrecognized inner attribute'
-            end
-          end
-          @lexer.pop(Haml2Erb::Tokens::AttributesEnd)
-        end
-
-        # handle element contents
-        if(@lexer.peek(Haml2Erb::Tokens::ContentsStart))
-          options.merge!(@lexer.pop(Haml2Erb::Tokens::ContentsStart).options)
-        end
-        options[:content_type] = :text unless options[:content_type]
-
-        if(@lexer.peek(Haml2Erb::Tokens::Contents))
-          options.merge!(:contents => @lexer.pop(Haml2Erb::Tokens::Contents).matched)
-        end
-
-        writer << options
-      end
-    rescue => error
-      raise ParsingError, "Haml2Erb had trouble parsing line #{@line_number} with input '#{@lexer.input}' remaining: #{error.to_s}", error.backtrace
-    end
-  end
-end

data/lib/haml2erb/railtie.rb

@@ -1,7 +0,0 @@
-module Haml2Erb
-  class Railtie < Rails::Railtie
-    rake_tasks do
-      load File.join(File.dirname(__FILE__), '..', '..', 'tasks/haml2erb.rake')
-    end
-  end
-end

data/lib/haml2erb/tokens.rb

@@ -1,110 +0,0 @@
-module Haml2Erb
-  module Tokens
-
-    class Token
-      attr_reader :options, :matched
-
-      def initialize(matched, options = {})
-        @matched = matched
-        @options = options
-      end
-
-      def self.match(text)
-        match_data = @regex.match(text)
-        match_data ? self.new(match_data.to_s) : nil
-      end
-    end
-
-    class Indent < Token
-      @regex = /^(\s\s)+/
-
-      def self.match(text)
-        match_data = @regex.match(text)
-        match_data ? self.new(match_data.to_s, :indent => (match_data.to_s.size / 2)) : nil
-      end
-    end
-
-    class AttributesStart < Token
-      @regex = /^\{\s*/
-    end
-
-    class AttributesEnd < Token
-      @regex = /^\s*\}/
-    end
-
-    class ContentsStart < Token
-      @regex = /^((\s+)|(==\s*)|(=\s*))/
-
-      def self.match(text)
-        match_data = @regex.match(text)
-        if match_data
-          @return_token = case match_data[1][0,1]
-          when ' ' then self.new(match_data.to_s, :content_type => :text)
-          when '='
-            match_data[1][1,1] == '=' ? self.new(match_data.to_s, :content_type => :mixed) : self.new(match_data.to_s, :content_type => :ruby)
-          end
-        else
-          @return_token = nil
-        end
-        @return_token
-      end
-    end
-
-    class Contents < Token
-      @regex = /^.+$/
-
-      def self.match(text)
-        text.gsub!(/\\\-/, "-")
-        match_data = @regex.match(text)
-        match_data ? self.new(match_data.to_s) : nil
-      end
-    end
-
-    class InitialAttribute < Token
-      @regex = /^([%#\.])(\w+)/
-
-      def self.match(text)
-        match_data = @regex.match(text)
-        if match_data
-          @return_token = case match_data[1]
-          when '%' then self.new(match_data.to_s, :element_type => match_data[2])
-          when '#' then self.new(match_data.to_s, :element_id => match_data[2])
-          when '.' then self.new(match_data.to_s, :element_class => match_data[2])
-          end
-        else
-          @return_token = nil
-        end
-        @return_token
-      end
-    end
-
-    class InnerAttributeQuoted < Token
-      @regex = /^,?\s*:?['"]?([\w-]+)['"]?(:|(\s*=>))\s*['"]([^'"]+)['"]\s*/
-      def self.match(text)
-        match_data = @regex.match(text)
-        if(match_data) 
-          value = match_data[4].gsub(/#\{([^\}]+?)\}/, '<%= \1 %>') # replace #{ value } with <%= value %>
-          self.new(match_data.to_s, :element_attribute => { match_data[1] => value })
-        else
-          nil
-        end
-      end
-    end
-
-    class InnerAttributeRuby < Token
-      @regex = /^,?\s*:?['"]?([\w-]+)['"]?(:|(\s*=>))\s*([^'"\s][^,\s]+)\s*/
-      def self.match(text)
-        match_data = @regex.match(text)
-        match_data ? self.new(match_data.to_s, :element_attribute => { match_data[1] => "<%= #{match_data[4]} %>" }) : nil
-      end
-    end
-
-    class InnerAttributeNumber < Token
-      @regex = /^,?\s*:?['"]?([\w-]+)['"]?(:|(\s*=>))\s*(\d+)\s*/
-      def self.match(text)
-        match_data = @regex.match(text)
-        match_data ? self.new(match_data.to_s, :element_attribute => { match_data[1] => match_data[4] }) : nil
-      end
-    end
-  end
-end

data/tasks/haml2erb.rake

@@ -1,7 +0,0 @@
-desc "This task will take the supplied .haml input file and convert it to .erb.  It will remove the original .haml file and create a new .erb file"
-task :haml2erb, :filename, :needs => :environment do |t, args|
-  output_file = args[:filename].gsub(/\.haml/, '.erb')
-  p output_file
-  File.open(output_file, 'w') { |f| f.write Haml2Erb.convert(File.open(args[:filename], 'r').read) }
-  FileUtils.rm_r args[:filename]
-end