csv_class_maker 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 207394f7ae797a48015c6370a4d93c54c5b259f0
-  data.tar.gz: 60e2e85d26c52c4b004dfd0d02d4ba044a39af63
+  metadata.gz: 1a5b445825a19aad125c8fb3d531aad9001e2f74
+  data.tar.gz: 859a008a90053f81a0f5954c5c57df10afcfb360
 SHA512:
-  metadata.gz: 12e9b06c9f6c93c1102540aeb464e7e8115fcab1f86a01c72078dd6a0e2d96365e00ee191b93a735fb291ddf293e365526998264f54636ad271dafb379ca51c0
-  data.tar.gz: 1023d9ae9a19fd18aeb5ed33f0fc7054e675947287f8918a7ec58d6726d3786379f6157d30738b2d4dd4fc82a9856e641f8ecbc834b9245e0ff63312d9a8520f
+  metadata.gz: e25215d990e0b030b77ef755dfd1b486e1c918de3f30abc86d6dd934311f5f494721d48c1ac8dc9756cf5d27385a652f832b43810c12c51c86b9938af17b572f
+  data.tar.gz: d7690eaec949f6308ac85dca716d9106b891091f4e00f5d5b55baf49352900a4bc671ea95559a2324424c9b1c696e581190ea08a9939ca04a41b2481dac7bd0e

data/lib/csv_class_maker.rb

@@ -1 +1,2 @@
 require 'csv_class_maker/csv_class_maker'
+require "csv_find/csv_find"

data/lib/csv_class_maker/csv_class_maker.rb

@@ -6,17 +6,15 @@
 module CsvClassMaker
   require 'csv'
 
-  def self.generate_class(class_name, file_name, options = {})
-    options.merge!(
-      headers: true,
-      header_converters: :symbol,
-      return_headers: false
-    )
+  VERSION = {
+    major: '1',
+    minor: '1',
+    patch: '0'
+  }.values.join('.')
 
+  def self.generate_class(class_name, file_name, options = {})
     Object.const_set(class_name, Class.new do
-      require 'csv_class_maker/csv_find'
       include CsvFind
-
       csv_file(file_name, options)
     end
     )

data/spec/csv_class_maker_spec.rb

@@ -52,20 +52,38 @@ describe Object do
       expect(People.find(5)).to eq @person4
     end
 
-    it "responds to .find_by" do
+    it "[DEPRECATED] responds to .find_by" do
       (People).should respond_to(:find_by)
     end
 
-    it ".find_by returns correctly" do
+    it "[DEPRECATED] .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
+    it ".find_by returns an nil if there are no results" do
+      expect(People.find_by(nickname: 'Beastmode')).to eq nil
+    end
+
+
+    it "responds to .where" do
+      (People).should respond_to(:where)
+    end
+
+    it ".where returns correctly" do
+      expect(People.where(nickname: 'Pebbles')).to eq [@person2, @person3]
+      expect(People.where(nickname: 'Pebbles', last: 'Radiation')).to eq [@person3]
+    end
+
+    it ".where returns an empty array if there are no results" do
+      expect(People.where(nickname: 'Beastmode')).to eq []
+    end
+
+    it "[DEPRECATED] responds to .find_all_by" do
       (People).should respond_to(:find_all_by)
     end
 
-    it ".find_all_by returns correctly" do
+    it "[DEPRECATED] .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

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: csv_class_maker
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Mark Platt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-10 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: csv_find
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -33,7 +47,6 @@ extra_rdoc_files: []
 files:
 - lib/csv_class_maker.rb
 - lib/csv_class_maker/csv_class_maker.rb
-- lib/csv_class_maker/csv_find.rb
 - spec/csv_class_maker_spec.rb
 homepage: http://mrkplt.com
 licenses:
@@ -55,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: "'Object oriented CSV reading'"

data/lib/csv_class_maker/csv_find.rb

@@ -1,142 +0,0 @@
-module CsvClassMaker::CsvFind
-  def self.included(base)
-    base.send :extend, ClassMethods
-    base.send :prepend, InstanceMethods
-  end
-
-  module InstanceMethods
-    attr_accessor :line_number
-
-    def initialize(hash = nil)
-      if hash
-        hash.each { |k,v| send("#{k}=".to_sym, v) }
-      end
-    end
-
-    def ==(other_instance)
-      instance_variables.map do |instance_variable|
-        instance_variable_get(instance_variable) ==
-          other_instance.instance_variable_get(instance_variable)
-      end
-    end
-
-    private
-
-    attr_reader :hash
-  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
-      @line_number = nil
-      extract_headers(file_name, options)
-      define_accessors
-    end
-
-    def define_accessors
-      headers.each do |header|
-        self.send(:attr_accessor, header)
-      end
-    end
-
-    def all
-      rewind
-      file.map { |row| build_instance(row, file.lineno) }
-    end
-
-    def find_by(key_val_pair)
-      row = search(key_val_pair).last
-      build_instance(row, row[:line_number])
-    end
-
-    def find_all_by(key_val_pair)
-      search(key_val_pair).map { |row| build_instance(row, row[:line_number]) }
-    end
-
-    def find(line_number)
-      row = if (first_line..middle_line).include?(line_number)
-        front_find(line_number, file.path)
-      else
-        back_find(line_number, file.path)
-      end
-
-      row.nil? ? row : build_instance(row, line_number)
-    end
-
-    def first
-      rewind
-      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)
-    end
-
-    def each
-      rewind
-      (first_line..last_line).each do |line_number|
-        yield find(line_number) if block_given?
-      end
-    end
-
-    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 = new
-      row.each { |key, value| new_instance.send("#{key}=".to_sym, value) }
-      new_instance.line_number = line
-
-      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.select do |row|
-        if row[hash_pair.first] == hash_pair.last
-          $. != last_line ? row.push(line_number: $.) : row
-        end
-      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 + 1) - line_number} #{file_path} | head -n 1`
-      CSV.new(command, file_options).first
-    end
-  end
-end