effective_form_inputs 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e84a838832b598cc3b8261c04f468d304ae5d6ce
-  data.tar.gz: 9a1ce4d38760e24e0ff95a59db675cc94e98d97b
+  metadata.gz: accc0fe7bd2c46e9ef6623d7c68683a77dc1f5f7
+  data.tar.gz: 029d82f57a52ec949f525d914fda00476fcc015e
 SHA512:
-  metadata.gz: 5e357f9a67eb8ff7d33932117681d9552306db028835ec39fb71641b52ef2fd25431ea27f16582098a9e336c4c60df3b404ccca780c786672200501594b59669
-  data.tar.gz: 08f29d5e3bf603b181b3696519e7e4d67111598b1324be2592a8740bb0d3a97ebb43db5c9b803999a7dbc5c52fddc40a8abedd458b6b8c53df2b446d3b05514b
+  metadata.gz: 269ddf7bd1da80e1daeab5a6f2174b57f87c43c52d55d483dd40bcf894eeeb941358b80d489f035ec8dc38c163530befe630a16cc37b665bf488ceaac700083f
+  data.tar.gz: e29783d2fe62b7a9380683fd31478e664f12eb2a0f36699ead1337ae6d1540c2bd10676a577f48781e8d6426083856fdff1c0239b87539f6a385b2ad86a397d5

data/app/models/inputs/effective_select/input.rb

@@ -16,7 +16,14 @@ module Inputs
       end
 
       def to_html
-        collection_select(@object_name, @method, options[:collection], options[:label_method], options[:value_method], options, tag_options)
+        collection_select(@object_name, @method, collection, options[:value_method], options[:label_method], options, tag_options)
+      end
+
+      def collection
+        @collection ||= begin
+          collection = options.delete(:collection)
+          collection.respond_to?(:call) ? collection.call : collection.to_a
+        end
       end
 
       def options

data/app/models/inputs/effective_tel/input.rb

@@ -7,7 +7,7 @@ module Inputs
       DEFAULT_CELL_MASK = '(999) 999-9999'
 
       def default_options
-        {cellphone: false}
+        {cellphone: false, fax: false}
       end
 
       def default_input_html
@@ -25,15 +25,35 @@ module Inputs
 
         content_tag(:div, class: 'input-group') do
           content_tag(:span, class: 'input-group-addon') do
-            content_tag(:i, '', class: "glyphicon glyphicon-#{options[:cellphone] ? 'phone' : 'earphone'}").html_safe
+            content_tag(:i, '', class: "glyphicon glyphicon-#{glyphicon}").html_safe
           end +
           text_field_tag(field_name, value, tag_options)
         end
       end
 
+      def fax?
+        field_name.include?('fax') || options[:fax]
+      end
+
+      def cellphone?
+        field_name.include?('cell') || options[:cellphone]
+      end
+
+      def glyphicon
+        icon = 'earphone' # default
+
+        icon = 'phone' if field_name.include?('cell')
+        icon = 'phone-alt' if field_name.include?('fax')
+
+        icon = 'phone' if options[:cellphone]
+        icon = 'phone-alt' if options[:fax]
+
+        icon
+      end
+
       def js_options
         super.tap do |js_options|
-          if options[:cellphone] == true && js_options[:mask] == DEFAULT_TEL_MASK
+          if (fax? || cellphone?) && js_options[:mask] == DEFAULT_TEL_MASK
             js_options[:mask] = DEFAULT_CELL_MASK
           end
         end

data/lib/effective_form_inputs/version.rb

@@ -1,3 +1,3 @@
 module EffectiveFormInputs
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.6.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_form_inputs
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails