better_record 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d98e0b7f54bd71ded48d966277be30e39f485f598f0322ad7479d852a0ddb6c
-  data.tar.gz: d6c108b373661e0513ef8fd3044a587ede56f38dea16cda8d135e132bb27f0ff
+  metadata.gz: a405b0c0c1a44d6f315d0c9f364f855b1702f8c476a1eb50d6987b97b318c1a9
+  data.tar.gz: f3bd70fccb3de3710f73529de507052f44d946662e7889426d1ae0ac3b13a2e1
 SHA512:
-  metadata.gz: 74489d67ad1f0ffb4454d92dbc789883c74f9dcbeb4b4255c3b0cfd752a9a90624442c853eacad355252476ee5cdd661484a39f978056f01e4dd0ce347daa4a4
-  data.tar.gz: ae840a61e2d9e697ecf2d130ad037fa569f75eee558a4b05013514b6055031b72bfbc82cbb03a0b6825bf0eb2f50058774310161a05985cc61c47eda2b70d6cf
+  metadata.gz: cf1a31b4a42734e665b44d2cd9e40ac0a3023f99dc888bfb160982d7eabe22df3e892539e667c14d2a8b7c8d7df277c0728f02ef724de69c561fe9ecb21bfe7d
+  data.tar.gz: c133b0a2f00e425b146a7de7822269e0c73d4c28901804ad421441cb09b28d889b3da20525a2347f1fcdc99198e74ee9135057a1ae9dd05493345d0126950cb5

data/app/models/better_record/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BetterRecord
   class Base < ActiveRecord::Base
     self.abstract_class = true
@@ -28,6 +30,9 @@ module BetterRecord
     # == Boolean Class Methods ================================================
 
     # == Class Methods ========================================================
+    def self.gender_enum(col)
+      enum col, BetterRecord::Gender::ENUM
+    end
 
     # == Boolean Methods ======================================================
 
@@ -45,5 +50,7 @@ module BetterRecord
         super()
       end
     end
+
+
   end
 end

data/config/initializers/active_record/gender_type.rb

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

data/config/initializers/active_record/money_type.rb

@@ -2,7 +2,6 @@
 
 class MoneyType < ActiveRecord::Type::Value
   def cast(value)
-    return nil unless value
     convert_to_money(value)
   end
 

data/db/migrate/20180518042060_create_better_record_enum_types.rb

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

data/lib/better_record.rb

@@ -82,5 +82,10 @@ ActiveSupport.on_load(:active_record) do
     class Migration
       include BetterRecord::Migration
     end
+    module ConnectionAdapters
+      class TableDefinition
+        include BetterRecord::Gender::TableDefinition
+      end
+    end
   end
 end

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

@@ -0,0 +1,87 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module PostgreSQL
+      module OID # :nodoc:
+        class Enum < Type::Value
+          attr_accessor :value_array, :type_override
+
+          def cast(value)
+            value_array ? value_array.find {|v| /^#{v}/i =~ value.to_s } : value.to_s
+          end
+
+          def type
+            type_override || :enum
+          end
+
+          private
+
+            def cast_value(value)
+              value_array ? value_array.find {|v| /^#{v}/i =~ value.to_s } : value.to_s
+            end
+        end
+        # This class uses the data from PostgreSQL pg_type table to build
+        # the OID -> Type mapping.
+        #   - OID is an integer representing the type.
+        #   - Type is an OID::Type object.
+        # This class has side effects on the +store+ passed during initialization.
+
+        class TypeMapInitializer # :nodoc:
+          private
+            def register_enum_type(row)
+              use_sym = true
+              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 = ActiveRecord::Type.registry.__send__(:registrations).find do |type|
+                if type.matches?(row['typname'].to_sym)
+                  true
+                elsif type.matches?(row['typname'])
+                  use_sym = false
+                  true
+                end
+              end && (use_sym ? row['typname'].to_sym : row['typname'])
+
+              register row["oid"], enum_val
+            end
+        end
+      end
+    end
+
+    class PostgreSQLAdapter
+      private
+        def load_additional_types(oids = nil)
+          initializer = OID::TypeMapInitializer.new(type_map)
+
+          if supports_ranges?
+            query = <<-SQL
+              SELECT t.oid, t.typname, t.typelem, t.typdelim, t.typinput, r.rngsubtype, t.typtype, t.typbasetype,
+                     array_agg(e.enumlabel) as enumlabel
+              FROM pg_type as t
+              LEFT JOIN pg_range as r ON t.oid = r.rngtypid
+              LEFT JOIN pg_catalog.pg_enum as e ON t.oid = e.enumtypid
+            SQL
+          else
+            query = <<-SQL
+              SELECT t.oid, t.typname, t.typelem, t.typdelim, t.typinput, t.typtype, t.typbasetype
+              FROM pg_type as t
+            SQL
+          end
+
+          if oids
+            query += "WHERE t.oid::integer IN (%s)" % oids.join(", ")
+          else
+            query += initializer.query_conditions_for_initial_load
+          end
+
+          if supports_ranges?
+            query += "GROUP BY 1,2,3,4,5,6,7,8"
+          end
+
+          execute_and_clear(query, "SCHEMA", []) do |records|
+            initializer.run(records)
+          end
+        end
+    end
+  end
+end

data/lib/better_record/gender.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module BetterRecord
+  module Gender
+    ENUM = {
+      F: 'F',
+      M: 'M',
+      f: 'F',
+      m: 'M',
+      female: 'F',
+      Female: 'F',
+      male: 'M',
+      Male: 'M',
+    }.freeze
+
+    module TableDefinition
+      def gender(*args, **opts)
+        args.each do |name|
+          column name, :gender, **opts
+        end
+      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))
+      end
+
+      private
+        def convert_to_gender(value)
+          case value.to_s
+          when /^[Mm]/
+            'M'
+          when /^[Ff]/
+            'F'
+          else
+            nil
+          end
+        end
+    end
+  end
+end

data/lib/better_record/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Sampson Crowley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2018-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -245,6 +245,7 @@ files:
 - app/views/better_record/table_sizes/index.html.erb
 - app/views/better_record/table_sizes/show.html.erb
 - app/views/layouts/better_record/application.html.erb
+- config/initializers/active_record/gender_type.rb
 - config/initializers/active_record/money_type.rb
 - config/initializers/concerns.rb
 - config/initializers/core_ext/date.rb
@@ -257,8 +258,9 @@ files:
 - config/initializers/mime_types.rb
 - config/initializers/redis_store.rb
 - config/routes.rb
-- db/migrate/20180725160802_create_better_record_db_functions.rb
-- db/migrate/20180725201614_create_better_record_table_sizes.rb
+- db/migrate/20180518042050_create_better_record_db_functions.rb
+- db/migrate/20180518042060_create_better_record_enum_types.rb
+- db/migrate/20180518042070_create_better_record_table_sizes.rb
 - db/postgres-audit-trigger.psql
 - lib/better_record.rb
 - lib/better_record/batches.rb
@@ -267,6 +269,7 @@ files:
 - lib/better_record/concerns/active_record_extensions/associations_extensions/builder_extensions/association_extensions.rb
 - lib/better_record/concerns/active_record_extensions/attribute_methods/write.rb
 - lib/better_record/concerns/active_record_extensions/base_extensions.rb
+- lib/better_record/concerns/active_record_extensions/connection_adapter_extensions.rb
 - lib/better_record/concerns/active_record_extensions/reflection_extensions.rb
 - lib/better_record/concerns/controllers/authenticatable.rb
 - lib/better_record/concerns/controllers/sessionable.rb
@@ -274,6 +277,7 @@ files:
 - lib/better_record/encoder.rb
 - lib/better_record/engine.rb
 - lib/better_record/fake_redis.rb
+- lib/better_record/gender.rb
 - lib/better_record/inject_methods.rb
 - lib/better_record/jwt.rb
 - lib/better_record/migration.rb