merb-core 0.9.12 → 0.9.13

data/lib/merb-core/vendor/nokogiri/css/tokenizer.rb

@@ -0,0 +1,9 @@
+module Nokogiri
+  module CSS
+    class Tokenizer < GeneratedTokenizer
+      def scan(str)
+        scan_evaluate(str)
+      end
+    end
+  end
+end

data/lib/merb-core/vendor/nokogiri/css/tokenizer.rex

@@ -0,0 +1,63 @@
+module Nokogiri
+module CSS
+class GeneratedTokenizer
+
+macro
+  nl        \n|\r\n|\r|\f
+  w         [\s\r\n\f]*
+  nonascii  [^\\\\0-\\\\177]
+  num       -?([0-9]+|[0-9]*\.[0-9]+)
+  unicode   \\\\\\\\\[0-9a-f]{1,6}(\r\n|[\s\n\r\t\f])?
+
+  escape    {unicode}|\\\\\\\[^\n\r\f0-9a-f]
+  nmchar    [_a-z0-9-]|{nonascii}|{escape}
+  nmstart   [_a-z]|{nonascii}|{escape}
+  ident     [-]?({nmstart})({nmchar})*
+  name      ({nmchar})+
+  string1   "([^\n\r\f"]|\\{nl}|{nonascii}|{escape})*"
+  string2   '([^\n\r\f']|\\{nl}|{nonascii}|{escape})*'
+  string    {string1}|{string2}
+  invalid1  \"([^\n\r\f\\"]|\\{nl}|{nonascii}|{escape})*
+  invalid2  \'([^\n\r\f\\']|\\{nl}|{nonascii}|{escape})*
+  invalid   {invalid1}|{invalid2}
+  Comment   \/\*(.|[\r\n])*?\*\/
+
+rule
+
+# [:state]  pattern  [actions]
+
+            ~=               { [:INCLUDES, text] }
+            \|=              { [:DASHMATCH, text] }
+            \^=              { [:PREFIXMATCH, text] }
+            \$=              { [:SUFFIXMATCH, text] }
+            \*=              { [:SUBSTRINGMATCH, text] }
+            !=               { [:NOT_EQUAL, text] }
+            {ident}\(\s*     { [:FUNCTION, text] }
+            @{ident}         { [:IDENT, text] }
+            {ident}          { [:IDENT, text] }
+            {num}            { [:NUMBER, text] }
+            \#{name}         { [:HASH, text] }
+            {w}\+            { [:PLUS, text] }
+            {w}>             { [:GREATER, text] }
+            {w},             { [:COMMA, text] }
+            {w}~             { [:TILDE, text] }
+            \:not\(          { [:NOT, text] }
+            @{ident}         { [:ATKEYWORD, text] }
+            {num}%           { [:PERCENTAGE, text] }
+            {num}{ident}     { [:DIMENSION, text] }
+            <!--             { [:CDO, text] }
+            -->              { [:CDC, text] }
+            {w}\/\/          { [:DOUBLESLASH, text] }
+            {w}\/            { [:SLASH, text] }
+            
+            U\+[0-9a-f?]{1,6}(-[0-9a-f]{1,6})?  {[:UNICODE_RANGE, text] }
+            
+            {Comment}                    /* ignore comments */
+            [\s\t\r\n\f]+    { [:S, text] }
+            [\.*:\[\]=\)]    { [text, text] }
+            {string}         { [:STRING, text] }
+            {invalid}        { [:INVALID, text] }
+            .                { [text, text] }
+end
+end
+end

data/lib/merb-core/vendor/nokogiri/css/xpath_visitor.rb

@@ -0,0 +1,159 @@
+module Nokogiri
+  module CSS
+    class XPathVisitor
+      def visit_function node
+        #  note that nth-child and nth-last-child are preprocessed in css/node.rb.
+        case node.value.first
+        when /^text\(/
+          'child::text()'
+        when /^self\(/
+          "self::#{node.value[1]}"
+        when /^(eq|nth|nth-of-type|nth-child)\(/
+          if node.value[1].is_a?(Nokogiri::CSS::Node) and node.value[1].type == :AN_PLUS_B
+            an_plus_b(node.value[1])
+          else
+            "position() = " + node.value[1]
+          end
+        when /^(first|first-of-type)\(/
+          "position() = 1"
+        when /^(last|last-of-type)\(/
+          "position() = last()"
+        when /^(nth-last-child|nth-last-of-type)\(/
+          "position() = last() - #{node.value[1]}"
+        when /^contains\(/
+          "contains(., #{node.value[1]})"
+        when /^gt\(/
+          "position() > #{node.value[1]}"
+        when /^only-child\(/
+          "last() = 1"
+        else
+          node.value.first + ')'
+        end
+      end
+
+      def visit_not node
+        'not(' + node.value.first.accept(self) + ')'
+      end
+
+      def visit_preceding_selector node
+        node.value.last.accept(self) +
+          '[preceding-sibling::' +
+          node.value.first.accept(self) +
+          ']'
+      end
+
+      def visit_direct_adjacent_selector node
+         node.value.last.accept(self) +
+           '[preceding-sibling::' +
+           node.value.first.accept(self) +
+           '][position()=1]'
+      end
+
+      def visit_id node
+        node.value.first =~ /^#(.*)$/
+        "@id = '#{$1}'"
+      end
+
+      def visit_attribute_condition node
+        attribute = if (node.value.first.type == :FUNCTION) or (node.value.first.value.first =~ /::/)
+                      ''
+                    else
+                      '@'
+                    end
+        attribute += node.value.first.accept(self)
+
+        # Support non-standard css
+        attribute.gsub!(/^@@/, '@')
+
+        return attribute unless node.value.length == 3
+
+        value = node.value.last
+        value = "'#{value}'" if value !~ /^['"]/
+
+        case node.value[1]
+        when '*='
+          "contains(#{attribute}, #{value})"
+        when '^='
+          "starts-with(#{attribute}, #{value})"
+        when '|='
+          "#{attribute} = #{value} or starts-with(#{attribute}, concat(#{value}, '-'))"
+        when '~='
+          "contains(concat(\" \", #{attribute}, \" \"),concat(\" \", #{value}, \" \"))"
+        when '$='
+          "substring(#{attribute}, string-length(#{attribute}) - " +
+            "string-length(#{value}) + 1, string-length(#{value})) = #{value}"
+        else
+          attribute + " #{node.value[1]} " + "#{value}"
+        end
+      end
+
+      def visit_pseudo_class node
+        if node.value.first.is_a?(Nokogiri::CSS::Node) and node.value.first.type == :FUNCTION
+          node.value.first.accept(self)
+        else
+          case node.value.first
+          when "first" then "position() = 1"
+          when "last" then "position() = last()"
+          when "first-of-type" then "position() = 1"
+          when "last-of-type" then "position() = last()"
+          when "only-of-type" then "last() = 1"
+          when "empty" then "not(node())"
+          when "parent" then "node()"
+          else
+            '1 = 1'
+          end
+        end
+      end
+
+      def visit_class_condition node
+        "contains(concat(' ', @class, ' '),concat(' ', '#{node.value.first}', ' '))"
+      end
+
+      def visit_combinator node
+        node.value.first.accept(self) + ' and ' +
+        node.value.last.accept(self)
+      end
+
+      def visit_conditional_selector node
+        node.value.first.accept(self) + '[' +
+        node.value.last.accept(self) + ']'
+      end
+
+      def visit_descendant_selector node
+        node.value.first.accept(self) +
+        '//' +
+        node.value.last.accept(self)
+      end
+
+      def visit_child_selector node
+        node.value.first.accept(self) +
+        '/' +
+        node.value.last.accept(self)
+      end
+
+      def visit_element_name node
+        node.value.first
+      end
+
+      def accept node
+        node.accept(self)
+      end
+
+    private
+      def an_plus_b node
+        raise ArgumentError, "expected an+b node to contain 4 tokens, but is #{node.value.inspect}" unless node.value.size == 4
+
+        a = node.value[0].to_i
+        b = node.value[3].to_i
+
+        if (b == 0)
+          return "(position() mod #{a}) = 0"
+        else
+          compare = (a < 0) ? "<=" : ">="
+          return "(position() #{compare} #{b}) and (((position()-#{b}) mod #{a.abs}) = 0)"
+        end
+      end
+
+    end
+  end
+end

data/lib/merb-core/version.rb

@@ -1,3 +1,3 @@
 module Merb
-  VERSION = '0.9.12' unless defined?(Merb::VERSION)
+  VERSION = '0.9.13' unless defined?(Merb::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-core
 version: !ruby/object:Gem::Version 
-  version: 0.9.12
+  version: 0.9.13
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-30 00:00:00 -07:00
+date: 2008-11-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -215,7 +215,6 @@ files:
 - lib/merb-core/test/helpers/multipart_request_helper.rb
 - lib/merb-core/test/helpers/request_helper.rb
 - lib/merb-core/test/helpers/route_helper.rb
-- lib/merb-core/test/helpers/view_helper.rb
 - lib/merb-core/test/helpers.rb
 - lib/merb-core/test/matchers
 - lib/merb-core/test/matchers/controller_matchers.rb
@@ -223,6 +222,7 @@ files:
 - lib/merb-core/test/matchers/route_matchers.rb
 - lib/merb-core/test/matchers/view_matchers.rb
 - lib/merb-core/test/matchers.rb
+- lib/merb-core/test/run_spec.rb
 - lib/merb-core/test/run_specs.rb
 - lib/merb-core/test/tasks
 - lib/merb-core/test/tasks/spectasks.rb
@@ -231,7 +231,20 @@ files:
 - lib/merb-core/test/test_ext/object.rb
 - lib/merb-core/test/test_ext/rspec.rb
 - lib/merb-core/test/test_ext/string.rb
+- lib/merb-core/test/webrat.rb
 - lib/merb-core/test.rb
+- lib/merb-core/vendor
+- lib/merb-core/vendor/nokogiri
+- lib/merb-core/vendor/nokogiri/css
+- lib/merb-core/vendor/nokogiri/css/generated_parser.rb
+- lib/merb-core/vendor/nokogiri/css/generated_tokenizer.rb
+- lib/merb-core/vendor/nokogiri/css/node.rb
+- lib/merb-core/vendor/nokogiri/css/parser.rb
+- lib/merb-core/vendor/nokogiri/css/parser.y
+- lib/merb-core/vendor/nokogiri/css/tokenizer.rb
+- lib/merb-core/vendor/nokogiri/css/tokenizer.rex
+- lib/merb-core/vendor/nokogiri/css/xpath_visitor.rb
+- lib/merb-core/vendor/nokogiri/css.rb
 - lib/merb-core/version.rb
 - lib/merb-core.rb
 has_rdoc: true
@@ -256,7 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - install the json gem to get faster json parsing
 rubyforge_project: 
-rubygems_version: 1.3.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Merb. Pocket rocket web framework.

data/lib/merb-core/test/helpers/view_helper.rb

@@ -1,121 +0,0 @@
-module Merb
-  module Test
-    module ViewHelper
-
-      # Small utility class for working with the Hpricot parser class
-      class DocumentOutput
-
-        # ==== Parameters
-        # response_body<String>:: The response body to parse with Hpricot.
-        def initialize(response_body)
-          @parser = Hpricot.parse(response_body)
-        end
-
-        # ==== Parameters
-        # css_query<String>::
-        #   A CSS query to find the element for, e.g. "ul.links".
-        #
-        # ==== Returns
-        # String:: The content of the first tag matching the query.
-        def content_for(css_query)
-          match = @parser.search(css_query).first
-          match.inner_text unless match.nil?
-        end
-
-        # ==== Parameters
-        # css_query<String>:: A CSS query to find the elements for.
-        #
-        # ==== Returns
-        # Array[String]:: Content of all tags matching the query.
-        def content_for_all(css_query)
-          matches = @parser.search(css_query).collect{|ele| ele.inner_text}
-        end
-
-        # ==== Parameters
-        # css_query<String>:: A CSS query to find the elements for.
-        #
-        # ==== Returns
-        # Hpricot::Elements:: All tags matching the query.
-        def [](css_query)
-          @parser.search(css_query)
-        end
-      end
-
-      # ==== Parameters
-      # css_query<String>:: A CSS query to find the element for.
-      # output<DocumentOutput>::
-      #   The output to look for the element in. Defaults to process_output. 
-      #
-      # ==== Returns
-      # String:: The content of the first tag matching the query.
-      def tag(css_query, output = process_output)
-        output.content_for(css_query)
-      end
-
-      # ==== Parameters
-      # css_query<String>:: A CSS query to find the elements for.
-      # output<DocumentOutput>::
-      #   The output to look for the element in. Defaults to process_output. 
-      #
-      # ==== Returns
-      # Array[String]:: Content of all tags matching the query.
-      def tags(css_query, output = process_output)
-        output.content_for_all(css_query)
-      end
-
-      # ==== Parameters
-      # css_query<String>:: A CSS query to find the element for.
-      # output<DocumentOutput>::
-      #   The output to look for the element in. Defaults to process_output. 
-      #
-      # ==== Returns
-      # Hpricot::Elem:: The first tag matching the query.
-      def element(css_query, output = process_output)
-        output[css_query].first
-      end
-  
-      # ==== Parameters
-      # css_query<String>:: A CSS query to find the elements for.
-      # output<DocumentOutput>::
-      #   The output to look for the elements in. Defaults to process_output. 
-      #
-      # ==== Returns
-      # Array[Hpricot::Elem]:: All tags matching the query.
-      def elements(css_query, output = process_output)
-        Hpricot::Elements[*css_query.to_s.split(",").map{|s| s.strip}.map do |query|
-          output[query]
-        end.flatten]
-      end
-
-      # ==== Parameters
-      # css_query<String>:: A CSS query to find the elements for.
-      # text<String, Regexp>:: A pattern to match tag contents for.
-      # output<DocumentOutput>::
-      #   The output to look for the elements in. Defaults to process_output. 
-      #
-      # ==== Returns
-      # Array[Hpricot::Elem]:: All tags matching the query and pattern.
-      def get_elements(css_query, text, output = nil)
-        els = elements(*[css_query, output].compact)
-        case text
-          when String then els.reject {|t| !t.contains?(text) }
-          when Regexp then els.reject {|t| !t.matches?(text) }
-          else []
-        end
-      end
-  
-      protected
-
-        # ==== Returns
-        # DocumentOutput:: Document output from the response body.
-        def process_output
-          return @output unless @output.nil?
-          return @output = DocumentOutput.new(@response_output) unless @response_output.nil?
-          
-          raise "The response output was not in its usual places, please provide the output" if @controller.nil? || @controller.body.empty?
-          @response_output = @controller.body
-          @output = DocumentOutput.new(@controller.body)
-        end
-    end
-  end
-end