csv_record 2.1.2 → 3.0.0

data/lib/csv_record/csv_validations/custom_validation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CsvRecord::CustomValidation
   attr_accessor :message
 
@@ -6,15 +8,16 @@ class CsvRecord::CustomValidation
   end
 
   def run_on(obj)
-    if self.message.is_a? Proc
-      obj.instance_eval &self.message
+    if message.is_a?(Proc)
+      obj.instance_eval(&self.message)
     else
-      obj.send self.message
+      obj.send message
     end
   end
 
-private
+  private
+
   def get_correct_block_type
     self.class.send "#{self.type}_block"
   end
-end
+end

data/lib/csv_record/csv_validations/presence_validation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CsvRecord::PresenceValidation
   attr_accessor :field
 
@@ -6,8 +8,8 @@ class CsvRecord::PresenceValidation
   end
 
   def run_on(obj)
-    if obj.public_send(self.field).nil?
-      obj.errors.add self.field
-    end
+    return unless obj.public_send(field).nil?
+
+    obj.errors.add field
   end
-end
+end

data/lib/csv_record/csv_validations/uniqueness_validation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CsvRecord::UniquenessValidation
   attr_accessor :field
 
@@ -7,10 +9,11 @@ class CsvRecord::UniquenessValidation
 
   def run_on(obj)
     condition = {}
-    condition[self.field] = obj.public_send field
+    condition[field] = obj.public_send field
     records = obj.class.__where__ condition
-    if records.any? { |record| record != obj }
-      obj.errors.add field
-    end
+
+    return unless records.any? { |record| record != obj }
+
+    obj.errors.add field
   end
-end
+end

data/lib/csv_record/csv_validations/validations.rb

@@ -1,6 +1,8 @@
-require 'csv_record/csv_validations/custom_validation'
-require 'csv_record/csv_validations/uniqueness_validation'
-require 'csv_record/csv_validations/presence_validation'
+# frozen_string_literal: true
+
+require_relative 'custom_validation'
+require_relative 'uniqueness_validation'
+require_relative 'presence_validation'
 
 module CsvRecord::Validations
   module ClassMethods
@@ -20,7 +22,7 @@ module CsvRecord::Validations
       define_method "__#{class_macro}__" do |*field_names|
         field_names.each do |field|
           validation_obj = validation_class_name.new field
-          self.public_send "add_to_#{validator_collection}", validation_obj
+          public_send "add_to_#{validator_collection}", validation_obj
         end
       end
 
@@ -32,11 +34,10 @@ module CsvRecord::Validations
     end
 
     def validate(*methods, &block)
-      @custom_validators ||= []
       methods.each do |method|
-        @custom_validators << (CsvRecord::CustomValidation.new method)
+        custom_validators << CsvRecord::CustomValidation.new(method)
       end
-      @custom_validators << (CsvRecord::CustomValidation.new block) if block_given?
+      custom_validators << CsvRecord::CustomValidation.new(block) if block_given?
     end
   end
 
@@ -49,39 +50,33 @@ module CsvRecord::Validations
     end
 
     def invalid?
-      not self.__valid__?
+      not __valid__?
     end
 
     def errors
-      unless @errors
-        @errors = []
-        def @errors.add attribute
-          self << attribute
-        end
-      end
-
-      @errors
+      @errors ||= Errors.new
     end
 
     alias :valid? :__valid__?
 
     private
-    def trigger_presence_validations
-      self.class.fields_to_validate_presence.each do |validator|
-        validator.run_on self
-      end
-    end
 
-    def trigger_uniqueness_validations
-      self.class.fields_to_validate_uniqueness.each do |validator|
-        validator.run_on self
+    [:presence, :uniqueness].each do |type|
+      define_method "trigger_#{type}_validations" do
+        fields_to_validate = self.class.public_send "fields_to_validate_#{type}"
+        fields_to_validate.each do |validator|
+          validator.run_on self
+        end
       end
     end
 
     def trigger_custom_validations
-      self.class.custom_validators.each do |validator|
-        validator.run_on self
-      end
+      self.class.custom_validators
+        .each { |validator| validator.run_on self }
     end
   end
-end
+
+  class Errors < Array
+    alias :add :<<
+  end
+end

data/lib/csv_record/document.rb

@@ -1,17 +1,17 @@
 require 'active_support/core_ext/string/inflections.rb'
 
-require 'csv_record/connector'
-require 'csv_record/csv_writers/writer'
-require 'csv_record/csv_readers/reader'
-require 'csv_record/timestamps'
-require 'csv_record/callbacks'
-require 'csv_record/helpers'
-require 'csv_record/associations'
-require 'csv_record/csv_validations/validations'
+require_relative 'connector'
+require_relative 'writer'
+require_relative 'reader'
+require_relative 'timestamps'
+require_relative 'callbacks'
+require_relative 'helpers'
+require_relative 'associations'
+require_relative 'csv_validations/validations'
 
-require 'csv_record/csv_fields'
-require 'csv_record/field'
-require 'csv_record/exceptions'
+require_relative 'fields'
+require_relative 'field'
+require_relative 'exceptions'
 
 # This is the base module for all domain objects that need to be persisted to
 # the database.
@@ -28,4 +28,4 @@ module CsvRecord::Document
 
     receiver.store_as receiver.name
   end
-end
+end

data/lib/csv_record/field.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CsvRecord::Field
   attr_reader :name, :doppelganger
 
@@ -11,11 +13,11 @@ class CsvRecord::Field
   end
 
   def to_s
-    self.name.to_s
+    name.to_s
   end
 
   def is?(value)
-    self.doppelganger.to_sym == value.to_sym ||
-      self.name.to_sym == value.to_sym
+    doppelganger.to_sym == value.to_sym ||
+      name.to_sym == value.to_sym
   end
-end
+end

data/lib/csv_record/fields.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+class CsvRecord::Fields
+  include Enumerable
+
+  def fields
+    @fields ||= []
+  end
+
+  def <<(field)
+    fields << field
+  end
+
+  def include?(field)
+    has_doppelganger? field
+  end
+
+  [:name, :doppelganger].each do |attribute|
+    define_method "has_#{attribute}?" do |field|
+      fields.any? do |field_model|
+        field_model.public_send(attribute) == field
+      end
+    end
+  end
+
+  def find_with_doppelganger(doppelganger)
+    fields
+      .select { |field| field.is? doppelganger }
+      .first
+  end
+
+  def each(&block)
+    fields.each(&block)
+  end
+
+  def method_missing(meth, *args, &block)
+    if to_a.respond_to?(meth)
+      to_a.public_send(meth, *args, &block)
+    else
+      super
+    end
+  end
+
+  alias :add :<<
+end

data/lib/csv_record/helpers.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 class Object
   def integer?
-    /(?<number>^\d+$)/ =~ self.to_s
+    /(?<number>^\d+$)/ =~ to_s
     not number.nil?
   end
 
   def float?
-    /(?<number>^\d+\.\d+)$/ =~ self.to_s
+    /(?<number>^\d+\.\d+)$/ =~ to_s
     not number.nil?
   end
 
@@ -20,16 +22,18 @@ end
 
 class String
   def constantize
-    self.split('_').map { |w| w.capitalize }.join
+    split('_').map { |w| w.capitalize }.join
   end
+
   def to_class
-    Object.const_get self.constantize.singularize
+    Object.const_get constantize.singularize
   end
+
   def underscore
-    self.gsub(/::/, '/').
+    gsub(/::/, '/').
     gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
     gsub(/([a-z\d])([A-Z])/,'\1_\2').
     tr("-", "_").
     downcase
   end
-end
+end

data/lib/csv_record/{csv_queries/query.rb → query.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'condition'
 
 class CsvRecord::Query
@@ -9,7 +11,7 @@ class CsvRecord::Query
     @klass = klass
 
     @conditions = conditions.map do |condition|
-      CsvRecord::Condition.new *condition
+      CsvRecord::Condition.new(*condition)
     end
   end
 
@@ -21,7 +23,7 @@ class CsvRecord::Query
 
   def __trigger__
     klass.open_database_file do |csv|
-      rows = search_for csv, self.conditions
+      rows = search_for csv, conditions
       rows.map { |row| klass.build row.to_hash }
     end
   end
@@ -39,7 +41,7 @@ class CsvRecord::Query
   end
 
   def each(&block)
-    to_a.each &block
+    to_a.each(&block)
   end
 
   def empty?
@@ -50,7 +52,7 @@ class CsvRecord::Query
   alias :trigger :__trigger__
   alias :to_a :__to_a__
 
-protected
+  private
 
   def search_for(csv, params)
     csv.entries.select do |attributes|
@@ -59,15 +61,6 @@ protected
   end
 
   def conditions_as_string
-    conditions_string = ''
-    self.conditions.each_with_index do |condition, index|
-      conditions_string << condition.to_code
-      conditions_string << ' and ' if first_and_not_last? index
-    end
-    conditions_string
-  end
-
-  def first_and_not_last?(index)
-    (self.conditions.size > 1) and (index != self.conditions.size - 1)
+    @_conditions_as_string ||= conditions.map(&:to_code).join ' and '
   end
-end
+end

data/lib/csv_record/reader.rb

@@ -0,0 +1,120 @@
+# frozen_string_literal: true
+
+require 'csv_record/query'
+
+module CsvRecord::Reader
+  module ClassMethods
+    DYNAMIC_FINDER_PATTERN = /^find_by_(.+)$/
+
+    def build(params={})
+      new.tap do |inst|
+        break unless params
+
+        params.each do |key, value|
+          attribute = fields.find_with_doppelganger(key)
+          attr_name = attribute ? attribute.name : key
+          inst.public_send "#{attr_name}=", value
+        end
+
+        yield inst if block_given?
+      end
+    end
+
+    def __fields__
+      @fields ||= ::CsvRecord::Fields.new
+    end
+
+    def __doppelganger_fields__
+      __fields__.map(&:doppelganger)
+    end
+
+    def all
+      open_database_file do |csv|
+        csv.entries.map(&method(:build))
+      end
+    end
+
+    def first
+      all.first
+    end
+
+    def last
+      all.last
+    end
+
+    def __count__
+      open_database_file do |csv|
+        csv.entries.size
+      end
+    end
+
+    def __find__(condition)
+      (__where__ id: condition.to_param).first
+    end
+
+    def __where__(params)
+      ::CsvRecord::Query.new self, params
+    end
+
+    def method_missing(meth, *args, &block)
+      if meth.to_s =~ DYNAMIC_FINDER_PATTERN
+        dynamic_finder $1, *args, &block
+      else
+        super
+      end
+    end
+
+    def respond_to?(meth)
+      (meth.to_s =~ DYNAMIC_FINDER_PATTERN) || super
+    end
+
+    private
+
+    def dynamic_finder(meth, *args, &block)
+      properties = meth.split '_and_'
+      conditions = Hash[properties.zip args]
+      __where__(conditions).first
+    end
+
+    alias :fields :__fields__
+    alias :find :__find__
+    alias :count :__count__
+    alias :where :__where__
+    alias :doppelganger_fields :__doppelganger_fields__
+  end
+
+  module InstanceMethods
+    def __values__
+      self.class.fields.map do |attribute|
+        public_send attribute.name
+      end
+    end
+
+    def __attributes__
+      Hash[self.class.fields.zip(values)]
+    end
+
+    def __to_param__
+      id.to_s
+    end
+
+    def ==(obj)
+      self.class == obj.class and
+        to_param == obj.to_param
+    end
+
+    def !=(obj)
+      self.class != obj.class ||
+        to_param != obj.to_param
+    end
+
+    alias :attributes :__attributes__
+    alias :values :__values__
+    alias :to_param :__to_param__
+  end
+
+  def self.included(receiver)
+    receiver.extend         ClassMethods
+    receiver.send :include, InstanceMethods
+  end
+end