hamlizer 0.0.1 → 0.0.2

data/README.md

@@ -1,6 +1,6 @@
 # Hamlizer
 
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/lilibethdlc/hamlizer)
+[![Code Climate](https://codeclimate.com/github/lilibethdlc/hamlizer.png)](https://codeclimate.com/github/lilibethdlc/hamlizer)
 
 HTML/ERB to HAML converter
 

data/lib/hamlizer/attributes_haml_converter.rb

@@ -1,38 +1,40 @@
-class AttributesHamlConverter
-  def initialize(element)
-    @element = element
-  end
+module Hamlizer
+  class AttributesHamlConverter
+    def initialize(element)
+      @element = element
+    end
 
-  def haml
-    element.has_attributes? ? (id_haml + class_haml + regular_attributes_haml) : ''
-  end
+    def haml
+      element.has_attributes? ? (id_haml + class_haml + regular_attributes_haml) : ''
+    end
 
-  private
+    private
 
-  attr_reader :element
+    attr_reader :element
 
-  def attribute_haml(name, value)
-    if name.match(/^\w+$/)
-      attribute_name = "#{name}:"
-    else
-      attribute_name = "'#{name}' =>"
+    def attribute_haml(name, value)
+      if name.match(/^\w+$/)
+        attribute_name = "#{name}:"
+      else
+        attribute_name = "'#{name}' =>"
+      end
+      "#{attribute_name} '#{value}'"
     end
-    "#{attribute_name} '#{value}'"
-  end
 
-  def class_haml
-    element.html_class ? ".#{element.html_class.gsub(/\s+/, '.')}" : ''
-  end
+    def class_haml
+      element.html_class ? ".#{element.html_class.gsub(/\s+/, '.')}" : ''
+    end
 
-  def id_haml
-    element.id ? "##{element.id}" : ''
-  end
+    def id_haml
+      element.id ? "##{element.id}" : ''
+    end
 
-  def regular_attributes_haml
-    attributes_haml = element.regular_attributes.map do |name, value|
-      attribute_haml name, value
-    end.compact.join(', ')
+    def regular_attributes_haml
+      attributes_haml = element.regular_attributes.map do |name, value|
+        attribute_haml name, value
+      end.compact.join(', ')
 
-    attributes_haml.empty? ? '' : "{ #{attributes_haml} }"
+      attributes_haml.empty? ? '' : "{ #{attributes_haml} }"
+    end
   end
 end

data/lib/hamlizer/content_printer.rb

@@ -0,0 +1,31 @@
+module Hamlizer
+  class ContentPrinter
+    def initialize(element_converter)
+      @element_converter = element_converter
+    end
+
+    def content
+      "\n#{level_spacing}#{ElementHamlConverter.new(element_converter.element, element_converter.level + 1).haml}"
+    end
+
+    private
+    attr_reader :element_converter
+
+    def element_content
+      element_converter.element.content.gsub("\n", ' ').strip
+    end
+
+    def level_spacing
+      '  ' * element_converter.level
+    end
+
+    def content_haml(code = nil)
+      if element_converter.element.only_child?
+        "#{code} #{element_content}"
+      else
+        code += ' ' if code
+        "\n#{level_spacing}#{code}#{element_content}"
+      end
+    end
+  end
+end

data/lib/hamlizer/content_printer_factory.rb

@@ -0,0 +1,16 @@
+module Hamlizer
+  class ContentPrinterFactory
+    def self.printer_for(element_converter)
+      case element_converter.element.name
+      when 'erb_print'
+        ErbContentPrinter.new(element_converter)
+      when 'erb_non_print'
+        NonErbContentPrinter.new(element_converter)
+      when 'text'
+        TextContentPrinter.new(element_converter)
+      else
+        ContentPrinter.new(element_converter)
+      end
+    end
+  end
+end

data/lib/hamlizer/element_haml_converter.rb

@@ -1,75 +1,42 @@
-class ElementHamlConverter
-  def initialize(element, level = 1)
-    @element = element
-    @level = level
-  end
+module Hamlizer
+  class ElementHamlConverter
+    def initialize(element, level = 1)
+      @element = element
+      @level = level
+    end
 
-  def haml
-    element_name_haml + attributes_haml + element_content_haml
-  end
+    def haml
+      element_name_haml + attributes_haml + element_content_haml
+    end
 
-  private
+    attr_reader :element, :level
 
-  attr_reader :element, :level
+    private
 
-  def attributes_haml
-    attributes_haml_converter.haml
-  end
+    def attributes_haml
+      attributes_haml_converter.haml
+    end
 
-  def attributes_haml_converter
-    AttributesHamlConverter.new(element)
-  end
+    def attributes_haml_converter
+      AttributesHamlConverter.new(element)
+    end
 
-  def element_content_haml
-    content_haml = element.children.map do |child|
-      if child.name == 'erb_print'
-        erb_print_haml(child)
-      elsif child.name == 'erb_non_print'
-        erb_non_print_haml(child)
-      elsif child.name == 'text'
-        text_haml(child)
+    def element_content_haml
+      if element.children.any?
+        element.children.map do |child|
+          ContentPrinterFactory.printer_for(ElementHamlConverter.new(child, level)).content
+        end.join
       else
-        "\n#{level_spacing}#{ElementHamlConverter.new(child, level + 1).haml}"
+        element.content
       end
-    end.join
-
-    content_haml
-  end
-
-  def element_name_haml
-    should_include_name_in_haml? ? "%#{element.name}" : ''
-  end
-
-  def child_content(child)
-    child.content.gsub("\n", ' ').strip
-  end
-
-  def child_haml(child, code = nil)
-    if child.only_child?
-      "#{code} #{child_content(child)}"
-    else
-      code += ' ' if code
-      "\n#{level_spacing}#{code}#{child_content(child)}"
     end
-  end
-
-  def erb_non_print_haml(element)
-    child_haml(element, '-')
-  end
-
-  def erb_print_haml(element)
-    child_haml(element, '=')
-  end
-
-  def level_spacing
-    '  ' * level
-  end
 
-  def should_include_name_in_haml?
-    (!element.div? || (element.has_id? && element.has_class?))
-  end
+    def element_name_haml
+      exclude_name_from_haml? ? '' : "%#{element.name}"
+    end
 
-  def text_haml(element)
-    child_haml(element)
+    def exclude_name_from_haml?
+      element.text? || (element.div? && (element.has_id? || element.has_class?))
+    end
   end
 end

data/lib/hamlizer/erb_content_printer.rb

@@ -0,0 +1,7 @@
+module Hamlizer
+  class ErbContentPrinter < ContentPrinter
+    def content
+      content_haml('=')
+    end
+  end
+end

data/lib/hamlizer/html_element.rb

@@ -1,60 +1,65 @@
 require 'nokogiri'
 
-class HtmlElement
-  def initialize(element)
-    @element = element
-  end
+module Hamlizer
+  class HtmlElement
+    def initialize(element)
+      @element = element
+    end
 
-  def children
-    element.children.map { |child| HtmlElement.new child }
-  end
+    def children
+      element.children.map { |child| HtmlElement.new child }
+    end
 
-  def content
-    element.content
-  end
+    def content
+      element.content
+    end
 
-  def div?
-    element.name == 'div'
-  end
+    def div?
+      element.name == 'div'
+    end
 
-  def has_attributes?
-    element.attributes.any?
-  end
+    def has_attributes?
+      element.attributes.any?
+    end
 
-  def has_class?
-    html_class.nil?
-  end
+    def has_class?
+      !html_class.nil?
+    end
 
-  def has_content?
-    content && !content.empty?
-  end
+    def has_content?
+      content && !content.empty?
+    end
 
-  def has_id?
-    id.nil?
-  end
+    def has_id?
+      !id.nil?
+    end
 
-  def only_child?
-    element.parent.children.count == 1
-  end
+    def only_child?
+      element.parent.children.count == 1
+    end
 
-  def html_class
-    @class ||= element['class']
-  end
+    def html_class
+      @class ||= element['class']
+    end
 
-  def id
-    @id ||= element['id']
-  end
+    def id
+      @id ||= element['id']
+    end
 
-  def name
-    element.name
-  end
+    def name
+      element.name
+    end
 
-  def regular_attributes
-    Hash[element.attributes.select { |name, _| !%w(id class).include? name }]
-  end
+    def regular_attributes
+      Hash[element.attributes.select { |name, _| !%w(id class).include? name }]
+    end
 
-  private
+    def text?
+      element.name == 'text'
+    end
 
-  attr_reader :element, :parent
-end
+    private
 
+    attr_reader :element, :parent
+  end
+end

data/lib/hamlizer/non_erb_content_printer.rb

@@ -0,0 +1,7 @@
+module Hamlizer
+  class NonErbContentPrinter < ContentPrinter
+    def content
+      content_haml('-')
+    end
+  end
+end

data/lib/hamlizer/text_content_printer.rb

@@ -0,0 +1,7 @@
+module Hamlizer
+  class TextContentPrinter < ContentPrinter
+    def content
+      content_haml
+    end
+  end
+end

data/lib/hamlizer/version.rb

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

data/lib/hamlizer.rb

@@ -2,10 +2,16 @@ require 'hamlizer/version'
 require 'hamlizer/html_element'
 require 'hamlizer/element_haml_converter'
 require 'hamlizer/attributes_haml_converter'
+require 'hamlizer/content_printer'
+require 'hamlizer/content_printer_factory'
+require 'hamlizer/erb_content_printer'
+require 'hamlizer/non_erb_content_printer'
+require 'hamlizer/text_content_printer'
 require 'nokogiri'
 
 module Hamlizer
   def self.hamlize(html)
+    html.strip!
     convert_erb_to_parseable_xml!(html)
 
     if html.start_with?('<html>')

data/spec/lib/hamlizer/html_element_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+module Hamlizer
+  describe HtmlElement do
+    let(:element) { {} }
+    subject { HtmlElement.new element }
+
+    describe '#has_id?' do
+      context 'when the source element has an id' do
+        let(:element) { { 'id' => 'identificador' } }
+
+        it 'returns true' do
+          expect(subject).to have_id
+        end
+      end
+
+      context 'when the source element does not have an id' do
+        it 'returns false' do
+          expect(subject).to_not have_id
+        end
+      end
+    end
+
+    describe '#has_class?' do
+      context 'when the source element has a class' do
+        let(:element) { { 'class' => 'clase' } }
+
+        it 'returns true' do
+          expect(subject).to have_class
+        end
+      end
+
+      context 'when the source element does not have a class' do
+        it 'returns false' do
+          expect(subject).to_not have_class
+        end
+      end
+    end
+
+    describe '#text?' do
+      context 'when the source element\'s name is "text"' do
+        let(:element) { double('element', name: 'text') }
+
+        it 'returns true' do
+          expect(subject).to be_text
+        end
+      end
+
+      context 'when the source element\'s name is something other than "text"' do
+        let(:element) { double('element', name: 'hello') }
+
+        it 'returns true' do
+          expect(subject).to_not be_text
+        end
+      end
+    end
+  end
+end

data/spec/lib/hamlizer_spec.rb

@@ -1,113 +1,138 @@
 require 'spec_helper'
 
-describe Hamlizer do
-  describe '.hamlize' do
-
-    it 'leaves an empty string alone' do
-      expect(hamlize('')).to eq ''
-    end
-
-    it 'returns empty string for whitespace' do
-      expect(hamlize('       ')).to eq ''
-      expect(hamlize("\n\n\n\n")).to eq ''
-    end
-
-    it 'converts an empty tag correctly' do
-      expect(hamlize('<br/>')).to eq '%br'
-      expect(hamlize('<br>')).to eq '%br'
-    end
-
-    it 'converts html standard layout tags correctly' do
-      expect(hamlize('<html></html>')).to eq '%html'
-      expect(hamlize('<html><body></body></html>')).to eq "%html\n  %body"
-    end
-
-    it 'converts a tag with no content' do
-      expect(hamlize('<span></span>')).to eq '%span'
-    end
-
-    it 'converts a tag with text content' do
-      text = 'abc'
-      expect(hamlize("<span>#{text}</span>")).to eq "%span #{text}"
-      expect(hamlize("<span>#{text}\n#{text}</span>")).to eq "%span #{text} #{text}"
-    end
-
-    it 'converts multiple tags on the same level' do
-      expect(hamlize('<br/><br/><br/>')).to eq "%br\n%br\n%br"
-      text = 'hello'
-      expect(hamlize("<span>#{text}</span><span/>")).to eq "%span #{text}\n%span"
-    end
-
-    it 'converts nested tags' do
-      expect(hamlize('<div><span></span></div>')).to eq "%div\n  %span"
-      expect(hamlize('<div><p><span></span></p></div>')).to eq "%div\n  %p\n    %span"
-    end
-
-    it 'converts nested tags with content' do
-      expect(hamlize('<div>abc<span>abc</span></div>')).to eq "%div\n  abc\n  %span abc"
-      expect(hamlize('<div>abc<p>hello<span>abc</span></p></div>')).to eq "%div\n  abc\n  %p\n    hello\n    %span abc"
-    end
-
-    it 'converts a tag with attributes' do
-      title = 'El Titulo'
-      source = 'La Fuente'
-
-      expect(hamlize("<span title='#{title}'></span>")).to eq "%span{ title: '#{title}' }"
-      expect(hamlize("<span title='#{title}' source='#{source}'></span>")).to eq "%span{ title: '#{title}', source: '#{source}' }"
-      expect(hamlize("<span title='#{title}' data-source='#{source}'></span>")).to eq "%span{ title: '#{title}', 'data-source' => '#{source}' }"
+module Hamlizer
+  describe Hamlizer do
+    describe '.hamlize' do
+
+      it 'leaves an empty string alone' do
+        expect(hamlize('')).to eq ''
+      end
+
+      it 'leaves a non html text alone' do
+        expect(hamlize('hello')).to eq 'hello'
+      end
+
+      it 'returns empty string for whitespace' do
+        expect(hamlize('       ')).to eq ''
+        expect(hamlize("\n\n\n\n")).to eq ''
+      end
+
+      it 'converts an empty tag correctly' do
+        expect(hamlize('<br/>')).to eq '%br'
+        expect(hamlize('<br>')).to eq '%br'
+      end
+
+      it 'converts html standard layout tags correctly' do
+        expect(hamlize('<html></html>')).to eq '%html'
+        expect(hamlize('<html><body></body></html>')).to eq "%html\n  %body"
+      end
+
+      it 'converts a tag with no content' do
+        expect(hamlize('<span></span>')).to eq '%span'
+      end
+
+      it 'converts a tag with text content' do
+        text = 'abc'
+        expect(hamlize("<span>#{text}</span>")).to eq "%span #{text}"
+        expect(hamlize("<span>#{text}\n#{text}</span>")).to eq "%span #{text} #{text}"
+      end
+
+      it 'converts multiple tags on the same level' do
+        expect(hamlize('<br/><br/><br/>')).to eq "%br\n%br\n%br"
+        text = 'hello'
+        expect(hamlize("<span>#{text}</span><span/>")).to eq "%span #{text}\n%span"
+      end
+
+      it 'converts nested tags' do
+        expect(hamlize('<div><span></span></div>')).to eq "%div\n  %span"
+        expect(hamlize('<div><p><span></span></p></div>')).to eq "%div\n  %p\n    %span"
+      end
+
+      it 'converts nested tags with content' do
+        expect(hamlize('<div>abc<span>def</span></div>')).to eq "%div\n  abc\n  %span def"
+        expect(hamlize('<div>abc<p>hello<span>abc</span></p></div>')).to eq "%div\n  abc\n  %p\n    hello\n    %span abc"
+      end
+
+      it 'converts a tag with attributes' do
+        title = 'El Titulo'
+        source = 'La Fuente'
+
+        expect(hamlize("<span title='#{title}'></span>")).to eq "%span{ title: '#{title}' }"
+        expect(hamlize("<span title='#{title}' source='#{source}'></span>")).to eq "%span{ title: '#{title}', source: '#{source}' }"
+        expect(hamlize("<span title='#{title}' data-source='#{source}'></span>")).to eq "%span{ title: '#{title}', 'data-source' => '#{source}' }"
+      end
+
+      it 'uses the "#id" syntax for the id attribute' do
+        id = 'el_identificador'
+        title = 'El Titulo'
+
+        expect(hamlize("<span id='#{id}'></span>")).to eq "%span##{id}"
+        expect(hamlize("<span id='#{id}' title='#{title}'></span>")).to eq "%span##{id}{ title: '#{title}' }"
+      end
+
+      it 'uses the ".class" syntax for the class attribute' do
+        html_class = 'la_clase'
+        title = 'El Titulo'
+
+        expect(hamlize("<span class='#{html_class}'></span>")).to eq "%span.#{html_class}"
+        expect(hamlize("<span class='#{html_class}' title='#{title}'></span>")).to eq "%span.#{html_class}{ title: '#{title}' }"
+
+        html_classes = %w(una_clase otra_clase)
+        expect(hamlize("<span class='#{html_classes.join(' ')}' title='#{title}'></span>")).to eq "%span.#{html_classes.join('.')}{ title: '#{title}' }"
+        expect(hamlize("<span class='#{html_classes.join('   ')}' title='#{title}'></span>")).to eq "%span.#{html_classes.join('.')}{ title: '#{title}' }"
+      end
+
+      context 'when hamlizing the div tag' do
+        let(:title) { 'El Titulo' }
+        let(:html_class) { 'la_clase' }
+        let(:id) { 'el_identificador' }
+
+        it 'includes %div when the tag does not have any attributes' do
+          expect(hamlize('<div></div>')).to eq '%div'
+        end
+
+        it 'includes %div when the attributes are not id or class' do
+          expect(hamlize("<div title='#{title}'></div>")).to eq "%div{ title: '#{title}' }"
+        end
+
+        it 'uses "#" when the div has an id attribute' do
+          expect(hamlize("<div id='#{id}'></div>")).to eq "##{id}"
+        end
+
+        it 'uses "." when the div has just one class in the class attribute' do
+          expect(hamlize("<div class='#{html_class}'></div>")).to eq ".#{html_class}"
+        end
+
+        it 'uses "..." when the div has more than one class in the class attribute' do
+          expect(hamlize("<div class='hola tu'></div>")).to eq '.hola.tu'
+        end
+
+        it 'uses "#." when the div has both id and class attributes' do
+          expect(hamlize("<div class='#{html_class}' id='#{id}'></div>")).to eq "##{id}.#{html_class}"
+        end
+      end
+
+      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('<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
+    end
+
+    def hamlize(html)
+      haml = Hamlizer.hamlize(html)
+
+      begin
+        Haml::Engine.new(haml).to_html
+      rescue Exception => e
+        raise e.class, "#{e.message}\nIn:\n#{haml}" unless [NameError, NoMethodError].include? e.class
+      end
+
+      haml
     end
-
-    it 'uses the "#id" syntax for the id attribute' do
-      id = 'el_identificador'
-      title = 'El Titulo'
-
-      expect(hamlize("<span id='#{id}'></span>")).to eq "%span##{id}"
-      expect(hamlize("<span id='#{id}' title='#{title}'></span>")).to eq "%span##{id}{ title: '#{title}' }"
-    end
-
-    it 'uses the ".class" syntax for the class attribute' do
-      html_class = 'la_clase'
-      title = 'El Titulo'
-
-      expect(hamlize("<span class='#{html_class}'></span>")).to eq "%span.#{html_class}"
-      expect(hamlize("<span class='#{html_class}' title='#{title}'></span>")).to eq "%span.#{html_class}{ title: '#{title}' }"
-
-      html_classes = %w(una_clase otra_clase)
-      expect(hamlize("<span class='#{html_classes.join(' ')}' title='#{title}'></span>")).to eq "%span.#{html_classes.join('.')}{ title: '#{title}' }"
-      expect(hamlize("<span class='#{html_classes.join('   ')}' title='#{title}'></span>")).to eq "%span.#{html_classes.join('.')}{ title: '#{title}' }"
-    end
-
-    it 'does not use %div for divs that have an id or a class' do
-      id = 'el_identificador'
-      html_class = 'la_clase'
-      title = 'El Titulo'
-
-      expect(hamlize('<div></div>')).to eq '%div'
-      expect(hamlize("<div title='#{title}'></div>")).to eq "%div{ title: '#{title}' }"
-      expect(hamlize("<div id='#{id}'></div>")).to eq "##{id}"
-      expect(hamlize("<div class='#{html_class}'></div>")).to eq ".#{html_class}"
-    end
-
-    it 'parses erb printing code', :focus 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('<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
-  end
-
-  def hamlize(html)
-    haml = Hamlizer.hamlize(html)
-
-    begin
-      Haml::Engine.new(haml).to_html
-    rescue Exception => e
-      raise e.class, "#{e.message}\nIn: #{haml}" unless [NameError, NoMethodError].include? e.class
-    end
-
-    haml
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hamlizer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -77,9 +77,15 @@ files:
 - 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/erb_content_printer.rb
 - lib/hamlizer/html_element.rb
+- lib/hamlizer/non_erb_content_printer.rb
+- lib/hamlizer/text_content_printer.rb
 - lib/hamlizer/version.rb
+- spec/lib/hamlizer/html_element_spec.rb
 - spec/lib/hamlizer_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -102,10 +108,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: HTML/ERB to HAML converter
 test_files:
+- spec/lib/hamlizer/html_element_spec.rb
 - spec/lib/hamlizer_spec.rb
 - spec/spec_helper.rb