ardb 0.27.3 → 0.29.0

data/test/unit/test_helpers_tests.rb

@@ -1,10 +1,9 @@
-require 'assert'
-require 'ardb/test_helpers'
+require "assert"
+require "ardb/test_helpers"
 
-require 'ardb/adapter_spy'
+require "ardb/adapter_spy"
 
 module Ardb::TestHelpers
-
   class UnitTests < Assert::Context
     desc "Ardb::TestHelpers"
     subject{ Ardb::TestHelpers }
@@ -13,19 +12,13 @@ module Ardb::TestHelpers
     should have_imeths :create_db!, :create_db, :drop_db!, :drop_db
     should have_imeths :connect_db!, :connect_db, :migrate_db!, :migrate_db
     should have_imeths :reset_db, :reset_db!
-
   end
 
   class UsageTests < UnitTests
     setup do
-      @adapter_spy_class = Ardb::AdapterSpy.new
-      @orig_ardb_adapter = Ardb.adapter
-      Ardb::Adapter.current = @adapter_spy = @adapter_spy_class.new
-    end
-    teardown do
-      Ardb::Adapter.current = @orig_ardb_adapter
+      @adapter_spy = Ardb::AdapterSpy.new
+      Assert.stub(Ardb, :adapter){ @adapter_spy }
     end
-
   end
 
   class DropTablesTests < UsageTests
@@ -36,7 +29,6 @@ module Ardb::TestHelpers
       subject.drop_tables
       assert_equal 1, @adapter_spy.drop_tables_called_count
     end
-
   end
 
   class LoadSchemaTests < UsageTests
@@ -47,7 +39,6 @@ module Ardb::TestHelpers
       subject.load_schema
       assert_equal 1, @adapter_spy.load_schema_called_count
     end
-
   end
 
   class CreateDbTests < UsageTests
@@ -68,7 +59,6 @@ module Ardb::TestHelpers
       subject.create_db!
       assert_equal 2, @adapter_spy.create_db_called_count
     end
-
   end
 
   class DropDbTests < UsageTests
@@ -89,7 +79,6 @@ module Ardb::TestHelpers
       subject.drop_db!
       assert_equal 2, @adapter_spy.drop_db_called_count
     end
-
   end
 
   class ConnectDbTests < UsageTests
@@ -110,7 +99,6 @@ module Ardb::TestHelpers
       subject.connect_db!
       assert_equal 2, @adapter_spy.connect_db_called_count
     end
-
   end
 
   class MigrateDbTests < UsageTests
@@ -131,7 +119,6 @@ module Ardb::TestHelpers
       subject.migrate_db!
       assert_equal 2, @adapter_spy.migrate_db_called_count
     end
-
   end
 
   class ResetDbTests < UsageTests
@@ -172,7 +159,5 @@ module Ardb::TestHelpers
       assert_equal 2, @adapter_spy.create_db_called_count
       assert_equal 2, @adapter_spy.load_schema_called_count
     end
-
   end
-
 end

data/test/unit/use_db_default_tests.rb

@@ -1,11 +1,10 @@
-require 'assert'
-require 'ardb/use_db_default'
+require "assert"
+require "ardb/use_db_default"
 
-require 'much-plugin'
-require 'ardb/record_spy'
+require "much-plugin"
+require "ardb/record_spy"
 
 module Ardb::UseDbDefault
-
   class UnitTests < Assert::Context
     desc "Ardb::UseDbDefault"
     setup do
@@ -27,9 +26,9 @@ module Ardb::UseDbDefault
     end
 
     should "add use db default attributes using `use_db_default`" do
-      attr_name = Factory.string
-      subject.use_db_default(attr_name)
-      assert_includes attr_name, subject.ardb_use_db_default_attrs
+      an_attr_name = Factory.string
+      subject.use_db_default(an_attr_name)
+      assert_includes an_attr_name, subject.ardb_use_db_default_attrs
 
       attr_names = [Factory.string, Factory.string.to_sym]
       subject.use_db_default(*attr_names)
@@ -58,7 +57,6 @@ module Ardb::UseDbDefault
       exp = [:ardb_allow_db_to_default_attrs]
       assert_equal exp, callback.args
     end
-
   end
 
   class InitTests < UnitTests
@@ -71,13 +69,13 @@ module Ardb::UseDbDefault
 
       # simulate activerecords `@attributes` hash
       @original_attrs = @attr_names.inject({}) do |h, n|
-        h.merge!(n => [nil, Factory.string, Factory.integer].choice)
+        h.merge!(n => [nil, Factory.string, Factory.integer].sample)
       end
       @original_attrs.merge!(Factory.string => Factory.string)
       @record.attributes = @original_attrs.dup
 
       # randomly pick a use-db-default attribute to be changed
-      @record.changed_use_db_default_attrs = [@attr_names.choice]
+      @record.changed_use_db_default_attrs = [@attr_names.sample]
       @unchanged_attr_names = @attr_names - @record.changed_use_db_default_attrs
 
       # we should always get the record we just inserted back
@@ -132,7 +130,6 @@ module Ardb::UseDbDefault
         assert_equal @original_attrs[name], subject.attributes[name]
       end
     end
-
   end
 
   module UseDbDefaultRecordSpy
@@ -156,5 +153,4 @@ module Ardb::UseDbDefault
       end
     end
   end
-
 end

metadata

@@ -1,88 +1,108 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ardb
-version: !ruby/object:Gem::Version 
-  version: 0.27.3
+version: !ruby/object:Gem::Version
+  version: 0.29.0
 platform: ruby
-authors: 
+authors:
 - Kelly Redding
 - Collin Redding
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2016-04-07 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2020-12-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: assert
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.15.1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.18.1
   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.18.1
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.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::Version
+        version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.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.1.0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: much-plugin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: ns-options
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.1.6
-  type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+- !ruby/object:Gem::Dependency
   name: scmd
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 3.0.1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.3
   type: :runtime
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.3
 description: Activerecord database tools.
-email: 
+email:
 - kelly@kellyredding.com
 - collin.redding@me.com
-executables: 
+executables:
 - ardb
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -95,16 +115,14 @@ files:
 - lib/ardb/adapter/sqlite.rb
 - lib/ardb/adapter_spy.rb
 - lib/ardb/cli.rb
-- lib/ardb/clirb.rb
+- lib/ardb/cli/clirb.rb
+- 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/record_spy.rb
 - lib/ardb/relation_spy.rb
 - lib/ardb/require_autoloaded_active_record_files.rb
-- lib/ardb/root_path.rb
 - lib/ardb/test_helpers.rb
 - lib/ardb/use_db_default.rb
 - lib/ardb/version.rb
@@ -112,6 +130,13 @@ files:
 - script/determine_autoloaded_active_record_files.rb
 - test/helper.rb
 - test/support/factory.rb
+- test/support/fake_schema.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/.keep
 - test/unit/adapter/base_tests.rb
 - test/unit/adapter/mysql_tests.rb
 - test/unit/adapter/postgresql_tests.rb
@@ -119,58 +144,47 @@ files:
 - test/unit/adapter_spy_tests.rb
 - test/unit/ardb_tests.rb
 - test/unit/cli_tests.rb
-- test/unit/config_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/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
-- tmp/mysqltest/.gitkeep
-- tmp/pgtest/.gitkeep
-- tmp/pgtest/Gemfile
-- tmp/pgtest/Gemfile.lock
-- tmp/pgtest/config/.gitkeep
-- tmp/sqlitetest/.gitkeep
-- tmp/sqlitetest/Gemfile
-- tmp/sqlitetest/Gemfile.lock
-- tmp/sqlitetest/config/.gitkeep
-- tmp/testdb/config/.gitkeep
-- tmp/testdb/config/db.rb
-- tmp/testdb/fake_schema.rb
 homepage: http://github.com/redding/ardb
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - &id008 
-    - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id008
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - "~>"
+    - !ruby/object:Gem::Version
+      version: '2.4'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 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/.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/.keep
 - test/unit/adapter/base_tests.rb
 - test/unit/adapter/mysql_tests.rb
 - test/unit/adapter/postgresql_tests.rb
@@ -178,11 +192,8 @@ test_files:
 - test/unit/adapter_spy_tests.rb
 - test/unit/ardb_tests.rb
 - test/unit/cli_tests.rb
-- test/unit/config_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/record_spy_tests.rb
 - test/unit/relation_spy_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