ardb 0.27.3 → 0.28.0

data/test/unit/has_slug_tests.rb

@@ -66,7 +66,7 @@ module Ardb::HasSlug
     end
 
     should "allow customizing the has slug config using `has_slug`" do
-      separator        = NON_WORD_CHARS.choice
+      separator        = NON_WORD_CHARS.sample
       allow_underscore = Factory.boolean
       subject.has_slug({
         :attribute         => @slug_attribute,
@@ -145,8 +145,8 @@ module Ardb::HasSlug
   class InitTests < UnitTests
     desc "when init"
     setup do
-      @preprocessor      = [:downcase, :upcase, :capitalize].choice
-      @separator         = NON_WORD_CHARS.choice
+      @preprocessor      = [:downcase, :upcase, :capitalize].sample
+      @separator         = NON_WORD_CHARS.sample
       @allow_underscores = Factory.boolean
 
       @record_class.has_slug(:source => @source_attribute)
@@ -272,8 +272,8 @@ module Ardb::HasSlug
 
     should "turn invalid chars into a separator" do
       string = Factory.integer(3).times.map do
-        "#{Factory.string(3)}#{NON_WORD_CHARS.choice}#{Factory.string(3)}"
-      end.join(NON_WORD_CHARS.choice)
+        "#{Factory.string(3)}#{NON_WORD_CHARS.sample}#{Factory.string(3)}"
+      end.join(NON_WORD_CHARS.sample)
       assert_equal string.gsub(/[^\w]+/, '-'), subject.new(string, @args)
     end
 
@@ -288,9 +288,9 @@ module Ardb::HasSlug
     end
 
     should "allow passing a custom separator" do
-      separator = NON_WORD_CHARS.choice
+      separator = NON_WORD_CHARS.sample
 
-      invalid_char = (NON_WORD_CHARS - [separator]).choice
+      invalid_char = (NON_WORD_CHARS - [separator]).sample
       string = "#{Factory.string}#{invalid_char}#{Factory.string}"
       exp = string.gsub(/[^\w]+/, separator)
       assert_equal exp, subject.new(string, @args.merge(:separator => separator))
@@ -321,7 +321,7 @@ module Ardb::HasSlug
       assert_equal string.gsub(/-{2,}/, '-'), subject.new(string, @args)
 
       # remove separators that were added from changing invalid chars
-      invalid_chars = (Factory.integer(3) + 1).times.map{ NON_WORD_CHARS.choice }.join
+      invalid_chars = (Factory.integer(3) + 1).times.map{ NON_WORD_CHARS.sample }.join
       string = "#{Factory.string}#{invalid_chars}#{Factory.string}"
       assert_equal string.gsub(/[^\w]+/, '-'), subject.new(string, @args)
     end
@@ -331,7 +331,7 @@ module Ardb::HasSlug
       assert_equal string[1..-2], subject.new(string, @args)
 
       # remove separators that were added from changing invalid chars
-      invalid_char = NON_WORD_CHARS.choice
+      invalid_char = NON_WORD_CHARS.sample
       string = "#{invalid_char}#{Factory.string}-#{Factory.string}#{invalid_char}"
       assert_equal string[1..-2], subject.new(string, @args)
     end

data/test/unit/migration_helpers_tests.rb

@@ -1,6 +1,8 @@
 require 'assert'
 require 'ardb/migration_helpers'
 
+require 'ardb/adapter_spy'
+
 module Ardb::MigrationHelpers
 
   class UnitTests < Assert::Context
@@ -14,6 +16,11 @@ module Ardb::MigrationHelpers
   class ForeignKeyTests < UnitTests
     desc "ForeignKey handler"
     setup do
+      @adapter_spy = nil
+      Assert.stub(Ardb::Adapter, :new) do |*args|
+        @adapter_spy = Ardb::AdapterSpy.new(*args)
+      end
+
       @fk = ForeignKey.new('fromtbl', 'fromcol', 'totbl')
     end
     subject{ @fk }
@@ -37,21 +44,20 @@ module Ardb::MigrationHelpers
       assert_equal exp_name, subject.name
     end
 
-    should "use Ardb's config db adapter" do
-      exp_adapter = Ardb::Adapter.send(Ardb.config.db.adapter)
-      assert_equal exp_adapter, subject.adapter
+    should "know its adapter" do
+      assert_not_nil @adapter_spy
+      assert_equal Ardb.config, @adapter_spy.config
+      assert_equal @adapter_spy, subject.adapter
     end
 
     should "generate appropriate foreign key sql" do
-      exp_add_sql = "ALTER TABLE fromtbl"\
-                    " ADD CONSTRAINT fk_fromtbl_fromcol"\
-                    " FOREIGN KEY (fromcol)"\
-                    " REFERENCES totbl (id)"
-      assert_equal exp_add_sql, subject.add_sql
-
-      exp_drop_sql = "ALTER TABLE fromtbl"\
-                     " DROP CONSTRAINT fk_fromtbl_fromcol"
-      assert_equal exp_drop_sql, subject.drop_sql
+      exp = "FAKE ADD FOREIGN KEY SQL fromtbl fromcol " \
+            "totbl id fk_fromtbl_fromcol"
+      assert_equal exp, subject.add_sql
+
+      exp = "FAKE DROP FOREIGN KEY SQL fromtbl fromcol " \
+            "totbl id fk_fromtbl_fromcol"
+      assert_equal exp, subject.drop_sql
     end
 
   end

data/test/unit/migration_tests.rb

@@ -1,5 +1,10 @@
-require "assert"
-require "ardb/migration"
+require 'assert'
+require 'ardb/migration'
+
+# This is needed to call `classify` on a string; if this isn't manually required
+# these tests can fail if activesupport hasn't been loaded by activerecord; the
+# `Migration` class will error saying `classify` is not a method on `String`
+require 'active_support/core_ext/string/inflections'
 
 class Ardb::Migration
 
@@ -27,16 +32,18 @@ class Ardb::Migration
         block.call(@file_spy)
       end
 
-      @id = Factory.migration_id
-      @migration = @migration_class.new(@id)
+      @ardb_config = Factory.ardb_config
+      @id          = Factory.migration_id
+      @migration   = @migration_class.new(@ardb_config, @id)
     end
     subject{ @migration }
 
-    should have_readers :identifier, :class_name, :file_name, :file_path
-    should have_readers :source
+    should have_readers  :migrations_path, :identifier
+    should have_readers :class_name, :file_name, :file_path, :source
     should have_imeths :save!
 
     should "know its attrs" do
+      assert_equal @ardb_config.migrations_path, subject.migrations_path
       assert_equal @id, subject.identifier
 
       exp = @id.classify.pluralize
@@ -45,7 +52,7 @@ class Ardb::Migration
       exp = "#{@time_now.strftime("%Y%m%d%H%M%S")}_#{@id.underscore}"
       assert_equal exp, subject.file_name
 
-      exp = File.join(Ardb.config.migrations_path, "#{subject.file_name}.rb")
+      exp = File.join(subject.migrations_path, "#{subject.file_name}.rb")
       assert_equal exp, subject.file_path
 
       exp = "require 'ardb/migration_helpers'\n\n" \
@@ -59,16 +66,16 @@ class Ardb::Migration
 
     should "complain if no identifier is provided" do
       assert_raises(NoIdentifierError) do
-        @migration_class.new([nil, ''].choice)
+        @migration_class.new(@ardb_config, [nil, ''].sample)
       end
     end
 
     should "write the migration source to the migrations path on save" do
       subject.save!
 
-      assert_equal [Ardb.config.migrations_path], @mkdir_called_with
-      assert_equal [subject.file_path, 'w'],      @file_open_called_with
-      assert_equal [subject.source],              @file_spy.write_called_with
+      assert_equal [subject.migrations_path], @mkdir_called_with
+      assert_equal [subject.file_path, 'w'],  @file_open_called_with
+      assert_equal [subject.source],          @file_spy.write_called_with
     end
 
   end

data/test/unit/pg_json_tests.rb

@@ -0,0 +1,39 @@
+require 'assert'
+require 'ardb/pg_json'
+
+module Ardb; end
+module Ardb::PgJson
+
+  class UnitTests < Assert::Context
+    desc "Ardb postgresql json shim"
+    setup do
+      @connection_adapters = ActiveRecord::ConnectionAdapters
+    end
+    subject{ @connection_adapters }
+
+    should "update active record postgres adapter to support json columns" do
+      adapter_class = subject::PostgreSQLAdapter
+      exp = { :name => 'json' }
+      assert_equal exp, adapter_class::NATIVE_DATABASE_TYPES[:json]
+      exp = { :name => 'jsonb' }
+      assert_equal exp, adapter_class::NATIVE_DATABASE_TYPES[:jsonb]
+    end
+
+    should "update active record postgres column to support json columns" do
+      column_class = subject::PostgreSQLColumn
+      default = Factory.boolean ? "'{}'::json" : "'{}'::jsonb"
+      assert_equal '{}', column_class.extract_value_from_default(default)
+      default = Factory.boolean ? "'[]'::json" : "'[]'::jsonb"
+      assert_equal '[]', column_class.extract_value_from_default(default)
+
+      column = column_class.new(Factory.string, Factory.string)
+      assert_equal :json,  column.send(:simplified_type, 'json')
+      assert_equal :jsonb, column.send(:simplified_type, 'jsonb')
+    end
+
+    # Note: The rest of the postgresql json shim logic is tested in the pg json
+    # system tests
+
+  end
+
+end

data/test/unit/record_spy_tests.rb

@@ -177,7 +177,7 @@ module Ardb::RecordSpy
       assert_respond_to "around_#{name}", subject
       assert_respond_to "after_#{name}",  subject
 
-      callback_name = ["before_#{name}", "around_#{name}", "after_#{name}"].choice
+      callback_name = ["before_#{name}", "around_#{name}", "after_#{name}"].sample
       method_name = Factory.string
       subject.send(callback_name, method_name)
       callback = subject.callbacks.last

data/test/unit/test_helpers_tests.rb

@@ -18,12 +18,8 @@ module Ardb::TestHelpers
 
   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

data/test/unit/use_db_default_tests.rb

@@ -71,13 +71,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ardb
 version: !ruby/object:Gem::Version 
-  version: 0.27.3
+  version: 0.28.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-04-07 00:00:00 Z
+date: 2016-06-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assert
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.15.1
+        version: 2.16.1
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -48,29 +48,19 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.1.0
+        version: 0.1.1
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: ns-options
+  name: scmd
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.6
+        version: 3.0.2
   type: :runtime
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: scmd
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 3.0.1
-  type: :runtime
-  version_requirements: *id007
 description: Activerecord database tools.
 email: 
 - kelly@kellyredding.com
@@ -95,16 +85,17 @@ 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/pg_json.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 +103,14 @@ files:
 - script/determine_autoloaded_active_record_files.rb
 - 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/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/unit/adapter/base_tests.rb
 - test/unit/adapter/mysql_tests.rb
 - test/unit/adapter/postgresql_tests.rb
@@ -119,29 +118,17 @@ 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/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
-- 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: 
 - MIT
@@ -154,13 +141,13 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - &id008 
+  - &id007 
     - ">="
     - !ruby/object:Gem::Version 
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - *id008
+  - *id007
 requirements: []
 
 rubyforge_project: 
@@ -171,6 +158,14 @@ summary: Activerecord database tools.
 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/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/unit/adapter/base_tests.rb
 - test/unit/adapter/mysql_tests.rb
 - test/unit/adapter/postgresql_tests.rb
@@ -178,12 +173,12 @@ 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/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/root_path.rb

@@ -1,15 +0,0 @@
-# This takes a path string relative to the configured root path and tranforms
-# to the full qualifed root path.  The goal here is to specify path options
-# with root-relative path strings.
-
-module Ardb
-
-  class RootPath < String
-
-    def initialize(path_string)
-      super(Ardb.config.root_path.join(path_string).to_s)
-    end
-
-  end
-
-end

data/test/unit/config_tests.rb

@@ -1,58 +0,0 @@
-require 'assert'
-require 'ardb'
-
-require 'ns-options/assert_macros'
-
-class Ardb::Config
-
-  class UnitTests < Assert::Context
-    include NsOptions::AssertMacros
-
-    desc "Ardb::Config"
-    subject{ Ardb::Config }
-
-    should have_namespace :db
-    should have_option  :db_file,   Pathname, :default => ENV['ARDB_DB_FILE']
-    should have_option  :root_path, Pathname, :required => true
-    should have_option  :logger, :required => true
-    should have_options :migrations_path, :schema_path
-    should have_imeth   :db_settings
-
-    should "should use `db/migrations` as the default migrations path" do
-      exp_path = Pathname.new(TESTDB_PATH).join("db/migrations").to_s
-      assert_equal exp_path, subject.migrations_path
-    end
-
-    should "should use `db/schema` as the default schema path" do
-      exp_path = Pathname.new(TESTDB_PATH).join("db/schema").to_s
-      assert_equal exp_path, subject.schema_path
-    end
-
-    should "build the db connection settings from the db configs" do
-      # returns only non-nil values with string keys
-      exp = {
-        'adapter'  => "postgresql",
-        'database' => "ardbtest"
-      }
-      assert_equal exp, subject.db_settings
-    end
-
-  end
-
-  class DbTests < UnitTests
-    desc "db namespace"
-    subject{ Ardb::Config.db }
-
-    should have_option :adapter,          String,  :required => true
-    should have_option :database,         String,  :required => true
-    should have_option :encoding,         String,  :required => false
-    should have_option :host,             String,  :required => false
-    should have_option :port,             Integer, :required => false
-    should have_option :username,         String,  :required => false
-    should have_option :password,         String,  :required => false
-    should have_option :pool,             Integer, :required => false
-    should have_option :checkout_timeout, Integer, :required => false
-
-  end
-
-end