csv_class_maker 0.3.0 → 0.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 948e6040124f37290122b5405595b00889cfb579
+  data.tar.gz: 48ed1b40e8b145f0d58f5d32857e3ffb7b40ee92
+SHA512:
+  metadata.gz: 109692828cc8410b9d10d3fd7f7f28b2a8e7972267e5cb987d7b43522aa7ce711254bcfa734a8639460cfd96188f3fbb23a7d3a213850ddf9eaec6c3363f31d2
+  data.tar.gz: 82c30a2788e9c90af06da059f006d82c0c0a75f9b3e86c4dc84adf04c9fe6e16389a7aeeaa692882534008c6e59a6220ff7fa9634cd20a5d47c036ac93a0bb55

data/lib/csv_class_maker/csv_class_maker.rb

@@ -48,12 +48,10 @@ module CsvClassMaker
   private
 
   def self.extract_headers(file_name, options)
-    @csv_headers = []
     csv_file = File.open(file_name,'r')
 
-    CSV.new(csv_file, options).first.each do |headers, values|
-      @csv_headers << headers
+    @csv_headers = CSV.new(csv_file, options).first.map do |headers, values|
+      headers
     end
-    @csv_headers
   end
 end

data/lib/csv_class_maker/csv_find.rb

@@ -1,10 +1,7 @@
 module CsvClassMaker::CsvFind
-
   def all
     rewind
-    object_array = []
-    file.each {|row| object_array << build_instance(row, file.lineno) }
-    object_array
+    file.map { |row| build_instance(row, file.lineno) }
   end
 
   def find_by(key_val_pair)
@@ -13,40 +10,34 @@ module CsvClassMaker::CsvFind
   end
 
   def find_all_by(key_val_pair)
-    rows = search(key_val_pair)
-    output_objects = []
-    rows.each { |row|
-      output_objects << build_instance(row, row[:line_number])
-    }
-    output_objects
+    search(key_val_pair).map { |row| build_instance(row, row[:line_number]) }
   end
 
   def find(line_number)
-    if (first_line..last_line).include? line_number
-      row = front_find(line_number, file.path)
+    row = if (first_line..last_line).include? line_number
+      front_find(line_number, file.path)
     elsif (middle_line..last_line).include? line_number
-      row = back_find(line_number, file.path)
-    else
-      row = nil
+      back_find(line_number, file.path)
     end
-    row.nil? ? nil : build_instance(row, line_number)
+
+    row.nil? ? row : build_instance(row, line_number)
   end
 
   def first
     rewind
-    build_instance file.first, first_line
+    build_instance(file.first, first_line)
   end
 
   def last
     command = `head -n 1 #{file.path} && tail -n 1 #{file.path}`
     last_row = CSV.new(command, file_options).first
-    build_instance last_row, last_line
+    build_instance(last_row, last_line)
   end
 
   def each
     rewind
     (first_line..last_line).each do |line_number|
-      yield find line_number
+      yield find(line_number)
     end
   end
 
@@ -54,7 +45,7 @@ module CsvClassMaker::CsvFind
 
   def build_instance(row, line)
     new_instance = self.new
-    row.each { |key, value| new_instance.send "#{key}=".to_sym, value }
+    row.each { |key, value| new_instance.send("#{key}=".to_sym, value) }
     new_instance.line_number = line
     return new_instance
   end
@@ -68,29 +59,17 @@ module CsvClassMaker::CsvFind
     @results = file
     @pairs = key_val_pair
 
-    @pairs.each { |pair|
-      @results = dig(pair, @results)
-    }
+    @pairs.each { |pair| @results = dig(pair, @results) }
 
     @results
   end
 
   def dig(hash_pair, rows)
-    @key = hash_pair.first
-    @value = hash_pair.last
-    @accumulator = []
-
-    rows.each { |row|
-      if row[@key] == @value
-        if $. != last_line
-          @accumulator << row.push(line_number: $.) if $. != last_line
-        else
-          @accumulator << row
-        end
+    rows.map do |row|
+      if row[hash_pair.first] == hash_pair.last
+        $. != last_line ? row.push(line_number: $.) : row
       end
-    }
-
-    @accumulator
+    end.reject(&:nil?)
   end
 
   def front_find(line_number, file_path)
@@ -101,5 +80,4 @@ module CsvClassMaker::CsvFind
     command = `head -n 1 #{file_path} && tail -n #{last_line - line_number} #{file_path} | head -n 1`
     CSV.new(command, file_options).first
   end
-
 end

data/spec/csv_class_maker_spec.rb

@@ -62,7 +62,7 @@ describe Object do
     end
     it ".each line yields" do
       @output = []
-      People.each{|person| @output << person.first}
+      People.each{ |person| @output << person.first }
       expect(@output).to eq ['Mark', 'Longinus', 'Johnny', 'Charlie']
     end
   end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv_class_maker
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.3.1
 platform: ruby
 authors:
 - Mark Platt
@@ -14,7 +13,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,13 +20,12 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0'
-description: ! '''csv_class_maker will create a class out of your csv''s headers,
-  and provide some methods for finding data in the CSV'''
+description: '''csv_class_maker will create a class out of your csv''s headers, and
+  provide some methods for finding data in the CSV'''
 email: mplatt@mrkplt.com
 executables: []
 extensions: []
@@ -41,27 +38,26 @@ files:
 homepage: http://mrkplt.com
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
-summary: ! '''Object oriented CSV reading'''
+specification_version: 4
+summary: '''Object oriented CSV reading'''
 test_files:
 - spec/csv_class_maker_spec.rb