Merge pull request #505 from farismosman/master

[#1668] Unable to create forms when Base language is in Arabic

app/models/field.rb

@@ -13,6 +13,7 @@ class Field < Hash
   localize_properties [:display_name, :help_text, :option_strings_text]
   attr_reader :options
   property :base_language, :default=>'en'
+
   TEXT_FIELD = "text_field"
   TEXT_AREA = "textarea"
   RADIO_BUTTON = "radio_button"
@@ -58,9 +59,20 @@ class Field < Hash
   validates_with_method :display_name, :method => :validate_unique_display_name
   validates_with_method :option_strings, :method => :validate_has_2_options
   validates_with_method :option_strings, :method => :validate_has_a_option
-  validates_format_of :display_name, :with => /([a-zA-Z]+)/, :message => I18n.t("activerecord.errors.models.field.display_name_format")
+  validates_with_method :display_name, :method => :validate_name_format
   validates_with_method :display_name, :method => :valid_presence_of_base_language_name
 
+  def validate_name_format
+    special_characters = /[*!@#%$\^]/
+    white_spaces = /^(\s+)$/
+    if (display_name =~ special_characters) || (display_name =~ white_spaces)
+      errors.add(:display_name, I18n.t("activerecord.errors.models.field.display_name_format"))
+      return false
+    else
+      return true
+    end
+  end
+
   def valid_presence_of_base_language_name
     if base_language==nil
       self.base_language='en'

app/models/form_section.rb

@@ -18,7 +18,7 @@ class FormSection < CouchRestRails::Document
   view_by :order
   validates_presence_of "name_#{I18n.default_locale}", :message => I18n.t("activerecord.errors.models.form_section.presence_of_name")
   validates_with_method :name, :method => :valid_presence_of_base_language_name
-  validates_format_of :name, :with => /^([a-zA-Z0-9_\s]*)$/, :message => I18n.t("activerecord.errors.models.form_section.format_of_name")
+  validates_with_method :name, :method => :validate_name_format
   validates_with_method :unique_id, :method => :validate_unique_id
   validates_with_method :name, :method => :validate_unique_name
   validates_with_method :visible, :method => :validate_visible_field, :message => I18n.t("activerecord.errors.models.form_section.visible_method")
@@ -85,6 +85,7 @@ def self.get_by_unique_id unique_id
 
   def self.add_field_to_formsection formsection, field
     raise I18n.t("activerecord.errors.models.form_section.add_field_to_form_section") unless formsection.editable
+    field.merge!({'base_language' => formsection['base_language']})
     formsection.fields.push(field)
     formsection.save
   end
@@ -180,6 +181,17 @@ def order_fields new_field_names
 
   protected
 
+  def validate_name_format
+    special_characters = /[*!@#%$\^]/
+    white_spaces = /^(\s+)$/
+    if (name =~ special_characters) || (name =~ white_spaces)
+      errors.add(:name, I18n.t("activerecord.errors.models.form_section.format_of_name"))
+      return false
+    else
+      return true
+    end
+  end
+
   def validate_visible_field
     self.visible = true if self.perm_visible?
     true

app/models/search_criteria.rb

@@ -35,7 +35,7 @@ def self.lucene_query(criteria_list)
   def to_lucene_query
     phrases = value.split(/\s+OR\s+/i)
     phrases.map do |phrase|
-      query = phrase.split(/[ ,]+/).map {|word| "(#{field}_text:#{word.downcase}~ OR #{field}_text:#{word.downcase}*)"}.join(" AND ")
+      query = phrase.split(/[ ,-]+/).map {|word| "(#{field}_text:#{word.downcase}~ OR #{field}_text:#{word.downcase}*)"}.join(" AND ")
       "(#{query})"
     end.join(" OR ")
   end

capybara_features/create_new_form.feature

@@ -36,7 +36,7 @@ Feature: Create new forms
 
     Given I am on form section page
     And I follow "Create New Form Section"
-    And I fill in "form_section_name" with "This is D£dgy"
+    And I fill in "form_section_name" with "This is D$dgy"
     And I fill in "form_section_description" with "I am a new custom form.  Say hello!"
 
     When I press "Save Details"

capybara_features/upload_a_childs_audio.feature

@@ -42,7 +42,7 @@ Feature:
     Then I should see "Child was successfully updated"
     And I click the "Photos and Audio" link
     And I should see an audio element that can play the audio file named "sample.mp3"
-    And the record history should log "Audio changed "
+    And the record history should log "Audio changed"
     And the record history should log "by bob"
 
   @gc

spec/models/form_section_spec.rb

@@ -3,9 +3,9 @@
 
 describe FormSection do
 
-  def mock_formsection(stubs={})
-    stubs.reverse_merge!(:fields=>[], :save => true, :editable => true)
-    @mock_formsection ||= mock_model(FormSection, stubs)
+  def create_formsection(stubs={})
+    stubs.reverse_merge!(:fields=>[], :save => true, :editable => true, :base_language => "en")
+    @create_formsection = FormSection.new stubs
   end
 
   def new_field(fields = {})
@@ -123,15 +123,22 @@ def new_should_be_called_with (name, value)
 
     it "adds the field to the formsection" do
       field = Field.new_text_field("name")
-      formsection = mock_formsection :fields => [new_field(), new_field()], :save=>true
+      formsection = create_formsection :fields => [new_field(), new_field()], :save => true
       FormSection.add_field_to_formsection formsection, field
       formsection.fields.length.should == 3
       formsection.fields[2].should == field
     end
 
+    it "adds base_language to fields in formsection" do
+      field = Field.new_textarea("name")
+      formsection = create_formsection :fields => [new_field(), new_field()], :save=>true
+      FormSection.add_field_to_formsection formsection, field
+      formsection.fields[2].should have_key("base_language")
+    end
+
     it "saves the formsection" do
       field = Field.new_text_field("name")
-      formsection = mock_formsection
+      formsection = create_formsection
       formsection.should_receive(:save)
       FormSection.add_field_to_formsection formsection, field
     end
@@ -149,15 +156,15 @@ def new_should_be_called_with (name, value)
 
     it "adds the textarea to the formsection" do
       field = Field.new_textarea("name")
-      formsection = mock_formsection :fields => [new_field(), new_field()], :save=>true
+      formsection = create_formsection :fields => [new_field(), new_field()], :save=>true
       FormSection.add_field_to_formsection formsection, field
       formsection.fields.length.should == 3
       formsection.fields[2].should == field
     end
 
     it "saves the formsection with textarea field" do
       field = Field.new_textarea("name")
-      formsection = mock_formsection
+      formsection = create_formsection
       formsection.should_receive(:save)
       FormSection.add_field_to_formsection formsection, field
     end
@@ -168,15 +175,15 @@ def new_should_be_called_with (name, value)
 
     it "adds the select drop down to the formsection" do
       field = Field.new_select_box("name", ["some", ""])
-      formsection = mock_formsection :fields => [new_field(), new_field()], :save=>true
+      formsection = create_formsection :fields => [new_field(), new_field()], :save=>true
       FormSection.add_field_to_formsection formsection, field
       formsection.fields.length.should == 3
       formsection.fields[2].should == field
     end
 
     it "saves the formsection with select drop down field" do
       field = Field.new_select_box("name", ["some", ""])
-      formsection = mock_formsection
+      formsection = create_formsection
       formsection.should_receive(:save)
       FormSection.add_field_to_formsection formsection, field
     end
@@ -292,11 +299,23 @@ def new_should_be_called_with (name, value)
     end
 
     it "should validate name is alpha_num" do
-      form_section = FormSection.new(:name=>"££ss")
+      form_section = FormSection.new(:name=> "r@ndom name!")
+      form_section.should_not be_valid
+      form_section.errors.on(:name).should be_present
+    end
+
+    it "should not allow name with white speces only" do
+      form_section = FormSection.new(:name=> "     ")
       form_section.should_not be_valid
       form_section.errors.on(:name).should be_present
     end
 
+    it "should allow arabic names" do
+      form_section = FormSection.new(:name=>"العربية")
+      form_section.should be_valid
+      form_section.errors.on(:name).should_not be_present
+    end
+
     it "should validate name is unique" do
       same_name = 'Same Name'
       valid_attributes = {:name => same_name, :unique_id => same_name.dehumanize, :description => '', :visible => true, :order => 0}