rgarner-csv-mapper 0.5.1 → 0.7.0

data/Rakefile

@@ -41,7 +41,7 @@ Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "csv-mapper #{version}"
+  rdoc.title = "rgarner-csv-mapper #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.7.0

data/lib/csv-mapper/attribute_map.rb

@@ -8,6 +8,10 @@ module CsvMapper
     def initialize(name, index, map_context)
       @name, @index, @map_context = name, index, map_context
     end
+
+    def to_s
+      "#{@index}: #{@name}"
+    end
   
     # Set the index that this map is targeting.
     #
@@ -51,5 +55,5 @@ module CsvMapper
         @transformer.call(csv_row, @index)
       end
     end
-end
+  end
 end

data/lib/csv-mapper/row_map.rb

@@ -17,6 +17,7 @@ module CsvMapper
       @csv_data = csv_data
       @before_filters = []
       @after_filters = []
+      @named_columns = false
       @parser_options = {}
       @start_at_row = 0
       @stop_at_row = Infinity
@@ -49,17 +50,14 @@ module CsvMapper
     #
     # i.e. read_attributes_from_file('files+' => 'files_plus', 'files-' => 'files_minus)
     def read_attributes_from_file aliases = {}
-      attributes = FasterCSV.new(@csv_data, @parser_options).readline
-      @start_at_row = [ @start_at_row, 1 ].max
-      @csv_data.rewind
       unnamed_number = 1
-      attributes.each_with_index do |name, index|
+      iterate_headers do |name, index|
         if name.nil?
           name = "_field_#{unnamed_number}"
-          unnamed_number += 1                  
+          unnamed_number += 1
         end
         name.strip!
-        use_name = aliases[name] || name.gsub(/\s+/, '_').gsub(/[\W]+/, '').downcase
+        use_name = aliases[name] || attributize_field_name(name)
         add_attribute use_name, index
       end
     end
@@ -72,6 +70,12 @@ module CsvMapper
       @parser_options.merge :col_sep => @delimited_by
     end
 
+    # Default csv_mapper behaviour is to use the ordinal position of a mapped attribute.
+    # If you prefer to look for a column with the name of the attribute, use this method.
+    def named_columns
+      @named_columns = true
+    end
+
     # Convenience method to 'move' the cursor skipping the current index.
     def _SKIP_
       self.move_cursor
@@ -151,6 +155,17 @@ module CsvMapper
     # An optional first argument is used to move this maps cursor position and as the index of the
     # new AttributeMap
     def method_missing(name, *args) # :nodoc:
+      existing_map = self.mapped_attributes.find {|attr| attr.name == name}
+      return existing_map if existing_map
+
+      # Effectively add an alias when we see new_field('With/Aliased/Name')
+      if args[0].is_a? String
+        return add_attribute(name, headers_to_indices.fetch(args[0].downcase)) 
+      end
+      
+      if @named_columns
+        return add_attribute(name, headers_to_indices.fetch(name.to_s))
+      end
 
       if index = args[0]
         self.move_cursor(index - self.cursor)
@@ -168,6 +183,20 @@ module CsvMapper
       end).flatten!
     end
 
+    def iterate_headers
+      attributes = FasterCSV.new(@csv_data, @parser_options).readline
+      @start_at_row = [ @start_at_row, 1 ].max
+      @csv_data.rewind
+      attributes.each_with_index { |name, index| yield name, index }
+    end
+
+    def headers_to_indices
+      return @h_to_i if @h_to_i
+      @h_to_i = {}
+      iterate_headers { |name, index| @h_to_i[name.strip.downcase] = index if name }
+      @h_to_i
+    end
+
     def map_to_class # :nodoc:
       unless @map_to_klass
         attrs = mapped_attributes.collect {|attr_map| attr_map.name}
@@ -180,5 +209,9 @@ module CsvMapper
     def cursor=(value) # :nodoc:
       @cursor=value
     end
+
+    def attributize_field_name(name)
+      name.gsub(/\s+/, '_').gsub(/[\W]+/, '').downcase
+    end
   end
 end

data/spec/csv-mapper_spec.rb

@@ -143,6 +143,44 @@ describe CsvMapper do
       results[1].number_of_years_old.should == '26'
     end
 
+    describe "Adding only certain attributes by name or alias" do
+      before :all do
+        @results = CsvMapper.import(File.dirname(__FILE__) + '/test_with_empty_column_names.csv') do
+          named_columns
+          surname('Last Name')
+          age.map { |row, index| row[index].to_i }
+        end
+      end
+
+      it "should have Last name aliased as surname" do
+        @results[1].surname.should == 'Doe'
+      end
+
+      it "should transform age to 26 (a Fixnum)" do
+        @results[1].age.should == 26
+      end
+
+      it "should not have First Name at all" do
+        lambda { @results[1].first_name }.should raise_error(NoMethodError)
+      end
+
+      it "should raise IndexError when adding non-existent fields" do
+        lambda {
+          @results = CsvMapper.import(File.dirname(__FILE__) + '/test_with_empty_column_names.csv') do
+            add_attributes_by_name('doesnt_exist')
+          end
+        }.should raise_error(IndexError)
+      end
+
+      it "should raise IndexError when adding non-existent aliases" do
+        lambda {
+          @results = CsvMapper.import(File.dirname(__FILE__) + '/test_with_empty_column_names.csv') do
+            my_new_field('doesnt_exist')
+          end
+        }.should raise_error(IndexError)
+      end
+    end
+
     it "should be able to assign default column names when column names are null" do
       results = CsvMapper.import(File.dirname(__FILE__) + '/test_with_empty_column_names.csv') do
         read_attributes_from_file

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rgarner-csv-mapper
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 3
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 1
-  version: 0.5.1
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Luke Pillow
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-25 00:00:00 +01:00
+date: 2010-08-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency