hamlizer 0.0.2 → 0.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 367d4b71fe6adf5eca2d1fb6714040b30fef3a74
+  data.tar.gz: 04d83a5b169f332dc8fb613eaff0111b2b50352b
+SHA512:
+  metadata.gz: 07590ba8387e8cc60a8cd8ed49a994dc66db78d2d4890f696320a07c1b2892e5f8080c63fd58ce716431a59a27ec9ae3166e8d017d65fe903bdc2133e783ada7
+  data.tar.gz: 2c9119ae7731393537a73e06e12457f98bb6f1aa18761deeba6269e80a71ca97cda0dc397a690a18f8f6881b392d0b1d92933fd6afd466b58039a67c8e2deda2

data/.ruby-gemset

@@ -0,0 +1 @@
+hamlizer

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0

data/bin/hamlize

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+require 'hamlizer'
+
+input = ARGV.last.dup
+from_file = File.exist?(input)
+
+if input
+  html = from_file ? File.read(input) : input
+  output = Hamlizer.hamlize(html)
+
+  if from_file && ARGV.include?('-f')
+    File.open("#{input}.haml", 'w') { |file| file.write(output) }
+  else
+    puts output
+  end
+end

data/hamlizer.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |gem|
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'nokogiri'
+  gem.add_dependency 'nokogiri', '~> 1.5.9'
 
-  gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'haml'
+  gem.add_development_dependency 'rspec', '~> 2.13.0'
+  gem.add_development_dependency 'haml', '~> 4.0.3'
 end

data/lib/hamlizer/content_printer.rb

@@ -5,7 +5,7 @@ module Hamlizer
     end
 
     def content
-      "\n#{level_spacing}#{ElementHamlConverter.new(element_converter.element, element_converter.level + 1).haml}"
+      "\n#{ElementHamlConverter.new(element_converter.element).haml}"
     end
 
     private
@@ -16,7 +16,7 @@ module Hamlizer
     end
 
     def level_spacing
-      '  ' * element_converter.level
+      '  ' * Hamlizer.current_level
     end
 
     def content_haml(code = nil)

data/lib/hamlizer/element_haml_converter.rb

@@ -1,15 +1,17 @@
 module Hamlizer
   class ElementHamlConverter
-    def initialize(element, level = 1)
+    def initialize element
       @element = element
-      @level = level
     end
 
     def haml
-      element_name_haml + attributes_haml + element_content_haml
+      Hamlizer.current_level -= 1 if element.else?
+      complete_haml = element_name_haml + attributes_haml + element_content_haml
+      Hamlizer.current_level += 1 if element.if? || element.else?
+      element.end? ? nil : complete_haml
     end
 
-    attr_reader :element, :level
+    attr_reader :element
 
     private
 
@@ -23,16 +25,21 @@ module Hamlizer
 
     def element_content_haml
       if element.children.any?
-        element.children.map do |child|
-          ContentPrinterFactory.printer_for(ElementHamlConverter.new(child, level)).content
+        Hamlizer.current_level += 1
+
+        children_haml = element.children.map do |child|
+          ContentPrinterFactory.printer_for(ElementHamlConverter.new(child)).content
         end.join
+
+        Hamlizer.current_level -= 1
+        children_haml
       else
         element.content
       end
     end
 
     def element_name_haml
-      exclude_name_from_haml? ? '' : "%#{element.name}"
+      exclude_name_from_haml? ? '' : ElementNamePrinter.new(element).name
     end
 
     def exclude_name_from_haml?

data/lib/hamlizer/element_name_printer.rb

@@ -0,0 +1,25 @@
+module Hamlizer
+  class ElementNamePrinter
+    def initialize element
+      @element = element
+    end
+
+    def name
+      case element.name
+      when 'erb_print'
+        "#{level_spacing}="
+      when 'erb_non_print'
+        "#{level_spacing}-"
+      else
+        "#{level_spacing}%#{element.name}"
+      end
+    end
+
+    def level_spacing
+      '  ' * Hamlizer.current_level
+    end
+
+    private
+    attr_reader :element
+  end
+end

data/lib/hamlizer/html_element.rb

@@ -7,17 +7,41 @@ module Hamlizer
     end
 
     def children
-      element.children.map { |child| HtmlElement.new child }
+      element.children.map { |child| HtmlElement.new child }.select(&:has_content?)
     end
 
     def content
-      element.content
+      element.content.strip
     end
 
     def div?
       element.name == 'div'
     end
 
+    def else?
+      (parent.erb? && text? && content.start_with?('els')) || (erb? && children.all?(&:else?))
+    end
+
+    def empty?
+      text? && (!content || content.empty?)
+    end
+
+    def end?
+      parent.erb? && text? && content.start_with?('end') || (erb? && children.all?(&:end?))
+    end
+
+    def erb?
+      erb_print? || erb_non_print?
+    end
+
+    def erb_print?
+      name == 'erb_print'
+    end
+
+    def erb_non_print?
+      name == 'erb_non_print'
+    end
+
     def has_attributes?
       element.attributes.any?
     end
@@ -27,7 +51,7 @@ module Hamlizer
     end
 
     def has_content?
-      content && !content.empty?
+      !empty?
     end
 
     def has_id?
@@ -35,7 +59,11 @@ module Hamlizer
     end
 
     def only_child?
-      element.parent.children.count == 1
+      parent.children.count == 1
+    end
+
+    def parent
+      HtmlElement.new element.parent
     end
 
     def html_class
@@ -46,6 +74,10 @@ module Hamlizer
       @id ||= element['id']
     end
 
+    def if?
+      parent.erb? && text? && content.start_with?('if') || (erb? && children.all?(&:if?))
+    end
+
     def name
       element.name
     end
@@ -60,6 +92,6 @@ module Hamlizer
 
     private
 
-    attr_reader :element, :parent
+    attr_reader :element
   end
 end

data/lib/hamlizer/version.rb

@@ -1,3 +1,3 @@
 module Hamlizer
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/hamlizer.rb

@@ -7,11 +7,14 @@ require 'hamlizer/content_printer_factory'
 require 'hamlizer/erb_content_printer'
 require 'hamlizer/non_erb_content_printer'
 require 'hamlizer/text_content_printer'
+require 'hamlizer/element_name_printer'
 require 'nokogiri'
 
 module Hamlizer
   def self.hamlize(html)
+    self.current_level = 0
     html.strip!
+    html.squeeze! ' '
     convert_erb_to_parseable_xml!(html)
 
     if html.start_with?('<html>')
@@ -22,7 +25,10 @@ module Hamlizer
 
     return '' if root.nil?
 
-    children_haml = root.children.map { |element| ElementHamlConverter.new(HtmlElement.new(element)).haml }.join("\n")
+    children_haml = root.children.map do |element|
+      haml = ElementHamlConverter.new(HtmlElement.new(element)).haml
+      haml && !haml.empty? ? haml : nil
+    end.compact.join("\n")
 
     if html.start_with?('<html>')
       haml = "%html"
@@ -45,4 +51,12 @@ module Hamlizer
   def self.remove_erb_printing_code!(html)
     html.gsub!(/<%=(.+?)%>/, '<erb:erb_print>\1</erb:erb_print>')
   end
+
+  def self.current_level
+    @@current_level
+  end
+
+  def self.current_level= level
+    @@current_level = level
+  end
 end

data/spec/lib/hamlizer/html_element_spec.rb

@@ -54,5 +54,212 @@ module Hamlizer
         end
       end
     end
+
+    describe 'erb_non_print?' do
+      context 'when the element is an erb_non_print' do
+        let(:element) { double(:element, name: 'erb_non_print') }
+        it 'returns true' do
+          expect(subject).to be_erb_non_print
+        end
+      end
+
+      context 'when the element is not an erb_non_print' do
+        let(:element) { double(:element, name: 'text') }
+        it 'returns false' do
+          expect(subject).to_not be_erb_non_print
+        end
+      end
+    end
+
+    describe 'erb_print?' do
+      context 'when the element is an erb_print' do
+        let(:element) { double(:element, name: 'erb_print') }
+        it 'returns true' do
+          expect(subject).to be_erb_print
+        end
+      end
+
+      context 'when the element is not an erb_print' do
+        let(:element) { double(:element, name: 'text') }
+        it 'returns false' do
+          expect(subject).to_not be_erb_print
+        end
+      end
+    end
+
+    describe 'erb?' do
+      context 'when the element is an erb_print' do
+        before { subject.stub(erb_print?: true, erb_non_print?: false) }
+
+        it 'returns true' do
+          expect(subject).to be_erb
+        end
+      end
+
+      context 'when the element is an erb_non_print' do
+        before { subject.stub(erb_print?: false, erb_non_print?: true) }
+
+        it 'returns true' do
+          expect(subject).to be_erb
+        end
+      end
+
+      context 'when the element is not an erb element' do
+        before { subject.stub(erb_print?: false, erb_non_print?: false) }
+
+        it 'returns true' do
+          expect(subject).to_not be_erb
+        end
+      end
+    end
+
+    describe 'if?' do
+      context 'when the element is an if' do
+        let(:parent) { double(:parent, name: 'erb_non_print', erb?: true) }
+        let(:element) { double(:element, name: 'text', content: 'if true', parent: parent) }
+
+        it 'returns true' do
+          expect(subject).to be_if
+        end
+      end
+
+      context 'when the element is not an if' do
+        let(:parent) { double(:parent, name: 'text', erb?: false) }
+        let(:element) { double(:element, name: 'text', content: 'if true', parent: parent) }
+
+        it 'returns false' do
+          expect(subject).to_not be_if
+        end
+      end
+    end
+
+    describe 'else?' do
+      context 'when the element is an else' do
+        let(:parent) { double(:parent, name: 'erb_non_print', erb?: true) }
+        let(:element) { double(:element, name: 'text', content: 'else', parent: parent) }
+
+        it 'returns true' do
+          expect(subject).to be_else
+        end
+      end
+
+      context 'when the element is an else' do
+        let(:parent) { double(:parent, name: 'erb_non_print', erb?: true) }
+        let(:element) { double(:element, name: 'text', content: 'elsif', parent: parent) }
+
+        it 'returns true' do
+          expect(subject).to be_else
+        end
+      end
+
+      context 'when the element is not an else' do
+        let(:parent) { double(:parent, name: 'text', erb?: false) }
+        let(:element) { double(:element, name: 'text', content: 'not true', parent: parent) }
+
+        it 'returns false' do
+          expect(subject).to_not be_else
+        end
+      end
+    end
+
+    describe 'end?' do
+      context 'when the element is an end' do
+        let(:parent) { double(:parent, name: 'erb_non_print', erb?: true) }
+        let(:element) { double(:element, name: 'text', content: 'end', parent: parent) }
+
+        it 'returns true' do
+          expect(subject).to be_end
+        end
+      end
+
+      context 'when the element is not an end' do
+        let(:parent) { double(:parent, name: 'text', erb?: true) }
+        let(:element) { double(:element, name: 'text', content: 'if true', parent: parent) }
+
+        it 'returns false' do
+          expect(subject).to_not be_end
+        end
+      end
+
+      context 'when the element is not an end' do
+        let(:parent) { double(:parent, name: 'text', erb?: false) }
+        let(:element) { double(:element, name: 'text', content: 'if true', parent: parent) }
+
+        it 'returns false' do
+          expect(subject).to_not be_end
+        end
+      end
+    end
+
+    describe '#only_child?' do
+      let(:parent) { double(:parent, children: children) }
+
+      before do
+        subject.stub(parent: parent)
+      end
+
+      context 'when the element is an only child' do
+        let(:children) { [element] }
+        let(:element) { double(:element) }
+
+        it 'returns true' do
+          expect(subject).to be_only_child
+        end
+      end
+
+      context 'when the element is not an only child' do
+        let(:element) { double(:element) }
+
+        let(:child1) { double(:child1) }
+        let(:child2) { double(:child1) }
+        let(:children) { [element, child1, child2] }
+
+        it 'returns false' do
+          expect(subject).to_not be_only_child
+        end
+      end
+    end
+
+    describe '#empty?' do
+      context 'when the element is of type text and' do
+        before { subject.stub(text?: true) }
+
+        context 'it has content' do
+          let(:element) { double(:element, content: 'hello') }
+
+          it 'returns false' do
+            expect(subject).to_not be_empty
+          end
+        end
+
+        context 'it does not have any content' do
+          let(:element) { double(:element, content: '') }
+
+          it 'returns true' do
+            expect(subject).to be_empty
+          end
+        end
+      end
+
+      context 'when the element is not of type text and' do
+        before { subject.stub(text?: false) }
+
+        context 'it has content' do
+          let(:element) { double(:element, content: 'hello') }
+
+          it 'returns false' do
+            expect(subject).to_not be_empty
+          end
+        end
+
+        context 'it does not have any content' do
+          let(:element) { double(:element, content: '') }
+
+          it 'returns true' do
+            expect(subject).to_not be_empty
+          end
+        end
+      end
+    end
   end
 end

data/spec/lib/hamlizer_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 module Hamlizer
   describe Hamlizer do
     describe '.hamlize' do
-
       it 'leaves an empty string alone' do
         expect(hamlize('')).to eq ''
       end
@@ -17,6 +16,14 @@ module Hamlizer
         expect(hamlize("\n\n\n\n")).to eq ''
       end
 
+      it 'does not return unnecesary whitespace' do
+        expect(hamlize(content_from('with_extra_line_breaks.html')))
+          .to eq content_from('with_extra_line_breaks.haml')
+
+        expect(hamlize(("    <p>Hello</p>     <p>There</p>    ")))
+          .to eq content_from('with_extra_line_breaks.haml')
+      end
+
       it 'converts an empty tag correctly' do
         expect(hamlize('<br/>')).to eq '%br'
         expect(hamlize('<br>')).to eq '%br'
@@ -114,16 +121,28 @@ module Hamlizer
 
       it 'parses erb printing code' do
         expect(hamlize('<strong><%= item.title %></strong>')).to eq '%strong= item.title'
-        expect(hamlize('<p><%= hello %><strong><%= item.title %></strong></p>')).to eq "%p\n  = hello\n  %strong= item.title"
+        expect(hamlize(content_from('erb_1.html.erb'))).to eq content_from('erb_1.html.haml')
         expect(hamlize('<p><% hello %><strong><%= item.title %></strong></p>')).to eq "%p\n  - hello\n  %strong= item.title"
       end
 
       it 'parses erb non-printing code' do
         expect(hamlize('<div><% a = 2 + 2 %></div>')).to eq '%div- a = 2 + 2'
       end
+
+      it 'parses erb code at the root level' do
+        expect(hamlize(content_from('erb_on_root.html.erb'))).to eq content_from('erb_on_root.html.haml')
+      end
+
+      it 'parses erb code for if-else' do
+        expect(hamlize(content_from('if_else.html.erb'))).to eq content_from('if_else.html.haml')
+      end
+
+      it 'ignores extra spaces' do
+        expect(hamlize(content_from('spaces.html.erb'))).to eq content_from('spaces.html.haml')
+      end
     end
 
-    def hamlize(html)
+    def hamlize html
       haml = Hamlizer.hamlize(html)
 
       begin
@@ -134,5 +153,9 @@ module Hamlizer
 
       haml
     end
+
+    def content_from test_file_name
+      File.read("spec/test_files/#{test_file_name}").chomp
+    end
   end
 end

data/spec/test_files/erb_1.html.erb

@@ -0,0 +1 @@
+<p><%= hello %><strong><%= item.title %></strong></p>

data/spec/test_files/erb_1.html.haml

@@ -0,0 +1,3 @@
+%p
+  = hello
+  %strong= item.title

data/spec/test_files/erb_on_root.html.erb

@@ -0,0 +1,4 @@
+<% a = 2 %>
+<p><%= a %></p>
+<% b = 3 %>
+<p><%= b %></p>

data/spec/test_files/erb_on_root.html.haml

@@ -0,0 +1,4 @@
+- a = 2
+%p= a
+- b = 3
+%p= b

data/spec/test_files/if_else.html.erb

@@ -0,0 +1,7 @@
+<% if true %>
+<%= 'hello' %>
+<%= 'yeah' %>
+<p>if</p>
+<% else %>
+<%= 'bye' %>
+<% end %>

data/spec/test_files/if_else.html.haml

@@ -0,0 +1,6 @@
+- if true
+  = 'hello'
+  = 'yeah'
+  %p if
+- else
+  = 'bye'

data/spec/test_files/spaces.html.erb

@@ -0,0 +1 @@
+<p> <%= a %>   </p>

data/spec/test_files/spaces.html.haml

@@ -0,0 +1 @@
+%p= a

data/spec/test_files/with_extra_line_breaks.haml

@@ -0,0 +1,2 @@
+%p Hello
+%p There

data/spec/test_files/with_extra_line_breaks.html

@@ -0,0 +1,6 @@
+<p>
+  Hello
+</p>
+<p>
+  There
+</p>

data/spec/test_files/with_extra_line_breaks.html.haml

@@ -0,0 +1,4 @@
+%p Hello
+
+
+%p There

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hamlizer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.3
 platform: ruby
 authors:
 - Lilibeth De La Cruz
@@ -10,76 +9,74 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-10 00:00:00.000000000 Z
+date: 2013-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.9
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.3
 description: Convert your views from HTML/ERB to HAML
 email:
 - lilibethdlc@gmail.com
 - edggonzalezg@gmail.com
-executables: []
+executables:
+- hamlize
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/hamlize
 - hamlizer.gemspec
 - lib/hamlizer.rb
 - lib/hamlizer/attributes_haml_converter.rb
 - lib/hamlizer/content_printer.rb
 - lib/hamlizer/content_printer_factory.rb
 - lib/hamlizer/element_haml_converter.rb
+- lib/hamlizer/element_name_printer.rb
 - lib/hamlizer/erb_content_printer.rb
 - lib/hamlizer/html_element.rb
 - lib/hamlizer/non_erb_content_printer.rb
@@ -88,31 +85,52 @@ files:
 - spec/lib/hamlizer/html_element_spec.rb
 - spec/lib/hamlizer_spec.rb
 - spec/spec_helper.rb
+- spec/test_files/erb_1.html.erb
+- spec/test_files/erb_1.html.haml
+- spec/test_files/erb_on_root.html.erb
+- spec/test_files/erb_on_root.html.haml
+- spec/test_files/if_else.html.erb
+- spec/test_files/if_else.html.haml
+- spec/test_files/spaces.html.erb
+- spec/test_files/spaces.html.haml
+- spec/test_files/with_extra_line_breaks.haml
+- spec/test_files/with_extra_line_breaks.html
+- spec/test_files/with_extra_line_breaks.html.haml
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: HTML/ERB to HAML converter
 test_files:
 - spec/lib/hamlizer/html_element_spec.rb
 - spec/lib/hamlizer_spec.rb
 - spec/spec_helper.rb
+- spec/test_files/erb_1.html.erb
+- spec/test_files/erb_1.html.haml
+- spec/test_files/erb_on_root.html.erb
+- spec/test_files/erb_on_root.html.haml
+- spec/test_files/if_else.html.erb
+- spec/test_files/if_else.html.haml
+- spec/test_files/spaces.html.erb
+- spec/test_files/spaces.html.haml
+- spec/test_files/with_extra_line_breaks.haml
+- spec/test_files/with_extra_line_breaks.html
+- spec/test_files/with_extra_line_breaks.html.haml

data/.rvmrc

@@ -1 +0,0 @@
-rvm --create 1.9.3@hamlizer