jquery-rails 4.0.0.beta1 → 4.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 980af19d5077a9cbd177a653fd33964f5c68df2f
-  data.tar.gz: 2becaf966d6b6a7774a77d93254cd719b367c12e
+  metadata.gz: e887a893642721415c82ed5352f0bf20aeaf7b80
+  data.tar.gz: 78878da2589447f73ba45d807fcfdbf46277216f
 SHA512:
-  metadata.gz: 2a43212bb1c63b6776ff6d179112bfd2220a2db779c1f276eac06ad0ff975b879febaa1e56e3088b6bdec9e1f11516e711fc23bf49f23d45f7ee40c500acbdc3
-  data.tar.gz: 86d4029e21e50608ffd4b1c77da3168d07a7f14ae9b28a99d4edf3b707d53b278a9bf9b9ab3821d78a161689086ee15e127641b2a8ab9f5ee9923b3e30a596c1
+  metadata.gz: 2b7534cbe3d773035193a64966498fccf547cc4a5c7bb6d253599429f2fecd59ce669d6e93ff05ebd1a5a5120c3d6cfcdfa62eaa9fed1682677a5f618599688e
+  data.tar.gz: 9db1588e83c175bee49ae8e1da8a417ca6dd96808dbe3f6b81a89becabeb708c32ef16b6daf89e90974a515fe878d8e12ecdf078bd8cd23312b0bf36ff5e9f8f

data/lib/jquery/assert_select.rb

@@ -1,104 +1,96 @@
 require 'rails/dom/testing/assertions/selector_assertions'
 
-module Jquery
-  module Rails
-    module SelectorAssertions
-      # Selects content from a JQuery response.  Patterned loosely on
-      # assert_select_rjs.
-      #
-      # === Narrowing down
-      #
-      # With no arguments, asserts that one or more method calls are made.
-      #
-      # Use the +method+ argument to narrow down the assertion to only
-      # statements that call that specific method.
-      #
-      # Use the +opt+ argument to narrow down the assertion to only statements
-      # that pass +opt+ as the first argument.
-      #
-      # Use the +id+ argument to narrow down the assertion to only statements
-      # that invoke methods on the result of using that identifier as a
-      # selector.
-      #
-      # === Using blocks
-      #
-      # Without a block, +assert_select_jquery_ merely asserts that the
-      # response contains one or more statements that match the conditions
-      # specified above
-      #
-      # With a block +assert_select_jquery_ also asserts that the method call
-      # passes a javascript escaped string containing HTML.  All such HTML
-      # fragments are selected and passed to the block.  Nested assertions are
-      # supported.
-      #
-      # === Examples
-      #
-      # # asserts that the #notice element is hidden
-      # assert_select :hide, '#notice'
-      #
-      # # asserts that the #cart element is shown with a blind parameter
-      # assert_select :show, :blind, '#cart'
-      #
-      # # asserts that #cart content contains a #current_item
-      # assert_select :html, '#cart' do
-      #   assert_select '#current_item'
-      # end
-
-      PATTERN_HTML  = "\"((\\\\\"|[^\"])*)\""
-      PATTERN_UNICODE_ESCAPED_CHAR = /\\u([0-9a-zA-Z]{4})/
-
-      def assert_select_jquery(*args, &block)
-        jquery_method = args.first.is_a?(Symbol) ? args.shift : nil
-        jquery_opt    = args.first.is_a?(Symbol) ? args.shift : nil
-        id            = args.first.is_a?(String) ? args.shift : nil
+module Rails::Dom::Testing::Assertions::SelectorAssertions
+  # Selects content from a JQuery response.  Patterned loosely on
+  # assert_select_rjs.
+  #
+  # === Narrowing down
+  #
+  # With no arguments, asserts that one or more method calls are made.
+  #
+  # Use the +method+ argument to narrow down the assertion to only
+  # statements that call that specific method.
+  #
+  # Use the +opt+ argument to narrow down the assertion to only statements
+  # that pass +opt+ as the first argument.
+  #
+  # Use the +id+ argument to narrow down the assertion to only statements
+  # that invoke methods on the result of using that identifier as a
+  # selector.
+  #
+  # === Using blocks
+  #
+  # Without a block, +assert_select_jquery_ merely asserts that the
+  # response contains one or more statements that match the conditions
+  # specified above
+  #
+  # With a block +assert_select_jquery_ also asserts that the method call
+  # passes a javascript escaped string containing HTML.  All such HTML
+  # fragments are selected and passed to the block.  Nested assertions are
+  # supported.
+  #
+  # === Examples
+  #
+  # # asserts that the #notice element is hidden
+  # assert_select :hide, '#notice'
+  #
+  # # asserts that the #cart element is shown with a blind parameter
+  # assert_select :show, :blind, '#cart'
+  #
+  # # asserts that #cart content contains a #current_item
+  # assert_select :html, '#cart' do
+  #   assert_select '#current_item'
+  # end
 
-        pattern = "\\s*\\.#{jquery_method || '\\w+'}\\("
-        pattern = "#{pattern}['\"]#{jquery_opt}['\"],?\\s*" if jquery_opt
-        pattern = "#{pattern}#{PATTERN_HTML}"
-        pattern = "(?:jQuery|\\$)\\(['\"]#{id}['\"]\\)#{pattern}" if id
+  PATTERN_HTML  = "\"((\\\\\"|[^\"])*)\""
+  PATTERN_UNICODE_ESCAPED_CHAR = /\\u([0-9a-zA-Z]{4})/
 
-        fragments = Nokogiri::HTML::Document.new
-        response.body.scan(Regexp.new(pattern)).each do |match|
-          doc = Nokogiri::HTML::Document.parse(unescape_js(match.first))
-          doc.root.children.each do |child|
-            fragments << child if child.element?
-          end
-        end
+  def assert_select_jquery(*args, &block)
+    jquery_method = args.first.is_a?(Symbol) ? args.shift : nil
+    jquery_opt    = args.first.is_a?(Symbol) ? args.shift : nil
+    id            = args.first.is_a?(String) ? args.shift : nil
 
-        unless fragments.children.any? { |child| child.element? }
-          opts = [jquery_method, jquery_opt, id].compact
-          flunk "No JQuery call matches #{opts.inspect}"
-        end
+    pattern = "\\s*\\.#{jquery_method || '\\w+'}\\("
+    pattern = "#{pattern}['\"]#{jquery_opt}['\"],?\\s*" if jquery_opt
+    pattern = "#{pattern}#{PATTERN_HTML}"
+    pattern = "(?:jQuery|\\$)\\(['\"]#{id}['\"]\\)#{pattern}" if id
 
-        if block
-          begin
-            in_scope, @selected = @selected, fragments
-            yield
-          ensure
-            @selected = in_scope
-          end
-        end
+    fragments = Nokogiri::HTML::Document.new
+    response.body.scan(Regexp.new(pattern)).each do |match|
+      doc = Nokogiri::HTML::Document.parse(unescape_js(match.first))
+      doc.root.children.each do |child|
+        fragments << child if child.element?
       end
+    end
 
-    private
+    unless fragments.children.any? { |child| child.element? }
+      opts = [jquery_method, jquery_opt, id].compact
+      flunk "No JQuery call matches #{opts.inspect}"
+    end
 
-      # Unescapes a JS string.
-      def unescape_js(js_string)
-        # js encodes double quotes and line breaks.
-        unescaped= js_string.gsub('\"', '"')
-        unescaped.gsub!('\\\'', "'")
-        unescaped.gsub!(/\\\//, '/')
-        unescaped.gsub!('\n', "\n")
-        unescaped.gsub!('\076', '>')
-        unescaped.gsub!('\074', '<')
-        # js encodes non-ascii characters.
-        unescaped.gsub!(PATTERN_UNICODE_ESCAPED_CHAR) {|u| [$1.hex].pack('U*')}
-        unescaped
+    if block
+      begin
+        in_scope, @selected = @selected, fragments
+        yield
+      ensure
+        @selected = in_scope
       end
     end
   end
-end
 
-module Rails::Dom::Testing::Assertions::SelectorAssertions
-  include Jquery::Rails::SelectorAssertions
+  private
+
+    # Unescapes a JS string.
+    def unescape_js(js_string)
+      # js encodes double quotes and line breaks.
+      unescaped= js_string.gsub('\"', '"')
+      unescaped.gsub!('\\\'', "'")
+      unescaped.gsub!(/\\\//, '/')
+      unescaped.gsub!('\n', "\n")
+      unescaped.gsub!('\076', '>')
+      unescaped.gsub!('\074', '<')
+      # js encodes non-ascii characters.
+      unescaped.gsub!(PATTERN_UNICODE_ESCAPED_CHAR) {|u| [$1.hex].pack('U*')}
+      unescaped
+    end
 end

data/lib/jquery/rails/version.rb

@@ -1,6 +1,6 @@
 module Jquery
   module Rails
-    VERSION = "4.0.0.beta1"
+    VERSION = "4.0.0.beta2"
     JQUERY_VERSION = "1.11.1"
     JQUERY_2_VERSION = "2.1.1"
     JQUERY_UJS_VERSION = "1.0.1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-rails
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta1
+  version: 4.0.0.beta2
 platform: ruby
 authors:
 - André Arko