sequelizer 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c861615a451de131f3bc64e53d8c49ed94f28478
-  data.tar.gz: 6b8a256ee95cb64202a6be965f8a53ac254eb53a
+  metadata.gz: f0e093599e70651e91335650ab1356e697c514ee
+  data.tar.gz: b46f6b86d1fe965767ed5c2a117631c44ff4ae07
 SHA512:
-  metadata.gz: fcf9bd9a65a46f889495ccaab52b4eeae644a005ddeb597329ceb7a37ca2d0184a6d4b0289957f0e8dba8b62f22c8dfbd9b87fd331a5bbc2f3ece7172f0384fa
-  data.tar.gz: b4e6facc90132c5d95f1a3c5863cbc207f7e448bf47f383df04d5b27471048e00be7dedb61df052fcc370cc99571673764afa8a80a47d79c20aa445e1dba1aac
+  metadata.gz: 248907aecabe87161db1b2a4ce3c3ee2a917cecb8436d995ca26653e2838bedecd770731189ab01b150c48d9f12ff122290c60432f458daede237547d32154a9
+  data.tar.gz: 8584066aec604be6eee2f22411bb12df2d72a350218727dab1f0a0108a8395325ed8f8db5acd1a85c4936fb1846713139bc0707fa6aa6cc90d46a46eb9ec2ce6

data/CHANGELOG.md

@@ -1,6 +1,21 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 0.0.5 - 2014-08-29
+
+### Added
+- Support for TinyTDS (SQL Server) in update_gemfile command
+
+### Deprecated
+- Nothing.
+
+### Removed
+- Nothing.
+
+### Fixed
+- timeout is always converted to integer before passing to Sequel.connect
+
+
 ## 0.0.4 - 2014-08-18
 
 ### Added
@@ -16,6 +31,7 @@ All notable changes to this project will be documented in this file.
 ### Fixed
 - Nothing.
 
+
 ## 0.0.3 - 2014-07-10
 
 ### Added

data/examples/database.yml

@@ -11,7 +11,7 @@
 #
 # If all of those are nil, we'll default to development
 common: &common
-  adapter: postgresql
+  adapter: postgres
   host: localhost
   username: my_username
   password: my_password

data/lib/sequelizer/connection_maker.rb

@@ -22,12 +22,7 @@ module Sequelizer
 
     # Returns a Sequel connection to the database
     def connection
-      conn = Sequel.connect(options.to_hash)
-      cm = self
-      conn.define_singleton_method(:sequelizer_options) do
-        cm.options
-      end
-      conn
+      Sequel.connect(options.to_hash)
     end
   end
 end

data/lib/sequelizer/gemfile_modifier.rb

@@ -36,6 +36,8 @@ module Sequelizer
         'sqlite3'
       when 'mysql'
         'mysql2'
+      when 'tinytds'
+        'tiny_tds'
       when nil
         raise "No database adapter defined in your Sequelizer configuration"
       else

data/lib/sequelizer/options.rb

@@ -12,7 +12,7 @@ module Sequelizer
       @options
     end
 
-    %w(adapter database username password schema_search_path).each do |name|
+    %w(adapter database username password search_path).each do |name|
       define_method(name) do
         @options[name]
       end
@@ -34,11 +34,18 @@ module Sequelizer
         paths = %w(search_path schema_search_path schema).map { |key| sequelizer_options.delete(key) }.compact
 
         unless paths.empty?
-          sequelizer_options[:schema_search_path] = paths.first
+          sequelizer_options[:search_path] = paths.first
           sequelizer_options[:after_connect] = after_connect(paths.first)
         end
       end
 
+      if sequelizer_options[:timeout]
+        # I'm doing a merge! here because the indifferent access part
+        # of OptionsHash seemed to not work when I tried
+        # sequelizer_options[:timeout] = sequelizer_options[:timeout].to_i
+        sequelizer_options.merge!(timeout: sequelizer_options[:timeout].to_i)
+      end
+
       sequelizer_options
     end
 

data/lib/sequelizer/version.rb

@@ -1,4 +1,4 @@
 module Sequelizer
   # Version for the gem
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/sequelizer/test_options.rb

@@ -11,28 +11,33 @@ class TestOptions < Minitest::Test
     assert_equal('postgres', options.to_hash['adapter'])
   end
 
-  def test_finds_schema_as_search_path
+  def test_finds_search_path_as_search_path
     options = Sequelizer::Options.new(Sequelizer::OptionsHash.new(adapter: 'postgres', search_path: 'path'))
 
-    assert_equal('path', options.schema_search_path)
+    assert_equal('path', options.search_path)
   end
 
-  def test_finds_schema_as_schema
+  def test_finds_schema_as_search_path
     options = Sequelizer::Options.new(Sequelizer::OptionsHash.new(adapter: 'postgres', schema: 'path'))
 
-    assert_equal('path', options.schema_search_path)
+    assert_equal('path', options.search_path)
   end
 
-  def test_finds_schema_as_schema_search_path
+  def test_finds_schema_search_path_as_search_path
     options = Sequelizer::Options.new(Sequelizer::OptionsHash.new(adapter: 'postgres', schema_search_path: 'path'))
 
-    assert_equal('path', options.schema_search_path)
+    assert_equal('path', options.search_path)
   end
 
-  def test_prefers_schema_path_over_schema_search_path
+  def test_prefers_search_path_over_schema_search_path
     options = Sequelizer::Options.new(Sequelizer::OptionsHash.new(adapter: 'postgres', search_path: 'path', schema_search_path: 'path2'))
 
-    assert_equal('path', options.schema_search_path)
+    assert_equal('path', options.search_path)
+  end
+
+  def test_returns_timeout_as_an_integer_even_if_given_string
+    options = Sequelizer::Options.new({timeout: "30"})
+    assert_equal(30, options.to_hash[:timeout])
   end
 
   def test_returns_a_hash_even_if_given_nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequelizer
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ryan Duryea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler