simple_form_ransack 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bf0d09cf759f75b2f06b555c2ab33721f06d36b
-  data.tar.gz: 8a54387e3b835ebd68a53a61c9773e1b5023c0ac
+  metadata.gz: c763fb28de54e7cce0d673dbef3f9a9087e9330d
+  data.tar.gz: 9bca32d430e9d66876a8b93facbc68109368f691
 SHA512:
-  metadata.gz: e687398d0bd4dcc8e8eeab8dcbf0c795e38028a5910209b758e10e897304b3c63c0966fe3cee3f1076416b5b24218e112d48d319a6156cee493b96d7bd191c7b
-  data.tar.gz: 85766928afba1b324409900f0a273b09fec46ffab504468a0177973e161c8ffa32dec4dad27419cd23b086d2b0851ddf122db49feb4fdaf82a83cf414943071d
+  metadata.gz: b8dc68e1dac428ddda09f0d4311851780d5bc9aa4329e1d2865c6b593b4525caa13001f6ec5e24842a382960c1f25606ca9fc6794fcd232ab4de45559e3a8173
+  data.tar.gz: f4696e0b19efb0cfcdcc631d11f0c439757965cbcac459967d52c0915a41f5a99cc481bdaa21dcc8c2bfd475b9a9b45ff395be94fc22f1669344047b8d842db5

data/app/helpers/simple_form_ransack_helper.rb

@@ -5,21 +5,21 @@ module SimpleFormRansackHelper
     else
       opts = {}
     end
-    
+
     opts[:url] = request.original_fullpath unless opts[:url]
     opts[:method] = "get" unless opts[:method]
     args << opts
-    
+
     model_class = resource.klass
     sample_model = model_class.new
-    
+
     simple_form_for(sample_model, *args) do |form|
       form_proxy = SimpleFormRansack::FormProxy.new(
-        :resource => resource,
-        :form => form,
-        :params => params,
+        resource: resource,
+        form: form,
+        params: params,
       )
-      
+
       yield form_proxy
     end
   end

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'
 end
 
 require_relative "../app/helpers/simple_form_ransack_helper"
-require_relative "simple_form_ransack/form_proxy"

data/lib/simple_form_ransack/attribute_inspector.rb

@@ -7,22 +7,22 @@ class SimpleFormRansack::AttributeInspector
     @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
@@ -34,60 +34,60 @@ class SimpleFormRansack::AttributeInspector
           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}
+      @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)
+        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
+    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
+    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

@@ -5,56 +5,56 @@ class SimpleFormRansack::FormProxy
     @class = @resource.klass
     @params = args[:params]
     @form = args[:form]
-    
+
     raise "No params given in arguments: #{args.keys}" unless @params
   end
-  
+
   def input(name, *args)
     if args.last.is_a?(Hash)
       opts = args.pop
     else
       opts = {}
     end
-    
+
     attribute_name = real_name(name, opts)
     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)
-    
+
     opts[:required] = false unless opts.key?(:required)
     opts[:input_html] = input_html
     args << opts
     return @form.input(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)
     if !opts.key?(:label)
       attribute_inspector = ::SimpleFormRansack::AttributeInspector.new(
-        :name => attribute_name,
-        :instance => @object,
-        :clazz => @class
+        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)
@@ -90,7 +90,7 @@ private
       end
     end
   end
-  
+
   def as_list?(opts)
     if as_from_opts(opts) == "select"
       return true
@@ -98,23 +98,23 @@ private
       return false
     end
   end
-  
+
   def as_from_opts(attribute_name, opts)
     if opts[:as].present?
       return opts[:as].to_s
-    elsif opts[:collection]
+    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
-    
+
     return "text"
   end
-  
+
   def real_name(name, opts)
     match = name.to_s.match(/^(.+)_(eq|cont|eq_any|gteq|lteq|gt|lt)$/)
     if match

data/lib/simple_form_ransack/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormRansack
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_form_ransack
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: country_select
+  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'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -171,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ransack and SimpleForm combined.