better_record 0.20.2 → 0.21.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ca398ddfa56296c0537b21aa7c83b003a74c507c59dcc1485746c9779f86102
-  data.tar.gz: f74f6161b0289e13d2c3782da0c76f97dd3d133196d5d3f32d077dac303ac8af
+  metadata.gz: 521ff1e0cbdf88a48e82d12f5c2fa5f209f69713cac846119d04a8c251fc6395
+  data.tar.gz: 19a85f7f166cd00068d4798917223ec4780178a08bb7734d700d146e0742c193
 SHA512:
-  metadata.gz: d3c8c042446cbd69db0e8bb546db34d813877141eb33159ad0db07304875ec48579848ad5fd32c829a6406c0c58014740c47987b76937a61785c0f43865b680f
-  data.tar.gz: 77eee27b978463e0a80fee412c1ac2d2bca757fdab7c33c9fbcaa14d8de90b1a9f75da8af0873462e8f58a26047ad04a43ddb624ce9a44a42499ddd1d0a5398d
+  metadata.gz: f4d05dad7c7fb940210c0dd227de208376f56433aa7e9135979253c128307bc6a35b135f09df258299f7ddf31f550306c4f9747f6e48e336cf630b0bfe1725d0
+  data.tar.gz: 1fdfcac88985fc30d470377deed92feb8f696ca765cc6ec37ee330a1f45a4e34654ae7bfe0570439ddd90f5f343a57411b764102a709b176ae466f50a08d6464

data/app/models/better_record/model_concerns/has_validated_avatar.rb

@@ -187,10 +187,8 @@ module BetterRecord
           define_method :reloaded_record do
             self.class.find_by(id: self.id)
           end
-
         end
       end
-
     end
   end
 end

data/config/initializers/active_record/three_state_type.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+ActiveRecord::Type.register(:three_state, BetterRecord::ThreeState::Type)

data/db/migrate/20190209033946_update_better_record_audit_functions.rb

@@ -1,12 +1,15 @@
 class UpdateBetterRecordAuditFunctions < ActiveRecord::Migration[5.2]
   def up
-    last_event = BetterRecord::LoggedAction.count
-
     execute <<-SQL
       ALTER TABLE #{BetterRecord.db_audit_schema}.logged_actions
       RENAME TO old_logged_actions
     SQL
 
+    ola = Class.new(BetterRecord::LoggedAction)
+    ola.table_name = "#{BetterRecord.db_audit_schema}.old_logged_actions"
+
+    last_event = ola.count + 1
+
     sql = ""
     source = File.new(BetterRecord::Engine.root.join('db', 'postgres-audit-v2-table.psql'), "r")
     while (line = source.gets)

data/db/migrate/20190416215152_add_three_state_boolean_type.rb

@@ -0,0 +1,19 @@
+class AddThreeStateBooleanType < ActiveRecord::Migration[5.2]
+  def up
+  end
+  def up
+    execute <<-SQL
+      DO $$
+        BEGIN
+          IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'three_state') THEN
+            CREATE TYPE three_state AS ENUM ('Y', 'N', 'U');
+          END IF;
+        END
+      $$;
+    SQL
+  end
+
+  def down
+    execute "DROP TYPE IF EXISTS three_state;"
+  end
+end

data/lib/better_record.rb

@@ -86,8 +86,10 @@ module BetterRecord
   self.token_send_as_arg = Boolean.strict_parse(ENV.fetch('BR_TOKEN_AS_ARG') { false })
 end
 
+require "#{File.expand_path(__dir__)}/better_record/custom_type.rb"
+
 Dir.glob("#{File.expand_path(__dir__)}/better_record/*.rb").each do |d|
-  require d unless (d =~ /fake/)
+  require d unless (d =~ /fake|custom_type/)
 end
 
 ActiveSupport.on_load(:active_record) do
@@ -103,6 +105,7 @@ ActiveSupport.on_load(:active_record) do
         include BetterRecord::ExchangeRateInteger::TableDefinition
         include BetterRecord::Gender::TableDefinition
         include BetterRecord::MoneyInteger::TableDefinition
+        include BetterRecord::ThreeState::TableDefinition
       end
     end
   end

data/lib/better_record/batches.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 # frozen_string_literal: true
 
 module BetterRecord

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

@@ -15,13 +15,15 @@ module BetterRecord
         end
 
         def normalize_attribute_value(attr_name, value)
-          case type_for_attribute(attr_name)
+          case t = type_for_attribute(attr_name)
           when ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Array
             [value].flatten.select(&:present?)
           when ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Jsonb
             value.presence || {}
           when ActiveRecord::Type::Boolean
             BetterRecord.strict_booleans ? Boolean.strict_parse(value) : Boolean.parse(value)
+          when BetterRecord::CustomType
+            t.class.normalize_type_value(value)
           else
             value.presence
           end

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

@@ -29,7 +29,7 @@ module ActiveRecord
           private
             def register_domain_type(row)
               if (in_reg = check_registry(row['typname']))
-                register row['oid'], ActiveRecord::Type.registry.lookup(in_reg.send :name)
+                register row['oid'], in_reg
               elsif base_type = @store.lookup(row["typbasetype"].to_i)
                 register row["oid"], base_type
               else
@@ -38,23 +38,24 @@ module ActiveRecord
             end
 
             def register_enum_type(row)
-              enum_val = OID::Enum.new
-              enum_val.value_array = row['enumlabel'][1..-2].split(',').presence
-              enum_val.value_array.map!(&:to_i) if enum_val.value_array.all? {|v| v =~ /^[0-9]+$/}
 
-              enum_val.type_override = (val = check_registry(row['typname'])) && val.__send__(:name)
+              if (reg_val = check_registry(row['typname'])).is_a?(BetterRecord::CustomType)
+                register row['oid'], reg_val
+              else
+                enum_val = OID::Enum.new
+                enum_val.value_array = row['enumlabel'][1..-2].split(',').presence
+                enum_val.value_array.map!(&:to_i) if enum_val.value_array.all? {|v| v =~ /^[0-9]+$/}
+
+                enum_val.type_override = (reg_val && row['typname'].to_sym).presence
 
-              register row["oid"], enum_val
+                register row["oid"], enum_val
+              end
             end
 
             def check_registry(name)
-              ActiveRecord::Type.registry.__send__(:registrations).find do |type|
-                if type.matches?(name.to_sym)
-                  true
-                elsif type.matches?(name)
-                  true
-                end
-              end
+              ActiveRecord::Type.registry.lookup(name.to_sym)
+            rescue
+              nil
             end
 
         end

data/lib/better_record/custom_type.rb

@@ -0,0 +1,43 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+module BetterRecord
+  class CustomType < ActiveRecord::Type::Value
+    def self.normalize_type_value(value)
+      raise "Method Not Implemented"
+    end
+
+    def self.cast(value)
+      self.normalize_type_value(value)
+    end
+
+    def self.deserialize(value)
+      self.normalize_type_value(value)
+    end
+
+    def self.serialize(value)
+      self.normalize_type_value(value)
+    end
+
+    alias :super_cast :cast
+    alias :super_deserialize :deserialize
+    alias :super_serialize :serialize
+
+    def cast(value)
+      super_cast(self.class.cast(value))
+    end
+
+    def deserialize(value)
+      super_deserialize(self.class.deserialize(value))
+    end
+
+    def serialize(value)
+      super_serialize(self.class.serialize(value))
+    end
+
+    private
+      def normalize_type_value(value)
+        self.class.normalize_type_value(value)
+      end
+  end
+end

data/lib/better_record/encoder.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 # frozen_string_literal: true
 
 module BetterRecord

data/lib/better_record/engine.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 # frozen_string_literal: true
 
 module BetterRecord

data/lib/better_record/exchange_rate_integer.rb

@@ -1,8 +1,25 @@
+# encoding: utf-8
 # frozen_string_literal: true
+
 require 'store_as_int'
 
 module BetterRecord
   module ExchangeRateInteger
+
+    def self.convert_to_exchange_rate(value)
+      return StoreAsInt::ExchangeRate.new(0) unless value
+      if (!value.kind_of?(Numeric))
+        begin
+          exchange_rate_to_i = (value.gsub(/\%/, '').presence || 0).to_d * StoreAsInt::ExchangeRate.base
+          StoreAsInt::ExchangeRate.new(exchange_rate_to_i.to_i)
+        rescue
+          StoreAsInt::ExchangeRate.new
+        end
+      else
+        StoreAsInt::ExchangeRate.new(value)
+      end
+    end
+
     module TableDefinition
       def exchange_rate_integer(*args, **opts)
         args.each do |name|
@@ -11,33 +28,14 @@ module BetterRecord
       end
     end
 
-    class Type < ActiveRecord::Type::Value
-      def cast(value)
-        convert_to_exchange_rate(value)
-      end
-
-      def deserialize(value)
-        super(convert_to_exchange_rate(value))
+    class Type < BetterRecord::CustomType
+      def self.normalize_type_value(value)
+        BetterRecord::ExchangeRateInteger.convert_to_exchange_rate(value)
       end
 
-      def serialize(value)
-        super(convert_to_exchange_rate(value).value)
+      def self.serialize(value)
+        normalize_type_value(value).value
       end
-
-      private
-        def convert_to_exchange_rate(value)
-          return StoreAsInt::ExchangeRate.new(0) unless value
-          if (!value.kind_of?(Numeric))
-            begin
-              exchange_rate_to_i = (value.gsub(/\%/, '').presence || 0).to_d * StoreAsInt::ExchangeRate.base
-              StoreAsInt::ExchangeRate.new(exchange_rate_to_i.to_i)
-            rescue
-              StoreAsInt::ExchangeRate.new
-            end
-          else
-            StoreAsInt::ExchangeRate.new(value)
-          end
-        end
     end
   end
 end

data/lib/better_record/fake_redis.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 # frozen_string_literal: true
 
 module BetterRecord

data/lib/better_record/gender.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 # frozen_string_literal: true
 
 module BetterRecord
@@ -14,9 +15,20 @@ module BetterRecord
       u: 'U',
       U: 'U',
       unknown: 'U',
-      Unknown: 'F'
+      Unknown: 'U'
     }.freeze
 
+    def self.convert_to_gender(value)
+      case value.to_s
+      when /^[Ff]/
+        'F'
+      when /^[Mm]/
+        'M'
+      else
+        'U'
+      end
+    end
+
     module TableDefinition
       def gender(*args, **opts)
         args.each do |name|
@@ -25,31 +37,10 @@ module BetterRecord
       end
     end
 
-    class Type < ActiveRecord::Type::Value
-
-      def cast(value)
-        convert_to_gender(value)
-      end
-
-      def deserialize(value)
-        super(convert_to_gender(value))
-      end
-
-      def serialize(value)
-        super(convert_to_gender(value))
+    class Type < BetterRecord::CustomType
+      def self.normalize_type_value(value)
+        BetterRecord::Gender.convert_to_gender(value)
       end
-
-      private
-        def convert_to_gender(value)
-          case value.to_s
-          when /[Ff]/
-            'F'
-          when /[Mm]/
-            'M'
-          else
-            'U'
-          end
-        end
     end
   end
 end

data/lib/better_record/jwt.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 # frozen_string_literal: true
 
 require 'jwt'

data/lib/better_record/money_integer.rb

@@ -3,6 +3,20 @@ require 'store_as_int'
 
 module BetterRecord
   module MoneyInteger
+    def self.convert_to_money(value)
+      return StoreAsInt::Money.new(0) unless value
+      if (!value.kind_of?(Numeric))
+        begin
+          dollars_to_cents = (value.gsub(/\$/, '').presence || 0).to_d * StoreAsInt::Money.base
+          StoreAsInt::Money.new(dollars_to_cents.to_i)
+        rescue
+          StoreAsInt::Money.new
+        end
+      else
+        StoreAsInt::Money.new(value)
+      end
+    end
+
     module TableDefinition
       def money_integer(*args, **opts)
         args.each do |name|
@@ -11,33 +25,14 @@ module BetterRecord
       end
     end
 
-    class Type < ActiveRecord::Type::Value
-      def cast(value)
-        convert_to_money(value)
+    class Type < BetterRecord::CustomType
+      def self.normalize_type_value(value)
+        BetterRecord::MoneyInteger.convert_to_money(value)
       end
 
-      def deserialize(value)
-        super(convert_to_money(value))
+      def self.serialize(value)
+        normalize_type_value(value).value
       end
-
-      def serialize(value)
-        super(convert_to_money(value).value)
-      end
-
-      private
-        def convert_to_money(value)
-          return StoreAsInt::Money.new(0) unless value
-          if (!value.kind_of?(Numeric))
-            begin
-              dollars_to_cents = (value.gsub(/\$/, '').presence || 0).to_d * StoreAsInt::Money.base
-              StoreAsInt::Money.new(dollars_to_cents.to_i)
-            rescue
-              StoreAsInt::Money.new
-            end
-          else
-            StoreAsInt::Money.new(value)
-          end
-        end
     end
   end
 end

data/lib/better_record/three_state.rb

@@ -0,0 +1,66 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+module BetterRecord
+  module ThreeState
+    ENUM = {
+      Y: 'Y',
+      y: 'Y',
+      Yes: 'Y',
+      yes: 'Y',
+      T: 'Y',
+      t: 'Y',
+      True: 'Y',
+      true: 'Y',
+      true => 'Y',
+      N: 'N',
+      n: 'N',
+      No: 'N',
+      no: 'N',
+      F: 'N',
+      f: 'N',
+      False: 'N',
+      false: 'N',
+      false => 'N',
+      U: 'U',
+      u: 'U',
+      Unknown: 'U',
+      unknown: 'U',
+    }.freeze
+
+    TITLECASE = {
+      'Y' => 'Yes',
+      'N' => 'No',
+      'U' => 'Unknown',
+    }.freeze
+
+    def self.titleize(category)
+      TITLECASE[convert_to_three_state(category) || 'U']
+    end
+
+    def self.convert_to_three_state(value)
+      case value.to_s.downcase
+      when /^(?:y|t(rue)?$)/
+        'Y'
+      when /^(?:n|f(alse)?$)/
+        'N'
+      else
+        'U'
+      end
+    end
+
+    module TableDefinition
+      def three_state(*args, **opts)
+        args.each do |name|
+          column name, :three_state, **opts
+        end
+      end
+    end
+
+    class Type < BetterRecord::CustomType
+      def self.normalize_type_value(value)
+        BetterRecord::ThreeState.convert_to_three_state(value)
+      end
+    end
+  end
+end

data/lib/better_record/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.20.2
+  version: 0.21.2
 platform: ruby
 authors:
 - Sampson Crowley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-03 00:00:00.000000000 Z
+date: 2019-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -251,6 +251,7 @@ files:
 - config/initializers/active_record/exchange_rate_integer_type.rb
 - config/initializers/active_record/gender_type.rb
 - config/initializers/active_record/money_integer_type.rb
+- config/initializers/active_record/three_state_type.rb
 - config/initializers/active_support/time_with_zone.rb
 - config/initializers/concerns.rb
 - config/initializers/core_ext/date.rb
@@ -272,6 +273,7 @@ files:
 - db/migrate/20190123225641_add_exchange_rate_integer_type.rb
 - db/migrate/20190209033946_update_better_record_audit_functions.rb
 - db/migrate/20190209195134_audit_trigger_v3.rb
+- db/migrate/20190416215152_add_three_state_boolean_type.rb
 - db/postgres-audit-trigger.psql
 - db/postgres-audit-v2-table.psql
 - db/postgres-audit-v2-trigger.psql
@@ -290,6 +292,7 @@ files:
 - lib/better_record/concerns/controllers/authenticatable.rb
 - lib/better_record/concerns/controllers/sessionable.rb
 - lib/better_record/concerns/controllers/uploadable.rb
+- lib/better_record/custom_type.rb
 - lib/better_record/encoder.rb
 - lib/better_record/engine.rb
 - lib/better_record/exchange_rate_integer.rb
@@ -311,6 +314,7 @@ files:
 - lib/better_record/rspec/extensions/required_column.rb
 - lib/better_record/tasks/better_record/install.rake
 - lib/better_record/tasks/spec/attributes.rake
+- lib/better_record/three_state.rb
 - lib/better_record/version.rb
 - lib/core_ext/array.rb
 - lib/core_ext/boolean.rb