6 files changed, 109 insertions, 17 deletions
diff --git a/app/models/chouette/vehicle_journey.rb b/app/models/chouette/vehicle_journey.rb
index 9b94f7f0e..c5a6901d7 100644
--- a/app/models/chouette/vehicle_journey.rb
+++ b/app/models/chouette/vehicle_journey.rb
@@ -3,6 +3,7 @@ module Chouette
   class VehicleJourney < Chouette::TridentActiveRecord
     has_paper_trail
     include ChecksumSupport
+    include CustomFieldsSupport
     include VehicleJourneyRestrictions
     include ObjectidSupport
     include StifTransportModeEnumerations
@@ -340,21 +341,6 @@ module Chouette
       end
     end
 
-    def self.custom_fields
-      CustomField.where(resource_type: self.name.split("::").last)
-    end
-
-
-    def custom_fields
-      Hash[*self.class.custom_fields.map do |v|
-        [v.code, v.slice(:code, :name, :field_type, :options).update(value: custom_field_value(v.code))]
-      end.flatten]
-    end
-
-    def custom_field_value key
-      (custom_field_values || {})[key.to_s]
-    end
-
     def self.matrix(vehicle_journeys)
       Hash[*VehicleJourneyAtStop.where(vehicle_journey_id: vehicle_journeys.pluck(:id)).map do |vjas|
         [ "#{vjas.vehicle_journey_id}-#{vjas.stop_point_id}", vjas]
diff --git a/app/models/compliance_check_message_export.rb b/app/models/compliance_check_message_export.rb
index 04e1a9caa..bbaaa8e3f 100644
--- a/app/models/compliance_check_message_export.rb
+++ b/app/models/compliance_check_message_export.rb
@@ -26,12 +26,14 @@ class ComplianceCheckMessageExport
   end
 
   def to_csv(options = {})
-    CSV.generate(options.slice(:col_sep, :quote_char, :force_quotes)) do |csv|
+    csv_string = CSV.generate(options.slice(:col_sep, :quote_char, :force_quotes)) do |csv|
       csv << column_names
       compliance_check_messages.each do |compliance_check_message|
         csv << [compliance_check_message.compliance_check.criticity, *compliance_check_message.message_attributes.values_at('test_id', 'source_objectid'), options[:server_url] + compliance_check_message.message_attributes['source_object_path'], I18n.t("compliance_check_messages.#{compliance_check_message.message_key}", compliance_check_message.message_attributes.deep_symbolize_keys)]
       end
     end
+    # We add a BOM to indicate we use UTF-8
+    "\uFEFF" + csv_string
   end
 
   def to_zip(temp_file,options = {})
diff --git a/app/models/concerns/custom_fields_support.rb b/app/models/concerns/custom_fields_support.rb
new file mode 100644
index 000000000..6c76bd653
--- /dev/null
+++ b/app/models/concerns/custom_fields_support.rb
@@ -0,0 +1,24 @@
+module CustomFieldsSupport
+  extend ActiveSupport::Concern
+
+  included do
+    validate :custom_fields_values_are_valid
+
+    def self.custom_fields
+      CustomField.where(resource_type: self.name.split("::").last)
+    end
+
+    def custom_fields
+      CustomField::Collection.new self
+    end
+
+    def custom_field_value key
+      (custom_field_values || {})[key.to_s]
+    end
+
+    private
+    def custom_fields_values_are_valid
+      custom_fields.values.all?{|cf| cf.valid?}
+    end
+  end
+end
diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb
index 774c8b0f6..4a840744e 100644
--- a/app/models/custom_field.rb
+++ b/app/models/custom_field.rb
@@ -6,4 +6,80 @@ class CustomField < ActiveRecord::Base
 
   validates :name, uniqueness: {scope: [:resource_type, :workgroup_id]}
   validates :code, uniqueness: {scope: [:resource_type, :workgroup_id], case_sensitive: false}
+
+  class Collection < HashWithIndifferentAccess
+    def initialize object
+      vals = object.class.custom_fields.map do |v|
+        [v.code, CustomField::Value.new(object, v, object.custom_field_value(v.code))]
+      end
+      super Hash[*vals.flatten]
+    end
+
+    def to_hash
+      HashWithIndifferentAccess[*self.map{|k, v| [k, v.to_hash]}.flatten(1)]
+    end
+  end
+
+  class Value
+    def self.new owner, custom_field, value
+      field_type = custom_field.options["field_type"]
+      klass_name = field_type && "CustomField::Value::#{field_type.classify}"
+      klass = klass_name && const_defined?(klass_name) ? klass_name.constantize : CustomField::Value::Base
+      klass.new owner, custom_field, value
+    end
+
+    class Base
+      def initialize owner, custom_field, value
+        @custom_field = custom_field
+        @raw_value = value
+        @owner = owner
+        @errors = []
+        @validated = false
+        @valid = false
+      end
+
+      delegate :code, :name, :field_type, :options, to: :@custom_field
+
+      def validate
+        @valid = true
+      end
+
+      def valid?
+        validate unless @validated
+        @valid
+      end
+
+      def value
+        @raw_value
+      end
+
+      def errors_key
+        "custom_fields.#{code}"
+      end
+
+      def to_hash
+        HashWithIndifferentAccess[*%w(code name field_type options value).map{|k| [k, send(k)]}.flatten(1)]
+      end
+    end
+
+    class Integer < Base
+      def value
+        @raw_value.to_i
+      end
+
+      def validate
+        @valid = true
+        unless @raw_value =~ /\A\d*\Z/
+          @owner.errors.add errors_key, "'#{@raw_value}' is not a valid integer"
+          @valid = false
+        end
+      end
+    end
+
+    class String < Base
+      def value
+        "#{@raw_value}"
+      end
+    end
+  end
 end
diff --git a/app/models/import_message_export.rb b/app/models/import_message_export.rb
index 05f8a2cc7..991eb0f61 100644
--- a/app/models/import_message_export.rb
+++ b/app/models/import_message_export.rb
@@ -26,12 +26,14 @@ class ImportMessageExport
   end
 
   def to_csv(options = {})
-    CSV.generate(options) do |csv|
+    csv_string = CSV.generate(options) do |csv|
       csv << column_names
       import_messages.each do |import_message|
         csv << [import_message.criticity, import_message.message_key, I18n.t("import_messages.#{import_message.message_key}", import_message.message_attributes.deep_symbolize_keys), *import_message.resource_attributes.values_at("filename", "line_number", "column_number")  ]
       end
     end
+    # We add a BOM to indicate we use UTF-8
+    "\uFEFF" + csv_string
   end
 
   def to_zip(temp_file,options = {})
diff --git a/app/models/organisation.rb b/app/models/organisation.rb
index e8fb4e060..745bc0d22 100644
--- a/app/models/organisation.rb
+++ b/app/models/organisation.rb
@@ -13,6 +13,8 @@ class Organisation < ActiveRecord::Base
   has_many :line_referentials, through: :line_referential_memberships
 
   has_many :workbenches
+  has_many :workgroups, through: :workbenches
+
   has_many :calendars
   has_many :api_keys, class_name: 'Api::V1::ApiKey'