em-sequel-async 0.1.5 → 0.1.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a5399cd6ad77a994a587abef2eab6a322715f48e
+  data.tar.gz: c8eec55d2a1d547d42f8aff73c4d75b81be5e5ea
+SHA512:
+  metadata.gz: 403adb2e0bce5e000a853f7f740c6f452d55a59ce090a4f5984d593c8f43fa08c1a4a19cf087a0848af134a9844facafd345ebf2aa3ba9d8f127eba18c852b54
+  data.tar.gz: 8ff23de7750af0b74e3f4fc8019edfdc624a2f7b7c1896a85f7f70ad307263c22d5d76e1e64c250efc2319bf1861282ab54f57bd50f43043158866215193b377

data/.travis.yml

@@ -0,0 +1 @@
+services: mysql

data/Gemfile

@@ -5,6 +5,7 @@ gem 'mysql2'
 gem 'eventmachine'
 
 group :development do
+  gem 'test-unit'
   gem 'await'
   gem 'bundler'
   gem 'jeweler'

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Scott Tadman, The Working Group Inc.
+Copyright (c) 2012-2016 Scott Tadman, The Working Group Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,8 +1,25 @@
 # em-sequel-async
 
-Updated mysql2 driven replacement for tmm1/em-mysql
+This is an EventMachine compatible adapter layer for [Sequel](http://sequel.jeremyevans.net)
+that's intended to be a drop-in replacement for [tmm1/em-mysql](https://github.com/tmm1/em-mysql).
+
+Only the `mysql2` driver is supported at this time.
+
+## Dependencies
+
+This library requires Ruby 1.9.3 or better.
+
+## Testing
+
+To configure the test environment create a defaults file `.database.yml`
+in the root of the project. The user defined here will need to have
+`CREATE DATABASE` priviliges.
+
+To test:
+
+    rake test
 
 ## Copyright
 
-Copyright (c) 2012-2013 Scott Tadman, The Working Group Inc.
+Copyright (c) 2012-2016 Scott Tadman, The Working Group Inc.
 See LICENSE.txt for further details.

data/RELEASES.txt

@@ -1,9 +1,7 @@
+0.1.6
+ - Integrated fix from @yhara to pass through time-zone configuration options.
 0.1.5
  - Resolved issue with stale connections not being removed from pools
    correctly. Will retry dead connections every ten seconds.
-0.1.4
-0.1.3
-0.1.2
-0.1.1
 0.1.0
  - Initial version

data/Rakefile

@@ -20,8 +20,9 @@ Jeweler::Tasks.new do |gem|
   gem.license = "MIT"
   gem.summary = %Q{Asynchronous Helper Methods for Sequel}
   gem.description = %Q{Implements a number of asynchronous helper methods for Sequel}
-  gem.email = "scott@twg.ca"
+  gem.email = "tadman@postageapp.com"
   gem.authors = [ "Scott Tadman" ]
+  gem.required_ruby_version = '>=1.9.3'
 end
 
 Jeweler::RubygemsDotOrgTasks.new
@@ -33,3 +34,5 @@ Rake::TestTask.new(:test) do |test|
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
+
+task default: :test

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/em-sequel-async.gemspec

@@ -2,22 +2,25 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: em-sequel-async 0.1.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "em-sequel-async"
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Scott Tadman"]
-  s.date = "2013-09-10"
+  s.date = "2016-05-11"
   s.description = "Implements a number of asynchronous helper methods for Sequel"
-  s.email = "scott@twg.ca"
+  s.email = "tadman@postageapp.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
   ]
   s.files = [
     ".document",
+    ".travis.yml",
     "Gemfile",
     "LICENSE.txt",
     "README.md",
@@ -34,17 +37,18 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/tadman/em-sequel-async"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.required_ruby_version = Gem::Requirement.new(">= 1.9.3")
+  s.rubygems_version = "2.5.1"
   s.summary = "Asynchronous Helper Methods for Sequel"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sequel>, [">= 0"])
       s.add_runtime_dependency(%q<mysql2>, [">= 0"])
       s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
+      s.add_development_dependency(%q<test-unit>, [">= 0"])
       s.add_development_dependency(%q<await>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
@@ -52,6 +56,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sequel>, [">= 0"])
       s.add_dependency(%q<mysql2>, [">= 0"])
       s.add_dependency(%q<eventmachine>, [">= 0"])
+      s.add_dependency(%q<test-unit>, [">= 0"])
       s.add_dependency(%q<await>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
@@ -60,6 +65,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sequel>, [">= 0"])
     s.add_dependency(%q<mysql2>, [">= 0"])
     s.add_dependency(%q<eventmachine>, [">= 0"])
+    s.add_dependency(%q<test-unit>, [">= 0"])
     s.add_dependency(%q<await>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

data/lib/em-sequel-async/mysql.rb

@@ -26,9 +26,10 @@ class EmSequelAsync::Mysql
     # == Instance Methods ===================================================
     
     def initialize(db)
+      @db = db
       @options = {
-        :symbolize_keys => true,
-        :cast_booleans => true
+        symbolize_keys: true,
+        cast_booleans: true
       }
 
       db.opts.each do |key, value|
@@ -105,7 +106,11 @@ class EmSequelAsync::Mysql
       @connections[connection] = [ query, callback ]
 
       start = Time.now
-      deferrable = connection.query(query)
+      deferrable = connection.query(
+        query,
+        database_timezone: @db.timezone,
+        application_timezone: Sequel.application_timezone
+      )
       
       deferrable.callback do |result|
         log(:debug, "(%.6fs) [OK] %s" % [ Time.now - start, query ])

data/lib/em-sequel-async/sequel_extensions.rb

@@ -47,8 +47,8 @@ module EmSequelAsync::SequelExtensions
     
     module InstanceMethods
       STOCK_COUNT_OPTS = {
-        :select => [ Sequel::LiteralString.new("COUNT(*)").freeze ],
-        :order => nil
+        select: [ Sequel::LiteralString.new("COUNT(*)").freeze ],
+        order: nil
       }.freeze
       
       def async_insert(*args)

data/test/helper.rb

@@ -3,6 +3,7 @@ require 'bundler'
 
 begin
   Bundler.setup(:default, :development)
+
 rescue Bundler::BundlerError => e
   $stderr.puts e.message
   $stderr.puts "Run `bundle install` to install missing gems"
@@ -12,7 +13,7 @@ end
 
 require 'test/unit'
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.expand_path(File.join('..', 'lib'), File.dirname(__FILE__)))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'em-sequel-async'
@@ -23,6 +24,8 @@ require 'eventmachine'
 
 Sequel.extension(:em_sequel_async)
 
+DATABASE_DEFAULTS_PATH = File.expand_path('../.database.yml', File.dirname(__FILE__))
+
 require 'await'
 
 class Test::Unit::TestCase
@@ -38,3 +41,40 @@ class Test::Unit::TestCase
     end
   end
 end
+
+def database_defaults
+  @database_defaults ||= begin
+    config = if (File.exist?(DATABASE_DEFAULTS_PATH))
+      require 'yaml'
+      
+      Hash[
+        YAML.load(File.open(DATABASE_DEFAULTS_PATH)).collect do |key, value|
+          [ key.to_sym, value ]
+        end
+      ]
+    else
+      { }
+    end
+
+    {
+      adapter: 'mysql2',
+      host: 'localhost',
+      username: 'root',
+      password: ''
+    }.merge(config)
+  end
+end
+
+def database_config
+  @database_config ||= {
+    default: database_defaults.merge(
+      database: 'emsa_test_default'
+    ),
+    a: database_defaults.merge(
+      database: 'emsa_test_a'
+    ),
+    b: database_defaults.merge(
+      database: 'emsa_test_b'
+    )
+  }
+end

data/test/test_em-sequel-async.rb

@@ -1,38 +1,18 @@
-require File.expand_path('helper', File.dirname(__FILE__))
-
-DB_CONFIG = {
-  :default => {
-    :adapter => 'mysql2',
-    :username => 'test',
-    :password => 'JAQv0RM6xFVb8yz06GiQ7mOq',
-    :database => 'emsa_test_default'
-  },
-  :a => {
-    :adapter => 'mysql2',
-    :username => 'test',
-    :password => 'JAQv0RM6xFVb8yz06GiQ7mOq',
-    :database => 'emsa_test_a'
-  },
-  :b => {
-    :adapter => 'mysql2',
-    :username => 'test',
-    :password => 'JAQv0RM6xFVb8yz06GiQ7mOq',
-    :database => 'emsa_test_b'
-  }
-}.freeze
-
-DB = Hash[DB_CONFIG.collect { |db, config| [ db, Sequel.connect(config) ] }]
+require_relative './helper'
+
+DB = Hash[database_config.collect { |db, config| [ db, Sequel.connect(config) ] }]
 
 {
-  :default => %w[ db_default_a_models db_default_b_models ],
-  :a => %w[ example_as ],
-  :b => %w[ example_bs ]
+  default: %w[ db_default_a_models db_default_b_models ],
+  a: %w[ example_as ],
+  b: %w[ example_bs ]
 }.each do |db, tables|
-  create_config = DB_CONFIG[db].dup
+  create_config = database_config[db].dup
   db_name = create_config.delete(:database)
   
   handle = Mysql2::Client.new(create_config)
-  db_name = DB_CONFIG[db][:database]
+
+  db_name = database_config[db][:database]
   
   handle.query("DROP DATABASE IF EXISTS `#{db_name}`")
   handle.query("CREATE DATABASE `#{db_name}`")
@@ -79,7 +59,7 @@ class TestEmSequelAsync < Test::Unit::TestCase
     em do
       await do
         DbDefaultAModel.async_insert(
-          :data => 'Test Name',
+          data: 'Test Name',
           &defer do |id|
             inserted_id = id
           end
@@ -102,21 +82,21 @@ class TestEmSequelAsync < Test::Unit::TestCase
     em do
       await do
         DbDefaultAModel.async_insert(
-          :data => 'Test Name',
+          data: 'Test Name',
           &defer do |id|
             inserted_id = id
             
             assert inserted_id > 0
 
-            DbDefaultAModel.where(:id => inserted_id).async_count(
+            DbDefaultAModel.where(id: inserted_id).async_count(
               &defer do |count|
                 found_count = count
               end
             )
 
             DbDefaultAModel.async_insert_ignore(
-              :id => inserted_id,
-              :data => 'Duplicate',
+              id: inserted_id,
+              data: 'Duplicate',
               &defer do |count|
                 inserted_count = count
               end
@@ -131,25 +111,25 @@ class TestEmSequelAsync < Test::Unit::TestCase
     
     em do
       found_count = nil
-      delete_count = nil
+      deleted_count = nil
       inserted_count = nil
       
       await do |a|
-        DbDefaultAModel.where(:id => inserted_id).async_delete(
+        DbDefaultAModel.where(id: inserted_id).async_delete(
           &defer do |count|
             deleted_count = count
             
             assert_equal 1, deleted_count
 
-            DbDefaultAModel.where(:id => inserted_id).async_count(
-              &defer do |count|
-                found_count = count
+            DbDefaultAModel.where(id: inserted_id).async_count(
+              &defer do |_count|
+                found_count = _count
 
                 DbDefaultAModel.async_insert_ignore(
-                  :id => inserted_id,
-                  :data => 'Duplicate',
-                  &defer do |count|
-                    inserted_count = count
+                  id: inserted_id,
+                  data: 'Duplicate',
+                  &defer do |__count|
+                    inserted_count = __count
                   end
                 )
               end
@@ -187,13 +167,13 @@ class TestEmSequelAsync < Test::Unit::TestCase
       
       await do
         DbDefaultAModel.async_insert(
-          :data => 'Test Name',
+          data: 'Test Name',
           &defer do |id|
             inserted_id = id
             
             DbDefaultAModel.async_insert(
-              :id => inserted_id,
-              :data => 'Duplicate',
+              id: inserted_id,
+              data: 'Duplicate',
               &defer do |*f|
                 duplicate_id = f[0]
               end

metadata

@@ -1,121 +1,123 @@
 --- !ruby/object:Gem::Specification
 name: em-sequel-async
 version: !ruby/object:Gem::Version
-  version: 0.1.5
-  prerelease: 
+  version: 0.1.6
 platform: ruby
 authors:
 - Scott Tadman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: await
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Implements a number of asynchronous helper methods for Sequel
-email: scott@twg.ca
+email: tadman@postageapp.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .document
+- ".document"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -132,26 +134,25 @@ files:
 homepage: http://github.com/tadman/em-sequel-async
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Asynchronous Helper Methods for Sequel
 test_files: []