lib/csv2hash/coercers/yaml_coercer.rb in csv2hash-0.7.3 vs lib/csv2hash/coercers/yaml_coercer.rb in csv2hash-0.7.5

@@ -17,17 +17,90 @@
         rescue KeyError # Rules without ExtraValidator
         rescue SyntaxError # When extra validator is a instance of Object
         end
       end
 
+      # Public: Extract String to Regex
+      #
+      # /Sex/ => /Sex/
+      # /Sex/ => /Sex/i
+      # /Sex/ => /\A(Sex)\z/
+      # /Sex/ => /\A(Sex)\z/i
+
+      # 'Sex' => /Sex/
+      # 'Sex' => /Sex/i
+      # 'Sex' => /\A(Sex)\z/
+      # 'Sex' => /\A(Sex)\z/i
+      #
+      # Examples
+      #
+      #   deserialize_regex!
+      #   # => position: [0 ,0]
+      #   # => position: /Sex/
+      #   # => position: [[0 ,/Sex/], 0]
+      #
+      # Returns Regex (See private method YamlCoercer#regexp)
       def deserialize_regex!
         y, x = self.rules.fetch :position
-        if y.is_a?(Array)
-          column, matcher_string = y
-          self.rules[:position] = [[column, Regexp.new(matcher_string)],x]
-        elsif y.is_a?(String)
-          self.rules[:position] = Regexp.new("\\A(#{y})\\z")
+        # Value possible:
+        # * (regular) [0, 0]
+        # * (collection) 'Sex'
+        # * (mapping) [[0, 'Sex'], 0]
+
+        return if y.is_a?(Fixnum) # There are nothing to deserialized [0, 0]
+
+        # Deserialize only type of (Collection) ['Sex', 0] or (Mapping) [[0, 'Sex'], 0]
+        column, matching_string_expression = extract_column y
+
+        self.rules[:position] = if y.is_a?(Array)
+          [[column, regexp(matching_string_expression)],x] # (Mapping)
+        else # String or Regexp
+          regexp(matching_string_expression) # (Collection)
         end
+      end
+
+      # Public: Extract if is necessary the column number.
+      # You have two type of position based on regex :
+      # * mapping: This need a column position for searching on this column the row position (search y position)
+      # * collection: Search in all columns for find column position (search x position)
+      #
+      # value - Array or String - example : [1,'Sex'] or 'Sex'
+      #
+      # Examples
+      #
+      #   extract_column([1, 'Sex'])
+      #   # => [1, 'Sex']
+      #
+      #   extract_column('Sex')
+      #   # => [nil, 'Sex']
+      #
+      # Returns a array with column position (type mapping) and matching string
+      def extract_column value
+        return value if value.is_a?(Array)
+        [nil, value]
+      end
+
+      # Public: Return regexp from string
+      #
+      # term - Matching String - Example : 'Sex'
+      #
+      # Examples
+      #
+      #   regexp('Sex')
+      #   # => /\A(Sex)\z/  # exact_matching: true,  ignore_case: false
+      #   # => /\A(Sex)\z/i # exact_matching: true,  ignore_case: true
+      #   # => /Sex/        # exact_matching: false, ignore_case: false
+      #   # => /Sex/i       # exact_matching: false, ignore_case: true
+      #
+      # Returns a regex depend of configuration, see
+      def regexp term
+        term = term.source if term.is_a?(Regexp)
+        term = "\\A(#{term})\\z" if Csv2hash.configuration.exact_matching
+
+        args = [term]
+        args << Regexp::IGNORECASE if Csv2hash.configuration.ignore_case
+
+        Regexp.new(*args)
       end
 
       def deserialize_range!
         begin
           values = self.rules.fetch(:values)