ardb 0.27.2 → 0.27.3

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 311d362f1bd82654a1495a7d44cf65220ac90950
-  data.tar.gz: 5eb5ec19f2388b1113d4949f0b12e7bd0a4b10ea
+  metadata.gz: efed4edb38eade9eaa2de6263e30f163b4ffa3db
+  data.tar.gz: 41bb43c7936a806124cdeb747d78c6a4de2393e4
 SHA512: 
-  metadata.gz: 88d482971f3b0f023a62091432392508b1a4107032593eeae7bca5350e05083e770789d0b5c8c658f9be3b5339921627885edd3a418cb7ef4d9fb3fc0cb0bbdf
-  data.tar.gz: 493d4e295d894418be638db6c7fddeb116a5fee72244b57fa9ab27924ddcb2b3574a87e0ed9c10c75455e0a46adbb281b5c730c36009da656cfe5d5eb8bd0694
+  metadata.gz: ba2ed871805feac6de258476b78dc906c63b6a4491b8ab24925dc87447e19f4e89f073b6642729d8ec863a3b760257293da95ed4aa7e8d2b3f7d09aedc86cefe
+  data.tar.gz: f521735072f0ce180c0073593af0aefc5ae16cc3bcab8ed5c0dcf7677f1da6d818fa8b051c1f91fa07b18626582b4beeec021810a51223f6ca538d503c9fb7bb

data/Gemfile

@@ -2,7 +2,6 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rake'
 gem 'pry',  "~> 0.9.0"
 
 # Lock down gem versions because they require a newer version of ruby

data/ardb.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.version     = Ardb::VERSION
   gem.authors     = ["Kelly Redding", "Collin Redding"]
   gem.email       = ["kelly@kellyredding.com", "collin.redding@me.com"]
-  gem.description = %q{Activerecord database tools.}
   gem.summary     = %q{Activerecord database tools.}
+  gem.description = %q{Activerecord database tools.}
   gem.homepage    = "http://github.com/redding/ardb"
   gem.license     = 'MIT'
 
@@ -18,12 +18,12 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency("assert", ["~> 2.15"])
+  gem.add_development_dependency("assert", ["~> 2.15.1"])
 
   gem.add_dependency('activerecord',  ["~> 3.2"])
   gem.add_dependency('activesupport', ["~> 3.2"])
-  gem.add_dependency('much-plugin',   ["~> 0.1"])
-  gem.add_dependency('ns-options',    ["~> 1.1"])
-  gem.add_dependency('scmd',          ["~> 3.0"])
+  gem.add_dependency('much-plugin',   ["~> 0.1.0"])
+  gem.add_dependency('ns-options',    ["~> 1.1.6"])
+  gem.add_dependency('scmd',          ["~> 3.0.1"])
 
 end

data/lib/ardb.rb

@@ -35,17 +35,23 @@ module Ardb
     end
   end
 
+  def self.escape_like_pattern(pattern, escape_char = nil)
+    self.adapter.escape_like_pattern(pattern, escape_char)
+  end
+
   class Config
     include NsOptions::Proxy
 
     namespace :db do
-      option :adapter,  String,  :required => true
-      option :database, String,  :required => true
-      option :encoding, String,  :required => false
-      option :host,     String,  :required => false
-      option :port,     Integer, :required => false
-      option :username, String,  :required => false
-      option :password, String,  :required => false
+      option :adapter,          String,  :required => true
+      option :database,         String,  :required => true
+      option :encoding,         String,  :required => false
+      option :host,             String,  :required => false
+      option :port,             Integer, :required => false
+      option :username,         String,  :required => false
+      option :password,         String,  :required => false
+      option :pool,             Integer, :required => false
+      option :checkout_timeout, Integer, :required => false
     end
 
     option :db_file,         Pathname, :default => ENV['ARDB_DB_FILE']

data/lib/ardb/adapter/base.rb

@@ -15,6 +15,14 @@ class Ardb::Adapter
       @sql_schema_path  = "#{schema_path}.sql"
     end
 
+    def escape_like_pattern(pattern, escape_char = nil)
+      escape_char ||= "\\"
+      pattern = pattern.to_s.dup
+      pattern.gsub!(escape_char){ escape_char * 2 }
+      # don't allow custom wildcards
+      pattern.gsub!(/%|_/){ |wildcard_char| "#{escape_char}#{wildcard_char}" }
+    end
+
     def foreign_key_add_sql(*args);  raise NotImplementedError; end
     def foreign_key_drop_sql(*args); raise NotImplementedError; end
 

data/lib/ardb/db_tests.rb

@@ -0,0 +1,15 @@
+require 'active_record'
+require 'assert'
+
+module Ardb
+
+  class DbTests < Assert::Context
+    around do |block|
+      ActiveRecord::Base.transaction do
+        block.call
+        raise ActiveRecord::Rollback
+      end
+    end
+  end
+
+end

data/lib/ardb/has_slug.rb

@@ -33,10 +33,13 @@ module Ardb
         # since the slug isn't written till an after callback we can't always
         # validate presence of it
         validates_presence_of(attribute, :on => :update)
-        validates_uniqueness_of(attribute, {
-          :case_sensitive => true,
-          :scope          => options[:unique_scope]
-        })
+
+        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

data/lib/ardb/version.rb

@@ -1,3 +1,3 @@
 module Ardb
-  VERSION = "0.27.2"
+  VERSION = "0.27.3"
 end

data/test/unit/adapter/base_tests.rb

@@ -12,6 +12,7 @@ class Ardb::Adapter::Base
 
     should have_readers :config_settings, :database
     should have_readers :ruby_schema_path, :sql_schema_path
+    should have_imeths :escape_like_pattern
     should have_imeths :foreign_key_add_sql, :foreign_key_drop_sql
     should have_imeths :create_db, :drop_db, :connect_db, :migrate_db
     should have_imeths :load_schema, :load_ruby_schema, :load_sql_schema
@@ -30,6 +31,29 @@ class Ardb::Adapter::Base
       assert_equal "#{Ardb.config.schema_path}.sql", subject.sql_schema_path
     end
 
+    should "know how to escape like patterns" do
+      pattern = "#{Factory.string}%" \
+                "#{Factory.string}_" \
+                "#{Factory.string}\\" \
+                "#{Factory.string} " \
+                "#{Factory.string}"
+      exp = pattern.gsub("\\"){ "\\\\" }.gsub('%', "\\%").gsub('_', "\\_")
+      assert_equal exp, subject.escape_like_pattern(pattern)
+    end
+
+    should "allow using a custom escape char when escaping like patterns" do
+      escape_char = '#'
+      pattern = "#{Factory.string}%" \
+                "#{Factory.string}_" \
+                "#{Factory.string}\\" \
+                "#{Factory.string}#{escape_char}" \
+                "#{Factory.string} " \
+                "#{Factory.string}"
+      exp = pattern.gsub(escape_char, "#{escape_char}#{escape_char}")
+      exp = exp.gsub('%', "#{escape_char}%").gsub('_', "#{escape_char}_")
+      assert_equal exp, subject.escape_like_pattern(pattern, escape_char)
+    end
+
     should "not implement the foreign key sql meths" do
       assert_raises(NotImplementedError){ subject.foreign_key_add_sql }
       assert_raises(NotImplementedError){ subject.foreign_key_drop_sql }

data/test/unit/ardb_tests.rb

@@ -5,16 +5,20 @@ module Ardb
 
   class UnitTests < Assert::Context
     desc "Ardb"
-    subject{ Ardb }
     setup do
       @orig_ar_logger = ActiveRecord::Base.logger
+      Adapter.reset
+
+      @module = Ardb
     end
     teardown do
       Adapter.reset
       ActiveRecord::Base.logger = @orig_ar_logger
     end
+    subject{ @module }
 
     should have_imeths :config, :configure, :adapter, :validate!, :init
+    should have_imeths :escape_like_pattern
 
     should "return its `Config` class with the `config` method" do
       assert_same Config, subject.config
@@ -23,12 +27,11 @@ module Ardb
     should "complain if init'ing and not all configs are set" do
       orig_adapter = Ardb.config.db.adapter
       Ardb.config.db.adapter = nil
-      assert_raises(NotConfiguredError) { subject.init }
+      assert_raises(NotConfiguredError){ subject.init }
       Ardb.config.db.adapter = orig_adapter
     end
 
     should "init the adapter on init" do
-      Adapter.reset
       assert_nil Adapter.current
       begin
         subject.init
@@ -53,4 +56,20 @@ module Ardb
 
   end
 
+  class InitTests < UnitTests
+    desc "when init"
+    setup do
+      # don't establish connection, otherwise this errors if it can't connect to
+      # an actual DB
+      @module.init(false)
+    end
+
+    should "demeter its adapter" do
+      pattern = "%#{Factory.string}\\#{Factory.string}_"
+      exp = subject.adapter.escape_like_pattern(pattern)
+      assert_equal exp, subject.escape_like_pattern(pattern)
+    end
+
+  end
+
 end

data/test/unit/config_tests.rb

@@ -43,13 +43,15 @@ class Ardb::Config
     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 :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
 

data/test/unit/db_tests_tests.rb

@@ -0,0 +1,37 @@
+require 'assert'
+require 'ardb/db_tests'
+
+require 'active_record'
+
+class Ardb::DbTests
+
+  class UnitTests < Assert::Context
+    desc "Ardb::DbTests"
+    setup do
+      @transaction_called = false
+      Assert.stub(ActiveRecord::Base, :transaction) do |&block|
+        @transaction_called = true
+        block.call
+      end
+    end
+    subject{ Ardb::DbTests }
+
+    should "be an assert context" do
+      assert subject < Assert::Context
+    end
+
+    should "add an around callback that runs tests in a transaction that rolls back" do
+      assert_equal 1, subject.arounds.size
+      callback = subject.arounds.first
+
+      block_yielded_to = false
+      assert_raises(ActiveRecord::Rollback) do
+        callback.call(proc{ block_yielded_to = true })
+      end
+      assert_true @transaction_called
+      assert_true block_yielded_to
+    end
+
+  end
+
+end

data/test/unit/has_slug_tests.rb

@@ -102,6 +102,16 @@ module Ardb::HasSlug
       assert_nil validation.options[:scope]
     end
 
+    should "not add a unique validation if skipping unique validation" do
+      subject.has_slug({
+        :source                 => @source_attribute,
+        :skip_unique_validation => true
+      })
+
+      validation = subject.validations.find{ |v| v.type == :uniqueness }
+      assert_nil validation
+    end
+
     should "allow customizing its validations using `has_slug`" do
       unique_scope = Factory.string.to_sym
       subject.has_slug({

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ardb
 version: !ruby/object:Gem::Version 
-  version: 0.27.2
+  version: 0.27.3
 platform: ruby
 authors: 
 - Kelly Redding
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-03-17 00:00:00 Z
+date: 2016-04-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assert
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.15"
+        version: 2.15.1
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -48,7 +48,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.1"
+        version: 0.1.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -58,7 +58,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.1"
+        version: 1.1.6
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -68,7 +68,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "3.0"
+        version: 3.0.1
   type: :runtime
   version_requirements: *id007
 description: Activerecord database tools.
@@ -84,9 +84,8 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
-- Rakefile
 - ardb.gemspec
 - bin/ardb
 - lib/ardb.rb
@@ -97,6 +96,7 @@ files:
 - lib/ardb/adapter_spy.rb
 - lib/ardb/cli.rb
 - lib/ardb/clirb.rb
+- lib/ardb/db_tests.rb
 - lib/ardb/default_order_by.rb
 - lib/ardb/has_slug.rb
 - lib/ardb/migration.rb
@@ -120,6 +120,7 @@ files:
 - 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
@@ -178,6 +179,7 @@ test_files:
 - 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

data/Rakefile

@@ -1 +0,0 @@
-require "bundler/gem_tasks"