baza_models 0.0.9 → 0.0.14

data/Rakefile

@@ -1,18 +1,16 @@
-# 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"
 
-require "jeweler"
-Jeweler::Tasks.new do |gem|
+require "juwelier"
+Juwelier::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
   gem.name = "baza_models"
   gem.homepage = "http://github.com/kaspernj/baza_models"
@@ -23,7 +21,7 @@ Jeweler::Tasks.new do |gem|
   gem.authors = ["kaspernj"]
   # dependencies defined in Gemfile
 end
-Jeweler::RubygemsDotOrgTasks.new
+Juwelier::RubygemsDotOrgTasks.new
 
 require "rspec/core"
 require "rspec/core/rake_task"

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.14

data/baza_models.gemspec

@@ -1,19 +1,19 @@
-# Generated by jeweler
+# Generated by juwelier
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: baza_models 0.0.9 ruby lib
+# stub: baza_models 0.0.14 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "baza_models"
-  s.version = "0.0.9"
+  s.name = "baza_models".freeze
+  s.version = "0.0.14"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["kaspernj"]
-  s.date = "2016-08-10"
-  s.description = "ActiveRecord like models for the Baza database framework"
-  s.email = "k@spernj.org"
+  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 = "2021-01-02"
+  s.description = "ActiveRecord like models for the Baza database framework".freeze
+  s.email = "k@spernj.org".freeze
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
     ".rspec",
     ".rubocop.yml",
     ".rubocop_todo.yml",
+    ".ruby-version",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -67,7 +68,7 @@ Gem::Specification.new do |s|
     "lib/baza_models/validators/length_validator.rb",
     "lib/baza_models/validators/presence_validator.rb",
     "lib/baza_models/validators/uniqueness_validator.rb",
-    "shippable.yml",
+    "peak_flow.yml",
     "spec/baza_models/autoloader_spec.rb",
     "spec/baza_models/baza_orm_adapter_spec.rb",
     "spec/baza_models/class_translation_spec.rb",
@@ -91,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",
@@ -102,66 +102,72 @@ Gem::Specification.new do |s|
     "spec/test_classes/user.rb",
     "spec/test_classes/user_passport.rb"
   ]
-  s.homepage = "http://github.com/kaspernj/baza_models"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.0"
-  s.summary = "ActiveRecord like models for the Baza database framework"
+  s.homepage = "http://github.com/kaspernj/baza_models".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "3.0.6".freeze
+  s.summary = "ActiveRecord like models for the Baza database framework".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<array_enumerator>, [">= 0.0.10"])
-      s.add_runtime_dependency(%q<baza>, ["~> 0.0.21"])
-      s.add_runtime_dependency(%q<string-cases>, [">= 0.0.3"])
-      s.add_runtime_dependency(%q<auto_autoloader>, [">= 0.0.1"])
-      s.add_runtime_dependency(%q<html_gen>, [">= 0.0.12"])
-      s.add_runtime_dependency(%q<simple_delegate>, [">= 0.0.2"])
-      s.add_development_dependency(%q<rspec>, ["~> 3.3.0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
-      s.add_development_dependency(%q<factory_girl>, [">= 0"])
-      s.add_development_dependency(%q<sqlite3>, [">= 0"])
-      s.add_development_dependency(%q<jdbc-sqlite3>, [">= 0"])
-      s.add_development_dependency(%q<best_practice_project>, [">= 0"])
-      s.add_development_dependency(%q<rubocop>, ["= 0.37.0"])
-      s.add_development_dependency(%q<orm_adapter>, [">= 0"])
+      s.add_runtime_dependency(%q<array_enumerator>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<auto_autoloader>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<baza>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<html_gen>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<simple_delegate>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<string-cases>.freeze, [">= 0"])
+      s.add_development_dependency(%q<best_practice_project>.freeze, [">= 0"])
+      s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
+      s.add_development_dependency(%q<factory_bot>.freeze, [">= 0"])
+      s.add_development_dependency(%q<jdbc-sqlite3>.freeze, [">= 0"])
+      s.add_development_dependency(%q<juwelier>.freeze, [">= 0"])
+      s.add_development_dependency(%q<orm_adapter>.freeze, [">= 0"])
+      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>, [">= 0.0.10"])
-      s.add_dependency(%q<baza>, ["~> 0.0.21"])
-      s.add_dependency(%q<string-cases>, [">= 0.0.3"])
-      s.add_dependency(%q<auto_autoloader>, [">= 0.0.1"])
-      s.add_dependency(%q<html_gen>, [">= 0.0.12"])
-      s.add_dependency(%q<simple_delegate>, [">= 0.0.2"])
-      s.add_dependency(%q<rspec>, ["~> 3.3.0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
-      s.add_dependency(%q<factory_girl>, [">= 0"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])
-      s.add_dependency(%q<jdbc-sqlite3>, [">= 0"])
-      s.add_dependency(%q<best_practice_project>, [">= 0"])
-      s.add_dependency(%q<rubocop>, ["= 0.37.0"])
-      s.add_dependency(%q<orm_adapter>, [">= 0"])
+      s.add_dependency(%q<array_enumerator>.freeze, [">= 0"])
+      s.add_dependency(%q<auto_autoloader>.freeze, [">= 0"])
+      s.add_dependency(%q<baza>.freeze, [">= 0"])
+      s.add_dependency(%q<html_gen>.freeze, [">= 0"])
+      s.add_dependency(%q<simple_delegate>.freeze, [">= 0"])
+      s.add_dependency(%q<string-cases>.freeze, [">= 0"])
+      s.add_dependency(%q<best_practice_project>.freeze, [">= 0"])
+      s.add_dependency(%q<bundler>.freeze, [">= 0"])
+      s.add_dependency(%q<factory_bot>.freeze, [">= 0"])
+      s.add_dependency(%q<jdbc-sqlite3>.freeze, [">= 0"])
+      s.add_dependency(%q<juwelier>.freeze, [">= 0"])
+      s.add_dependency(%q<orm_adapter>.freeze, [">= 0"])
+      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
-    s.add_dependency(%q<array_enumerator>, [">= 0.0.10"])
-    s.add_dependency(%q<baza>, ["~> 0.0.21"])
-    s.add_dependency(%q<string-cases>, [">= 0.0.3"])
-    s.add_dependency(%q<auto_autoloader>, [">= 0.0.1"])
-    s.add_dependency(%q<html_gen>, [">= 0.0.12"])
-    s.add_dependency(%q<simple_delegate>, [">= 0.0.2"])
-    s.add_dependency(%q<rspec>, ["~> 3.3.0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
-    s.add_dependency(%q<factory_girl>, [">= 0"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])
-    s.add_dependency(%q<jdbc-sqlite3>, [">= 0"])
-    s.add_dependency(%q<best_practice_project>, [">= 0"])
-    s.add_dependency(%q<rubocop>, ["= 0.37.0"])
-    s.add_dependency(%q<orm_adapter>, [">= 0"])
+    s.add_dependency(%q<array_enumerator>.freeze, [">= 0"])
+    s.add_dependency(%q<auto_autoloader>.freeze, [">= 0"])
+    s.add_dependency(%q<baza>.freeze, [">= 0"])
+    s.add_dependency(%q<html_gen>.freeze, [">= 0"])
+    s.add_dependency(%q<simple_delegate>.freeze, [">= 0"])
+    s.add_dependency(%q<string-cases>.freeze, [">= 0"])
+    s.add_dependency(%q<best_practice_project>.freeze, [">= 0"])
+    s.add_dependency(%q<bundler>.freeze, [">= 0"])
+    s.add_dependency(%q<factory_bot>.freeze, [">= 0"])
+    s.add_dependency(%q<jdbc-sqlite3>.freeze, [">= 0"])
+    s.add_dependency(%q<juwelier>.freeze, [">= 0"])
+    s.add_dependency(%q<orm_adapter>.freeze, [">= 0"])
+    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/class_translation.rb

@@ -39,6 +39,10 @@ class BazaModels::ClassTranslation
     @klass.name.split("::").last
   end
 
+  def name
+    @klass.name
+  end
+
   def param_key
     @param_key ||= class_name_snake
   end

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/helpers/ransacker_helper.rb

@@ -2,7 +2,7 @@ module BazaModels::Helpers::RansackerHelper
   def bm_paginate_content(collection)
     require "html_gen"
 
-    new_params = params.dup
+    new_params = params.dup.permit!
     current_page = collection.page
     total_pages = collection.total_pages
 
@@ -53,7 +53,7 @@ module BazaModels::Helpers::RansackerHelper
       new_params[:q][:s] = sort_asc
     end
 
-    href = url_for(new_params)
+    href = url_for(new_params.permit!)
 
     element = HtmlGen::Element.new(:a, str: label, attr: {href: href})
     element.html

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 = [
@@ -45,7 +46,7 @@ class BazaModels::Model
 
   QUERY_METHODS = [
     :average, :all, :any?, :destroy_all, :each, :empty?, :ids, :maximum, :minimum, :none?, :count, :find, :first, :find_first, :last,
-    :length, :size, :select, :includes, :joins, :group, :where, :order, :pluck, :preloads, :sum, :limit, :to_a, :accessible_by, :ransack
+    :length, :size, :select, :includes, :joins, :group, :where, :order, :pluck, :preloads, :sum, :limit, :accessible_by, :ransack
   ].freeze
   QUERY_METHODS.each do |query_method|
     (class << self; self; end).__send__(:define_method, query_method) do |*args, &blk|
@@ -57,6 +58,7 @@ class BazaModels::Model
     self.class.init_model
 
     reset_errors
+    @before_last_save = {}
     @changes = {}
 
     if args[:init]
@@ -74,9 +76,7 @@ class BazaModels::Model
     end
   end
 
-  # rubocop:disable Style/TrivialAccessors
   def new_record?
-    # rubocop:enable Style/TrivialAccessors
     @new_record
   end
 
@@ -86,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
 
@@ -143,8 +145,6 @@ class BazaModels::Model
     attr_writer :db, :table_name
   end
 
-  attr_writer :table_name
-
   def autoloads
     @autoloads ||= {}
     @autoloads
@@ -186,7 +186,7 @@ class BazaModels::Model
   end
 
   def to_param
-    id.to_s if id
+    id&.to_s
   end
 
   def to_key
@@ -200,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
@@ -232,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
 
@@ -259,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
 
@@ -270,6 +272,7 @@ class BazaModels::Model
     changed = false
     @changes.each do |key, value|
       next if @data.fetch(key) == value
+
       changed = true
       break
     end
@@ -282,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
 
@@ -315,6 +315,14 @@ protected
         false
       end
     end
+
+    define_method("will_save_change_to_#{column_name}?") do
+      will_save_change_to_attribute?(column_name)
+    end
+
+    define_method("#{column_name}_before_last_save") do
+      attribute_before_last_save(column_name)
+    end
   end
 
   def reset_errors
@@ -333,7 +341,7 @@ protected
         pass_args = callback_data.fetch(:args)
         pass_args = [] if method_obj.arity == 0
 
-        __send__(callback_data[:method_name], *pass_args)
+        __send__(callback_data.fetch(:method_name), *pass_args)
       else
         raise "Didn't know how to perform callbacks for #{name}"
       end
@@ -350,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
 
@@ -374,8 +381,21 @@ protected
     new_attributes
   end
 
+  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