rearmed_rails 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d4600628a08453dea6e8e8a177982331c765a13
-  data.tar.gz: 52efe76a55f2cfcbdf428d4019fb67fcdc5110a5
+  metadata.gz: 5d2e1474fe0711ea54cf256d3954b9254c4e8e01
+  data.tar.gz: 26d6c3cb7c20f65d5568019d4be2c4335af2dabe
 SHA512:
-  metadata.gz: 9d2bb730931f1d2ac2db064f858931a88118cf8855198fa18e789e54bb91d9c42f62a793891071ea9499edff68157f401feec40ed8451e1b8dc518a9a5c31474
-  data.tar.gz: 484eb3af4136de98b5a5a9075f3c2ca1c5b51b2147b664ab701ca55b6d28507335a6754941b2f626bd40fa2e3b58835a9aa4097ce8da1c8e973ee52f7ffa1ea8
+  metadata.gz: 461717a406c59c914ad5f66fa2955efb0678aaf8926a315d733a41f134f40dfaab46433f3a923beec00dc947b626ccd2aa1def8bdfb1f841033af074f6105547
+  data.tar.gz: aa3ce67201167bf2ba223043118fb992db82300c277c021ca14c87d76b3f90daa6aaed0ef19d5200aa63afe935a1581afb06df69efb24a3c4851968806ef829b

data/CHANGELOG.md

@@ -1,6 +1,8 @@
 CHANGELOG
 ---------
 
+- **1.0.5 - August 3, 2017**
+  - Fix `options_for_select_include_blank` & `options_for_select_include_blank` for Rails 5.1+ and improved them to patch in safer way
 - **1.0.4 - July 19, 2017**
   - Fix error in `find_duplicates` method
 - **1.0.3 - May 3, 2017**

data/lib/rearmed_rails/monkey_patches/rails/helpers.rb

@@ -55,57 +55,35 @@ if defined?(ActionView::Helpers)
 
     if enabled || RearmedRails.dig(RearmedRails.enabled_patches, :rails, :helpers, :options_for_select_include_blank)
       def options_for_select(container, selected = nil)
-        return container if String === container
-
         if selected.is_a?(Hash)
           include_blank = selected[:include_blank] || selected['include_blank']
         end
 
-        selected, disabled = extract_selected_and_disabled(selected).map do |r|
-          Array(r).map(&:to_s)
-        end
-
-        options = []
+        options = super
 
         if include_blank
           include_blank = '' if include_blank == true
-          options.push(content_tag_string(:option, include_blank, {value: ''}))
-        end
 
-        container.each do |element|
-          html_attributes = option_html_attributes(element)
-          text, value = option_text_and_value(element).map(&:to_s)
-
-          html_attributes[:selected] ||= option_value_selected?(value, selected)
-          html_attributes[:disabled] ||= disabled && option_value_selected?(value, disabled)
-          html_attributes[:value] = value
+          if Rails::VERSION::MAJOR >= 5 && Rails::VERSION::MINOR >= 1
+            str = tag_builder.content_tag_string(:option, include_blank, {value: ''})
+          else
+            str = content_tag_string(:option, include_blank, {value: ''})
+          end
 
-          options.push content_tag_string(:option, text, html_attributes)
+          options.prepend(str)
         end
 
-        options.join("\n").html_safe
+        options
       end
     end
 
-    if enabled || RearmedRails.dig(RearmedRails.enabled_patches, :rails, :helpers, :options_from_collection_for_select_include_blank)
+    if enabled || RearmedRails.dig(RearmedRails.enabled_patches, :rails, :helpers, :options_for_select_include_blank)
       def options_from_collection_for_select(collection, value_method, text_method, selected = nil)
         options = collection.map do |element|
           [value_for_collection(element, text_method), value_for_collection(element, value_method), option_html_attributes(element)]
         end
 
-        if selected.is_a?(Hash)
-          include_blank = selected[:include_blank] || selected['include_blank']
-        end
-
-        selected, disabled = extract_selected_and_disabled(selected)
-
-        select_deselect = {
-          selected: extract_values_from_collection(collection, value_method, selected),
-          disabled: extract_values_from_collection(collection, value_method, disabled),
-          include_blank: include_blank
-        }
-
-        options_for_select(options, select_deselect)
+        options_for_select(options, selected)
       end
     end
   end

data/lib/rearmed_rails/version.rb

@@ -1,3 +1,3 @@
 module RearmedRails
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rearmed_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Weston Ganger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-19 00:00:00.000000000 Z
+date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake