baza_models 0.0.11 → 0.0.15

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/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/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/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/model/has_many_relations_spec.rb

@@ -45,7 +45,7 @@ describe BazaModels::Model::HasManyRelations do
     end
   end
 
-  context "#<<" do
+  describe "#<<" do
     it "adds models to persisted parent" do
       organization.save!
       organization.users << User.create!(email: "test@example.com")

data/spec/baza_models/model/manipulation_spec.rb

@@ -10,17 +10,17 @@ describe BazaModels::Model::Manipulation do
   it "#created_at" do
     expect(user.created_at).to eq nil
     user.save!
-    expect(user.created_at).to_not eq nil
+    expect(user.created_at).not_to eq nil
   end
 
   it "#updated_at" do
     expect(user.updated_at).to eq nil
     user.save!
-    expect(user.updated_at).to_not eq nil
+    expect(user.updated_at).not_to eq nil
     old_updated_at = user.updated_at
     sleep 1
     user.email = "test2@example.com"
     user.save!
-    expect(user.updated_at).to_not eq old_updated_at
+    expect(user.updated_at).not_to eq old_updated_at
   end
 end

data/spec/baza_models/model_spec.rb

@@ -22,8 +22,8 @@ describe "BazaModels::Model" do
     expect(user.id).to eq nil
     expect(user.to_param).to eq nil
     user.save!
-    expect(user.id).to_not eq nil
-    expect(user.to_param).to_not eq nil
+    expect(user.id).not_to eq nil
+    expect(user.to_param).not_to eq nil
     expect(user.to_param).to eq user.id.to_s
   end
 
@@ -62,12 +62,30 @@ describe "BazaModels::Model" do
     end
   end
 
+  it "#update" do
+    user.save!
+    expect(user.update(email: "newemail@example.com")).to eq true
+    expect(user.email).to eq "newemail@example.com"
+  end
+
+  it "#update!" do
+    user.save!
+    user.update!(email: "newemail@example.com")
+    expect(user.email).to eq "newemail@example.com"
+  end
+
   it "#update_attributes" do
     user.save!
     expect(user.update_attributes(email: "newemail@example.com")).to eq true
     expect(user.email).to eq "newemail@example.com"
   end
 
+  it "#update_attributes!" do
+    user.save!
+    user.update_attributes!(email: "newemail@example.com")
+    expect(user.email).to eq "newemail@example.com"
+  end
+
   it "#before_save, #after_save" do
     expect(user.before_save_called).to eq nil
     expect(user.after_save_called).to eq nil
@@ -152,17 +170,19 @@ describe "BazaModels::Model" do
 
   it "#each" do
     user.save!
+    found = []
     count = 0
     User.each do |user|
-      expect(user).to eq user
+      found << user
       count += 1
     end
 
     expect(count).to eq 1
+    expect(found).to eq [user]
   end
 
   it "#attribute_names" do
-    expect(User.attribute_names).to eq %w(id organization_id email email_confirmation created_at updated_at admin)
+    expect(User.attribute_names).to eq %w[id organization_id email email_confirmation created_at updated_at admin]
   end
 
   it "#columns" do
@@ -211,6 +231,13 @@ describe "BazaModels::Model" do
     expect(user.email).to eq "test@example.com"
   end
 
+  describe "#to_a" do
+    it "does not respond to it, because it will fuck up Array(ModelClass)" do
+      expect { User.to_a }.to raise_error(NoMethodError)
+      expect { User.to_ary }.to raise_error(NoMethodError)
+    end
+  end
+
   describe "#attribute_before_last_save" do
     it "returns the value as it was before the save" do
       user.save!

data/spec/baza_models/query_spec.rb

@@ -7,7 +7,7 @@ describe BazaModels::Query do
   let(:role_user) { Role.new(user: user, role: "user") }
   let(:role_admin) { Role.new(user: user, role: "administrator") }
 
-  context "#average" do
+  describe "#average" do
     it "calculates the average" do
       5.times do |n|
         User.create! id: n + 1, email: "user#{n}@example.com"
@@ -18,7 +18,7 @@ describe BazaModels::Query do
     end
   end
 
-  context "#where" do
+  describe "#where" do
     before do
       user.save!
     end
@@ -29,6 +29,14 @@ describe BazaModels::Query do
       expect(query.to_a).to eq [user]
     end
 
+    it "supports hashes with nils" do
+      user.update!(email_confirmation: nil)
+
+      query = User.where(users: {email_confirmation: nil})
+      expect(query.to_sql).to eq "SELECT `users`.* FROM `users` WHERE `users`.`email_confirmation` IS NULL"
+      expect(query.to_a).to eq [user]
+    end
+
     it "supports strings" do
       query = User.where("email = 'test@example.com'")
       expect(query.to_sql).to eq "SELECT `users`.* FROM `users` WHERE (email = 'test@example.com')"
@@ -49,7 +57,7 @@ describe BazaModels::Query do
     end
   end
 
-  context "#ids" do
+  describe "#ids" do
     it "returns the ids of the models" do
       5.times do |n|
         User.create! id: n + 1, email: "user#{n}@example.com"
@@ -60,7 +68,7 @@ describe BazaModels::Query do
     end
   end
 
-  context "#joins" do
+  describe "#joins" do
     before do
       user.save!
       role_admin.save!
@@ -94,7 +102,7 @@ describe BazaModels::Query do
     end
   end
 
-  context "#group, #order" do
+  describe "#group, #order" do
     before do
       user
       role_user
@@ -109,7 +117,7 @@ describe BazaModels::Query do
       roles = Role.group(:role).order(:role).to_a
 
       expect(roles.length).to eq 2
-      expect(roles.map(&:role)).to eq %w(administrator user)
+      expect(roles.map(&:role)).to eq %w[administrator user]
     end
   end
 

data/spec/factories/organization.rb

@@ -1,5 +1,5 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :organization do
-    name "Test organization"
+    name { "Test organization" }
   end
 end

data/spec/factories/user.rb

@@ -1,7 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user do
     organization
 
-    email "user@example.com"
+    email { "user@example.com" }
   end
 end

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require "rspec"
 require "baza_models"
-require "factory_girl"
+require "factory_bot"
 
 Dir.foreach("spec/test_classes") do |file|
   require "test_classes/#{file}" if file.end_with?(".rb")
@@ -15,8 +15,8 @@ end
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each { |f| require f }
 
 RSpec.configure do |config|
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
 end

data/spec/support/database_helper.rb

@@ -53,7 +53,8 @@ module DatabaseHelper
         {name: :updated_at, type: :datetime},
         {name: :admin, type: :tinyint}
       ],
-      indexes: [:organization_id, :email])
+      indexes: [:organization_id, :email]
+    )
 
     @db.tables.create(
       :user_passports,
@@ -64,7 +65,8 @@ module DatabaseHelper
       ],
       indexes: [
         :user_id
-      ])
+      ]
+    )
 
     @db.tables.create(
       :persons,
@@ -72,7 +74,8 @@ module DatabaseHelper
         {name: :id, type: :int, primarykey: true, autoincr: true},
         {name: :user_id, type: :int}
       ],
-      indexes: [:user_id])
+      indexes: [:user_id]
+    )
 
     @db.tables.create(
       :roles,

data/spec/test_classes/user.rb

@@ -24,11 +24,12 @@ class User < BazaModels::Model
   # Used to test callbacks.
   BazaModels::Model::CALLBACK_TYPES.each do |callback_type|
     attr_reader "#{callback_type}_called"
+
     __send__(callback_type, :add_callback, callback_type)
   end
 
   def self.ransackable_scopes(_auth_object = nil)
-    %i(created_at_since)
+    %i[created_at_since]
   end
 
 private