ardb 0.28.3 → 0.30.0

metadata

@@ -1,78 +1,114 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ardb
-version: !ruby/object:Gem::Version 
-  version: 0.28.3
+version: !ruby/object:Gem::Version
+  version: 0.30.0
 platform: ruby
-authors: 
+authors:
 - Kelly Redding
 - Collin Redding
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2016-08-18 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: assert
+date: 2022-01-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: much-style-guide
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.7
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.16.1
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.7
+- !ruby/object:Gem::Dependency
+  name: assert
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.19.8
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - &id003 !ruby/object:Gem::Version 
-        version: "3.2"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.19.8
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: much-plugin
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.2.0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: much-mixin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.5
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: scmd
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 3.0.2
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.5
+- !ruby/object:Gem::Dependency
+  name: scmd
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.5
   type: :runtime
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.5
 description: Activerecord database tools.
-email: 
+email:
 - kelly@kellyredding.com
 - collin.redding@me.com
-executables: 
+executables:
 - ardb
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
+- ".l.yml"
+- ".rubocop.yml"
+- ".ruby-version"
+- ".t.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -89,10 +125,7 @@ files:
 - lib/ardb/cli/commands.rb
 - lib/ardb/db_tests.rb
 - lib/ardb/default_order_by.rb
-- lib/ardb/has_slug.rb
 - lib/ardb/migration.rb
-- lib/ardb/migration_helpers.rb
-- lib/ardb/pg_json.rb
 - lib/ardb/record_spy.rb
 - lib/ardb/relation_spy.rb
 - lib/ardb/require_autoloaded_active_record_files.rb
@@ -104,13 +137,12 @@ files:
 - test/helper.rb
 - test/support/factory.rb
 - test/support/fake_schema.rb
-- test/support/postgresql/migrations/.gitkeep
-- test/support/postgresql/pg_json_migrations/20160519133432_create_pg_json_migrate_test.rb
+- test/support/postgresql/migrations/.keep
 - test/support/postgresql/schema.rb
 - test/support/postgresql/setup_test_db.rb
 - test/support/relative_require_test_db_file.rb
 - test/support/require_test_db_file.rb
-- test/system/pg_json_tests.rb
+- test/system/.keep
 - test/unit/adapter/base_tests.rb
 - test/unit/adapter/mysql_tests.rb
 - test/unit/adapter/postgresql_tests.rb
@@ -120,52 +152,45 @@ files:
 - test/unit/cli_tests.rb
 - test/unit/db_tests_tests.rb
 - test/unit/default_order_by_tests.rb
-- test/unit/has_slug_tests.rb
-- test/unit/migration_helpers_tests.rb
 - test/unit/migration_tests.rb
-- test/unit/pg_json_tests.rb
 - test/unit/record_spy_tests.rb
 - test/unit/relation_spy_tests.rb
 - test/unit/test_helpers_tests.rb
 - test/unit/use_db_default_tests.rb
 - tmp/.gitkeep
 homepage: http://github.com/redding/ardb
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
-post_install_message: 
+post_install_message:
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - &id007 
-    - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id007
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '2.5'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.3.5
+signing_key:
 specification_version: 4
 summary: Activerecord database tools.
-test_files: 
+test_files:
 - test/helper.rb
 - test/support/factory.rb
 - test/support/fake_schema.rb
-- test/support/postgresql/migrations/.gitkeep
-- test/support/postgresql/pg_json_migrations/20160519133432_create_pg_json_migrate_test.rb
+- test/support/postgresql/migrations/.keep
 - test/support/postgresql/schema.rb
 - test/support/postgresql/setup_test_db.rb
 - test/support/relative_require_test_db_file.rb
 - test/support/require_test_db_file.rb
-- test/system/pg_json_tests.rb
+- test/system/.keep
 - test/unit/adapter/base_tests.rb
 - test/unit/adapter/mysql_tests.rb
 - test/unit/adapter/postgresql_tests.rb
@@ -175,10 +200,7 @@ test_files:
 - test/unit/cli_tests.rb
 - test/unit/db_tests_tests.rb
 - test/unit/default_order_by_tests.rb
-- test/unit/has_slug_tests.rb
-- test/unit/migration_helpers_tests.rb
 - test/unit/migration_tests.rb
-- test/unit/pg_json_tests.rb
 - test/unit/record_spy_tests.rb
 - test/unit/relation_spy_tests.rb
 - test/unit/test_helpers_tests.rb

data/lib/ardb/has_slug.rb

@@ -1,107 +0,0 @@
-require 'much-plugin'
-
-module Ardb
-
-  module HasSlug
-    include MuchPlugin
-
-    DEFAULT_ATTRIBUTE    = :slug
-    DEFAULT_PREPROCESSOR = :downcase
-    DEFAULT_SEPARATOR    = '-'.freeze
-
-    plugin_included do
-      extend ClassMethods
-      include InstanceMethods
-
-      @ardb_has_slug_configs = Hash.new{ |h, k| h[k] = {} }
-    end
-
-    module ClassMethods
-
-      def has_slug(options = nil)
-        options ||= {}
-        raise(ArgumentError, "a source must be provided") unless options[:source]
-
-        attribute = (options[:attribute] || DEFAULT_ATTRIBUTE).to_sym
-        @ardb_has_slug_configs[attribute].merge!({
-          :source_proc       => options[:source].to_proc,
-          :preprocessor_proc => (options[:preprocessor] || DEFAULT_PREPROCESSOR).to_proc,
-          :separator         => options[:separator] || DEFAULT_SEPARATOR,
-          :allow_underscores => !!options[:allow_underscores]
-        })
-
-        # since the slug isn't written till an after callback we can't always
-        # validate presence of it
-        validates_presence_of(attribute, :on => :update)
-
-        if options[:skip_unique_validation] != true
-          validates_uniqueness_of(attribute, {
-            :case_sensitive => true,
-            :scope          => options[:unique_scope]
-          })
-        end
-
-        after_create :ardb_has_slug_generate_slugs
-        after_update :ardb_has_slug_generate_slugs
-      end
-
-      def ardb_has_slug_configs
-        @ardb_has_slug_configs
-      end
-
-    end
-
-    module InstanceMethods
-
-      private
-
-      def reset_slug(attribute = nil)
-        attribute ||= DEFAULT_ATTRIBUTE
-        self.send("#{attribute}=", nil)
-      end
-
-      def ardb_has_slug_generate_slugs
-        self.class.ardb_has_slug_configs.each do |attr_name, config|
-          slug_source = if !self.send(attr_name) || self.send(attr_name).to_s.empty?
-            self.instance_eval(&config[:source_proc])
-          else
-            self.send(attr_name)
-          end
-
-          generated_slug = Slug.new(slug_source, {
-            :preprocessor      => config[:preprocessor_proc],
-            :separator         => config[:separator],
-            :allow_underscores => config[:allow_underscores]
-          })
-          next if self.send(attr_name) == generated_slug
-          self.send("#{attr_name}=", generated_slug)
-          self.update_column(attr_name, generated_slug)
-        end
-      end
-
-    end
-
-    module Slug
-      def self.new(string, options = nil)
-        options ||= {}
-        preprocessor       = options[:preprocessor]
-        separator          = options[:separator]
-        allow_underscores  = options[:allow_underscores]
-        regexp_escaped_sep = Regexp.escape(separator)
-
-        slug = preprocessor.call(string.to_s.dup)
-        # Turn unwanted chars into the separator
-        slug.gsub!(/[^\w#{regexp_escaped_sep}]+/, separator)
-        # Turn underscores into the separator, unless allowing
-        slug.gsub!(/_/, separator) unless allow_underscores
-        # No more than one of the separator in a row.
-        slug.gsub!(/#{regexp_escaped_sep}{2,}/, separator)
-        # Remove leading/trailing separator.
-        slug.gsub!(/\A#{regexp_escaped_sep}|#{regexp_escaped_sep}\z/, '')
-        slug
-      end
-    end
-
-  end
-
-end

data/lib/ardb/migration_helpers.rb

@@ -1,77 +0,0 @@
-require 'ardb'
-
-module Ardb
-
-  module MigrationHelpers
-    module_function
-
-    def foreign_key(from_table, from_column, to_table, options={})
-      fk = ForeignKey.new(from_table, from_column, to_table, options)
-      execute(fk.add_sql)
-    end
-
-    def drop_foreign_key(*args)
-      from_table, from_column = args[0..1]
-      options = args.last.kind_of?(Hash) ? args.last : {}
-      fk = ForeignKey.new(from_table, from_column, nil, options)
-      execute(fk.drop_sql)
-    end
-
-    def remove_column_with_fk(table, column)
-      drop_foreign_key(table, column)
-      remove_column(table, column)
-    end
-
-    class ForeignKey
-      attr_reader :from_table, :from_column, :to_table, :to_column, :name, :adapter
-
-      def initialize(from_table, from_column, to_table, options=nil)
-        options ||= {}
-        @from_table  = from_table.to_s
-        @from_column = from_column.to_s
-        @to_table    = to_table.to_s
-        @to_column   = (options[:to_column] || 'id').to_s
-        @name        = (options[:name] || "fk_#{@from_table}_#{@from_column}").to_s
-        @adapter     = Ardb::Adapter.new(Ardb.config)
-      end
-
-      def add_sql
-        apply_data(@adapter.foreign_key_add_sql)
-      end
-
-      def drop_sql
-        apply_data(@adapter.foreign_key_drop_sql)
-      end
-
-      private
-
-      def apply_data(template_sql)
-        template_sql.
-          gsub(':from_table',  @from_table).
-          gsub(':from_column', @from_column).
-          gsub(':to_table',    @to_table).
-          gsub(':to_column',   @to_column).
-          gsub(':name',        @name)
-      end
-    end
-
-    # This file will setup the AR migration command recorder for being able to
-    # change our stuff, require it in an initializer
-
-    module RecorderMixin
-
-      def foreign_key(*args)
-        record(:foreign_key, args)
-      end
-
-      protected
-
-      def invert_foreign_key(args)
-        [ :drop_foreign_key, args ]
-      end
-
-    end
-
-  end
-
-end

data/lib/ardb/pg_json.rb

@@ -1,90 +0,0 @@
-require 'active_record'
-require 'active_support'
-
-# Allow ActiveRecord to work with PostgreSQL json/jsonb fields, which aren't
-# supported with ActiveRecord 3.2
-# https://github.com/romanbsd/activerecord-postgres-json/blob/master/lib/activerecord-postgres-json/activerecord.rb
-require 'active_record/connection_adapters/postgresql_adapter'
-
-module ActiveRecord
-  module ConnectionAdapters
-    PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:json]  = { :name => 'json' }
-    PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:jsonb] = { :name => 'jsonb' }
-
-    class PostgreSQLColumn < Column
-      # Adds the json type for the column.
-      def simplified_type_with_json(field_type)
-        case field_type
-        when 'json'
-          :json
-        when 'jsonb'
-          :jsonb
-        else
-          simplified_type_without_json(field_type)
-        end
-      end
-
-      alias_method_chain :simplified_type, :json
-
-      class << self
-        def extract_value_from_default_with_json(default)
-          case default
-          when "'{}'::json", "'{}'::jsonb"
-            '{}'
-          when "'[]'::json", "'[]'::jsonb"
-            '[]'
-          else
-            extract_value_from_default_without_json(default)
-          end
-        end
-
-        alias_method_chain :extract_value_from_default, :json
-      end
-
-    end
-
-    class TableDefinition
-      # Adds json type for migrations. So you can add columns to a table like:
-      #   create_table :people do |t|
-      #     ...
-      #     t.json :info
-      #     ...
-      #   end
-      def json(*args)
-        options = args.extract_options!
-        column_names = args
-        column_names.each { |name| column(name, 'json', options) }
-      end
-
-      def jsonb(*args)
-        options = args.extract_options!
-        column_names = args
-        column_names.each { |name| column(name, 'jsonb', options) }
-      end
-
-    end
-
-    class Table
-      # Adds json type for migrations. So you can add columns to a table like:
-      #   change_table :people do |t|
-      #     ...
-      #     t.json :info
-      #     ...
-      #   end
-      def json(*args)
-        options = args.extract_options!
-        column_names = args
-        column_names.each { |name| column(name, 'json', options) }
-      end
-
-      def jsonb(*args)
-        options = args.extract_options!
-        column_names = args
-        column_names.each { |name| column(name, 'jsonb', options) }
-      end
-
-    end
-
-  end
-
-end

data/test/support/postgresql/pg_json_migrations/20160519133432_create_pg_json_migrate_test.rb

@@ -1,13 +0,0 @@
-require 'ardb/migration_helpers'
-
-class CreatePgJsonMigrateTest < ActiveRecord::Migration
-  include Ardb::MigrationHelpers
-
-  def change
-    create_table :pg_json_test_records do |t|
-      t.json  :json_attribute
-    end
-    add_column :pg_json_test_records, :jsonb_attribute, :jsonb
-  end
-
-end

data/test/system/pg_json_tests.rb

@@ -1,85 +0,0 @@
-require 'assert'
-require 'ardb/pg_json'
-
-require 'json'
-require 'test/support/postgresql/setup_test_db'
-
-module Ardb; end
-module Ardb::PgJson
-
-  class SystemTests < PostgresqlDbTests
-    desc "Ardb postgresql json shim"
-    setup do
-      @ardb_config.migrations_path = 'pg_json_migrations'
-    end
-
-    should "add support for postgresql json columns to migrations" do
-      # this should migrate the db, adding a record that has json/jsonb columns
-      assert_nothing_raised do
-        silence_stdout{ Ardb.adapter.migrate_db }
-      end
-
-      results = ActiveRecord::Base.connection.execute(
-        "SELECT column_name, data_type " \
-        "FROM INFORMATION_SCHEMA.COLUMNS " \
-        "WHERE table_name = 'pg_json_test_records'"
-      ).to_a
-      exp = {
-        'column_name' => 'json_attribute',
-        'data_type'   => 'json',
-      }
-      assert_includes exp, results
-      exp = {
-        'column_name' => 'jsonb_attribute',
-        'data_type'   => 'jsonb'
-      }
-      assert_includes exp, results
-    end
-
-  end
-
-  class WithMigratedTableTests < SystemTests
-    setup do
-      silence_stdout{ Ardb.adapter.migrate_db }
-      @record_class = Class.new(ActiveRecord::Base) do
-        self.table_name = 'pg_json_test_records'
-      end
-    end
-
-    should "add support for postgresql 'json' attributes on records" do
-      values = [Factory.string, Factory.integer, nil]
-
-      record = @record_class.new
-      assert_nil record.json_attribute
-      assert_nil record.jsonb_attribute
-
-      hash = Factory.integer(3).times.inject({}) do |h, n|
-        h.merge!(Factory.string => values.sample)
-      end
-      record.json_attribute  = JSON.dump(hash)
-      record.jsonb_attribute = JSON.dump(hash)
-      assert_nothing_raised{ record.save! }
-      record.reload
-      assert_equal hash, JSON.load(record.json_attribute)
-      assert_equal hash, JSON.load(record.jsonb_attribute)
-
-      array = Factory.integer(3).times.map{ values.sample }
-      record.json_attribute  = JSON.dump(array)
-      record.jsonb_attribute = JSON.dump(array)
-      assert_nothing_raised{ record.save! }
-      record.reload
-      assert_equal array, JSON.load(record.json_attribute)
-      assert_equal array, JSON.load(record.jsonb_attribute)
-
-      value = values.sample
-      record.json_attribute  = JSON.dump(value)
-      record.jsonb_attribute = JSON.dump(value)
-      assert_nothing_raised{ record.save! }
-      record.reload
-      assert_equal value, JSON.load(record.json_attribute)
-      assert_equal value, JSON.load(record.jsonb_attribute)
-    end
-
-  end
-
-end