csv_class_maker 0.3.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 948e6040124f37290122b5405595b00889cfb579
-  data.tar.gz: 48ed1b40e8b145f0d58f5d32857e3ffb7b40ee92
+  metadata.gz: 95996b1056611f64e83ca3266b363c6c190f7647
+  data.tar.gz: 85b0848cd6cc24a07b80bd9013824e043afc3dc7
 SHA512:
-  metadata.gz: 109692828cc8410b9d10d3fd7f7f28b2a8e7972267e5cb987d7b43522aa7ce711254bcfa734a8639460cfd96188f3fbb23a7d3a213850ddf9eaec6c3363f31d2
-  data.tar.gz: 82c30a2788e9c90af06da059f006d82c0c0a75f9b3e86c4dc84adf04c9fe6e16389a7aeeaa692882534008c6e59a6220ff7fa9634cd20a5d47c036ac93a0bb55
+  metadata.gz: e060ac87509f5ca88a09feab4ad1f7b2ce92d3e826f46b0a274fac6864c9de4a0ac75940c4821b74dd6d0350edbc930190f894254963dcd7ea028d94ead05f53
+  data.tar.gz: 6109f2f959a42c2f3b1efd43cf1e7e8d8379445b9ca99d8cb418a071e16d17382f10849d73393799e5493cfb7cf7f58ac8e994a820e674babb4dc260d4c820b5

data/lib/csv_class_maker/csv_class_maker.rb

@@ -13,45 +13,16 @@ module CsvClassMaker
       return_headers: false
     )
 
-    Object.const_set class_name, Struct.new(*extract_headers(file_name, options)) {
+    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.
 
-      # Class definition for dynamically generated classes.
       require 'csv_class_maker/csv_find'
-      extend CsvFind
+      include CsvFind
 
-      def initialize(hash=nil)
-        if hash
-          hash.each { |k,v| send "#{k}=".to_sym, v }
-        end
-      end
-
-      @@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
-
-      attr_accessor :line_number
-
-      def self.file; return @@file; end
-      def self.first_line; return @@first_line; end
-      def self.middle_line; return @@middle_line; end
-      def self.last_line; return @@last_line; end
-      def self.file_options; return @@file_options; end
-
-      # End of class definition.
-
-    }
-  end
-
-  private
-
-  def self.extract_headers(file_name, options)
-    csv_file = File.open(file_name,'r')
-
-    @csv_headers = CSV.new(csv_file, options).first.map do |headers, values|
-      headers
+      csv_file(file_name, options)
     end
+    )
   end
 end

data/lib/csv_class_maker/csv_find.rb

@@ -1,83 +1,145 @@
 module CsvClassMaker::CsvFind
-  def all
-    rewind
-    file.map { |row| build_instance(row, file.lineno) }
+  def self.included(base)
+    base.send :extend, ClassMethods
+    base.send :prepend, InstanceMethods
   end
 
-  def find_by(key_val_pair)
-    row = search(key_val_pair).last
-    build_instance(row, row[:line_number])
-  end
+  module InstanceMethods
+    attr_accessor :line_number
 
-  def find_all_by(key_val_pair)
-    search(key_val_pair).map { |row| build_instance(row, row[:line_number]) }
-  end
+    def initialize(hash = nil)
+      if hash
+        hash.each { |k,v| send("#{k}=".to_sym, v) }
+      end
+    end
 
-  def find(line_number)
-    row = if (first_line..last_line).include? line_number
-      front_find(line_number, file.path)
-    elsif (middle_line..last_line).include? line_number
-      back_find(line_number, file.path)
+    def ==(other_instance)
+      instance_variables.map do |instance_variable|
+        self.instance_variable_get(instance_variable) ==
+          other_instance.instance_variable_get(instance_variable)
+      end
     end
 
-    row.nil? ? row : build_instance(row, line_number)
-  end
+    private
 
-  def first
-    rewind
-    build_instance(file.first, first_line)
+    attr_reader :hash
   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)
-  end
+  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
+      @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)
+      end
 
-  def each
-    rewind
-    (first_line..last_line).each do |line_number|
-      yield find(line_number)
+      # self.send(:attr_accessor, :line_number)
     end
-  end
 
-  private
+    def all
+      rewind
+      file.map { |row| build_instance(row, file.lineno) }
+    end
 
-  def build_instance(row, line)
-    new_instance = self.new
-    row.each { |key, value| new_instance.send("#{key}=".to_sym, value) }
-    new_instance.line_number = line
-    return new_instance
-  end
+    def find_by(key_val_pair)
+      row = search(key_val_pair).last
+      build_instance(row, row[:line_number])
+    end
 
-  def rewind
-    file.rewind
-  end
+    def find_all_by(key_val_pair)
+      search(key_val_pair).map { |row| build_instance(row, row[:line_number]) }
+    end
 
-  def search(key_val_pair)
-    rewind
-    @results = file
-    @pairs = key_val_pair
+    def find(line_number)
+      row = if (first_line..last_line).include? line_number
+        front_find(line_number, file.path)
+      elsif (middle_line..last_line).include? line_number
+        back_find(line_number, file.path)
+      end
 
-    @pairs.each { |pair| @results = dig(pair, @results) }
+      row.nil? ? row : build_instance(row, line_number)
+    end
 
-    @results
-  end
+    def first
+      rewind
+      build_instance(file.first, first_line)
+    end
 
-  def dig(hash_pair, rows)
-    rows.map do |row|
-      if row[hash_pair.first] == hash_pair.last
-        $. != last_line ? row.push(line_number: $.) : row
+    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)
+    end
+
+    def each
+      rewind
+      (first_line..last_line).each do |line_number|
+        yield find(line_number)
       end
-    end.reject(&:nil?)
-  end
+    end
 
-  def front_find(line_number, file_path)
-    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`
-    CSV.new(command, file_options).first
+    private
+
+    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
+      end
+    end
+
+    def build_instance(row, line)
+      new_instance = self.new
+      row.each { |key, value| new_instance.send("#{key}=".to_sym, value) }
+      new_instance.line_number = line
+      return new_instance
+    end
+
+    def rewind
+      file.rewind
+    end
+
+    def search(key_val_pair)
+      rewind
+      @results = file
+      @pairs = key_val_pair
+
+      @pairs.each { |pair| @results = dig(pair, @results) }
+
+      @results
+    end
+
+    def dig(hash_pair, rows)
+      rows.map do |row|
+        if row[hash_pair.first] == hash_pair.last
+          $. != last_line ? row.push(line_number: $.) : row
+        end
+      end.reject(&:nil?)
+    end
+
+    def front_find(line_number, file_path)
+      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`
+      CSV.new(command, file_options).first
+    end
   end
 end

data/spec/csv_class_maker_spec.rb

@@ -1,4 +1,5 @@
 require './lib/csv_class_maker'
+require 'byebug'
 
 describe CsvClassMaker do
   context 'class methods' do
@@ -18,48 +19,59 @@ end
 
 describe Object do
   before(:all){
-    @person1 = People.new(first: 'Mark', last: 'Platt', nickname: 'JCool')
-    @person2 = People.new(first: 'Longinus', last: 'Smith', nickname: 'Pebbles')
-    @person3 = People.new(first: 'Johnny', last: 'Radiation', nickname: 'Pebbles')
-    @person4 = People.new(first: 'Charlie', last: 'Mansfield', nickname: 'Sammykins')
+    @person1 = People.new(first: 'Mark', last: 'Platt', nickname: 'JCool', line_number: 2)
+    @person2 = People.new(first: 'Longinus', last: 'Smith', nickname: 'Pebbles', line_number: 3)
+    @person3 = People.new(first: 'Johnny', last: 'Radiation', nickname: 'Pebbles', line_number: 4)
+    @person4 = People.new(first: 'Charlie', last: 'Mansfield', nickname: 'Sammykins', line_number: 5)
   }
 
   context 'class methods' do
     it "responds to .first" do
       (People).should respond_to(:first)
     end
+
     it ".first returns correctly" do
       expect(People.first).to eq @person1
     end
+
     it "responds to .last" do
       (People).should respond_to(:last)
     end
+
     it ".last returns correctly" do
       expect(People.last).to eq @person4
     end
+
     it "responds to .find" do
       (People).should respond_to(:find)
     end
+
     it ".find returns correctly" do
       expect(People.find(3)).to eq @person2
     end
+
     it "responds to .find_by" do
       (People).should respond_to(:find_by)
     end
+
     it ".find_by returns correctly" do
       expect(People.find_by(nickname: 'Pebbles')).to eq @person3
       expect(People.find_by(nickname: 'Pebbles', last: 'Smith')).to eq @person2
     end
+
     it "responds to .find_all_by" do
       (People).should respond_to(:find_all_by)
     end
+
     it ".find_all_by returns correctly" do
       expect(People.find_all_by(nickname: 'Pebbles')).to eq [@person2, @person3]
       expect(People.find_all_by(nickname: 'Pebbles', last: 'Radiation')).to eq [@person3]
     end
+
     it "responds to .each" do
       (People).should respond_to(:each)
     end
+
     it ".each line yields" do
       @output = []
       People.each{ |person| @output << person.first }
@@ -70,9 +82,11 @@ describe Object do
     it "responds to .first as defined in the csv" do
       (People.new).should respond_to(:first)
     end
+
     it "responds to .last as defined in the csv" do
       (People.new).should respond_to(:last)
     end
+
     it "responds to .nickname as defined in the csv" do
       (People.new).should respond_to(:nickname)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csv_class_maker
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Mark Platt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        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'''
 email: mplatt@mrkplt.com
@@ -47,7 +61,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='