hexp 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45fe82cfc464b888c41d8b632a929f6074d9b1cb
-  data.tar.gz: 9a015de7db34bd56cadf8304a940d51fea9f6d9e
+  metadata.gz: c9c632d0e470fa5f4c296f3eea2ae8069eef7b54
+  data.tar.gz: 4d22a65fe1a865974c745846bf2e4f350b807a12
 SHA512:
-  metadata.gz: ef380c391229dcb9716d9472882714ded77f5c3e0169f8ff98312a5e23bd1b61e3caed513f0e2c561e86b9e399b94ee88d0fbd7606f1ee83b353884199cff596
-  data.tar.gz: 29570e22c84b840bd04429ca27f5dc9535e3e4b080007ffda9e80f9472b61ae476ca1a4a036600c8db6f6cd9921a2be0cd44dc8c394505b7a5642874b6148454
+  metadata.gz: fe5cdf5086cb3c3a44b4a3a5b06ffa8787084865af31d607a253b4ecb8373f5611f270c70f780d1ee1f991f20dab4770aec803b423fe78cf0a665121b3df641c
+  data.tar.gz: bd4927fdc7ab98569707f1ef9966b15ffcb2eed58524212511b9cf62976ada17bc94adda6c86f30fce5c7b2cc8f45d2e1544fdfc27b45970c94ac7e20e9eb5df

data/.travis.yml

@@ -1,22 +1,46 @@
-# Currently fails on JRuby, partly due to Nokogiri behaving differently,
-# and partly for some other reason I'm not sure about regarding
-# Hexp::Node::Normalize
 language: ruby
-script: "bundle exec rspec"
+
+script: bundle exec rake $TASK
+
+sudo: false
+
 rvm:
   - 1.9.3
-  - 2.0.0
-  - 2.1.1
-  - 2.1.2
-  - 2.1.3
+  - 2.0
   - 2.1
-  - rbx
+  - 2.2
   - jruby
   - jruby-head
+  - rbx
   - ruby-head
+
+env:
+  - TASK=rspec
+  - TASK=mutant
+
 matrix:
+  # Jruby should be taken out of this list. It fails now because of a
+  # subtle Nokogiri incompatibility
   allow_failures:
     - rvm: jruby
     - rvm: ruby-head
     - rvm: jruby-head
     - rvm: rbx
+    - env: TASK=mutant
+
+  # Only run mutant on 2.2
+  exclude:
+    - rvm: 1.9.3
+      env: TASK=mutant
+    - rvm: 2.0
+      env: TASK=mutant
+    - rvm: 2.1
+      env: TASK=mutant
+    - rvm: jruby
+      env: TASK=mutant
+    - rvm: jruby-head
+      env: TASK=mutant
+    - rvm: rbx
+      env: TASK=mutant
+    - rvm: ruby-head
+      env: TASK=mutant

data/Changelog.md

@@ -1,6 +1,12 @@
 ### Development
 
-[full diff](http://github.com/plexus/hexp/compare/v0.4.2...master)
+[full diff](http://github.com/plexus/hexp/compare/v0.4.4...master)
+
+### v0.4.4
+
+* Drop the dependency on SASS, use Nokogiri instead for parsing CSS
+  selectors
+
 
 ### v0.4.3
 

data/Rakefile

@@ -46,9 +46,18 @@ end
 require 'mutant'
 task :default => :mutant
 
+desc "run mutant"
 task :mutant do
   pattern = ENV.fetch('PATTERN', 'Hexp*')
   opts    = ENV.fetch('MUTANT_OPTS', '').split(' ')
   result  = Mutant::CLI.run(%w[-Ilib -rhexp --use rspec --score 100] + opts + [pattern])
   fail unless result == Mutant::CLI::EXIT_SUCCESS
 end
+
+require 'rspec/core/rake_task'
+
+desc "run rspec"
+RSpec::Core::RakeTask.new(:rspec) do |t, task_args|
+  t.rspec_opts = "-Ispec"
+  t.pattern = "spec"
+end

data/code_of_conduct.md

@@ -0,0 +1,32 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect
+all people who contribute through reporting issues, posting feature
+requests, updating documentation, submitting pull requests or patches,
+and other activities.
+
+We are committed to making participation in this project a
+harassment-free experience for everyone, regardless of level of
+experience, gender, gender identity and expression, sexual
+orientation, disability, personal appearance, body size, race, age, or
+religion.
+
+Examples of unacceptable behavior by participants include the use of
+sexual language or imagery, derogatory comments or personal attacks,
+trolling, public or private harassment, insults, or other
+unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit,
+or reject comments, commits, code, wiki edits, issues, and other
+contributions that are not aligned to this Code of Conduct. Project
+maintainers who do not follow the Code of Conduct may be removed from
+the project team.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior
+may be reported by opening an issue or contacting one or more of the
+project maintainers.
+
+This Code of Conduct is adapted from the
+[Contributor Covenant](http:contributor-covenant.org), version 1.0.0,
+available at
+[http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)

data/hexp.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |gem|
   gem.test_files       = `git ls-files -- spec`.split($/)
   gem.extra_rdoc_files = %w[README.md]
 
-  gem.add_runtime_dependency 'sass', '~> 3.2.19'
   gem.add_runtime_dependency 'nokogiri', '~> 1.6'
   gem.add_runtime_dependency 'equalizer', '~> 0.0'
   gem.add_runtime_dependency 'concord', '~> 0.0'

data/lib/hexp.rb

@@ -3,7 +3,6 @@ require 'forwardable'
 require 'pathname'
 
 require 'nokogiri'
-require 'sass'
 require 'equalizer'
 require 'concord'
 
@@ -112,7 +111,6 @@ require 'hexp/list'
 require 'hexp/dom'
 
 require 'hexp/css_selector'
-require 'hexp/css_selector/sass_parser'
 require 'hexp/css_selector/parser'
 
 require 'hexp/errors'

data/lib/hexp/css_selector.rb

@@ -100,9 +100,13 @@ module Hexp
       #
       # @api private
       def matches?(element)
-        members.any? do |sequence|
-          sequence.members.count == 1 &&
-            sequence.head_matches?(element)
+        members.any? do |member|
+          case member
+          when Sequence
+            member.members.count == 1 && member.head_matches?(element)
+          else
+            member.matches?(element)
+          end
         end
       end
 
@@ -164,6 +168,10 @@ module Hexp
     class SimpleSequence
       include Members
 
+      def matches_path?(path)
+        matches?(path.last)
+      end
+
       # Does the element match all parts of this SimpleSequence
       #
       # @params [Hexp::Node] element
@@ -176,12 +184,17 @@ module Hexp
           simple.matches?(element)
         end
       end
+      alias head_matches? matches?
     end
 
     # A CSS element declaration, like 'div'
     class Element
       include Named
 
+      def matches_path?(path)
+        matches?(path.last)
+      end
+
       # Does the node match this element selector
       #
       # @param [Hexp::Node] element
@@ -196,6 +209,10 @@ module Hexp
 
     # Match any element, '*'
     class Universal
+      def self.new
+        @@instance ||= super
+      end
+
       def matches?(element)
         true
       end
@@ -250,9 +267,9 @@ module Hexp
     #
     # @api private
     class Attribute
-      include Equalizer.new(:name, :namespace, :operator, :value, :flags)
+      include Equalizer.new(:name, :operator, :value)
 
-      attr_reader :name, :namespace, :operator, :value, :flags
+      attr_reader :name, :operator, :value
 
       # Construct a new Attribute selector
       #
@@ -261,23 +278,17 @@ module Hexp
       #
       # @param [String] name
       #   Name of the attribute, like 'href'
-      # @param [String] namespace
-      #   unused
       # @param [nil, String] operator
       #   Operator like '~=', '^=', ... Use blank to simply test attribute
       #   presence.
       # @param [String] value
       #   Value to test for, operator dependent
-      # @param [Object] flags
-      #   unused
       #
       # @api private
-      def initialize(name, namespace, operator, value, flags)
+      def initialize(name, operator, value)
         @name      = name.freeze
-        @namespace = namespace.freeze
         @operator  = operator.freeze
         @value     = value.freeze
-        @flag      = flags.freeze
       end
 
       # Debugging representation
@@ -286,7 +297,7 @@ module Hexp
       #
       # @api private
       def inspect
-        "<#{self.class.name.split('::').last} name=#{name} namespace=#{namespace.inspect} operator=#{operator.inspect} value=#{value.inspect} flags=#{flags.inspect}>"
+        "<#{self.class.name.split('::').last} name=#{name} operator=#{operator.inspect} value=#{value.inspect}>"
       end
 
       # Does the node match this attribute selector
@@ -301,9 +312,6 @@ module Hexp
         return false unless element[name]
         attribute = element[name]
 
-        # TODO: check the spec with regards to IDENTIFIERS vs STRINGS as value
-        #       see if we can lett SASS parse the string instead of unwrapping
-        #       it ourselves
         value = self.value
         value = $1.gsub('\"', '"') if value =~ /\A"?(.*?)"?\z/
 
@@ -311,19 +319,19 @@ module Hexp
           # CSS 2
         when nil
           true
-        when '='  # exact match
+        when :equal  # '=': exact match
           attribute == value
-        when '~=' # space separated list contains
+        when :includes # '~=': space separated list contains
           attribute.split(' ').include?(value)
-        when '|=' # equal to, or starts with followed by a dash
+        when :dash_match # '|=' equal to, or starts with followed by a dash
           attribute =~ /\A#{Regexp.escape(value)}(-|\z)/
 
           # CSS 3
-        when '^=' # starts with
+        when :prefix_match #'^=': starts with
           attribute.index(value) == 0
-        when '$=' # ends with
+        when :suffix_match # '$=': ends with
           attribute =~ /#{Regexp.escape(value)}\z/
-        when '*=' # contains
+        when :substring_match # '*=': contains
           !!(attribute =~ /#{Regexp.escape(value)}/)
 
         else

data/lib/hexp/css_selector/parser.rb

@@ -28,7 +28,11 @@ module Hexp
       #
       # @api private
       def parse
-        rewrite_comma_sequence(SassParser.call(@selector))
+        CommaSequence.new(
+          ::Nokogiri::CSS.parse(@selector).map do |node|
+            node.accept(self)
+          end
+        )
       end
 
       # Parse a CSS selector in one go
@@ -41,77 +45,59 @@ module Hexp
         new(selector).parse
       end
 
-      private
-
-      # Map CommaSequence from the SASS namespace to our own
-      #
-      # @param [Sass::Selector::CommaSequence] comma_sequence
-      # @return [Hexp::CssSelector::CommaSequence]
-      #
-      # @api private
-      def rewrite_comma_sequence(comma_sequence)
-        CommaSequence.new(comma_sequence.members.map{|sequence| rewrite_sequence(sequence)})
+      def visit_descendant_selector(node)
+        Sequence.new(
+          node.value.map {|child| child.accept(self) }
+        )
       end
 
-      # Map Sequence from the SASS namespace to our own
-      #
-      # @param [Sass::Selector::Sequence] comma_sequence
-      # @return [Hexp::CssSelector::Sequence]
-      #
-      # @api private
-      def rewrite_sequence(sequence)
-        Sequence.new(sequence.members.map{|simple_sequence| rewrite_simple_sequence(simple_sequence)})
-      end
+      def visit_conditional_selector(node)
+        head, tail = node.value
+        children = [head]
+        while tail.type == :COMBINATOR
+          head, tail = tail.value
+          children << head
+        end
+        children << tail
 
-      # Map SimpleSequence from the SASS namespace to our own
-      #
-      # @param [Sass::Selector::SimpleSequence] comma_sequence
-      # @return [Hexp::CssSelector::SimpleSequence]
-      #
-      # @api private
-      def rewrite_simple_sequence(simple_sequence)
-        SimpleSequence.new(simple_sequence.members.map{|simple| rewrite_simple(simple)})
+        SimpleSequence.new(
+          children.map {|child| child.accept(self) }
+        )
       end
 
-      # Map Simple from the SASS namespace to our own
-      #
-      # @param [Sass::Selector::Simple] comma_sequence
-      # @return [Hexp::CssSelector::Simple]
-      #
-      # @api private
-      def rewrite_simple(simple)
-        case simple
-        when ::Sass::Selector::Element             # span
-          Element.new(simple.name.first)
-        when ::Sass::Selector::Class               # .foo
-          Class.new(simple.name.first)
-        when ::Sass::Selector::Id                  # #main
-          Id.new(simple.name.first)
-        when ::Sass::Selector::Attribute           # [href^="http://"]
-          raise "CSS attribute selector flags are curently ignored by Hexp (not implemented)" unless simple.flags.nil?
-          raise "CSS attribute namespaces are curently ignored by Hexp (not implemented)" unless simple.namespace.nil?
-          raise "CSS attribute operator #{simple.operator} not understood by Hexp" unless %w[= ~= ^= |= $= *=].include?(simple.operator) || simple.operator.nil?
-          Attribute.new(
-            simple.name.first,
-            simple.namespace,
-            simple.operator,
-            simple.value ? simple.value.first : nil,
-            simple.flags
-          )
-        when ::Sass::Selector::Universal           # *
+      def visit_element_name(node)
+        if node.value == ["*"]
           Universal.new
         else
-          raise "CSS selectors containing #{simple.class} are not implemented in Hexp"
+          Element.new(node.value.first)
         end
+      end
+
+      def visit_class_condition(node)
+        Class.new(node.value.first)
+      end
 
-        # As of yet unimplemented
-        # when ::Sass::Selector::Universal           # *
-        # when ::Sass::Selector::Parent              # & in Sass
-        # when ::Sass::Selector::Interpolation       # #{} in Sass
-        # when ::Sass::Selector::Pseudo              # :visited, ::first-line, :nth-child(2n+1)
-        # when ::Sass::Selector::SelectorPseudoClass # :not(.foo)
+      def visit_id(node)
+        Id.new(node.value.first.sub(/^#/, ''))
+      end
+
+      # ul > li
+      def visit_child_selector(node)
+        raise "not implemented"
+      end
 
+      # [href^="http://"]
+      def visit_attribute_condition(node)
+        element, operator, value = node.value
+        name = element.value.first
+        Attribute.new(name.sub(/^@/, ''), operator, value)
       end
+
+      # li:first / li:nth-child(3n)
+      def visit_pseudo_selector(node)
+        raise "not implemented"
+      end
+
     end
   end
 end

data/lib/hexp/version.rb

@@ -1,3 +1,3 @@
 module Hexp
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end

data/spec/shared_helper.rb

@@ -7,8 +7,11 @@ RSpec::Matchers.define :dom_eq do |other_dom|
   end
 end
 
-RSpec.configure do |configuration|
-  configuration.mock_with :rspec do |configuration|
+RSpec.configure do |rspec|
+  rspec.mock_with :rspec do |configuration|
     configuration.syntax = :expect
   end
+  rspec.around(:each) do |example|
+    Timeout.timeout(1, &example)
+  end
 end

data/spec/unit/hexp/css_selector/attribute_spec.rb

@@ -1,12 +1,10 @@
 require 'spec_helper'
 
 describe Hexp::CssSelector::Attribute do
-  subject(:selector) { described_class.new(name, namespace, operator, value, flags) }
+  subject(:selector) { described_class.new(name, operator, value) }
   let(:name)      { nil }
-  let(:namespace) { nil }
   let(:operator)  { nil }
   let(:value)     { nil }
-  let(:flags)     { nil }
 
   describe 'without an operator' do
     let(:name) { 'href' }
@@ -26,7 +24,7 @@ describe Hexp::CssSelector::Attribute do
 
   describe 'with the "=" operator' do
     let(:name)     { 'class' }
-    let(:operator) { '=' }
+    let(:operator) { :equal }
     let(:value)    { 'foo' }
 
     it "should match if the attribute's value is exactly equal to the given value" do
@@ -44,7 +42,7 @@ describe Hexp::CssSelector::Attribute do
 
   describe 'the "~=" operator' do
     let(:name)     { 'class' }
-    let(:operator) { '~=' }
+    let(:operator) { :includes }
     let(:value)    { 'foo' }
 
     it 'should match an entry in a space separated list' do
@@ -62,7 +60,7 @@ describe Hexp::CssSelector::Attribute do
 
   describe 'the "|=" operator' do
     let(:name)     { 'id' }
-    let(:operator) { '|=' }
+    let(:operator) { :dash_match }
     let(:value)    { 'foo' }
 
     it 'should match if the attribute starts with the value, followed by a dash' do
@@ -80,7 +78,7 @@ describe Hexp::CssSelector::Attribute do
 
   describe 'the "^=" operator' do
     let(:name)     { 'id' }
-    let(:operator) { '^=' }
+    let(:operator) { :prefix_match }
     let(:value)    { 'foo' }
 
     it 'should match if the attribute is just the value' do
@@ -98,7 +96,7 @@ describe Hexp::CssSelector::Attribute do
 
   describe 'the "$=" operator' do
     let(:name)     { 'id' }
-    let(:operator) { '$=' }
+    let(:operator) { :suffix_match }
     let(:value)    { 'foo' }
 
     it 'should match if the attribute is just the value' do
@@ -116,7 +114,7 @@ describe Hexp::CssSelector::Attribute do
 
   describe 'the "*=" operator' do
     let(:name)     { 'id' }
-    let(:operator) { '*=' }
+    let(:operator) { :substring_match }
     let(:value)    { 'foo' }
 
     it 'should match if the attribute is just the value' do

data/spec/unit/hexp/css_selector/parser_spec.rb

@@ -9,10 +9,7 @@ describe Hexp::CssSelector::Parser do
   context 'with a single tag' do
     let(:selector) { 'body' }
     it {
-      should eq HC::CommaSequence[
-        HC::Sequence[
-          HC::SimpleSequence[
-            HC::Element.new('body')]]]
+      should eq HC::CommaSequence[HC::Element.new('body')]
     }
   end
 
@@ -29,6 +26,7 @@ describe Hexp::CssSelector::Parser do
       should eq HC::CommaSequence[
         HC::Sequence[
           HC::SimpleSequence[
+            HC::Universal.new,
             HC::Id.new('main')],
           HC::SimpleSequence[
             HC::Element.new('a'),
@@ -40,11 +38,10 @@ describe Hexp::CssSelector::Parser do
     let(:selector) { 'div[link=href]' }
     it {
       should eq HC::CommaSequence[
-        HC::Sequence[
           HC::SimpleSequence[
             HC::Element.new('div'),
-            HC::Attribute.new('link', nil, '=', 'href', nil),
-          ]]]
+            HC::Attribute.new('link', :equal, 'href'),
+          ]]
     }
   end
 

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: hexp
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Arne Brasseur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2015-02-15 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
@@ -153,6 +139,7 @@ files:
 - README.md
 - Rakefile
 - bench/node/rewrite_bench.rb
+- code_of_conduct.md
 - config/devtools.yml
 - config/flay.yml
 - config/flog.yml
@@ -173,7 +160,6 @@ files:
 - lib/hexp/core_ext/nil.rb
 - lib/hexp/css_selector.rb
 - lib/hexp/css_selector/parser.rb
-- lib/hexp/css_selector/sass_parser.rb
 - lib/hexp/dom.rb
 - lib/hexp/dsl.rb
 - lib/hexp/errors.rb
@@ -249,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Generate and manipulate HTML documents and nodes.

data/lib/hexp/css_selector/sass_parser.rb

@@ -1,40 +0,0 @@
-module Hexp
-  module CssSelector
-    # A CSS Parser that only knows how to parse CSS selectors
-    #
-    class SassParser < ::Sass::SCSS::CssParser
-      # Initialize the parser with the selector to parse
-      #
-      # @param [String] selector
-      #
-      # @api private
-      def initialize(selector)
-        # TODO this is a private API and has before changed in minor versions,
-        # see if there is a more robust call.
-        super(selector, '', 0)
-      end
-
-      # Parse the selector
-      #
-      # @return [Sass::Selector::CommaSequence]
-      #
-      # @api private
-      def parse
-        init_scanner!
-        result = selector_comma_sequence
-        raise "Invalid CSS selector : unconsumed input #{@scanner.rest}" unless @scanner.eos?
-        result
-      end
-
-      # Parse a CSS selector in one go
-      #
-      # @param [String] selector
-      # @return [Sass::Selector::CommaSequence]
-      #
-      # @api private
-      def self.call(selector)
-        self.new(selector).parse
-      end
-    end
-  end
-end