better_record 0.16.1 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9da7dfa5f4edc6d8389cb2e1f8599f84629d91ca8482d54cfe7bb2eac708c32
-  data.tar.gz: d3edd96851b2af73067d40f5e4443659a09b6735efe483b5090ec16f1f7d263c
+  metadata.gz: 81f5e207070f67c49384c88765d2420575e8ae8c97f4deb8ce6018a7e0d87efb
+  data.tar.gz: dfcb23a181c8074ff08dccd0a5a7b76c6676a92ffca711a860adb313a56c1b98
 SHA512:
-  metadata.gz: 0d139bab289cdcb3df7503accd7a78a79d4a016fbfd3b1ea167d01716c0837c69bfb1b4fe661cb40c9f84407d7cef82ad12e15306ecf786949ab6f3c7886bb53
-  data.tar.gz: 3fc5dba27275c1cecb374809e5d8ac5f1c761cb3ed6d415b4c7bd6ca7b7b253736738b3b17fd23a28f20fd114958fa794f8bd2a069c29b7580fc7c37e006cb1f
+  metadata.gz: 8eda452e19969b7b66e6ea6d823c765598698d458cdb51bd9a11f9e279bae46b6b449bf39a309051070028d90514f676997c5c2557c647f2a875a11914a01a09
+  data.tar.gz: 54f634bfd2833292510c7f6cc0041310ba8a9c5456948acb152f3b00c24109e6a3528168009c5a95ea017d8fc972291e76a44195ad17a437a231f92522739010

data/app/models/better_record/attachment_validation.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module BetterRecord
-  class AttachmentValidation < ApplicationRecord
+  class AttachmentValidation < Base
     # == Constants ============================================================
 
     # == Attributes ===========================================================
@@ -12,13 +12,14 @@ module BetterRecord
     belongs_to :attachment,
       class_name: 'ActiveStorage::Attachment',
       inverse_of: :validations
-      
+
     ActiveStorage::Attachment.has_many :validations,
       class_name: 'BetterRecord::AttachmentValidation',
       foreign_key: :attachment_id,
       inverse_of: :attachment,
       dependent: :destroy
     # == Validations ==========================================================
+    validates_presence_of :name
 
     # == Scopes ===============================================================
 
@@ -27,6 +28,9 @@ module BetterRecord
     # == Boolean Class Methods ================================================
 
     # == Class Methods ========================================================
+    # def self.boolean_columns
+    #   @@boolean_columns ||= %i[ ran ].freeze
+    # end
 
     # == Boolean Methods ======================================================
 

data/app/models/better_record/table_size.rb

@@ -51,19 +51,27 @@ module BetterRecord
     # == Boolean Class Methods ================================================
 
     # == Class Methods ========================================================
+    class << self
+      alias :super_all :all
+    end
+
     def self.find_by(*args)
       reload_data
       super *args
     end
 
     def self.all
-      reload_data if last_updated.blank? || (super.first.last_updated > 1.hour.ago)
+      reload_data if self.last_updated.blank? || (self.last_updated < 1.hour.ago)
       super
     end
 
     def self.reload_data
-      @@last_updated ||= Time.now
       connection.execute UPDATE_TABLE_SIZES_SQL
+      self.last_updated = Time.now
+    end
+
+    def self.last_updated
+      @@last_updated ||= super_all.first&.updated_at
     end
 
     # def self.default_print

data/db/migrate/20190107202602_add_updated_at_to_better_record_table_sizes.rb

@@ -0,0 +1,5 @@
+class AddUpdatedAtToBetterRecordTableSizes < ActiveRecord::Migration[5.2]
+  def change
+    add_column("#{BetterRecord.db_audit_schema}.table_sizes", :updated_at, :datetime, default: -> { 'NOW()'})
+  end
+end

data/lib/better_record/concerns/active_record_extensions/base_extensions.rb

@@ -167,7 +167,7 @@ module BetterRecord
 
       def set_booleans
         self.class.boolean_columns.each do |nm|
-          self.__send__("#{nm}=", __send__("#{nm}=", !!Boolean.parse(__send__ nm)))
+          __send__("#{nm}=", !!Boolean.parse(__send__ nm))
         end
         true
       end

data/lib/better_record/concerns/active_record_extensions/base_extensions/attribute_methods/write.rb

@@ -21,6 +21,9 @@ module BetterRecord
           when ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Jsonb
             value.presence || {}
           when ActiveRecord::Type::Boolean
+            puts attr_name, value, type_for_attribute(attr_name).is_a?(ActiveRecord::Type::Boolean),BetterRecord.strict_booleans, (
+              BetterRecord.strict_booleans ? Boolean.strict_parse(value) : Boolean.parse(value)
+            )
             BetterRecord.strict_booleans ? Boolean.strict_parse(value) : Boolean.parse(value)
           else
             value.presence

data/lib/better_record/rspec/extensions/boolean_column.rb

@@ -3,51 +3,60 @@
 module BetterRecord
   module Rspec
     module Extensions
-      def boolean_column(factory_name, column_name, default_val = false)
+      def boolean_column(factory_name, column_name, default: false, keep_boolean_strictness: true)
+        b_state = BetterRecord.strict_booleans || false
+        
         describe column_name.to_s do
-          let(:record) { build(factory_name) }
+          let(:record) { build(*factory_name) }
 
-          it "cannot be nil in the database" do
-            stubbed = record.dup
-            allow(stubbed).to receive(:set_booleans)
-
-            stubbed.__send__"#{column_name}=", nil
-            expect(stubbed.valid?).to be false
-            expect(stubbed.errors[column_name]).to include("must be true or false")
-            expect { stubbed.save(validate: false) }.to raise_error(ActiveRecord::NotNullViolation)
-          end
-
-          it "defaults to '#{default_val}'" do
+          it "defaults to '#{default}'" do
             empty_record = record.class.new
-            expect(empty_record.__send__ column_name).to be default_val
+            expect(empty_record.__send__ column_name).to be default
           end
+          if keep_boolean_strictness
+            it "parses to a #{b_state ? 'two' : 'three'}-state boolean" do
+              [ nil, 0, 1, "true", "false", true, false ].each do |val|
+                record.__send__"#{column_name}=", val
+
+                expect(record.__send__ column_name).to eq(Boolean.__send__(b_state ? :strict_parse : :parse, val))
+              end
+            end
+          else
+            context 'loose booleans' do
+              before do
+                BetterRecord.strict_booleans = false
+              end
 
-          it "will parse to boolean on save" do
-            record.__send__"#{column_name}=", nil
-            record.save
-            expect(record.__send__ column_name).to be false
+              after do
+                BetterRecord.strict_booleans = b_state
+              end
 
-            record.__send__"#{column_name}=", 0
-            record.save
-            expect(record.__send__ column_name).to be false
+              it "parses to a three-state boolean" do
+                [ nil, 0, 1, "true", "false", true, false ].each do |val|
+                  record.__send__"#{column_name}=", val
 
-            record.__send__"#{column_name}=", 'false'
-            record.save
-            expect(record.__send__ column_name).to be false
+                  expect(record.__send__ column_name).to eq(Boolean.parse(val))
+                end
+              end
+            end
 
-            record.__send__"#{column_name}=", 1
-            record.save
-            expect(record.__send__ column_name).to be true
+            context 'strict booleans' do
+              before do
+                BetterRecord.strict_booleans = true
+              end
 
-            record.__send__"#{column_name}=", 'asdf'
-            record.save
-            expect(record.__send__ column_name).to be true
+              after do
+                BetterRecord.strict_booleans = b_state
+              end
 
-            record.__send__"#{column_name}=", 'true'
-            record.save
-            expect(record.__send__ column_name).to be true
+              it "parses to a two-state boolean" do
+                [ nil, 0, 1, "true", "false", true, false ].each do |val|
+                  record.__send__"#{column_name}=", val
 
-            record.destroy
+                  expect(record.__send__ column_name).to eq(Boolean.strict_parse(val))
+                end
+              end
+            end
           end
         end
       end

data/lib/better_record/rspec/extensions/has_valid_factory.rb

@@ -8,7 +8,7 @@ module BetterRecord
           records = []
           count = (count.to_i == 0) ? 1 : count.to_i
           count.times do
-            test_factory = build(factory_name)
+            test_factory = build(*factory_name)
             unless test_factory.valid?
               puts test_factory.errors.full_messages
             end

data/lib/better_record/rspec/extensions/optional_column.rb

@@ -5,7 +5,7 @@ module BetterRecord
     module Extensions
       def optional_column(factory_name, column_name, &blk)
         describe column_name.to_s do
-          let(:record) { build(factory_name) }
+          let(:record) { build(*factory_name) }
 
           it "is optional" do
             record.__send__"#{column_name}=", nil

data/lib/better_record/rspec/extensions/required_column.rb

@@ -3,9 +3,9 @@
 module BetterRecord
   module Rspec
     module Extensions
-      def required_column(factory_name, column_name, unique = false, in_app_only = false, &blk)
+      def required_column(factory_name, column_name, unique: false, in_app_only: false, &blk)
         describe column_name.to_s do
-          let(:record) { build(factory_name) }
+          let(:record) { build(*factory_name) }
 
           it "is required" do
             record.__send__"#{column_name}=", nil

data/lib/better_record/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BetterRecord
-  VERSION = '0.16.1'
+  VERSION = '0.17.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.17.0
 platform: ruby
 authors:
 - Sampson Crowley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-04 00:00:00.000000000 Z
+date: 2019-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -265,6 +265,7 @@ files:
 - db/migrate/20180518042060_create_better_record_custom_types.rb
 - db/migrate/20180518042070_create_better_record_table_sizes.rb
 - db/migrate/20181228204403_create_better_record_attachment_validations.rb
+- db/migrate/20190107202602_add_updated_at_to_better_record_table_sizes.rb
 - db/postgres-audit-trigger.psql
 - lib/better_record.rb
 - lib/better_record/batches.rb