csv_class_maker 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b032060813fda21e2eb3fde8b38f226e0e84cda9
-  data.tar.gz: 8a29ae5280459bb8bd4ebee4152ea05778659c38
+  metadata.gz: 207394f7ae797a48015c6370a4d93c54c5b259f0
+  data.tar.gz: 60e2e85d26c52c4b004dfd0d02d4ba044a39af63
 SHA512:
-  metadata.gz: 5f1b4b41e13cd8bf08448b18a95ad6841cfa6c8b90a7d291ccb2a334a7f1fd47a1ff841fae6b55a1096e3dcefab25294a3020b9fc5ed8d27b0f2e388ca231d82
-  data.tar.gz: 37d0051e32be666203322d76d57e886add86f3fbc84e0897343e7bcbe8fe053a9164543126ae5db92f44d212ac755328f469fb4b43b7cc2e12ad4975106c2f20
+  metadata.gz: 12e9b06c9f6c93c1102540aeb464e7e8115fcab1f86a01c72078dd6a0e2d96365e00ee191b93a735fb291ddf293e365526998264f54636ad271dafb379ca51c0
+  data.tar.gz: 1023d9ae9a19fd18aeb5ed33f0fc7054e675947287f8918a7ec58d6726d3786379f6157d30738b2d4dd4fc82a9856e641f8ecbc834b9245e0ff63312d9a8520f

data/lib/csv_class_maker/csv_find.rb

@@ -15,7 +15,7 @@ module CsvClassMaker::CsvFind
 
     def ==(other_instance)
       instance_variables.map do |instance_variable|
-        self.instance_variable_get(instance_variable) ==
+        instance_variable_get(instance_variable) ==
           other_instance.instance_variable_get(instance_variable)
       end
     end
@@ -26,24 +26,21 @@ module CsvClassMaker::CsvFind
   end
 
   module ClassMethods
+
+    attr_reader :headers, :file, :file_options,
+                :first_line, :middle_line, :last_line
+
     def csv_file(file_name, options = {})
       @file_options = options
       @file = CSV.new(File.open(file_name, 'r'), @file_options)
       @first_line = 2
       @last_line = `wc -l #{file_name}`.split(' ').first.to_i
-      @middle_line = (@last_line/2)+1
+      @middle_line = (@last_line/2) + 1
       @line_number = nil
       extract_headers(file_name, options)
       define_accessors
     end
 
-    def headers; return @headers; end
-    def file; return @file; end
-    def first_line; return @first_line; end
-    def middle_line; return @middle_line; end
-    def last_line; return @last_line; end
-    def file_options; return @file_options; end
-
     def define_accessors
       headers.each do |header|
         self.send(:attr_accessor, header)
@@ -65,9 +62,9 @@ module CsvClassMaker::CsvFind
     end
 
     def find(line_number)
-      row = if (first_line..middle_line).include? line_number
+      row = if (first_line..middle_line).include?(line_number)
         front_find(line_number, file.path)
-      elsif (middle_line..last_line).include? line_number
+      else
         back_find(line_number, file.path)
       end
 
@@ -88,7 +85,7 @@ module CsvClassMaker::CsvFind
     def each
       rewind
       (first_line..last_line).each do |line_number|
-        yield find(line_number)
+        yield find(line_number) if block_given?
       end
     end
 
@@ -103,10 +100,11 @@ module CsvClassMaker::CsvFind
     end
 
     def build_instance(row, line)
-      new_instance = self.new
+      new_instance = new
       row.each { |key, value| new_instance.send("#{key}=".to_sym, value) }
       new_instance.line_number = line
-      return new_instance
+
+      new_instance
     end
 
     def rewind
@@ -124,11 +122,11 @@ module CsvClassMaker::CsvFind
     end
 
     def dig(hash_pair, rows)
-      rows.map do |row|
+      rows.select do |row|
         if row[hash_pair.first] == hash_pair.last
           $. != last_line ? row.push(line_number: $.) : row
         end
-      end.reject(&:nil?)
+      end
     end
 
     def front_find(line_number, file_path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv_class_maker
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Mark Platt