data-converter 0.1.6 → 0.1.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1ab86a4fc881ba1446b4bb1391d6e0f3776a6e75
+  data.tar.gz: e14ecc460c9f2dde92f29ff1623e45c8ecf6ed5e
+SHA512:
+  metadata.gz: 8bd5f20a1e14effd29ee387639c25108056164cb146adcace677a6035b5d75180025f803c8a23c3d5fa5fa78af117a4f65382d0038cf14fb450e907b9892f7bd
+  data.tar.gz: 6852ffd724bd2f8bdff35a51ebf5a556bcd2e6122fa65404ad34daa26f79403d9f487f44d745b510027fe5a6011047b07c70057e6c62bc02e13c06ec02a7866e

data/README.md

@@ -0,0 +1,35 @@
+# data-converter
+
+DataConverter convert Array and Hash into HTML.
+
+## Installation
+
+add this line to your Gemfile.
+
+`gem 'data-converter'`
+
+or
+
+`$ gem install data-converter`
+
+## Usage
+
+```ruby
+require 'data-converter'
+
+DataConverter.parse([0,1,2,3]) #=> "<ul><li>0</li><li>1</li><li>2</li></ul>"
+DataConverter.parse(:foo => "bar") #=> "<dl><dt>foo</dt><dd>bar</dd></dl>"
+```
+
+## Contributing to Botch
+
+1. fork the project.
+2. create your feature branch. (`git checkout -b my-feature`)
+3. commit your changes. (`git commit -am 'commit message.'`)
+4. push to the branch. (`git push origin my-feature`)
+5. send pull request.
+
+## License
+
+MIT
+

data/data-converter.gemspec

@@ -1,17 +1,16 @@
-Gem::Specification.new do | spec |
-  spec.name = "data-converter"
-  spec.version = "0.1.6"
-  spec.summary = "It is under the devlopment."
-  spec.description = "Convert hash and array into HTML Element (Array => ul, Hash => dl)."
-  spec.homepage = "https://github.com/namusyaka/data-converter"
-  spec.author = "namusyaka"
-  spec.email = "namusyaka@gmail.com"
-  spec.files = %w(
-data-converter.gemspec
-README.rdoc
-lib
-test
-lib/data-converter.rb
-test/test.rb
-)
+require File.expand_path("../lib/version", __FILE__)
+
+Gem::Specification.new "data-converter", DataConverter::VERSION do |s|
+  s.summary          = "Convert hash and array into HTML Element."
+  s.description      = "Convert hash and array into HTML Element."
+  s.authors          = ["namusyaka"]
+  s.email            = "namusyaka@gmail.com"
+  s.homepage         = "https://github.com/namusyaka/data-converter"
+  s.files            = `git ls-files`.split("\n") - %w(.gitignore)
+  s.test_files       = s.files.select { |path| path =~ /^spec\/.*_spec\.rb/ }
+  s.license          = "MIT"
+
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "rspec-html-matchers"
 end

data/lib/data-converter.rb

@@ -1,12 +1,15 @@
-class String
-  def escapeHTML
-    self.gsub(/&/n, '&amp;').gsub(/\"/n, '&quot;').gsub(/>/n, '&gt;').gsub(/</n, '&lt;').gsub(/'/, '&#039;')
-  end
-end
-
 class DataConverter
   attr_reader :data
 
+  ESCAPE_VALUES = {
+    "&" => "&amp;",
+    "<" => "&lt;",
+    ">" => "&gt;",
+    '"' => "&quot;"
+  }
+
+  ESCAPE_REGEXP = Regexp.union(*ESCAPE_VALUES.keys)
+
   def initialize(data)
     @data = data
   end
@@ -21,20 +24,12 @@ class DataConverter
 
     case data
     when Array
-      list = <<-UL
-<ul>
-#{ convert_to_li(data).join("\n") }
-</ul>
-      UL
+      tag(:ul, convert_to_li(data), :escaped => true)
     when Hash
-      list = <<-DL
-<dl>
-#{ convert_to_dl_childs(data) }</dl>
-      DL
+      tag(:dl, convert_to_dl_childs(data), :escaped => true)
     else
-      return data
+      data
     end
-    list
   end
 
   private
@@ -44,25 +39,34 @@ class DataConverter
   end
   
   def convert_to_li(data)
-    data.map! do | e |
-      if check_data?(e)
-        "<li>#{ convert(e) }</li>"
+    data.map do |caption|
+      if check_data?(caption)
+        tag(:li, convert(caption), :escaped => true)
       else
-        "<li>#{ e.to_s.escapeHTML }</li>"
+        tag(:li, caption)
       end
-    end
+    end.join("\n")
   end
 
   def convert_to_dl_childs(data)
-    childs = ""
+    childs = []
     data.each_pair do | key, value |
-      childs += "<dt>#{ key.to_s.escapeHTML }</dt>\n"
+      childs << tag(:dt, key)
       if check_data?(value)
-        childs += "<dd>#{ convert(value) }</dd>\n"
+        childs << tag(:dd, convert(value), :escaped => true)
       else
-        childs += "<dd>#{ value.to_s.escapeHTML }</dd>\n"
+        childs << tag(:dd, value)
       end
     end
-    childs
+    childs.join("\n")
+  end
+
+  def tag(name, caption, options = {})
+    caption = caption.to_s
+    "<#{name}>#{options[:escaped] ? caption : escape_html(caption)}</#{name}>"
+  end
+
+  def escape_html(str)
+    str.to_s.gsub(ESCAPE_REGEXP) { |char| ESCAPE_VALUES[char] }
   end
 end

data/lib/version.rb

@@ -0,0 +1,3 @@
+class DataConverter
+  VERSION = '0.1.7'
+end

data/test/data_converter_spec.rb

@@ -0,0 +1,43 @@
+require File.expand_path("../../lib/data-converter", __FILE__)
+require 'rubygems'
+require 'rspec-html-matchers'
+require 'rspec'
+
+describe DataConverter do
+  before(:all) do
+    @array_data = [0, 1, 2, ["string", DataConverter, :symbol, 0.1]]
+    @hash_data  = { :foo => ["bar", "baz"], :hoge => { :fuga => :symbol }, :const => DataConverter, :float => 0.1 }
+  end
+
+  it "should support array." do
+    actual_html = DataConverter.parse(@array_data)
+    expect(actual_html).to have_tag('ul') do
+      with_tag 'li', :text => 0
+      with_tag 'li', :text => 1
+      with_tag 'li', :text => 2
+      with_tag 'li > ul'
+      with_tag 'li > ul li', :text => "string"
+      with_tag 'li > ul li', :text => "DataConverter"
+      with_tag 'li > ul li', :text => "symbol"
+      with_tag 'li > ul li', :text => "0.1"
+    end
+  end
+
+  it "should support hash." do
+    actual_html = DataConverter.parse(@hash_data)
+    expect(actual_html).to have_tag('dl') do
+      with_tag 'dt', :text => 'foo'
+      with_tag 'dt', :text => 'hoge'
+      with_tag 'dt', :text => 'const'
+      with_tag 'dt', :text => 'float'
+      with_tag 'dd > ul'
+      with_tag 'dd > ul > li', :text => 'bar'
+      with_tag 'dd > ul > li', :text => 'baz'
+      with_tag 'dd > dl'
+      with_tag 'dd > dl > dt', :text => 'fuga'
+      with_tag 'dd > dl > dd', :text => 'symbol'
+      with_tag 'dd', :text => "DataConverter"
+      with_tag 'dd', :text => '0.1'
+    end
+  end
+end

metadata

@@ -1,68 +1,91 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: data-converter
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 6
-  version: 0.1.6
+version: !ruby/object:Gem::Version
+  version: 0.1.7
 platform: ruby
-authors: 
+authors:
 - namusyaka
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-29 00:00:00 Z
-dependencies: []
-
-description: Convert hash and array into HTML Element (Array => ul, Hash => dl).
+date: 2013-08-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-html-matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Convert hash and array into HTML Element.
 email: namusyaka@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- README.md
 - data-converter.gemspec
-- README.rdoc
 - lib/data-converter.rb
-- test/test.rb
+- lib/version.rb
+- test/data_converter_spec.rb
 homepage: https://github.com/namusyaka/data-converter
-licenses: []
-
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+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"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.1
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
-summary: It is under the devlopment.
+specification_version: 4
+summary: Convert hash and array into HTML Element.
 test_files: []
-
+has_rdoc: 

data/README.rdoc

@@ -1,24 +0,0 @@
-=data-converter
-
-
-==Install
-  gem install data-converter
-
-==Description
-  Convert hash and array into HTML Element (Array => ul, Hash => dl).
-  It's under the development.
-
-==Code
-  require 'rubygems'
-  require 'data-converter'
-
-  puts DataConverter.parse({
-    :a => "b",
-    :c => { :d => ["<>&\"'", 1, 2] }
-  })
-  
-==License
-  the MIT License
-
-==Author
-  namusyaka

data/test/test.rb

@@ -1,59 +0,0 @@
-require 'test/unit'
-require File.expand_path('../../lib/data-converter', __FILE__)
-
-class Test_DataConverter < Test::Unit::TestCase
-  HASH_RESULT = <<-EOS
-<dl>
-<dt>a</dt>
-<dd><dl>
-<dt>b</dt>
-<dd><dl>
-<dt>c</dt>
-<dd><ul>
-<li>0</li>
-<li>1</li>
-<li>2</li>
-<li>3</li>
-</ul>
-</dd>
-</dl>
-</dd>
-</dl>
-</dd>
-</dl>
-  EOS
-
-  ARRAY_RESULT = <<-EOS
-<ul>
-<li><dl>
-<dt>f</dt>
-<dd><ul>
-<li>4</li>
-<li>5</li>
-<li>6</li>
-<li>7</li>
-</ul>
-</dd>
-</dl>
-</li>
-</ul>
-  EOS
-
-  def setup
-    @hash_data = { :a => { :b => { :c => [0, 1, 2, 3] } } }
-    @array_data = [{ :f => [4, 5, 6, 7] }]
-    @class = DataConverter
-  end
- 
-  def test_array_parse
-    assert_equal(ARRAY_RESULT, @class.parse(@array_data))
-  end
- 
-  def test_hash_parse
-    assert_equal(HASH_RESULT, @class.parse(@hash_data))
-  end
- 
-  def test_other_approach
-    assert_equal(HASH_RESULT, DataConverter.new(@hash_data).convert)
-  end  
-end