baza_models 0.0.9 → 0.0.14

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
@@ -162,7 +180,7 @@ describe "BazaModels::Model" do
   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
@@ -210,4 +228,29 @@ describe "BazaModels::Model" do
     user = User.new("email" => "test@example.com")
     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!
+
+      user.update!(email: "test2@example.com")
+
+      expect(user.email_before_last_save).to eq "test@example.com"
+    end
+  end
+
+  describe "#will_save_change_to_attribute?" do
+    it "returns true if the attribute will change" do
+      user.save!
+      user.email = "test2@example.com"
+      expect(user.will_save_change_to_email?).to eq true
+    end
+  end
 end

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

@@ -1,12 +1,9 @@
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
-
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 $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")
@@ -18,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baza_models
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.14
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2021-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array_enumerator
@@ -16,142 +16,142 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: baza
+  name: auto_autoloader
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.21
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.21
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: string-cases
+  name: baza
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: auto_autoloader
+  name: html_gen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: html_gen
+  name: simple_delegate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: simple_delegate
+  name: string-cases
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: best_practice_project
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: jdbc-sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: juwelier
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: orm_adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jdbc-sqlite3
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: best_practice_project
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -210,18 +210,46 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.37.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.37.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: orm_adapter
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -246,6 +274,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -290,7 +319,7 @@ files:
 - 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
@@ -314,7 +343,6 @@ files:
 - 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
@@ -343,8 +371,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.0
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: ActiveRecord like models for the Baza database framework