inline_forms 1.2.3 → 1.2.4

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

@@ -0,0 +1,26 @@
+InlineForms::SPECIAL_COLUMN_TYPES[:radio_button]=:integer
+# radio buttons are integers in this version
+# us like this:
+#   [ :sex , "gender", :radio_button, { 1 => 'male', 2 => 'female' } ],
+
+def radio_button_show(object, attribute)
+  values = attribute_values(object, attribute)
+  link_to_inline_edit object, attribute, object.send(attribute)
+end
+
+def radio_button_edit(object, attribute)
+  out ='<ul class="radio_list">'
+  attribute_values(object, attribute).each do |n,value|
+    out << '<li>'
+    out << radio_button_tag(attribute.to_s, value, value == object.send(attribute))
+    out << value
+    out << '</li>'
+  end
+  out << '</ul>'
+  raw out
+end
+
+def radio_button_update(object, attribute)
+  object[attribute.to_s.to_sym] = params[attribute.to_s.to_sym].nil? ? 0 : 1
+end
+

data/lib/app/helpers/inline_forms_helper.rb

@@ -122,7 +122,8 @@ 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!
-    values = object.inline_forms_attribute_list.assoc(attribute.to_sym)[3]
+    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

data/lib/app/validators/is_curacao_phone_validator.rb

@@ -4,33 +4,17 @@
 # taken from http://lindsaar.net/2010/1/31/validates_rails_3_awesome_is_true
 # (It's probably a fake regex but hey, it looks legit.)
 class IsCuracaoPhoneValidator < ActiveModel::EachValidator
-  EmailAddress = begin
-    qtext = '[^\\x0d\\x22\\x5c\\x80-\\xff]'
-    dtext = '[^\\x0d\\x5b-\\x5d\\x80-\\xff]'
-    atom = '[^\\x00-\\x20\\x22\\x28\\x29\\x2c\\x2e\\x3a-' +
-      '\\x3c\\x3e\\x40\\x5b-\\x5d\\x7f-\\xff]+'
-    quoted_pair = '\\x5c[\\x00-\\x7f]'
-    domain_literal = "\\x5b(?:#{dtext}|#{quoted_pair})*\\x5d"
-    quoted_string = "\\x22(?:#{qtext}|#{quoted_pair})*\\x22"
-    domain_ref = atom
-    sub_domain = "(?:#{domain_ref}|#{domain_literal})"
-    word = "(?:#{atom}|#{quoted_string})"
-    domain = "#{sub_domain}(?:\\x2e#{sub_domain})*"
-    local_part = "#{word}(?:\\x2e#{word})*"
-    addr_spec = "#{local_part}\\x40#{domain}"
-    pattern = /\A#{addr_spec}\z/
-  end
 
   def error_message
-    "is not a valid Curacao phone number."
+    "is geen geldig Curaçao telefoon nummer."
   end
 
   def help_message
-    "Needs to be a valid Curacao phone number."
+    "Telefoonnummer moet 7 cijfers zijn, bijvoorbeeld 6781256."
   end
 
   def validate_each(record, attribute, value)
-    unless value =~ EmailAddress
+    unless value =~ /[4-8][0-9]{6}/
       record.errors[attribute] << (options[:message] || error_message )
     end
   end

data/lib/app/views/inline_forms/_new.html.erb

@@ -18,7 +18,7 @@
             </div>
           </th>
         </tr>
-        <% attributes ||= ( @inline_forms_attribute_list || @object.inline_forms_attribute_list ) -%>
+        <% attributes = @inline_forms_attribute_list || @object.inline_forms_attribute_list -%>
         <% attributes.each do | attribute, name, form_element | -%>
           <% unless form_element.to_sym == :associated -%>
             <% css_class_id = "attribute_#{attribute}_#{@object.id}" -%>

data/lib/app/views/inline_forms/_show.html.erb

@@ -11,7 +11,7 @@
       </div>
     </th>
   </tr>
-  <% attributes ||= @object.inline_forms_attribute_list -%>
+  <% attributes = @inline_forms_attribute_list || @object.inline_forms_attribute_list -%>
   <% attributes.each do | attribute, name, form_element | -%>
     <% css_class_id = "#{@object.class.to_s.underscore}_#{@object.id}_#{attribute}" -%>
     <tr>

data/lib/inline_forms/version.rb

@@ -1,3 +1,3 @@
 module InlineForms
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inline_forms
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 2
-  - 3
-  version: 1.2.3
+  - 4
+  version: 1.2.4
 platform: ruby
 authors: 
 - Ace Suares
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-08 00:00:00 Z
+date: 2012-01-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
@@ -156,6 +156,7 @@ files:
 - lib/app/helpers/form_elements/info.rb
 - lib/app/helpers/form_elements/infoadmin.rb
 - lib/app/helpers/form_elements/question_list.rb
+- lib/app/helpers/form_elements/radio_button.rb
 - lib/app/helpers/form_elements/scale_with_integers.rb
 - lib/app/helpers/form_elements/scale_with_values.rb
 - lib/app/helpers/form_elements/slider_with_values.rb