simple_form_ransack 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b4c0e122f80c13f24d01d45df9b5dbdab1500bc
-  data.tar.gz: d805d5d2b30de2c16e9559813de19dfc01cf96ed
+  metadata.gz: 8a1915bb4fc37a6163a9415b73e2555fd5b8ffe8
+  data.tar.gz: 939a9a718795a1624be9237d16415ae264151860
 SHA512:
-  metadata.gz: d455e609222521307cc50fc1f664220ed987997613df53b761434a7cf38519413bd418fcf5e187480247a3d06be62a76a235c7b9b34f96317f232e177b42181a
-  data.tar.gz: 7fc9f976a887e44919f4c3e25d2aaed4fe67129b0f3ea53b32f0887cc333a97f5cfb13c98198476499fe70b48f376905ec37574c34869ae522f3f3f94b248706
+  metadata.gz: 062fb8029ac90464a9717c6264386c3c3145a3e4a7d7a1644a784fab22ffa333764a6ea87c9d468fa5785494aa7b535156d9e7efd7613eba4fb36b658d56abc6
+  data.tar.gz: bb6f45e1de84c9897b8622f24d02d614ccbb8a2bb97e6ca55f7c460346ab54d2a19c7bf88412a17abc74b86c3410769095cc5e8b612a500c5d51d50e4d5c9531

data/Rakefile

@@ -1,21 +1,17 @@
 begin
-  require 'bundler/setup'
+  require "bundler/setup"
 rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+  puts "You must `gem install bundler` and `bundle install` to run rake tasks"
 end
 
-require 'rdoc/task'
+require "rdoc/task"
 
 RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'SimpleFormRansack'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_dir = "rdoc"
+  rdoc.title    = "SimpleFormRansack"
+  rdoc.options << "--line-numbers"
+  rdoc.rdoc_files.include("README.rdoc")
+  rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
-
-
-
 Bundler::GemHelper.install_tasks
-

data/app/helpers/simple_form_ransack_helper.rb

@@ -17,7 +17,7 @@ module SimpleFormRansackHelper
       form_proxy = SimpleFormRansack::FormProxy.new(
         resource: resource,
         form: form,
-        params: params,
+        params: params
       )
 
       yield form_proxy

data/lib/simple_form_ransack.rb

@@ -1,6 +1,6 @@
 module SimpleFormRansack
   autoload :AttributeInspector, "simple_form_ransack/attribute_inspector"
-  autoload :FormProxy, 'simple_form_ransack/form_proxy'
+  autoload :FormProxy, "simple_form_ransack/form_proxy"
 end
 
 require_relative "../app/helpers/simple_form_ransack_helper"

data/lib/simple_form_ransack/attribute_inspector.rb

@@ -13,7 +13,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?
+    has_attribute_directly = @clazz.attribute_names.select { |name| name.to_s == @ransack_name.to_s }.any?
 
     research unless has_attribute_directly
   end
@@ -25,9 +25,11 @@ class SimpleFormRansack::AttributeInspector
 
       # The last part should be the attribute name.
       if index == @name_parts.length - 1
-        if attribute_result = attribute_by_builtup
-          puts "Attribute was: #{attribute_result[:name]}" if @debug
-          @attribute = attribute_result[:name]
+        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
@@ -36,11 +38,12 @@ class SimpleFormRansack::AttributeInspector
       end
 
       # Try next - maybe next key need to be added? (which is common!)
-      next unless reflection_result = reflection_by_builtup
+      reflection_result = reflection_by_builtup
+      next unless reflection_result
 
       @name_builtup = []
-      name = reflection_result[:name]
-      reflection = reflection_result[:reflection]
+      name = reflection_result.fetch(:name)
+      reflection = reflection_result.fetch(:reflection)
 
       puts "Name: #{name}" if @debug
       puts "Reflection: #{reflection}" if @debug
@@ -53,7 +56,7 @@ class SimpleFormRansack::AttributeInspector
   # Returns true if a complicated label could be generated and simple form should not do this itself.
   def generated_label?
     return true if @attribute && @generated_name_classes.any?
-    return false
+    false
   end
 
   # Generates the complicated label and returns it.
@@ -61,7 +64,9 @@ class SimpleFormRansack::AttributeInspector
     name = ""
 
     if @generated_name_classes.last
-      clazz, reflection = @generated_name_classes.last[:clazz], @generated_name_classes.last[:reflection]
+      clazz = @generated_name_classes.last.fetch(:clazz)
+      reflection = @generated_name_classes.last.fetch(:reflection)
+
       if reflection.collection?
         name << clazz.model_name.human(count: 2)
       else
@@ -72,22 +77,22 @@ class SimpleFormRansack::AttributeInspector
     name << " " unless name.empty?
     name << @current_clazz.human_attribute_name(@attribute).to_s.downcase
 
-    return name
+    name
   end
 
 private
 
   def reflection_by_builtup
     total_name = @name_builtup.join("_")
-    result = @current_clazz.reflections.select { |name, reflection| name.to_s == total_name }.first
+    result = @current_clazz.reflections.find { |name, _reflection| name.to_s == total_name }
     return {name: result[0], reflection: result[1]} if result
-    return false
+    false
   end
 
   def attribute_by_builtup
     total_name = @name_builtup.join("_")
-    result = @current_clazz.attribute_names.select { |name| name.to_s == total_name }.first
+    result = @current_clazz.attribute_names.find { |name| name.to_s == total_name }
     return {name: result} if result
-    return false
+    false
   end
 end

data/lib/simple_form_ransack/form_proxy.rb

@@ -1,10 +1,24 @@
 class SimpleFormRansack::FormProxy
+  def self.predicates_regex
+    unless @predicates_regex
+      predicates = Ransack::Configuration
+        .predicates
+        .map(&:first)
+        .map { |predicate| Regexp.escape(predicate) }
+        .join("|")
+
+      @predicates_regex = /^(.+)_(#{predicates})$/
+    end
+
+    @predicates_regex
+  end
+
   def initialize(args)
-    @resource = args[:resource]
+    @resource = args.fetch(:resource)
     @object = @resource.object
     @class = @resource.klass
-    @params = args[:params]
-    @form = args[:form]
+    @params = args.fetch(:params)
+    @form = args.fetch(:form)
 
     raise "No params given in arguments: #{args.keys}" unless @params
   end
@@ -16,7 +30,7 @@ class SimpleFormRansack::FormProxy
       opts = {}
     end
 
-    attribute_name = real_name(name, opts)
+    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)
@@ -26,7 +40,7 @@ class SimpleFormRansack::FormProxy
     opts[:required] = false unless opts.key?(:required)
     opts[:input_html] = input_html
     args << opts
-    return @form.input(attribute_name, *args)
+    @form.input(attribute_name, *args)
   end
 
   def method_missing(method_name, *args, &blk)
@@ -35,13 +49,14 @@ class SimpleFormRansack::FormProxy
 
 private
 
-  def set_label(attribute_name, opts, input_html)
-    if !opts.key?(:label)
+  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
@@ -49,15 +64,15 @@ private
   end
 
   def set_name(as, name, input_html)
-    unless input_html.key?(:name)
-      input_html[:name] = "q[#{name}]"
-      input_html[:name] << "[]" if as == "check_boxes"
-    end
+    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"
-      if !opts.key?(:selected)
+      unless opts.key?(:selected)
         if @params[name]
           opts[:selected] = @params[name]
         else
@@ -65,7 +80,7 @@ private
         end
       end
     elsif as == "check_boxes" || as == "radio_buttons"
-      if !opts.key?(:checked)
+      unless opts.key?(:checked)
         if @params[name]
           opts[:checked] = @params[name]
         else
@@ -73,15 +88,11 @@ private
         end
       end
     elsif as == "boolean"
-      if !input_html.key?(:checked)
-        if @params[name] == "1"
-          input_html[:checked] = "checked"
-        else
-          input_html[:checked] = nil
-        end
+      unless input_html.key?(:checked)
+        input_html[:checked] = ("checked" if @params[name] == "1")
       end
     else
-      if !input_html.key?(:value)
+      unless input_html.key?(:value)
         if @params[name]
           input_html[:value] = @params[name]
         else
@@ -92,33 +103,26 @@ private
   end
 
   def as_list?(opts)
-    if as_from_opts(opts) == "select"
-      return true
-    else
-      return false
-    end
+    return true if as_from_opts(opts) == "select"
+    false
   end
 
   def as_from_opts(attribute_name, opts)
     if opts[:as].present?
-      return opts[:as].to_s
-    elsif opts[:collection] || attribute_name.end_with?('country')
+      return opts.fetch(:as).to_s
+    elsif opts[:collection] || attribute_name.end_with?("country")
       return "select"
     end
 
-    if column = @class.columns_hash[attribute_name]
-      if column.type == :boolean
-        return "boolean"
-      end
-    end
+    column = @class.columns_hash[attribute_name]
+    return "boolean" if column && column.type == :boolean
 
-    return "text"
+    "text"
   end
 
-  def real_name(name, opts)
-    predicates = Ransack::Configuration.predicates.map(&:first).
-      map { |predicate| Regexp.escape(predicate) }.join("|")
-    match = name.to_s.match(/^(.+)_(#{predicates})$/)
+  def real_name(name)
+    match = name.to_s.match(SimpleFormRansack::FormProxy.predicates_regex)
+
     if match
       return match[1]
     else

data/lib/simple_form_ransack/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormRansack
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form_ransack
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Kasper Johansen
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Makes it easy to use SimpleForm::FormBuilder with Ransack without constantly
   having to supply labels and other pains.
 email: