simple_form_ransack 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a1915bb4fc37a6163a9415b73e2555fd5b8ffe8
-  data.tar.gz: 939a9a718795a1624be9237d16415ae264151860
+  metadata.gz: 006388474436da19f6fdddf9f5d8841df249294d
+  data.tar.gz: 6b3c4b4d309a654566c72e3c963fad0389c4e19f
 SHA512:
-  metadata.gz: 062fb8029ac90464a9717c6264386c3c3145a3e4a7d7a1644a784fab22ffa333764a6ea87c9d468fa5785494aa7b535156d9e7efd7613eba4fb36b658d56abc6
-  data.tar.gz: bb6f45e1de84c9897b8622f24d02d614ccbb8a2bb97e6ca55f7c460346ab54d2a19c7bf88412a17abc74b86c3410769095cc5e8b612a500c5d51d50e4d5c9531
+  metadata.gz: 48d2f85c01f488af2caf19b92525ec86faf7e52f04573f3261bf7bf8a44f3efb3eff7521085968dfaace16b2b677da981342d5064b3221c79f96ee3b1e96b80e
+  data.tar.gz: 098d43e27853fc4fb77a8b5b41f8f7a456f2a145eeecf4252d6ad422a1d29a34292884555337786d4dcb4eec880242c053f2686eed34c0ce5165747f4008633d

data/app/helpers/simple_form_ransack_helper.rb

@@ -1,5 +1,5 @@
 module SimpleFormRansackHelper
-  def simple_search_form_for(resource, params, *args)
+  def simple_search_form_for(ransack, *args)
     if args.last.is_a?(Hash)
       opts = args.pop
     else
@@ -10,14 +10,16 @@ module SimpleFormRansackHelper
     opts[:method] = "get" unless opts[:method]
     args << opts
 
-    model_class = resource.klass
+    model_class = ransack.klass
     sample_model = model_class.new
 
+    search_key = ransack.context.search_key
+
     simple_form_for(sample_model, *args) do |form|
       form_proxy = SimpleFormRansack::FormProxy.new(
-        resource: resource,
+        ransack: ransack,
         form: form,
-        params: params
+        params: params[search_key] || {}
       )
 
       yield form_proxy

data/config/locales/da.yml

@@ -0,0 +1,9 @@
+da:
+  simple_form_ransack:
+    words:
+      or: eller
+      and: og
+    match_types:
+      cont: indeholder
+      gteq: større eller lig med
+      lteq: mindre eller lig med

data/config/locales/en.yml

@@ -0,0 +1,9 @@
+en:
+  simple_form_ransack:
+    words:
+      or: or
+      and: and
+    match_types:
+      cont: contains
+      gteq: greather than or equals
+      lteq: less than or equals

data/lib/simple_form_ransack.rb

@@ -1,6 +1,18 @@
 module SimpleFormRansack
   autoload :AttributeInspector, "simple_form_ransack/attribute_inspector"
+  autoload :InputManipulator, "simple_form_ransack/input_manipulator"
   autoload :FormProxy, "simple_form_ransack/form_proxy"
+
+  def self.locale_files
+    files = []
+
+    I18n.available_locales.each do |locale|
+      path = "#{File.realpath("#{File.dirname(__FILE__)}/../config/locales")}/#{locale}.yml"
+      files << File.realpath(path) if File.exist?(path)
+    end
+
+    files
+  end
 end
 
 require_relative "../app/helpers/simple_form_ransack_helper"

data/lib/simple_form_ransack/attribute_inspector.rb

@@ -2,10 +2,11 @@
 class SimpleFormRansack::AttributeInspector
   def initialize(args)
     @args = args
-    @ransack_name = args[:name]
+    @ransack_name = args.fetch(:name)
     @name_parts = @ransack_name.to_s.split("_")
-    @instance = args[:instance]
-    @clazz = args[:clazz]
+    @instance = args.fetch(:instance)
+    @clazz = args.fetch(:clazz)
+    @as = args.fetch(:as)
     @debug = args[:debug]
 
     @generated_name_classes = []
@@ -13,9 +14,7 @@ class SimpleFormRansack::AttributeInspector
     @current_clazz = @clazz
     @name_builtup = []
 
-    has_attribute_directly = @clazz.attribute_names.select { |name| name.to_s == @ransack_name.to_s }.any?
-
-    research unless has_attribute_directly
+    research unless attribute_directly?
   end
 
   # Loop through the name parts and inspectors reflections with it.
@@ -26,15 +25,9 @@ class SimpleFormRansack::AttributeInspector
       # The last part should be the attribute name.
       if index == @name_parts.length - 1
         attribute_result = attribute_by_builtup
-
-        if attribute_result
-          puts "Attribute was: #{attribute_result.fetch(:name)}" if @debug
-          @attribute = attribute_result.fetch(:name)
-          break
-        else
-          puts "Not found: #{@name_builtup.join("_")}" if @debug
-          next
-        end
+        next unless attribute_result
+        @attribute = attribute_result.fetch(:name)
+        break
       end
 
       # Try next - maybe next key need to be added? (which is common!)
@@ -42,12 +35,8 @@ class SimpleFormRansack::AttributeInspector
       next unless reflection_result
 
       @name_builtup = []
-      name = reflection_result.fetch(:name)
       reflection = reflection_result.fetch(:reflection)
 
-      puts "Name: #{name}" if @debug
-      puts "Reflection: #{reflection}" if @debug
-
       @current_clazz = reflection.klass
       @generated_name_classes << {clazz: @current_clazz, reflection: reflection}
     end
@@ -61,27 +50,34 @@ class SimpleFormRansack::AttributeInspector
 
   # Generates the complicated label and returns it.
   def generated_label
-    name = ""
+    @generated_label = ""
 
     if @generated_name_classes.last
       clazz = @generated_name_classes.last.fetch(:clazz)
       reflection = @generated_name_classes.last.fetch(:reflection)
 
       if reflection.collection?
-        name << clazz.model_name.human(count: 2)
+        @generated_label << clazz.model_name.human(count: 2)
       else
-        name << clazz.model_name.human
+        @generated_label << clazz.model_name.human
       end
     end
 
-    name << " " unless name.empty?
-    name << @current_clazz.human_attribute_name(@attribute).to_s.downcase
-
-    name
+    add_id_to_generated_label
+    @generated_label
   end
 
 private
 
+  def add_id_to_generated_label
+    if @attribute == "id" && @as != "string"
+      # Don't add "id" to label, because it is being shown as a collection
+    else
+      @generated_label << " " unless @generated_label.empty?
+      @generated_label << @current_clazz.human_attribute_name(@attribute).to_s.downcase
+    end
+  end
+
   def reflection_by_builtup
     total_name = @name_builtup.join("_")
     result = @current_clazz.reflections.find { |name, _reflection| name.to_s == total_name }
@@ -95,4 +91,8 @@ private
     return {name: result} if result
     false
   end
+
+  def attribute_directly?
+    @clazz.attribute_names.find { |name| name.to_s == @ransack_name.to_s }
+  end
 end

data/lib/simple_form_ransack/form_proxy.rb

@@ -14,9 +14,9 @@ class SimpleFormRansack::FormProxy
   end
 
   def initialize(args)
-    @resource = args.fetch(:resource)
-    @object = @resource.object
-    @class = @resource.klass
+    @ransack = args.fetch(:ransack)
+    @object = @ransack.object
+    @class = @ransack.klass
     @params = args.fetch(:params)
     @form = args.fetch(:form)
 
@@ -24,109 +24,17 @@ class SimpleFormRansack::FormProxy
   end
 
   def input(name, *args)
-    if args.last.is_a?(Hash)
-      opts = args.pop
-    else
-      opts = {}
-    end
-
-    attribute_name = real_name(name)
-    as = as_from_opts(attribute_name, opts)
-    input_html = opts.delete(:input_html) || {}
-    set_value(as, name, opts, input_html)
-    set_name(as, name, input_html)
-    set_label(attribute_name, opts, input_html)
+    input_manipulator = SimpleFormRansack::InputManipulator.new(
+      name: name,
+      args: args,
+      params: @params,
+      class: @class
+    )
 
-    opts[:required] = false unless opts.key?(:required)
-    opts[:input_html] = input_html
-    args << opts
-    @form.input(attribute_name, *args)
+    @form.input(input_manipulator.attribute_name, *args)
   end
 
   def method_missing(method_name, *args, &blk)
     @form.__send__(method_name, *args, &blk)
   end
-
-private
-
-  def set_label(attribute_name, opts, _input_html)
-    unless opts.key?(:label)
-      attribute_inspector = ::SimpleFormRansack::AttributeInspector.new(
-        name: attribute_name,
-        instance: @object,
-        clazz: @class
-      )
-
-      if attribute_inspector.generated_label?
-        opts[:label] = attribute_inspector.generated_label
-      end
-    end
-  end
-
-  def set_name(as, name, input_html)
-    return if input_html.key?(:name)
-
-    input_html[:name] = "q[#{name}]"
-    input_html[:name] << "[]" if as == "check_boxes"
-  end
-
-  def set_value(as, name, opts, input_html)
-    if as == "select"
-      unless opts.key?(:selected)
-        if @params[name]
-          opts[:selected] = @params[name]
-        else
-          opts[:selected] = ""
-        end
-      end
-    elsif as == "check_boxes" || as == "radio_buttons"
-      unless opts.key?(:checked)
-        if @params[name]
-          opts[:checked] = @params[name]
-        else
-          opts[:checked] = ""
-        end
-      end
-    elsif as == "boolean"
-      unless input_html.key?(:checked)
-        input_html[:checked] = ("checked" if @params[name] == "1")
-      end
-    else
-      unless input_html.key?(:value)
-        if @params[name]
-          input_html[:value] = @params[name]
-        else
-          input_html[:value] = ""
-        end
-      end
-    end
-  end
-
-  def as_list?(opts)
-    return true if as_from_opts(opts) == "select"
-    false
-  end
-
-  def as_from_opts(attribute_name, opts)
-    if opts[:as].present?
-      return opts.fetch(:as).to_s
-    elsif opts[:collection] || attribute_name.end_with?("country")
-      return "select"
-    end
-
-    column = @class.columns_hash[attribute_name]
-    return "boolean" if column && column.type == :boolean
-
-    "text"
-  end
-
-  def real_name(name)
-    match = name.to_s.match(SimpleFormRansack::FormProxy.predicates_regex)
-
-    if match
-      return match[1]
-    else
-      raise "Couldn't figure out attribute name from: #{name}"
-    end
-  end
 end

data/lib/simple_form_ransack/input_manipulator.rb

@@ -0,0 +1,176 @@
+class SimpleFormRansack::InputManipulator
+  attr_reader :args
+
+  def initialize(args)
+    @args = args.fetch(:args)
+    @name = args.fetch(:name)
+    @params = args.fetch(:params)
+    @class = args.fetch(:class)
+
+    if @args.last.is_a?(Hash)
+      @opts = @args.pop
+    else
+      @opts = {}
+    end
+
+    @input_html = @opts[:input_html] || {}
+
+    calculate_name
+    calculate_as
+
+    set_values
+  end
+
+  def attribute_name
+    @attribute_name || @name
+  end
+
+private
+
+  def set_values
+    @opts[:required] = false unless @opts.key?(:required)
+    @opts[:input_html] = @input_html
+
+    set_value
+    set_name
+    set_label if @attribute_name && !@opts.key?(:label)
+
+    @args << @opts
+  end
+
+  def calculate_name
+    match = @name.to_s.match(SimpleFormRansack::FormProxy.predicates_regex)
+    return unless match
+
+    @attribute_name = match[1]
+    @match_type = match[2]
+
+    @name_parts = @attribute_name.split(/_(or|and)_/)
+    @name_parts_length = @name_parts.length
+  end
+
+  def calculate_as
+    column = @class.columns_hash[@attribute_name]
+
+    if @opts[:as].present?
+      @as = @opts.fetch(:as).to_s
+    elsif @opts[:collection]
+      @as = "select"
+    elsif @attribute_name.to_s.end_with?("country")
+      @as = "country"
+    elsif column && column.type == :boolean
+      @as = "boolean"
+    end
+
+    @as ||= "string"
+  end
+
+  def set_name
+    @input_html[:id] = "q_#{@name}"
+
+    return if @input_html.key?(:name)
+
+    @input_html[:name] = "q[#{@name}]"
+    @input_html[:name] << "[]" if @as == "check_boxes"
+  end
+
+  def set_label
+    label_parts = []
+
+    @name_parts.each_with_index do |attribute_name_part, index|
+      if attribute_name_part == "and" || attribute_name_part == "or"
+        label_parts << add_between_label(index, attribute_name_part) unless label_parts.empty?
+        next
+      end
+
+      label = label_part(attribute_name_part)
+
+      if label
+        label[0] = label[0].downcase if label_parts.any?
+        label_parts << label
+      end
+    end
+
+    label_from_parts(label_parts)
+  end
+
+  def add_between_label(index, attribute_name_part)
+    if index == @name_parts_length - 2
+      " #{I18n.t("simple_form_ransack.words.#{attribute_name_part}")} "
+    else
+      ", "
+    end
+  end
+
+  def label_from_parts(label_parts)
+    return if label_parts.empty?
+
+    @opts[:label] = label_parts.join
+    prepend_label_for = %w(cont gteq lteq)
+
+    return unless prepend_label_for.include?(@match_type)
+    @opts[:label] << " #{I18n.t("simple_form_ransack.match_types.#{@match_type}")}"
+  end
+
+  def label_part(attribute_name_part)
+    attribute_inspector = ::SimpleFormRansack::AttributeInspector.new(
+      name: attribute_name_part,
+      instance: @object,
+      clazz: @class,
+      as: @as
+    )
+
+    if attribute_inspector.generated_label?
+      attribute_inspector.generated_label
+    else
+      @class.human_attribute_name(attribute_name_part)
+    end
+  end
+
+  def set_value
+    if @as == "select" || @as == "country"
+      set_value_for_select
+    elsif @as == "check_boxes" || @as == "radio_buttons"
+      set_value_for_checked
+    elsif @as == "boolean"
+      set_value_for_boolean
+    else
+      set_value_for_input
+    end
+  end
+
+  def set_value_for_select
+    return if @opts.key?(:selected)
+
+    if @params[@name]
+      @opts[:selected] = @params[@name]
+    else
+      @opts[:selected] = ""
+    end
+  end
+
+  def set_value_for_checked
+    return if @opts.key?(:checked)
+
+    if @params[@name]
+      @opts[:checked] = @params[@name]
+    else
+      @opts[:checked] = ""
+    end
+  end
+
+  def set_value_for_boolean
+    return if @input_html.key?(:checked)
+    @input_html[:checked] = ("checked" if @params[@name] == "1")
+  end
+
+  def set_value_for_input
+    return if @input_html.key?(:value)
+
+    if @params[@name]
+      @input_html[:value] = @params[@name]
+    else
+      @input_html[:value] = ""
+    end
+  end
+end

data/lib/simple_form_ransack/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormRansack
-  VERSION = "0.0.11"
+  VERSION = "0.0.12".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_form_ransack
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,34 +24,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.9
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -175,9 +189,12 @@ files:
 - MIT-LICENSE
 - Rakefile
 - app/helpers/simple_form_ransack_helper.rb
+- config/locales/da.yml
+- config/locales/en.yml
 - lib/simple_form_ransack.rb
 - 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/version.rb
 - lib/tasks/simple_form_ransack_tasks.rake
 homepage: https://www.github.com/kaspernj/simple_form_ransack