simple_form_ransack 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dae9f1f5969a907d9edd65a9544387e00a0d8e6
-  data.tar.gz: 7d47d189be6c2813cf2496eb64e7d5d5fbda0956
+  metadata.gz: b62806d6d76f54996dffb15b1f5b5e1841da3011
+  data.tar.gz: e4341086af8437446c47b71e6140fb10a8de7989
 SHA512:
-  metadata.gz: bd1fa558b38d90876e3e6f1406d566ef061ddb0550ae08800d6b4dbd16bd3f8a5225ba2c3568f9c9960e7b08fc0c8d79ab103ec8aa1fde566f5b3bd962f9ab46
-  data.tar.gz: 2557ce5258751b0c5bb12118684bcca244dad7c0334dfc802bc98ad883e687caab6c1064bea5338a0a67a200836826ee58e89b96d4c016f2da1fa4aa856ed61d
+  metadata.gz: 5afd9876c38b25d9bc38650f1b134ad5b14d608b7721f17b05eb837ca79f0664d4524d66ce74532af8734700471c3a2bbc9dc23a007eedf48d250e729f99e702
+  data.tar.gz: 2e73a09f2e74dd016e57fc8aae295870d09c035646078be099cd22490d0d6b54c6f0ad10deb28ec7dc0b25d3009abc7b4311b9f50ee970b3502b66ed498ea7ef

data/app/helpers/simple_form_ransack_helper.rb

@@ -12,14 +12,13 @@ module SimpleFormRansackHelper
 
     model_class = ransack.klass
     sample_model = model_class.new
-
-    search_key = ransack.context.search_key
+    ransack_params = ransack.instance_variable_get(:@_registered_params)
 
     simple_form_for(sample_model, *args) do |form|
       form_proxy = SimpleFormRansack::FormProxy.new(
         ransack: ransack,
         form: form,
-        params: params[search_key] || {}
+        params: ransack_params
       )
 
       yield form_proxy

data/lib/simple_form_ransack.rb

@@ -5,8 +5,9 @@ module SimpleFormRansack
 
   def self.locale_files
     files = []
+    available_locales = (I18n.available_locales + Rails.application.config.i18n.available_locales).uniq
 
-    I18n.available_locales.each do |locale|
+    available_locales.each do |locale|
       path = "#{File.realpath("#{File.dirname(__FILE__)}/../config/locales")}/#{locale}.yml"
       files << File.realpath(path) if File.exist?(path)
     end
@@ -16,3 +17,4 @@ module SimpleFormRansack
 end
 
 require_relative "../app/helpers/simple_form_ransack_helper"
+require_relative "simple_form_ransack/ransack_search_monkey_patch"

data/lib/simple_form_ransack/input_manipulator.rb

@@ -34,6 +34,7 @@ private
 
     set_value
     set_name
+    set_include_blank
     set_label if @attribute_name && !@opts.key?(:label)
 
     @args << @opts
@@ -56,7 +57,7 @@ private
     if @opts[:as].present?
       @as = @opts.fetch(:as).to_s
     elsif @opts[:collection]
-      @as = "select"
+      calculate_as_collection
     elsif @attribute_name.to_s.end_with?("country")
       @as = "country"
     elsif column && column.type == :boolean
@@ -66,8 +67,18 @@ private
     @as ||= "string"
   end
 
+  def calculate_as_collection
+    if @match_type == "eq_any"
+      @as = "check_boxes"
+    else
+      @as = "select"
+    end
+  end
+
   def set_name
-    @input_html[:id] = "q_#{@name}"
+    # This overrides the individual check boxes and messes up the label targets
+    # There won't be any main input anyway, so it doesn't mess anything up either
+    @input_html[:id] = "q_#{@name}" unless @as == "check_boxes"
 
     return if @input_html.key?(:name)
 
@@ -174,4 +185,10 @@ private
       @input_html[:value] = ""
     end
   end
+
+  def set_include_blank
+    return if @opts.key?(:include_blank)
+    return if @as != "select" && @as != "country"
+    @opts[:include_blank] = true
+  end
 end

data/lib/simple_form_ransack/ransack_search_monkey_patch.rb

@@ -0,0 +1,11 @@
+require "ransack"
+
+# This saves the params given to Ransack, so they can be recalled later
+class Ransack::Search
+  alias old_build build
+
+  def build(params = {})
+    @_registered_params = params
+    old_build(params)
+  end
+end

data/lib/simple_form_ransack/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormRansack
-  VERSION = "0.0.13".freeze
+  VERSION = "0.0.14".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_form_ransack
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-23 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -195,6 +195,7 @@ files:
 - lib/simple_form_ransack/attribute_inspector.rb
 - lib/simple_form_ransack/form_proxy.rb
 - lib/simple_form_ransack/input_manipulator.rb
+- lib/simple_form_ransack/ransack_search_monkey_patch.rb
 - lib/simple_form_ransack/version.rb
 - lib/tasks/simple_form_ransack_tasks.rake
 homepage: https://www.github.com/kaspernj/simple_form_ransack