eita-jrails 0.9.8 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20613f4c1876b587fc3793a6d04c8fb63130f3a8
-  data.tar.gz: d04aab7ff8ee7c5be2c0a8b657253eb2e151e53e
+  metadata.gz: 5cf7c9e8c1a449a826bde01ea0688f5d44778646
+  data.tar.gz: b24f5cb2c44c3d8866e46e39479764305fb59fbf
 SHA512:
-  metadata.gz: 762fa79c93475085c597f4e698d887ae867e33fbe991b26fd9413c39c47f9a5551f9071664aa5e080860c22d93c79ce07939b37a7cd7474bc3426ed3a800864e
-  data.tar.gz: c1e55f831ec4c7779d3d0b6f40d08acb3f4979629bf5b56fd793c8a12deb413a5abefef2833a9a57cc015cf0924912f77feafa5b2a8035b89b627ef3f3bee633
+  metadata.gz: c2a218e5e17496de12a8be15af618e06aa82ad174be969800ae877fad993aa013bb3d63245889f55462f1828fb42ed3f1ce34fe2d840902dd6402a3074eedfcf
+  data.tar.gz: 0f4f470abce7f396bc89d58f6e0f699745785874d3bbaa255fe87bd51b79d6467bf64b8fbb478d30f66531771482abb5f48a08f993e46a83538d1c4213fd6b10

data/lib/action_view/helpers/jquery_helper.rb

@@ -328,26 +328,26 @@ module ActionView
       # If you don't need to attach a form to a resource, then check out form_remote_tag.
       #
       # See FormHelper#form_for for additional semantics.
-      def remote_form_for(record_or_name_or_array, *args, &proc)
-        options = args.extract_options!
+      def remote_form_for record, options = {}, &block
+        as = options[:as]
 
-        case record_or_name_or_array
+        case record
         when String, Symbol
-          object_name = record_or_name_or_array
-        when Array
-          object = record_or_name_or_array.last
-          object_name = ActiveModel::Naming.singular(object)
-          apply_form_for_options!(record_or_name_or_array, options)
-          args.unshift object
+          object_name = record
+          object = nil
         else
-          object      = record_or_name_or_array
-          object_name = ActiveModel::Naming.singular(record_or_name_or_array)
-          apply_form_for_options!(object, options)
-          args.unshift object
+          object = if record.is_a? Array then record.last else record end
+          if Rails::VERSION::MAJOR >= 4
+            object_name = as || model_name_from_record_or_class(object).param_key
+            apply_form_for_options! record, object, options
+          else
+            object_name = as || ActiveModel::Naming.param_key(object)
+            apply_form_for_options! record, options
+          end
         end
 
         form_remote_tag options do
-          fields_for object_name, *(args << options), &proc
+          fields_for object, options, &block
         end
       end
       alias_method :form_remote_for, :remote_form_for

data/lib/jrails/selector_assertions.rb

@@ -1,8 +1,8 @@
-# FIXME: support rails 4.2
-if Rails::VERSION::STRING < "4.2.0"
 
 require 'active_support/core_ext/module/aliasing'
-if Rails::VERSION::STRING < "4.1.0"
+if Rails::VERSION::STRING >= "4.2.0"
+  # uses nokogiri
+elsif Rails::VERSION::STRING < "4.1.0"
   require 'action_controller/vendor/html-scanner'
 else
   require 'action_view/vendor/html-scanner'
@@ -15,7 +15,14 @@ require 'action_dispatch/testing/assertions/selector'
 # Under MIT and/or CC By license.
 #++
 
-ActionDispatch::Assertions::SelectorAssertions.module_eval do
+module JRails::SelectorAssertions
+
+  if Rails::VERSION::STRING >= "4.2.0"
+    def response_from_page
+      html_document.root
+    end
+  end
+
   # Selects content from the RJS response.
   #
   # === Narrowing down
@@ -122,11 +129,20 @@ ActionDispatch::Assertions::SelectorAssertions.module_eval do
       when :remove, :show, :hide, :toggle
         matches = @response.body.match(pattern)
       else
-        @response.body.gsub(pattern) do |match|
-          html = unescape_rjs(match)
-          matches ||= []
-          matches.concat HTML::Document.new(html).root.children.select { |n| n.tag? }
-          ""
+        if Rails::VERSION::STRING >= "4.2.0"
+          @response.body.gsub pattern do |match|
+            html = unescape_rjs match
+            matches ||= Nokogiri::HTML.fragment ''
+            Nokogiri::HTML(html).root.children.each{ |n| matches.add_child n if n.element? }
+            ""
+          end
+        else
+          @response.body.gsub pattern do |match|
+            html = unescape_rjs match
+            matches ||= []
+            matches.concat HTML::Document.new(html).root.children.select{ |n| n.tag? }
+            ""
+          end
         end
     end
 
@@ -184,19 +200,34 @@ ActionDispatch::Assertions::SelectorAssertions.module_eval do
 
     if content_type && Mime::JS =~ content_type
       body = @response.body.dup
-      root = HTML::Node.new(nil)
-
-      while true
-        next if body.sub!(RJS_STATEMENTS[:any]) do |match|
-          html = unescape_rjs(match)
-          matches = HTML::Document.new(html).root.children.select { |n| n.tag? }
-          root.children.concat matches
-          ""
+      if Rails::VERSION::STRING >= "4.2.0"
+        root = Nokogiri::HTML.fragment ''
+
+        while true
+          next if body.sub!(RJS_STATEMENTS[:any]) do |match|
+            html = unescape_rjs match
+            Nokogiri::HTML(html).root.children.each{ |n| root.add_child n if n.element? }
+            ""
+          end
+          break
         end
-        break
-      end
 
-      root
+        root
+      else
+        root = HTML::Node.new(nil)
+
+        while true
+          next if body.sub!(RJS_STATEMENTS[:any]) do |match|
+            html = unescape_rjs(match)
+            matches = HTML::Document.new(html).root.children.select { |n| n.tag? }
+            root.children.concat matches
+            ""
+          end
+          break
+        end
+
+        root
+      end
     else
       response_from_page_without_rjs
     end
@@ -217,4 +248,6 @@ ActionDispatch::Assertions::SelectorAssertions.module_eval do
   end
 end
 
+ActionDispatch::Assertions.module_eval do
+  include JRails::SelectorAssertions
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eita-jrails
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.10.0
 platform: ruby
 authors:
 - Aaron Eisenberger
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: RJS and JqueryHelper/JqueryUiHelper with the same API from prototype-rails