baza_models 0.0.9 → 0.0.14

data/lib/baza_models/model/belongs_to_relations.rb

@@ -25,9 +25,7 @@ module BazaModels::Model::BelongsToRelations
       @relationships[relation_name] = relation
 
       define_method(relation_name) do
-        if (model = @changes[relation_name])
-          model
-        elsif (model = autoloads[relation_name])
+        if (model = @changes[relation_name]) || (model = autoloads[relation_name])
           model
         else
           if relation[:class_name]

data/lib/baza_models/model/has_many_relations.rb

@@ -4,9 +4,9 @@ module BazaModels::Model::HasManyRelations
   end
 
   module ClassMethods
-    # rubocop:disable Style/PredicateName
+    # rubocop:disable Naming/PredicateName
     def has_many(relation_name, *all_args)
-      # rubocop:enable Style/PredicateName
+      # rubocop:enable Naming/PredicateName
 
       args = all_args.pop
 

data/lib/baza_models/model/has_one_relations.rb

@@ -4,9 +4,9 @@ module BazaModels::Model::HasOneRelations
   end
 
   module ClassMethods
-    # rubocop:disable Style/PredicateName
+    # rubocop:disable Naming/PredicateName
     def has_one(relation_name, *all_args)
-      # rubocop:enable Style/PredicateName
+      # rubocop:enable Naming/PredicateName
 
       args = all_args.pop
 

data/lib/baza_models/model/manipulation.rb

@@ -10,9 +10,11 @@ module BazaModels::Model::Manipulation
       self.updated_at = Time.now if changed? && has_attribute?(:updated_at)
 
       if new_record
+        @before_last_save = @data
         status = create
       else
         fire_callbacks(:before_update)
+        @before_last_save = @data
         db.update(table_name, @changes, id: id) if changed?
         fire_callbacks(:after_update)
         status = true
@@ -22,14 +24,15 @@ module BazaModels::Model::Manipulation
 
       @changes = {}
       @new_record = false
+
       reload
 
       fire_callbacks(:after_save)
       fire_callbacks(:after_create) if new_record
 
-      return true
+      true
     else
-      return false
+      false
     end
   end
 
@@ -44,14 +47,12 @@ module BazaModels::Model::Manipulation
 
     @data[:id] = db.insert(table_name, @changes, return_id: true)
 
-    if @autoloads
-      @autoloads.each do |relation_name, collection|
-        relation = self.class.relationships.fetch(relation_name)
+    @autoloads&.each do |relation_name, collection|
+      relation = self.class.relationships.fetch(relation_name)
 
-        collection.each do |model|
-          model.assign_attributes(relation.fetch(:foreign_key) => id)
-          model.create! if model.new_record?
-        end
+      collection.each do |model|
+        model.assign_attributes(relation.fetch(:foreign_key) => id)
+        model.create! if model.new_record?
       end
     end
 
@@ -60,7 +61,7 @@ module BazaModels::Model::Manipulation
 
   def create!
     if create
-      return true
+      true
     else
       raise BazaModels::Errors::InvalidRecord, errors.full_messages.join(". ")
     end
@@ -68,21 +69,29 @@ module BazaModels::Model::Manipulation
 
   def save!(args = {})
     if save(args)
-      return true
+      true
     else
       raise BazaModels::Errors::InvalidRecord, errors.full_messages.join(". ")
     end
   end
 
-  def update_attributes(attributes)
+  def update(attributes)
     assign_attributes(attributes)
     save
   end
 
-  def update_attributes!(attributes)
+  def update!(attributes)
     raise BazaModels::Errors::InvalidRecord, @errors.full_messages.join(". ") unless update_attributes(attributes)
   end
 
+  def update_attributes(attributes)
+    update(attributes)
+  end
+
+  def update_attributes!(attributes)
+    update!(attributes)
+  end
+
   def assign_attributes(attributes)
     @changes.merge!(real_attributes(attributes))
   end
@@ -90,7 +99,7 @@ module BazaModels::Model::Manipulation
   def destroy
     if new_record?
       errors.add(:base, "cannot destroy new record")
-      return false
+      false
     else
       fire_callbacks(:before_destroy)
 
@@ -101,7 +110,7 @@ module BazaModels::Model::Manipulation
 
       db.delete(table_name, id: id)
       fire_callbacks(:after_destroy)
-      return true
+      true
     end
   end
 

data/lib/baza_models/model/queries.rb

@@ -7,6 +7,7 @@ module BazaModels::Model::Queries
     def find(id)
       row = db.select(table_name, {id: id}, limit: 1).fetch
       raise BazaModels::Errors::RecordNotFound, "Record not found by ID: #{id}" unless row
+
       new(row, init: true)
     end
 
@@ -23,6 +24,7 @@ module BazaModels::Model::Queries
     def find_or_initialize_by(data)
       model = find_by(data)
       return model if model
+
       new(data)
     end
 

data/lib/baza_models/model/scopes.rb

@@ -9,6 +9,7 @@ module BazaModels::Model::Scopes
       name = name.to_sym
 
       raise "Such a scope already exists" if @scopes.key?(name)
+
       @scopes[name] = {blk: blk}
 
       (class << self; self; end).__send__(:define_method, name) do

data/lib/baza_models/model/validations.rb

@@ -22,6 +22,7 @@ module BazaModels::Model::Validations
 
       validators[attribute_name].each do |validator|
         next unless validator.fire?(self)
+
         validator.validate(self, attribute_value)
       end
     end

data/lib/baza_models/query.rb

@@ -69,7 +69,8 @@ class BazaModels::Query
   end
 
   def count
-    if @previous_model && @previous_model.new_record?
+    if
+@previous_model&.new_record?
       autoloaded_cache_or_create.length
     else
       query = clone(selects: [])
@@ -193,7 +194,7 @@ class BazaModels::Query
       new_where = "(#{args.shift})"
 
       args.each do |arg|
-        new_where.sub!("?", @db.sqlval(arg))
+        new_where.sub!("?", @db.quote_value(arg))
       end
 
       new_wheres << new_where
@@ -208,7 +209,7 @@ class BazaModels::Query
         elsif arg.is_a?(TrueClass)
           arg = "1"
         else
-          arg = @db.sqlval(arg)
+          arg = @db.quote_value(arg)
         end
 
         str.sub!("?", arg)
@@ -283,7 +284,7 @@ class BazaModels::Query
     end
 
     if @includes.empty?
-      return array_enum
+      array_enum
     else
       array = array_enum.to_a
 
@@ -296,14 +297,12 @@ class BazaModels::Query
         autoloader.autoload
       end
 
-      return array
+      array
     end
   end
 
-  def each
-    to_enum.each do |model|
-      yield model
-    end
+  def each(&blk)
+    to_enum.each(&blk)
   end
 
   def find_each
@@ -376,6 +375,7 @@ class BazaModels::Query
 
   def sanitize_sql(value)
     return value if value.is_a?(Array) || value.is_a?(Integer) || value.is_a?(Integer)
+
     "'#{@db.esc(value)}'"
   end
 
@@ -413,9 +413,7 @@ private
   end
 
   def autoloaded_on_previous_model?
-    if @previous_model && @relation
-      return true if @previous_model.autoloads.include?(@relation.fetch(:relation_name))
-    end
+    return true if @previous_model && @relation && @previous_model.autoloads.include?(@relation.fetch(:relation_name))
 
     false
   end
@@ -439,11 +437,13 @@ private
 
   def key_convert(key, value)
     return "#{key}_id" if value.is_a?(BazaModels::Model)
+
     key
   end
 
   def value_convert(value)
     return value.id if value.is_a?(BazaModels::Model)
+
     value
   end
 
@@ -459,13 +459,15 @@ private
           sql << ", " unless first
         end
 
-        sql << @db.sqlval(val_i)
+        sql << @db.quote_value(val_i)
       end
 
       sql << ")"
       sql
+    elsif value == nil
+      "IS NULL"
     else
-      "= #{@db.sqlval(value)}"
+      "= #{@db.quote_value(value)}"
     end
   end
 

data/lib/baza_models/query/inspector.rb

@@ -36,6 +36,7 @@ private
 
     relationship_pair = @model.relationships.detect { |key, _value| key == argument }
     raise "Could not find a relationship on #{@model.name} by that name: #{argument}" unless relationship_pair
+
     relationship = relationship_pair[1]
 
     table_name = relationship.fetch(:table_name)
@@ -60,6 +61,7 @@ private
 
       relationship_pair = @model.relationships.detect { |relationship_name, _relationship| relationship_name == key }
       raise "Could not find a relationship on #{@model.name} by that name: #{value}" unless relationship_pair
+
       relationship = relationship_pair[1]
 
       BazaModels::Query::Inspector.new(

data/lib/baza_models/query/pagination.rb

@@ -1,10 +1,8 @@
 module BazaModels::Query::Pagination
   def current_page
-    if @page
-      @page
-    else
-      raise "Page has not been set"
-    end
+    raise "Page has not been set" unless @page
+
+    @page
   end
 
   def out_of_bounds?
@@ -44,11 +42,11 @@ module BazaModels::Query::Pagination
   end
 
   def total_pages
-    pages_count = (count.to_f / per.to_f)
+    pages_count = (count.to_f / per)
 
     pages_count = 1 if pages_count.nan? || pages_count == Float::INFINITY
     pages_count = pages_count.ceil
-    pages_count = 1 if pages_count == 0
+    pages_count = 1 if pages_count.zero?
     pages_count
   end
 end

data/lib/baza_models/query/sql_generator.rb

@@ -9,7 +9,7 @@ class BazaModels::Query::SqlGenerator
     end
   end
 
-  def to_sql
+  def to_sql # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     sql = "SELECT "
 
     if @selects.empty?
@@ -68,9 +68,9 @@ class BazaModels::Query::SqlGenerator
         end
 
         if @reverse_order
-          if order =~ /\s+desc/i
+          if /\s+desc/i.match?(order)
             order = order.gsub(/\s+desc/i, " ASC")
-          elsif order =~ /\s+asc/i
+          elsif /\s+asc/i.match?(order)
             order = order.gsub(/\s+asc/i, " DESC")
           else
             order = "#{order} DESC"

data/lib/baza_models/ransacker.rb

@@ -37,8 +37,10 @@ private
       elsif key.to_s == "s"
         match = value.to_s.match(/\A([A-z_\d]+)\s+(asc|desc)\Z/)
         raise "Couldn't sort-match: #{value}" unless match
+
         sort_by(column_name: match[1], sort_mode: match[2])
-      elsif ransackable_scopes && ransackable_scopes.include?(key.to_s)
+      elsif
+ransackable_scopes&.include?(key.to_s)
         @query = @query.__send__(key, value)
       end
     end

data/lib/baza_models/ransacker/relationship_scanner.rb

@@ -29,6 +29,7 @@ private
 
     loop do
       break if @name_parts.empty?
+
       name_part = @name_parts.shift
       current_name << name_part
 
@@ -71,6 +72,7 @@ private
 
     loop do
       break if join_parts.empty?
+
       join_part = join_parts.shift
 
       if join_parts.length == 1
@@ -96,6 +98,7 @@ private
     case @mode
     when :cont
       return if @value.empty?
+
       add_query_with_symbol("LIKE", "%#{@klass.db.esc(@value)}%")
     when :eq
       add_query_with_symbol("=")
@@ -121,6 +124,6 @@ private
     add_join_parts
     @ransacker.query = @ransacker
       .query
-      .where("#{@table_query}.#{@column_query} #{symbol} #{@klass.db.sqlval(value)}")
+      .where("#{@table_query}.#{@column_query} #{symbol} #{@klass.db.quote_value(value)}")
   end
 end

data/lib/baza_models/validators/confirmation_validator.rb

@@ -3,9 +3,7 @@ class BazaModels::Validators::ConfirmationValidator < BazaModels::Validators::Ba
     confirmation_attribute_name = "#{attribute_name}_confirmation"
     confirmation_value = model.__send__(confirmation_attribute_name)
 
-    if value && !confirmation_value
-      model.errors.add(attribute_name, "hasn't been confirmed")
-    end
+    model.errors.add(attribute_name, "hasn't been confirmed") if value && !confirmation_value
 
     model.errors.add(attribute_name, "was not the same as the confirmation") if value && confirmation_value && confirmation_value != value
   end

data/lib/baza_models/validators/uniqueness_validator.rb

@@ -2,10 +2,8 @@ class BazaModels::Validators::UniquenessValidator < BazaModels::Validators::Base
   def validate(model, value)
     query_same = model.class.where(attribute_name => value)
 
-    if scope
-      scope.each do |scope_part|
-        query_same = query_same.where(scope_part => model.__send__(scope_part))
-      end
+    scope&.each do |scope_part|
+      query_same = query_same.where(scope_part => model.__send__(scope_part))
     end
 
     model.errors.add(attribute_name, "isn't unique") if query_same.any?

data/peak_flow.yml

@@ -0,0 +1,4 @@
+rvm: true
+script:
+  - bundle exec rspec
+  - bundle exec rake best_practice_project:run

data/spec/baza_models/autoloader_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe BazaModels::Autoloader do
+describe BazaModels::Autoloader do # rubocop:disable RSpec/MultipleMemoizedHelpers
   include DatabaseHelper
 
   let!(:organization) { Organization.create! }

data/spec/baza_models/baza_orm_adapter_spec.rb

@@ -47,6 +47,6 @@ describe BazaModels::Query do
   end
 
   it "#column_names" do
-    expect(User.to_adapter.column_names).to eq %w(id organization_id email email_confirmation created_at updated_at admin)
+    expect(User.to_adapter.column_names).to eq %w[id organization_id email email_confirmation created_at updated_at admin]
   end
 end

data/spec/baza_models/class_translation_spec.rb

@@ -7,6 +7,10 @@ describe BazaModels::ClassTranslation do
     expect(User.model_name.human).to eq "User"
   end
 
+  it "#name" do
+    expect(User.model_name.name).to eq "User"
+  end
+
   it "#param_key" do
     expect(User.model_name.param_key).to eq "user"
   end