hexp 0.3.3 → 0.4.0.beta1

data/spec/unit/hexp/node/rewrite_spec.rb

@@ -60,7 +60,7 @@ describe Hexp::Node, 'rewrite' do
     end
 
     it 'should not pass those nodes again to the block' do
-      rewriter.to_hexp.should == H[:div, [
+      expect(rewriter.to_hexp).to eql H[:div, [
           [:a],
           [:blockquote, [
               [:p]]],

data/spec/unit/hexp/node/text_spec.rb

@@ -3,5 +3,5 @@ require 'spec_helper'
 describe Hexp::Node do
   subject { described_class[:p] }
 
-  its(:text?) { should be_false }
+  its(:text?) { should be false }
 end

data/spec/unit/hexp/node/to_dom_spec.rb

@@ -5,6 +5,6 @@ describe Hexp::Node, 'to_dom' do
 
   it 'should delegate to Domize' do
     expect(Hexp::Node::Domize).to receive(:new).with(subject, {}).and_return( ->{ 'result' } )
-    subject.to_dom.should == 'result'
+    expect(subject.to_dom).to eql 'result'
   end
 end

data/spec/unit/hexp/node/to_html_spec.rb

@@ -4,6 +4,22 @@ describe Hexp::Node, 'to_html' do
   subject { Hexp::Node[:tt] }
 
   it 'should render HTML' do
-    subject.to_html.should =~ %r{<tt></tt>}
+    expect(subject.to_html).to eql '<tt></tt>'
+  end
+
+  describe 'attribute escaping' do
+    subject { Hexp::Node[:foo, {bar: "it's fine&dandy"}] }
+
+    it 'should escape ampersand, single quote' do
+      expect(subject.to_html).to eql "<foo bar='it&#x27;s fine&amp;dandy'></foo>"
+    end
+  end
+
+  describe 'text node escaping' do
+    subject { Hexp::Node[:foo, "it's 5 > 3, & 6 < 3, \"fine chap\""] }
+
+    it 'should escape ampersand, single quote, double quote, lower than, greater than' do
+      expect(subject.to_html).to eql "<foo>it&#x27;s 5 &gt; 3, &amp; 6 &lt; 3, &quot;fine chap&quot;</foo>"
+    end
   end
 end

data/spec/unit/hexp/nokogiri/equality_spec.rb

@@ -5,7 +5,7 @@ describe Hexp::Nokogiri::Equality do
 
   context 'two empty documents' do
     it 'should be equal' do
-      described_class.new(Nokogiri::HTML::Document.new, Nokogiri::HTML::Document.new).call.should be_true
+      expect(described_class.new(Nokogiri::HTML::Document.new, Nokogiri::HTML::Document.new).call).to be true
     end
   end
 
@@ -16,7 +16,7 @@ describe Hexp::Nokogiri::Equality do
       node2 = Nokogiri::XML::Node.new('div', doc)
       node2['class'] = 'hello'
 
-      described_class.new(node1, node2).call.should be_true
+      expect(described_class.new(node1, node2).call).to be true
     end
   end
 
@@ -28,7 +28,7 @@ describe Hexp::Nokogiri::Equality do
       node2['class'] = 'hello'
       node2['id'] = 'zigzag'
 
-      described_class.new(node1, node2).call.should be_true
+      expect(described_class.new(node1, node2).call).to be true
     end
   end
 
@@ -39,7 +39,7 @@ describe Hexp::Nokogiri::Equality do
       node2 = Nokogiri::XML::Node.new('div', doc)
       node2 << Nokogiri::XML::Node.new('p', doc)
 
-      described_class.new(node1, node2).call.should be_true
+      expect(described_class.new(node1, node2).call).to be true
     end
   end
 
@@ -50,7 +50,7 @@ describe Hexp::Nokogiri::Equality do
       node2 = Nokogiri::XML::Node.new('div', doc)
       node2 << Nokogiri::XML::Node.new('em', doc)
 
-      described_class.new(node1, node2).call.should be_false
+      expect(described_class.new(node1, node2).call).to be false
     end
   end
 
@@ -62,7 +62,7 @@ describe Hexp::Nokogiri::Equality do
       node2 << Nokogiri::XML::Node.new('p', doc)
       node2 << Nokogiri::XML::Node.new('em', doc)
 
-      described_class.new(node1, node2).call.should be_false
+      expect(described_class.new(node1, node2).call).to be false
     end
   end
 

data/spec/unit/hexp/text_node_spec.rb

@@ -12,13 +12,13 @@ describe Hexp::TextNode do
   end
 
   describe 'DSL methods' do
-    its(:text?)   { should be_true }
+    its(:text?)   { should be true }
     its(:rewrite) { should eq(subject) }
     its(:to_hexp) { should eq(subject) }
 
     describe 'class?' do
       it 'should always return false' do
-        expect(subject.class?('strong')).to be_false
+        expect(subject.class?('strong')).to be false
       end
     end
   end

metadata

@@ -1,113 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: hexp
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0.beta1
 platform: ruby
 authors:
 - Arne Brasseur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-16 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.19
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: ice_nine
+  name: adamantium
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: equalizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: benchmark_suite
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mutant-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-its
+  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: Generate and manipulate HTML documents and nodes.
 email:
 - arne@arnebrasseur.net
@@ -116,13 +144,11 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - Changelog.md
 - Gemfile
-- Gemfile.devtools
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -143,6 +169,7 @@ files:
 - hexp.gemspec
 - lib/hexp.rb
 - lib/hexp/builder.rb
+- lib/hexp/core_ext/nil.rb
 - lib/hexp/css_selector.rb
 - lib/hexp/css_selector/parser.rb
 - lib/hexp/css_selector/sass_parser.rb
@@ -164,6 +191,7 @@ files:
 - lib/hexp/nokogiri/reader.rb
 - lib/hexp/sass/selector_parser.rb
 - lib/hexp/text_node.rb
+- lib/hexp/unparser.rb
 - lib/hexp/version.rb
 - spec/integration/literal_syntax_spec.rb
 - spec/shared_helper.rb
@@ -208,17 +236,17 @@ require_paths:
 - lib
 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'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Generate and manipulate HTML documents and nodes.

data/Gemfile.devtools

@@ -1,55 +0,0 @@
-# encoding: utf-8
-
-group :development do
-  gem 'rake',  '~> 10.1.0'
-  gem 'rspec', '~> 2.14.1'
-  gem 'yard',  '~> 0.8.7'
-end
-
-group :yard do
-  gem 'kramdown', '~> 1.1.0'
-end
-
-group :guard do
-  gem 'guard',         '~> 1.8.1'
-  gem 'guard-bundler', '~> 1.0.0'
-  gem 'guard-rspec',   '~> 3.0.2'
-  gem 'guard-rubocop', '~> 0.2.0'
-  # gem 'guard-mutant',  '~> 0.0.1'
-
-  # file system change event handling
-  gem 'listen',     '~> 1.3.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
-end
-
-group :metrics do
-  gem 'coveralls', '~> 0.6.7'
-  gem 'flay',      '~> 2.4.0'
-  gem 'flog',      '~> 4.1.1'
-  gem 'reek',      '~> 1.3.2'
-  gem 'rubocop',   '~> 0.11.0'
-  gem 'simplecov', '~> 0.7.1'
-  gem 'yardstick', '~> 0.9.7', git: 'https://github.com/dkubb/yardstick.git'
-
-  platforms :ruby_19, :ruby_20 do
-    # gem 'mutant', git: 'https://github.com/mbj/mutant.git'
-    gem 'yard-spellcheck', '~> 0.1.5'
-  end
-end
-
-group :benchmarks do
-  gem 'rbench', '~> 0.2.3'
-end
-
-platform :jruby do
-  group :jruby do
-    gem 'jruby-openssl', '~> 0.8.5'
-  end
-end

data/Gemfile.lock

@@ -1,186 +0,0 @@
-GIT
-  remote: git://github.com/rom-rb/devtools.git
-  revision: f831a3b8963ee4d4104b988b4d68e772acd25373
-  specs:
-    devtools (0.0.2)
-
-GIT
-  remote: https://github.com/dkubb/yardstick.git
-  revision: 2ab8dd59c64e9da098294b9056d08794cb06e994
-  specs:
-    yardstick (0.9.9)
-      yard (~> 0.8, >= 0.8.7.2)
-
-PATH
-  remote: .
-  specs:
-    hexp (0.3.3)
-      equalizer (~> 0.0)
-      ice_nine (~> 0.9)
-      nokogiri (~> 1.6)
-      sass (~> 3.2.19)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (1.1.0)
-    backports (3.3.5)
-    benchmark-ips (1.2.0)
-    benchmark_suite (1.0.0)
-      benchmark-ips (~> 1.0)
-    bouncy-castle-java (1.5.0147)
-    coderay (1.1.0)
-    coveralls (0.6.9)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
-    diff-lcs (1.2.5)
-    equalizer (0.0.9)
-    ffi (1.9.3)
-    ffi (1.9.3-java)
-    ffi-hunspell (0.3.0)
-      ffi (~> 1.0)
-    flay (2.4.0)
-      ruby_parser (~> 3.0)
-      sexp_processor (~> 4.0)
-    flog (4.1.2)
-      ruby_parser (~> 3.1, > 3.1.0)
-      sexp_processor (~> 4.0)
-    formatador (0.2.4)
-    guard (1.8.3)
-      formatador (>= 0.2.4)
-      listen (~> 1.3)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    guard-bundler (1.0.0)
-      bundler (~> 1.0)
-      guard (~> 1.1)
-    guard-rspec (3.0.3)
-      guard (>= 1.8)
-      rspec (~> 2.13)
-    guard-rubocop (0.2.2)
-      guard (~> 1.8)
-      rubocop (~> 0.10)
-    ice_nine (0.11.0)
-    jruby-openssl (0.8.10)
-      bouncy-castle-java (>= 1.5.0147)
-    kramdown (1.1.0)
-    libnotify (0.8.2)
-      ffi (>= 1.0.11)
-    listen (1.3.1)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    lumberjack (1.0.5)
-    method_source (0.8.2)
-    mime-types (2.2)
-    mini_portile (0.5.3)
-    multi_json (1.9.2)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    nokogiri (1.6.1-java)
-      mini_portile (~> 0.5.0)
-    parser (2.0.0)
-      ast (~> 1.1)
-      slop (~> 3.4, >= 3.4.5)
-    powerpack (0.0.9)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    pry (0.9.12.6-java)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-      spoon (~> 0.0)
-    rainbow (2.0.0)
-    rake (10.1.1)
-    rb-fchange (0.0.6)
-      ffi
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.3)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.2)
-      ffi (>= 0.5.0)
-    rb-notifu (0.0.4)
-    rbench (0.2.3)
-    reek (1.3.7)
-      rainbow
-      ruby2ruby (~> 2.0.8)
-      ruby_parser (~> 3.3)
-      sexp_processor
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    rubocop (0.11.1)
-      backports (~> 3.3.3)
-      parser (~> 2.0.0.pre6)
-      powerpack (~> 0.0.3)
-      rainbow (>= 1.1.4)
-    ruby2ruby (2.0.8)
-      ruby_parser (~> 3.1)
-      sexp_processor (~> 4.0)
-    ruby_parser (3.5.0)
-      sexp_processor (~> 4.1)
-    sass (3.2.19)
-    sexp_processor (4.4.3)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    slop (3.5.0)
-    spoon (0.0.4)
-      ffi
-    term-ansicolor (1.3.0)
-      tins (~> 1.0)
-    terminal-notifier-guard (1.5.3)
-    thor (0.19.1)
-    tins (1.1.0)
-    yard (0.8.7.4)
-    yard-spellcheck (0.1.5)
-      ffi-hunspell (~> 0.2)
-      yard (~> 0.6)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  benchmark_suite (~> 1.0)
-  coveralls (~> 0.6.7)
-  devtools!
-  flay (~> 2.4.0)
-  flog (~> 4.1.1)
-  guard (~> 1.8.1)
-  guard-bundler (~> 1.0.0)
-  guard-rspec (~> 3.0.2)
-  guard-rubocop (~> 0.2.0)
-  hexp!
-  jruby-openssl (~> 0.8.5)
-  kramdown (~> 1.1.0)
-  libnotify (~> 0.8.0)
-  listen (~> 1.3.0)
-  rake (~> 10.1.0)
-  rb-fchange (~> 0.0.6)
-  rb-fsevent (~> 0.9.3)
-  rb-inotify (~> 0.9.0)
-  rb-notifu (~> 0.0.4)
-  rbench (~> 0.2.3)
-  reek (~> 1.3.2)
-  rspec (~> 2.14.1)
-  rubocop (~> 0.11.0)
-  simplecov (~> 0.7.1)
-  terminal-notifier-guard (~> 1.5.3)
-  yard (~> 0.8.7)
-  yard-spellcheck (~> 0.1.5)
-  yardstick (~> 0.9.7)!