better_record 0.11.5 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87be3ec376e667eade78445c2f216bd623e854a0b964cd8584e91dc0c3147daf
-  data.tar.gz: dbdb4945a8dbcf3d98ca030c8b2e0310dc71a596c90289db79f17fc87b6bf33f
+  metadata.gz: 9dc9a42cf9a09d230c0793e2d6561c8bb827d7d41e606223300596109ffdc709
+  data.tar.gz: 57fea38332475bba21425a7abf25727795e445cb1ebdb595f21e1918f8309b58
 SHA512:
-  metadata.gz: 04bf71457cc94a8b17528c73abca67fb7c3b0a89c15969f97d61bc371cb824572248698bbe743ae392ae9a60db4b272b1d8c47202e1c4d1f7f8eac15a65e86cf
-  data.tar.gz: 65f90e4eba84826cbcb4066e5181862fe6b70330334a479b71d2c9cf7e9edef1182a1616e5bde9003fb9e2ab25997dda78baff1b900cc1a09b4077fda403164f
+  metadata.gz: 9b299259b22e7fa34cac8cffc35cffbb66ba28da90c9252b83ba1d2437bd33beed80b5036d4c64dbc6f587aeab088475d317f8dc536e6aaeadfe4a763c9f4f89
+  data.tar.gz: 0c5e23a2aaec21d11dbbf10eaf1db5691d053340438c63541e7cb24825a2d2f25b353bb6c89ae8c1b31cd77a9568dda81e4ca87878161e1fa6fc3627d0b43f07

data/app/models/better_record/base.rb

@@ -46,7 +46,7 @@ module BetterRecord
     def get_hashed_string(str)
       self.class.get_hashed_string(str)
     end
-    
+
     def indifferent_attributes
       attributes.with_indifferent_access
     end

data/config/initializers/active_record/money_integer_type.rb

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

data/db/migrate/20180518042060_create_better_record_custom_types.rb

@@ -0,0 +1,29 @@
+class CreateBetterRecordCustomTypes < 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
+
+    execute <<-SQL
+      DO $$
+        BEGIN
+          IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'money_integer') THEN
+            CREATE DOMAIN money_integer AS INTEGER NOT NULL DEFAULT 0;
+          END IF;
+        END
+      $$;
+    SQL
+
+  end
+
+  def down
+    execute "DROP DOMAIN IF EXISTS money_integer;"
+    execute "DROP TYPE IF EXISTS gender;"
+  end
+end

data/lib/better_record.rb

@@ -89,6 +89,7 @@ ActiveSupport.on_load(:active_record) do
     module ConnectionAdapters
       class TableDefinition
         include BetterRecord::Gender::TableDefinition
+        include BetterRecord::MoneyInteger::TableDefinition
       end
     end
   end

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

@@ -27,23 +27,36 @@ module ActiveRecord
 
         class TypeMapInitializer # :nodoc:
           private
+            def register_domain_type(row)
+              if (in_reg = check_registry(row['typname']))
+                register row['oid'], ActiveRecord::Type.registry.lookup(in_reg.send :name)
+              elsif base_type = @store.lookup(row["typbasetype"].to_i)
+                register row["oid"], base_type
+              else
+                warn "unknown base type (OID: #{row["typbasetype"]}) for domain #{row["typname"]}."
+              end
+            end
+
             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)
+              enum_val.type_override = (val = check_registry(row['typname'])) && val.__send__(:name)
+
+              register row["oid"], enum_val
+            end
+
+            def check_registry(name)
+              ActiveRecord::Type.registry.__send__(:registrations).find do |type|
+                if type.matches?(name.to_sym)
                   true
-                elsif type.matches?(row['typname'])
-                  use_sym = false
+                elsif type.matches?(name)
                   true
                 end
-              end && (use_sym ? row['typname'].to_sym : row['typname'])
-
-              register row["oid"], enum_val
+              end
             end
+
         end
       end
     end
@@ -75,7 +88,7 @@ module ActiveRecord
           end
 
           if supports_ranges?
-            query += "GROUP BY 1,2,3,4,5,6,7,8"
+            query += " GROUP BY 1,2,3,4,5,6,7,8"
           end
 
           execute_and_clear(query, "SCHEMA", []) do |records|

data/lib/better_record/money_integer.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+require 'store_as_int'
+
+module BetterRecord
+  module MoneyInteger
+    module TableDefinition
+      def money_integer(*args, **opts)
+        args.each do |name|
+          column name, :money_integer, **opts
+        end
+      end
+    end
+
+    class Type < ActiveRecord::Type::Value
+      def cast(value)
+        convert_to_money(value)
+      end
+
+      def deserialize(value)
+        super(convert_to_money(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 * 100
+              StoreAsInt.money(dollars_to_cents.to_i)
+            rescue
+              StoreAsInt::Money.new
+            end
+          else
+            StoreAsInt.money(value)
+          end
+        end
+    end
+  end
+end

data/lib/better_record/version.rb

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

data/lib/core_ext/array.rb

@@ -6,4 +6,16 @@ class Array
     each {|v| hashed[v] = v.to_s}
     hashed
   end
+
+  def extract!
+    return to_enum(:extract!) { size } unless block_given?
+
+    extracted_elements = []
+
+    reject! do |element|
+      extracted_elements << element if yield(element)
+    end
+
+    extracted_elements
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.12.1
 platform: ruby
 authors:
 - Sampson Crowley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-13 00:00:00.000000000 Z
+date: 2018-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -246,7 +246,7 @@ files:
 - 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/active_record/money_integer_type.rb
 - config/initializers/concerns.rb
 - config/initializers/core_ext/date.rb
 - config/initializers/core_ext/integer.rb
@@ -259,7 +259,7 @@ files:
 - config/initializers/redis_store.rb
 - config/routes.rb
 - db/migrate/20180518042050_create_better_record_db_functions.rb
-- db/migrate/20180518042060_create_better_record_enum_types.rb
+- db/migrate/20180518042060_create_better_record_custom_types.rb
 - db/migrate/20180518042070_create_better_record_table_sizes.rb
 - db/postgres-audit-trigger.psql
 - lib/better_record.rb
@@ -282,6 +282,7 @@ files:
 - lib/better_record/inject_methods.rb
 - lib/better_record/jwt.rb
 - lib/better_record/migration.rb
+- lib/better_record/money_integer.rb
 - lib/better_record/polymorphic_override.rb
 - lib/better_record/railtie.rb
 - lib/better_record/relation.rb

data/config/initializers/active_record/money_type.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-class MoneyType < ActiveRecord::Type::Value
-  def cast(value)
-    convert_to_money(value)
-  end
-
-  def deserialize(value)
-    super(convert_to_money(value))
-  end
-
-  def serialize(value)
-    new_val = convert_to_money(value)
-    super(new_val ? new_val.value : nil)
-  end
-
-  private
-    def convert_to_money(value)
-      return nil unless value
-      if (!value.kind_of?(Numeric))
-        begin
-          dollars_to_cents = (value.gsub(/\$/, '').presence || 0).to_d * 100
-          StoreAsInt.money(dollars_to_cents.to_i)
-        rescue
-          StoreAsInt::Money.new
-        end
-      else
-        StoreAsInt.money(value)
-      end
-    end
-end
-
-ActiveRecord::Type.register(:money_column, MoneyType)

data/db/migrate/20180518042060_create_better_record_enum_types.rb

@@ -1,18 +0,0 @@
-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