html 0.0.1 → 0.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: da09a50f8846475cb4145bcd212646c53c61ddbf
+  data.tar.gz: 3e70f3a5fc6c246274eeb5ccfbbc5b4ca869f47b
+SHA512:
+  metadata.gz: f60f69e38d7d84e5469076e71ed69e93208d16ad49657c873b261f7a788ac3ab526cc9a0a7da2312c2c38ba693bb69be8474b461104994aa4b1c85b4d2fb961c
+  data.tar.gz: af47fa9cd20ca6eb3488def0cc0ce1982c72872061cc44af8546c25de41664824cb33050ad52e58bd578c826e8f3b5b77174bc420cfa2f5f868c3b8351c75f69

data/.circle.yml

@@ -0,0 +1,4 @@
+---
+test:
+  override: 
+    - bundle exec rake ci

data/.travis.yml

@@ -1,16 +1,8 @@
 language: ruby
-bundler_args: --without guard 
+bundler_args: --without guard
 script: "bundle exec rake ci"
 rvm:
-  - 1.9.2
   - 1.9.3
-  - jruby-19mode 
-  - rbx-19mode
-allowed_failures:
-  matrix:
-    - 1.8.7
-    - jruby-18mode 
-    - rbx-18mode
-notifications:
-  email:
-    - mbj@seonic.net
+  - 2.0.0
+  - jruby
+  - rbx-2

data/Gemfile

@@ -2,5 +2,5 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'devtools',            :git => 'https://github.com/datamapper/devtools.git'
+gem 'devtools', :git => 'https://github.com/rom-rb/devtools.git'
 eval File.read('Gemfile.devtools')

data/Gemfile.devtools

@@ -1,55 +1,60 @@
 # encoding: utf-8
 
 group :development do
-  gem 'rake',  '~> 10.0.3'
-  gem 'rspec', '~> 2.13.0'
-  gem 'yard',  '~> 0.8.5'
+  gem 'rake',  '~> 10.1.0'
+  gem 'rspec', '~> 2.14.1'
+  gem 'yard',  '~> 0.8.7'
+
+  platform :rbx do
+    gem 'rubysl-singleton', '~> 2.0.0'
+  end
 end
 
 group :yard do
-  gem 'kramdown', '~> 0.14.2'
+  gem 'kramdown', '~> 1.3.0'
 end
 
 group :guard do
-  gem 'guard',         '~> 1.6.2'
-  gem 'guard-bundler', '~> 1.0.0'
-  gem 'guard-rspec',   '~> 2.4.1'
+  gem 'guard',         '~> 2.3.0'
+  gem 'guard-bundler', '~> 2.0.0'
+  gem 'guard-rspec',   '~> 4.2.0'
+  gem 'guard-rubocop', '~> 1.0.0'
 
   # file system change event handling
-  gem 'rb-fchange', '~> 0.0.6', :require => false
-  gem 'rb-fsevent', '~> 0.9.3', :require => false
-  gem 'rb-inotify', '~> 0.9.0', :require => false
-
-  gem 'listen', '~> 0.7.3'
+  gem 'listen',     '~> 2.4.0'
+  gem 'rb-fchange', '~> 0.0.6', require: false
+  gem 'rb-fsevent', '~> 0.9.3', require: false
+  gem 'rb-inotify', '~> 0.9.0', require: false
 
   # notification handling
-  gem 'libnotify',               '~> 0.8.0', :require => false
-  gem 'rb-notifu',               '~> 0.0.4', :require => false
-  gem 'terminal-notifier-guard', '~> 1.5.3', :require => false
+  gem 'libnotify',               '~> 0.8.0', require: false
+  gem 'rb-notifu',               '~> 0.0.4', require: false
+  gem 'terminal-notifier-guard', '~> 1.5.3', require: false
 end
 
 group :metrics do
-  gem 'flay',            '~> 2.1.0'
-  gem 'flog',            '~> 3.2.2'
-  gem 'reek',            '~> 1.3.1'
-  gem 'metric_fu-roodi', '~> 2.2.1'
-  gem 'yardstick',       '~> 0.9.3'
+  gem 'coveralls', '~> 0.7.0'
+  gem 'flay',      '~> 2.4.0'
+  gem 'flog',      '~> 4.2.0'
+  gem 'reek',      '~> 1.3.2'
+  gem 'rubocop',   '~> 0.16.0'
+  gem 'simplecov', '~> 0.8.2'
+  gem 'yardstick', '~> 0.9.9'
 
-  platforms :ruby_18, :ruby_19 do
-    # this indirectly depends on ffi which does not build on ruby-head
-    gem 'yard-spellcheck', '~> 0.1.5'
+  platforms :mri do
+    gem 'mutant', '~> 0.3.4'
   end
 
-  platforms :mri_19, :rbx do
-    gem 'mutant', '~> 0.2.20'
-  end
-
-  platforms :mri_19 do
-    gem 'simplecov', '~> 0.7.1'
+  platforms :ruby_19, :ruby_20 do
+    gem 'yard-spellcheck', '~> 0.1.5'
   end
 
-  platforms :rbx do
-    gem 'pelusa', '~> 0.2.2'
+  platform :rbx do
+    gem 'json',               '~> 1.8.1'
+    gem 'racc',               '~> 1.4'
+    gem 'rubysl-logger',      '~> 2.0.0'
+    gem 'rubysl-open-uri',    '~> 2.0.0'
+    gem 'rubysl-prettyprint', '~> 2.0.2'
   end
 end
 
@@ -59,6 +64,6 @@ end
 
 platform :jruby do
   group :jruby do
-    gem 'jruby-openssl', '~> 0.8.2'
+    gem 'jruby-openssl', '~> 0.8.5'
   end
 end

data/circle.yml

@@ -0,0 +1,3 @@
+test:
+  override:
+    - bundle exec rake ci

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 14
-total_score: 26
+total_score: 28

data/config/{site.reek → reek.yml}

@@ -7,7 +7,7 @@ UncommunicativeParameterName:
   - !ruby/regexp /^.$/
   - !ruby/regexp /[0-9]$/
   - !ruby/regexp /[A-Z]/
-LargeClass:
+TooManyMethods:
   max_methods: 10
   exclude: []
   enabled: true
@@ -51,11 +51,11 @@ NestedIterators:
   - Adamantium::ModuleMethods#define_memoize_method # 2 levels
   enabled: true
   max_allowed_nesting: 1
-LongMethod:
+TooManyStatements:
   max_statements: 7  # TODO: decrease max_statements to 5 or less
   exclude: []
   enabled: true
-Duplication:
+DuplicateMethodCall:
   allow_calls: []
   exclude: []
   enabled: true
@@ -75,7 +75,7 @@ UncommunicativeVariableName:
   - !ruby/regexp /^.$/
   - !ruby/regexp /[0-9]$/
   - !ruby/regexp /[A-Z]/
-SimulatedPolymorphism:
+RepeatedConditional:
   exclude: []
   enabled: true
   max_ifs: 1
@@ -84,7 +84,7 @@ DataClump:
   enabled: true
   max_copies: 1
   min_clump_size: 3
-ControlCouple:
+ControlParameter:
   exclude: []
   enabled: true
 LongYieldList:

data/html.gemspec

@@ -2,9 +2,9 @@
 
 Gem::Specification.new do |gem|
   gem.name        = 'html'
-  gem.version     = '0.0.1'
+  gem.version     = '0.1.1'
   gem.authors     = [ 'Markus Schirp' ]
-  gem.email       = [ 'mbj@seonic.net' ]
+  gem.email       = [ 'mbj@schirp-dso.com' ]
   gem.description = 'Because HTML is not a String'
   gem.summary     = gem.description
   gem.homepage    = 'https://github.com/mbj/html'
@@ -12,9 +12,9 @@ Gem::Specification.new do |gem|
   gem.require_paths    = [ 'lib' ]
   gem.files            = `git ls-files`.split("\n")
   gem.test_files       = `git ls-files -- spec`.split("\n")
+  gem.license          = 'MIT'
   gem.extra_rdoc_files = %w[TODO]
 
-  gem.add_runtime_dependency('backports',  [ '~> 3.0', '>= 3.0.3' ])
-  gem.add_runtime_dependency('adamantium',   '~> 0.0.7')
-  gem.add_runtime_dependency('equalizer',    '~> 0.0.5')
+  gem.add_runtime_dependency('adamantium',   '~> 0.1.0')
+  gem.add_runtime_dependency('equalizer',    '~> 0.0.9')
 end

data/lib/html.rb

@@ -1,5 +1,5 @@
 #encoding: utf-8
-require 'backports'
+
 require 'adamantium'
 require 'equalizer'
 require 'ice_nine'
@@ -9,13 +9,13 @@ module HTML
 
   CONTENT_TAGS = IceNine.deep_freeze(%w(
     a abbr address article aside audio b bdi bdo blockquote
-    body button canvas caption cite code col colgroup data 
-    dd del details dfn div dl dt em embed eventsource fieldset 
-    fieldsource figcaption figure footer form h1 h2 h3 h4 h5 h6 
-    head header hgroup html i iframe ins kbd label legend li link 
-    mark menu nav noscript object ol optgroup option output p pre 
-    q ruby rp rt s samp script section select small span strong 
-    style sub summary sup table tbody textarea tfoot th thead time 
+    body button canvas caption cite code col colgroup data
+    dd del details dfn div dl dt em embed eventsource fieldset
+    fieldsource figcaption figure footer form h1 h2 h3 h4 h5 h6
+    head header hgroup html i iframe ins kbd label legend li link
+    mark menu nav noscript object ol optgroup option output p pre
+    q ruby rp rt s samp script section select small span strong
+    style sub summary sup table tbody textarea tfoot th thead time
     title td tr ul var video
   ))
 
@@ -33,12 +33,18 @@ module HTML
   # @api private
   #
   def self.join(components)
-    contents = components.map do |component| 
+    contents = components.map do |component|
       Fragment.build(component)
     end
     Fragment.new(contents.join)
   end
 
+  ESCAPE_TABLE = IceNine.deep_freeze(
+    '>' => '<',
+    '<' => '&gt;',
+    '"' => '&quot;',
+    '&' => '&amp;'
+  )
 
   # Escape html
   #
@@ -50,13 +56,10 @@ module HTML
   #
   def self.escape(text)
     text.gsub(
-      /[><"]/,
-      '>' => '&lt;',
-      '<' => '&gt;',
-      '"' => '&amp;'
+      /[><"&]/, ESCAPE_TABLE
     )
   end
-  
+
   CONTENT_TAGS.each do |name|
     class_eval(<<-RUBY, __FILE__, __LINE__)
       def self.#{name}(*args)
@@ -86,7 +89,7 @@ module HTML
     Fragment.new("<#{type}#{attributes(attributes)}/>")
   end
 
-  # Create content tag 
+  # Create content tag
   #
   # @param [#to_str] type
   # @param [String] content
@@ -96,7 +99,7 @@ module HTML
   # @api private
   #
   def self.content_tag(type, content, attributes={})
-    Fragment.new("<#{type}#{attributes(attributes)}>#{Fragment.build(content).to_s}</#{type}>")
+    Fragment.new("<#{type}#{attributes(attributes)}>#{Fragment.build(content)}</#{type}>")
   end
 
   # Create html attributes
@@ -109,7 +112,7 @@ module HTML
   #
   def self.attributes(attributes)
     attributes.map do |key, value|
-      %Q{ #{key.to_s}="#{escape(value.to_s)}"} 
+      %Q{ #{key}="#{escape(value.to_s)}"}
     end.join
   end
 end

data/lib/html/fragment.rb

@@ -24,7 +24,7 @@ module HTML
       @content = string
     end
 
-    # Return string 
+    # Return string
     #
     # FIXME: This will be removed once I have my own templating language.
     #
@@ -32,14 +32,29 @@ module HTML
     #
     alias_method :to_s, :content
 
+    # Enumerate contents
+    #
+    # The idea is to make it compatible with a rack body.
+    #
+    # @return [self]
+    #   if block given
+    #
+    # @api private
+    #
+    def each
+      return to_enum unless block_given?
+      yield content
+      self
+    end
+
     # Create new fragment
     #
     # @param [String,Fragment] input
-    #  
+    #
     # @return [Fragment]
     #
     # @api private
-    #   
+    #
     def self.build(input)
       if input.kind_of?(self)
         input
@@ -49,6 +64,6 @@ module HTML
     end
 
     EMPTY = new('')
-  end
 
-end
+  end # Fragment
+end # HTML

data/spec/spec_helper.rb

@@ -1,11 +1,5 @@
 # encoding: utf-8
 
 require 'html'
-require 'rspec'
-
-# require spec support files and shared behavior
-Dir[File.expand_path('../{support,shared}/**/*.rb', __FILE__)].each { |f| require f }
-
-
-RSpec.configure do |config|
-end
+require 'devtools'
+require 'devtools/spec_helper'

data/spec/unit/html/class_methods/attributes_spec.rb

@@ -7,7 +7,8 @@ describe HTML, '.attributes' do
 
   examples = {
     { 'foo'  => 'bar' } => ' foo="bar"',
-    { 'foo'  => '"'   } => ' foo="&"',
+    { 'foo'  => '"'   } => ' foo="""',
+    { 'foo'  => '&'   } => ' foo="&"',
     { :class => :baz  } => ' class="baz"'
   }
 

data/spec/unit/html/class_methods/content_tag_spec.rb

@@ -16,6 +16,16 @@ describe HTML, '.tag' do
     end
   end
 
+  context 'with plaintext content' do
+    let(:arguments) { [ name, content] }
+
+    let(:content) { '<foo>' }
+
+    it 'should return html fragment wrapping excapted content' do
+      should eql(HTML::Fragment.new('<foo>&gt;foo&lt;</foo>'))
+    end
+  end
+
   context 'with attributes' do
     let(:arguments) { [ name, content, attributes ] }
 

data/spec/unit/html/class_methods/escape_spec.rb

@@ -9,7 +9,7 @@ describe HTML, '.escape' do
     'foo' => 'foo',
     '<>'  => '&gt;&lt;',
     '<foo>'  => '&gt;foo&lt;',
-    '<foo bar="baz">'  => '&gt;foo bar=&amp;baz&amp;&lt;'
+    '<foo bar="baz">'  => '&gt;foo bar=&quot;baz&quot;&lt;'
   }
 
   examples.each do |input, expectation|

data/spec/unit/html/fragment/class_methods/build_spec.rb

@@ -15,7 +15,7 @@ describe HTML::Fragment, '.build' do
   end
 
   context 'when input is HTML::Fragment' do
-    let(:input) { HTML::Fragment.new(mock) }
+    let(:input) { HTML::Fragment.new(double) }
 
     it 'should be input' do
       should be(input)

data/spec/unit/html/fragment/each_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe HTML::Fragment, '#each' do
+  let(:yields) { [] }
+
+  let(:object) { described_class.new(chunk) }
+
+  let(:chunk) { double('Chunk') }
+
+  context 'with block' do
+    subject { object.each { |chunk| yields << chunk } }
+
+    it 'should enumerate chunks' do
+      expect { subject }.to change { yields }.from([]).to([chunk])
+    end
+
+    it_should_behave_like 'a command method'
+  end
+
+  context 'without block' do
+    subject { object.each }
+
+    it { should be_a(Enumerator) }
+
+    its(:to_a) { should eql([chunk]) }
+  end
+end

metadata

@@ -1,92 +1,67 @@
 --- !ruby/object:Gem::Specification
 name: html
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors:
 - Markus Schirp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2014-02-16 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: backports
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.3
 - !ruby/object:Gem::Dependency
   name: adamantium
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: equalizer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.9
 description: Because HTML is not a String
 email:
-- mbj@seonic.net
+- mbj@schirp-dso.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - TODO
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".circle.yml"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Changelog.md
 - Gemfile
 - Gemfile.devtools
 - README.md
 - Rakefile
 - TODO
+- circle.yml
 - config/flay.yml
 - config/flog.yml
 - config/mutant.yml
+- config/reek.yml
 - config/roodi.yml
-- config/site.reek
 - config/yardstick.yml
 - html.gemspec
 - lib/html.rb
@@ -100,30 +75,31 @@ files:
 - spec/unit/html/class_methods/nocontent_tags_spec.rb
 - spec/unit/html/class_methods/tag_spec.rb
 - spec/unit/html/fragment/class_methods/build_spec.rb
+- spec/unit/html/fragment/each_spec.rb
 - spec/unit/html/fragment/initialize_spec.rb
 homepage: https://github.com/mbj/html
-licenses: []
+licenses:
+- MIT
+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.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Because HTML is not a String
 test_files:
 - spec/spec_helper.rb
@@ -135,5 +111,5 @@ test_files:
 - spec/unit/html/class_methods/nocontent_tags_spec.rb
 - spec/unit/html/class_methods/tag_spec.rb
 - spec/unit/html/fragment/class_methods/build_spec.rb
+- spec/unit/html/fragment/each_spec.rb
 - spec/unit/html/fragment/initialize_spec.rb
-has_rdoc: