inline_forms 1.2.5 → 1.2.7

data/lib/app/helpers/form_elements/radio_button.rb

@@ -5,14 +5,15 @@ InlineForms::SPECIAL_COLUMN_TYPES[:radio_button]=:integer
 
 def radio_button_show(object, attribute)
   values = attribute_values(object, attribute)
-  link_to_inline_edit object, attribute, object.send(attribute)
+  link_to_inline_edit object, attribute, values.assoc(object.send(attribute))[1] #TODO code for values.assoc(object.send(attribute)) = nil
 end
 
 def radio_button_edit(object, attribute)
   out ='<ul class="radio_list">'
-  attribute_values(object, attribute).each do |n,value|
+  values = attribute_values(object, attribute)
+  values.each do |key,value|
     out << '<li>'
-    out << radio_button_tag(attribute.to_s, value, value == object.send(attribute))
+    out << radio_button_tag(attribute.to_s, key, key == object.send(attribute))
     out << value
     out << '</li>'
   end
@@ -21,6 +22,6 @@ def radio_button_edit(object, attribute)
 end
 
 def radio_button_update(object, attribute)
-  object[attribute.to_s.to_sym] = params[attribute.to_s.to_sym].nil? ? 0 : 1
+  object[attribute.to_s.to_sym] = params[attribute.to_s.to_sym]
 end
 

data/lib/app/helpers/inline_forms_helper.rb

@@ -122,6 +122,19 @@ module InlineFormsHelper
     # if we have an array ['a','d','b'] will result in [[0,'a'],[2,'b'],[1,'d']] (sorted on value)
     # if we have a hash { 0=>'a', 2=>'b', 3=>'d' } will result in [[0,'a'],[2,'b'],[3,'d']] (it will keep the index and sort on the index)
     # TODO work this out better!
+    # 2012-01-23 Use Cases
+    # [ :sex , "sex", :radio_button, { 1 => 'f', 2 => 'm' } ],
+    # in this case we want the attribute in the database to be 1 or 2. From that attribute, we need to find the value.
+    # using an array, won't work, since [ 'v', 'm' ][1] would be 'm' in stead of 'v'
+    # so values should be a hash. BUT since we don't have sorted hashes (ruby 1,.8.7), the order of the values in the edit screen will be random.
+    # so we DO need an array, and look up by index.
+    # [[1,'v'],[2,'m]] and then use #assoc:
+    # assoc(obj) → new_ary or nil
+    # Searches through an array whose elements are also arrays comparing obj with the first element of each contained array using obj.==.
+    # Returns the first contained array that matches (that is, the first associated array), or nil if no match is found. See also Array#rassoc.
+    # like value=values.assoc(attribute_from_database)[1] (the [1] is needed since the result of #assoc = [1,'v'] and we need the 'v')
+    # I feel it's ugly but it works.
+
     attributes = @inline_forms_attribute_list || object.inline_forms_attribute_list # if we do this as a form_element, @inline.. is nil!!!
     values = attributes.assoc(attribute.to_sym)[3]
     raise "No Values defined in #{@Klass}, #{attribute}" if values.nil?
@@ -140,7 +153,6 @@ module InlineFormsHelper
     end
     values
   end
-
 end
 
 module Kernel

data/lib/app/validators/must_be_a_value_validator.rb

@@ -0,0 +1,61 @@
+# == usage:
+# in your model, add:
+#  validates :sex, :must_be_a_value => true;
+# 
+#  this checks against the objects attribute_values
+class MustBeAValueValidator < ActiveModel::EachValidator
+
+  def error_message
+    "is geen geldige keuze."
+  end
+
+  def help_message
+    "U dient een keuze te maken."
+  end
+
+  def validate_each(record, attribute, value)
+    values = attribute_values(record, attribute)
+    if values.assoc(value).nil?
+      record.errors[attribute] << (options[:message] || error_message )
+    end
+  end
+
+  protected
+  def attribute_values(object, attribute)
+    # if we have a range 1..6  will result in [[0,1],[1,2],[2,3],...,[5,6]]
+    # or range -3..3 will result in [[0,-3],[1,-2],[2,-1],...,[6,3]]
+    # if we have an array ['a','d','b'] will result in [[0,'a'],[2,'b'],[1,'d']] (sorted on value)
+    # if we have a hash { 0=>'a', 2=>'b', 3=>'d' } will result in [[0,'a'],[2,'b'],[3,'d']] (it will keep the index and sort on the index)
+    # TODO work this out better!
+    # 2012-01-23 Use Cases
+    # [ :sex , "sex", :radio_button, { 1 => 'f', 2 => 'm' } ],
+    # in this case we want the attribute in the database to be 1 or 2. From that attribute, we need to find the value.
+    # using an array, won't work, since [ 'v', 'm' ][1] would be 'm' in stead of 'v'
+    # so values should be a hash. BUT since we don't have sorted hashes (ruby 1,.8.7), the order of the values in the edit screen will be random.
+    # so we DO need an array, and look up by index.
+    # [[1,'v'],[2,'m]] and then use #assoc:
+    # assoc(obj) → new_ary or nil
+    # Searches through an array whose elements are also arrays comparing obj with the first element of each contained array using obj.==.
+    # Returns the first contained array that matches (that is, the first associated array), or nil if no match is found. See also Array#rassoc.
+    # like value=values.assoc(attribute_from_database)[1] (the [1] is needed since the result of #assoc = [1,'v'] and we need the 'v')
+    # I feel it's ugly but it works.
+
+    attributes = @inline_forms_attribute_list || object.inline_forms_attribute_list # if we do this as a form_element, @inline.. is nil!!!
+    values = attributes.assoc(attribute.to_sym)[3]
+    raise "No Values defined in #{@Klass}, #{attribute}" if values.nil?
+    if values.is_a?(Hash)
+      temp = Array.new
+      values.to_a.each do |k,v|
+        temp << [ k, v ]
+      end
+      values = temp.sort {|a,b| a[0]<=>b[0]}
+    else
+      temp = Array.new
+      values.to_a.each_index do |i|
+        temp << [ i, values.to_a[i] ]
+      end
+      values = temp.sort {|a,b| a[1]<=>b[1]}
+    end
+    values
+  end
+end

data/lib/inline_forms.rb

@@ -144,6 +144,9 @@ module InlineForms
     paths["app/assets"] << "lib/app/assets"
   end
 
+ 
+
+
 end
 
 # make the current method and the calling method available

data/lib/inline_forms/version.rb

@@ -1,3 +1,3 @@
 module InlineForms
-  VERSION = "1.2.5"
+  VERSION = "1.2.7"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inline_forms
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 2
-  - 5
-  version: 1.2.5
+  - 7
+  version: 1.2.7
 platform: ruby
 authors: 
 - Ace Suares
@@ -167,6 +167,7 @@ files:
 - lib/app/validators/is_a_curacao_id_number_validator.rb
 - lib/app/validators/is_curacao_phone_validator.rb
 - lib/app/validators/is_email_address_validator.rb
+- lib/app/validators/must_be_a_value_validator.rb
 - lib/app/validators/must_be_present_validator.rb
 - lib/app/validators/must_be_unique_validator.rb
 - lib/app/views/devise/confirmations/new.html.erb
@@ -241,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: inline_forms
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Inline editing of forms.