simple_form_ransack 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 908f1e7b0caf9a74d9afd4ace8b8eb2bd59f4662
-  data.tar.gz: 733e44844b4490f02a83c9796763a55bc897abf7
+  metadata.gz: c46e179d53d0bffde988759fa5b1b374a2d486bc
+  data.tar.gz: 13ec406b32985efe8f16a6351b599693f719df11
 SHA512:
-  metadata.gz: 97128aa38fa68a4dfed2bc346ea2f6496b5f48e5bc9f74a0977704469a6badb9711f87aeb51fbb6f800154e4988f754bf03a90db56ca69b29636a9408e3928a3
-  data.tar.gz: 0cf66c6a840b84598afab7d486da5c44e9269bc168929ff4e024a53af3afbe9d9b1e57673b1a418e9467205cde9fde63171e3b7fc86ae23f76446432fa3b6c79
+  metadata.gz: 397ece886b2a4f2321218301f1e2d53b40fd2b003148257754d23db5861a0bdd7d36f0c3734436bbd0370aa9704be5eb158076998407cef48293ec4fe7cf57cf
+  data.tar.gz: f6a1db27fe68971c6dc2abba089b5815fe13c2c52c00151bc7baebed17377ff70894c0c474e5106ad048ec8e7610f4286fa0c44bbbc69213261032dfc6ba058f

data/lib/simple_form_ransack.rb

@@ -1,4 +1,5 @@
 module SimpleFormRansack
+  autoload :AttributeInspector, "simple_form_ransack/attribute_inspector"
 end
 
 require_relative "../app/helpers/simple_form_ransack_helper"

data/lib/simple_form_ransack/attribute_inspector.rb

@@ -0,0 +1,93 @@
+# Inpect the model namespace for labels based on Ransack-names in order to generate labels for inputs.
+class SimpleFormRansack::AttributeInspector
+  def initialize(args)
+    @args = args
+    @ransack_name = args[:name]
+    @name_parts = @ransack_name.to_s.split("_")
+    @instance = args[:instance]
+    @clazz = args[:clazz]
+    @debug = args[:debug]
+    
+    @generated_name_classes = []
+    @models = []
+    @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
+  end
+  
+  # Loop through the name parts and inspectors reflections with it.
+  def research
+    @name_parts.each_with_index do |name_part, index|
+      @name_builtup << name_part
+      
+      # 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]
+          break
+        else
+          puts "Not found: #{@name_builtup.join("_")}" if @debug
+          next
+        end
+      end
+      
+      # Try next - maybe next key need to be added? (which is common!)
+      next unless reflection_result = reflection_by_builtup
+      
+      @name_builtup = []
+      name = reflection_result[:name]
+      reflection = reflection_result[:reflection]
+      
+      puts "Name: #{name}" if @debug
+      puts "Reflection: #{reflection}" if @debug
+      
+      @current_clazz = reflection.klass
+      @generated_name_classes << {:clazz => @current_clazz, :reflection => reflection}
+    end
+  end
+  
+  # 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
+  end
+  
+  # Generates the complicated label and returns it.
+  def generated_label
+    name = ""
+    
+    if @generated_name_classes.last
+      clazz, reflection = @generated_name_classes.last[:clazz], @generated_name_classes.last[:reflection]
+      if reflection.collection?
+        name << clazz.model_name.human(:count => 2)
+      else
+        name << clazz.model_name.human
+      end
+    end
+    
+    name << " " unless name.empty?
+    name << @current_clazz.human_attribute_name(@attribute).to_s.downcase
+    
+    return 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
+    return {:name => result[0], :reflection => result[1]} if result
+    return false
+  end
+  
+  def attribute_by_builtup
+    total_name = @name_builtup.join("_")
+    result = @current_clazz.attribute_names.select{ |name| name.to_s == total_name }.first
+    return {:name => result} if result
+    return false
+  end
+end

data/lib/simple_form_ransack/form_proxy.rb

@@ -18,19 +18,13 @@ class SimpleFormRansack::FormProxy
     
     attribute_name = real_name(name, opts)
     as = as_from_opts(opts)
-    
     input_html = opts.delete(:input_html) || {}
-    input_html[:name] = "q[#{name}]" unless input_html.key?(:name)
-    
-    if as == "select"
-      opts[:selected] = @params[name] if !input_html.key?(:selected) && @params[name]
-    else
-      input_html[:value] = @params[name] if !input_html.key?(:value) && @params[name]
-    end
+    set_value(as, name, opts, input_html)
+    set_name(as, name, input_html)
+    set_label(attribute_name, opts, input_html)
     
-    opts[:input_html] = input_html
     opts[:required] = false unless opts.key?(:required)
-    
+    opts[:input_html] = input_html
     args << opts
     return @form.input(attribute_name, *args)
   end
@@ -41,6 +35,62 @@ class SimpleFormRansack::FormProxy
   
 private
   
+  def set_label(attribute_name, opts, input_html)
+    if !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)
+    unless input_html.key?(:name)
+      input_html[:name] = "q[#{name}]"
+      input_html[:name] << "[]" if as == "check_boxes"
+    end
+  end
+  
+  def set_value(as, name, opts, input_html)
+    if as == "select"
+      if !opts.key?(:selected)
+        if @params[name]
+          opts[:selected] = @params[name]
+        else
+          opts[:selected] = ""
+        end
+      end
+    elsif as == "check_boxes" || as == "radio_buttons"
+      if !opts.key?(:checked)
+        if @params[name]
+          opts[:checked] = @params[name]
+        else
+          opts[:checked] = ""
+        end
+      end
+    else
+      if !input_html.key?(:value)
+        if @params[name]
+          input_html[:value] = @params[name]
+        else
+          input_html[:value] = ""
+        end
+      end
+    end
+  end
+  
+  def as_list?(opts)
+    if as_from_opts(opts) == "select"
+      return true
+    else
+      return false
+    end
+  end
+  
   def as_from_opts(opts)
     if opts[:as].present?
       return opts[:as].to_s
@@ -52,7 +102,7 @@ private
   end
   
   def real_name(name, opts)
-    match = name.to_s.match(/^(.+)_(eq|cont|eq_any)$/)
+    match = name.to_s.match(/^(.+)_(eq|cont|eq_any|gteq|lteq|gt|lt)$/)
     if match
       return match[1]
     else

data/lib/simple_form_ransack/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormRansack
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_form_ransack
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -134,6 +134,7 @@ files:
 - lib/simple_form_ransack.rb
 - lib/tasks/simple_form_ransack_tasks.rake
 - lib/simple_form_ransack/version.rb
+- lib/simple_form_ransack/attribute_inspector.rb
 - lib/simple_form_ransack/form_proxy.rb
 - MIT-LICENSE
 - Rakefile