csv_class_maker 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95996b1056611f64e83ca3266b363c6c190f7647
-  data.tar.gz: 85b0848cd6cc24a07b80bd9013824e043afc3dc7
+  metadata.gz: b032060813fda21e2eb3fde8b38f226e0e84cda9
+  data.tar.gz: 8a29ae5280459bb8bd4ebee4152ea05778659c38
 SHA512:
-  metadata.gz: e060ac87509f5ca88a09feab4ad1f7b2ce92d3e826f46b0a274fac6864c9de4a0ac75940c4821b74dd6d0350edbc930190f894254963dcd7ea028d94ead05f53
-  data.tar.gz: 6109f2f959a42c2f3b1efd43cf1e7e8d8379445b9ca99d8cb418a071e16d17382f10849d73393799e5493cfb7cf7f58ac8e994a820e674babb4dc260d4c820b5
+  metadata.gz: 5f1b4b41e13cd8bf08448b18a95ad6841cfa6c8b90a7d291ccb2a334a7f1fd47a1ff841fae6b55a1096e3dcefab25294a3020b9fc5ed8d27b0f2e388ca231d82
+  data.tar.gz: 37d0051e32be666203322d76d57e886add86f3fbc84e0897343e7bcbe8fe053a9164543126ae5db92f44d212ac755328f469fb4b43b7cc2e12ad4975106c2f20

data/lib/csv_class_maker/csv_class_maker.rb

@@ -14,10 +14,6 @@ module CsvClassMaker
     )
 
     Object.const_set(class_name, Class.new do
-      # remove building of the struct here. completely self contain method
-      # generation into the csv_find module so that you can pull extract headers
-      # method out.
-
       require 'csv_class_maker/csv_find'
       include CsvFind
 

data/lib/csv_class_maker/csv_find.rb

@@ -27,29 +27,27 @@ module CsvClassMaker::CsvFind
 
   module ClassMethods
     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
+      @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
       @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 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)
       end
-
-      # self.send(:attr_accessor, :line_number)
     end
 
     def all
@@ -67,7 +65,7 @@ module CsvClassMaker::CsvFind
     end
 
     def find(line_number)
-      row = if (first_line..last_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
         back_find(line_number, file.path)
@@ -99,7 +97,7 @@ module CsvClassMaker::CsvFind
     def extract_headers(file_name, options)
       csv_file = File.open(file_name,'r')
 
-      @@headers ||= CSV.new(csv_file, options).first.map do |headers, values|
+      @headers ||= CSV.new(csv_file, options).first.map do |headers, values|
         headers
       end
     end
@@ -137,8 +135,9 @@ module CsvClassMaker::CsvFind
       command = `head -n 1 #{file_path} && head -n #{line_number} #{file_path} | tail -n 1`
       CSV.new(command, file_options).first
     end
+
     def back_find(line_number, file_path)
-      command = `head -n 1 #{file_path} && tail -n #{last_line - line_number} #{file_path} | head -n 1`
+      command = `head -n 1 #{file_path} && tail -n #{(last_line + 1) - line_number} #{file_path} | head -n 1`
       CSV.new(command, file_options).first
     end
   end

data/spec/csv_class_maker_spec.rb

@@ -1,5 +1,4 @@
 require './lib/csv_class_maker'
-require 'byebug'
 
 describe CsvClassMaker do
   context 'class methods' do
@@ -47,7 +46,10 @@ describe Object do
     end
 
     it ".find returns correctly" do
+      expect(People.find(2)).to eq @person1
       expect(People.find(3)).to eq @person2
+      expect(People.find(4)).to eq @person3
+      expect(People.find(5)).to eq @person4
     end
 
     it "responds to .find_by" do

metadata

@@ -1,53 +1,39 @@
 --- !ruby/object:Gem::Specification
 name: csv_class_maker
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Mark Platt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.5.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.5.1
-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: []
 extra_rdoc_files: []
 files:
+- lib/csv_class_maker.rb
 - lib/csv_class_maker/csv_class_maker.rb
 - lib/csv_class_maker/csv_find.rb
-- lib/csv_class_maker.rb
 - spec/csv_class_maker_spec.rb
 homepage: http://mrkplt.com
 licenses:
@@ -59,19 +45,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: '''Object oriented CSV reading'''
+summary: "'Object oriented CSV reading'"
 test_files:
 - spec/csv_class_maker_spec.rb