baza_models 0.0.13 → 0.0.14

data/Rakefile

@@ -1,12 +1,10 @@
-# encoding: utf-8
-
 require "rubygems"
 require "bundler"
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
+  warn e.message
+  warn "Run `bundle install` to install missing gems"
   exit e.status_code
 end
 require "rake"

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

data/baza_models.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: baza_models 0.0.13 ruby lib
+# stub: baza_models 0.0.14 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "baza_models".freeze
-  s.version = "0.0.13"
+  s.version = "0.0.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["kaspernj".freeze]
-  s.date = "2019-10-18"
+  s.date = "2021-01-02"
   s.description = "ActiveRecord like models for the Baza database framework".freeze
   s.email = "k@spernj.org".freeze
   s.extra_rdoc_files = [
@@ -92,7 +92,6 @@ Gem::Specification.new do |s|
     "spec/baza_models/validators/format_validator_spec.rb",
     "spec/baza_models/validators/length_validator_spec.rb",
     "spec/baza_models/validators/uniqueness_validator_spec.rb",
-    "spec/baza_models_spec.rb",
     "spec/factories/organization.rb",
     "spec/factories/user.rb",
     "spec/spec_helper.rb",
@@ -127,6 +126,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rdoc>.freeze, [">= 0"])
       s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
       s.add_development_dependency(%q<rubocop>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rubocop-performance>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rubocop-rspec>.freeze, [">= 0"])
       s.add_development_dependency(%q<sqlite3>.freeze, [">= 0"])
     else
       s.add_dependency(%q<array_enumerator>.freeze, [">= 0"])
@@ -144,6 +145,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rdoc>.freeze, [">= 0"])
       s.add_dependency(%q<rspec>.freeze, [">= 0"])
       s.add_dependency(%q<rubocop>.freeze, [">= 0"])
+      s.add_dependency(%q<rubocop-performance>.freeze, [">= 0"])
+      s.add_dependency(%q<rubocop-rspec>.freeze, [">= 0"])
       s.add_dependency(%q<sqlite3>.freeze, [">= 0"])
     end
   else
@@ -162,6 +165,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rdoc>.freeze, [">= 0"])
     s.add_dependency(%q<rspec>.freeze, [">= 0"])
     s.add_dependency(%q<rubocop>.freeze, [">= 0"])
+    s.add_dependency(%q<rubocop-performance>.freeze, [">= 0"])
+    s.add_dependency(%q<rubocop-rspec>.freeze, [">= 0"])
     s.add_dependency(%q<sqlite3>.freeze, [">= 0"])
   end
 end

data/lib/baza_models/autoloader.rb

@@ -125,6 +125,7 @@ private
       orig_model = @models.detect { |array_model| array_model.id == orig_model_id }
 
       raise "Already autoloaded?" if orig_model.autoloads.key?(autoload_name)
+
       orig_model.autoloads[autoload_name] = model
 
       result.fetch(:models) << model

data/lib/baza_models/errors.rb

@@ -1,5 +1,6 @@
 class BazaModels::Errors
   class InvalidRecord < RuntimeError; end
+
   class RecordNotFound < RuntimeError; end
 
   def initialize
@@ -18,9 +19,7 @@ class BazaModels::Errors
       errors.each do |error|
         message = ""
 
-        unless attribute_name == :base
-          message << "#{StringCases.snake_to_camel(attribute_name)} "
-        end
+        message << "#{StringCases.snake_to_camel(attribute_name)} " unless attribute_name == :base
 
         message << error
         messages << message

data/lib/baza_models/model.rb

@@ -16,6 +16,7 @@ class BazaModels::Model
 
   attr_accessor :data, :db
   attr_reader :changes, :errors
+  attr_writer :db, :table_name
 
   # Define all callback methods.
   CALLBACK_TYPES = [
@@ -75,9 +76,7 @@ class BazaModels::Model
     end
   end
 
-  # rubocop:disable Style/TrivialAccessors
   def new_record?
-    # rubocop:enable Style/TrivialAccessors
     @new_record
   end
 
@@ -87,21 +86,23 @@ class BazaModels::Model
 
   def db
     return @db if @db
+
     @db ||= self.class.db
   end
 
-  attr_writer :db
-
   def self.attribute_names
     init_model
     @table.columns.map(&:name).map(&:clone)
   end
 
   def self.db
-    @db = nil if @db && @db.closed?
+    @db = nil if
+@db&.closed?
     return @db if @db
+
     @db ||= BazaModels.primary_db
     raise "No Baza database has been configured" unless @db
+
     @db
   end
 
@@ -144,8 +145,6 @@ class BazaModels::Model
     attr_writer :db, :table_name
   end
 
-  attr_writer :table_name
-
   def autoloads
     @autoloads ||= {}
     @autoloads
@@ -187,7 +186,7 @@ class BazaModels::Model
   end
 
   def to_param
-    id.to_s if id
+    id&.to_s
   end
 
   def to_key
@@ -201,6 +200,7 @@ class BazaModels::Model
   def reload
     @data = db.single(table_name, {id: id}, limit: 1)
     raise BazaModels::Errors::RecordNotFound unless @data
+
     @changes = {}
     self
   end
@@ -233,15 +233,15 @@ class BazaModels::Model
     return false unless self.class == other.class
 
     if new_record? && other.new_record?
-      return merged_data == other.__send__(:merged_data)
+      merged_data == other.__send__(:merged_data)
     else
-      return id == other.id
+      id == other.id
     end
   end
 
-  # rubocop:disable Style/PredicateName
+  # rubocop:disable Naming/PredicateName
   def has_attribute?(name)
-    # rubocop:enable Style/PredicateName
+    # rubocop:enable Naming/PredicateName
     self.class.column_names.include?(name.to_s)
   end
 
@@ -260,6 +260,7 @@ class BazaModels::Model
 
   def read_attribute(attribute_name)
     return @changes.fetch(attribute_name) if @changes.key?(attribute_name)
+
     @data.fetch(attribute_name)
   end
 
@@ -271,6 +272,7 @@ class BazaModels::Model
     changed = false
     @changes.each do |key, value|
       next if @data.fetch(key) == value
+
       changed = true
       break
     end
@@ -283,10 +285,7 @@ protected
   class << self
     attr_reader :__blank_attributes
   end
-
-  # rubocop:disable Style/TrivialAccessors
   def self.model_initialized?
-    # rubocop:enable Style/TrivialAccessors
     @model_initialized
   end
 
@@ -359,12 +358,11 @@ protected
     attributes.each do |attribute_name, attribute_value|
       belongs_to_relations = self.class.instance_variable_get(:@belongs_to_relations)
 
-      if belongs_to_relations
-        belongs_to_relations.each do |relation|
-          if attribute_name.to_s == relation[:relation_name].to_s
-            attribute_name = :"#{attribute_name}_id"
-            attribute_value = attribute_value.id if attribute_value
-          end
+
+      belongs_to_relations&.each do |relation|
+        if attribute_name.to_s == relation[:relation_name].to_s
+          attribute_name = :"#{attribute_name}_id"
+          attribute_value = attribute_value.id if attribute_value
         end
       end
 
@@ -385,16 +383,19 @@ protected
 
   def attribute_before_last_save(attribute_name)
     return @before_last_save.fetch(attribute_name) if @before_last_save.key?(attribute_name)
+
     @data.fetch(attribute_name)
   end
 
   def will_save_change_to_attribute?(attribute_name)
     return true if @changes.key?(attribute_name) && @changes[attribute_name] != data[attribute_name]
+
     false
   end
 
   def method_missing(method_name, *args, &blk)
     return @data.fetch(method_name) if @data.key?(method_name)
+
     super
   end
 end

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

@@ -30,9 +30,9 @@ module BazaModels::Model::Manipulation
       fire_callbacks(:after_save)
       fire_callbacks(:after_create) if new_record
 
-      return true
+      true
     else
-      return false
+      false
     end
   end
 
@@ -47,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
 
@@ -63,7 +61,7 @@ module BazaModels::Model::Manipulation
 
   def create!
     if create
-      return true
+      true
     else
       raise BazaModels::Errors::InvalidRecord, errors.full_messages.join(". ")
     end
@@ -71,25 +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)
-    update!(attributes)
-  end
-
   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
@@ -97,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)
 
@@ -108,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: [])
@@ -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
 
@@ -464,6 +464,8 @@ private
 
       sql << ")"
       sql
+    elsif value == nil
+      "IS NULL"
     else
       "= #{@db.quote_value(value)}"
     end