csv_record 1.2.0 → 1.3.0

data/Rakefile

@@ -9,4 +9,4 @@ Rake::TestTask.new do |t|
 end
 
 desc "Run tests"
-task :default => :test
+task default: :test

data/lib/csv_record/connector.rb

@@ -1,10 +1,8 @@
-require 'FileUtils'
-
 module CsvRecord
   module Connector
     def __initialize_db_directory__
       unless Dir.exists? 'db'
-        FileUtils.mkdir_p('db')
+        Dir.mkdir 'db'
       end
     end
 
@@ -22,14 +20,14 @@ module CsvRecord
     end
 
     def __open_database_file__(mode='r')
-      CSV.open(self.const_get('DATABASE_LOCATION'), mode, :headers => true) do |csv|
+      CSV.open(self.const_get('DATABASE_LOCATION'), mode, headers: true) do |csv|
         yield(csv)
       end
     end
 
     def __parse_database_file__
       open_database_file do |csv|
-        CSV.open(self.const_get('DATABASE_LOCATION_TMP'), 'w', :headers => true) do |copy|
+        CSV.open(self.const_get('DATABASE_LOCATION_TMP'), 'w', headers: true) do |copy|
           copy << fields
           csv.entries.each do |entry|
             new_row = yield(entry)

data/lib/csv_record/reader.rb

@@ -1,6 +1,8 @@
 module CsvRecord
   module Reader
     module ClassMethods
+      DYNAMIC_FINDER_PATTERN = /^find_by_(.+)$/
+
       def __fields__
         instance_methods(false).select { |m| m.to_s !~ /=$/ }
       end
@@ -27,7 +29,7 @@ module CsvRecord
 
       def __find__(param)
         param = param.id unless param.is_a? Integer
-        (__where__ :id => param).first
+        (__where__ id: param).first
       end
 
       def __where__(params)
@@ -56,7 +58,7 @@ module CsvRecord
       end
 
       def method_missing(meth, *args, &block)
-        if meth.to_s =~ /^find_by_(.+)$/
+        if meth.to_s =~ DYNAMIC_FINDER_PATTERN
           dynamic_finder $1, *args, &block
         else
           super # You *must* call super if you don't handle the
@@ -65,6 +67,18 @@ module CsvRecord
         end
       end
 
+      def respond_to?(meth)
+        (meth.to_s =~ DYNAMIC_FINDER_PATTERN) || super
+      end
+
+      protected
+
+      def dynamic_finder(meth, *args, &block)
+        properties = meth.split '_and_'
+        conditions = Hash[properties.zip args]
+        __where__ conditions
+      end
+
       alias :fields :__fields__
       alias :find :__find__
       alias :count :__count__

data/lib/csv_record/version.rb

@@ -1,3 +1,3 @@
 module CsvRecord
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/test/csv_record/reader_test.rb

@@ -33,7 +33,7 @@ describe CsvRecord::Reader do
     end
 
     it "Check the current attributes" do
-      expected_result = {:id=>nil, :created_at=>nil, :updated_at=>nil, :year=>1997, :make=>"Ford", :model=>"E350", :description=>"ac, abs, moon", :price=>3000.0}
+      expected_result = {id: nil, created_at: nil, updated_at: nil, year: 1997, make: 'Ford', model: 'E350', description: 'ac, abs, moon', price: 3000.0}
       car.attributes.must_equal expected_result
     end
 
@@ -106,6 +106,41 @@ describe CsvRecord::Reader do
         result = Car.where year: 2008, make: 'Chevroletion'
         result.must_be_empty
       end
+
+    end
+    describe 'dynamic finders' do
+      before do
+        car.save
+        second_car.save
+      end
+
+      let (:properties) { Car.fields }
+
+      it 'respond to certain dynamic methods' do
+        Car.must_respond_to "find_by_#{properties.sample}"
+      end
+
+      it 'finding with a single field' do
+        found_cars = Car.find_by_year 2007
+        found_cars.wont_be_empty
+        found_cars.first.must_be_instance_of Car
+      end
+
+      it 'finding with multiple fields' do
+        conditions = []
+        properties.each_with_index do |property, i|
+          values = []
+          i.times do |k|
+            conditions[i] = conditions[i] ? "#{conditions[i]}_and_#{properties[k]}" : properties[k]
+            values << car.send(properties[k])
+          end
+          if conditions[i]
+            found_cars = Car.public_send "find_by_#{conditions[i]}", *values
+            found_cars.wont_be_empty
+            found_cars.first.must_be_instance_of Car
+          end
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv_record
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors: