transactional_capybara 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b47fe9a7d758b60e2a61d02a9efc54683c04c958
-  data.tar.gz: 2fad7e2694272847292391264521c9edac1ec55b
+  metadata.gz: 7c9cf729d42a0122c754de2e83c0a04915e31e4a
+  data.tar.gz: d37be5f09cf6c06743ebbc1bb7e0f03ba67e7af8
 SHA512:
-  metadata.gz: 489e7e2d50f51dcb9d15fe8eb9198d2b09c71b394157e704ecbe9360e8070b63f8890f60834f9889ec560ced5fe84881610b7b35cf19a4be325d391272597672
-  data.tar.gz: d2fd46c45b0cc39fa8acfe71b538be2988cd9fa956571693378936e4a9a7f319462245122927b3eb074eea7296bbb25527743ca1cb46b31a21a129b880949c01
+  metadata.gz: a4d7ff9a275cb53bee768731c3fe9098620d2b7feb2c6cc12cdb87d3acaf4d6d0a10fc6e8caec1ef5f86b22ece3791c09b304989df8c14fe03e82544c3a760de
+  data.tar.gz: d1cc0c121d663faa17a143229d1e3a7760a36a344ee1eacd59152729eff19e5b507bbbf7c6b4a71f2be56dbfa5238ba4cfd2e80f4da24ee2221ea9b81d64fe18

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    transactional_capybara (0.1.0.pre.3)
+    transactional_capybara (0.1.0)
       capybara
 
 GEM
@@ -76,6 +76,7 @@ GEM
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
+    sequel (4.42.1)
     sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
@@ -105,6 +106,7 @@ DEPENDENCIES
   rake
   rspec
   selenium-webdriver
+  sequel
   sinatra
   sqlite3
   transactional_capybara!

data/README.md

@@ -11,6 +11,20 @@ Use this instead.
 
 For a detailed explanation of how this works, refer to the [introductory blog post].
 
+## Support ##
+
+Right now this gem automatically handles the following things:
+
+ * ActiveRecord
+ * Sequel
+ * jQuery
+ * Angular
+
+Tested on Capybara 2.4.x, may not work on other major versions.
+
+Don't see something you want?
+I'd love a pull request, or even just a friendly inquiry!
+
 ## Setup ##
 
 Add it to your Gemfile, of course:
@@ -138,19 +152,9 @@ after :each do
 end
 ```
 
-
-## Support ##
-
-Right now this gem automatically fixes the following things:
-
- * ActiveRecord
- * jQuery
- * Angular
-
-Tested on Capybara 2.4.x, may not work on other major versions.
-
-Don't see something you want?
-I'd love a pull request, or even just a friendly inquiry!
+## Sequel ##
+If you want to have shared database connections with sequel just
+add the option `single_threaded: true` to your sequel connection in test.
 
 ## Contributing
 

data/Rakefile

@@ -9,14 +9,17 @@ namespace :test do
   desc "Run tests against all drivers and all databases listed in the config"
   task :all do
     db_config = YAML.load_file(File.join(File.dirname(__FILE__), "spec/config.yml"))
-    db_config["database"].keys.each do |db_name|
+    configs = db_config["database"].keys.product(
+      %w[selenium webkit poltergeist],
+      %w[active_record sequel]
+    )
+    configs.each do |db_name, driver, orm|
       ENV['DB'] = db_name
-      %w[selenium webkit poltergeist].each do |driver|
-        ENV['DRIVER'] = driver
-        puts ENV.to_hash.slice 'DRIVER', 'DB'
-        Rake::Task['test:rspec'].reenable
-        Rake::Task['test:rspec'].invoke
-      end
+      ENV['DRIVER'] = driver
+      ENV['ORM'] = orm
+      puts ENV.to_hash.slice 'DRIVER', 'DB', 'ORM'
+      Rake::Task['test:rspec'].reenable
+      Rake::Task['test:rspec'].invoke
     end
   end
 

data/lib/transactional_capybara/shared_connection.rb

@@ -1,15 +1,12 @@
-class ActiveRecord::Base
-  mattr_accessor :shared_connection
-  @@shared_connection = nil
-
-  def self.connection
-    @@shared_connection || retrieve_connection
-  end
-end
-
 module TransactionalCapybara
   module_function
   def share_connection
-    ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection
+    #noop is default
   end
 end
+if defined?(ActiveRecord::Base)
+  require_relative './shared_connection/active_record'
+end
+if defined?(Sequel::Model)
+  require_relative './shared_connection/sequel'
+end

data/lib/transactional_capybara/shared_connection/active_record.rb

@@ -0,0 +1,15 @@
+class ActiveRecord::Base
+  mattr_accessor :shared_connection
+  @@shared_connection = nil
+
+  def self.connection
+    @@shared_connection || retrieve_connection
+  end
+end
+
+module TransactionalCapybara
+  module_function
+  def share_connection
+    ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection
+  end
+end

data/lib/transactional_capybara/shared_connection/sequel.rb

@@ -0,0 +1,6 @@
+module TransactionalCapybara
+  module_function
+  def share_connection
+    warn 'WARNING: No database connection sharing enabled! You propably want to use the sequel connection option single_threaded: true' unless Sequel::Model.db.single_threaded?
+  end
+end

data/lib/transactional_capybara/version.rb

@@ -1,3 +1,3 @@
 module TransactionalCapybara
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/.travis.config.yml

@@ -6,7 +6,9 @@ database:
     username: travis
     database: transactional_capybara_test
   sqlite:
-    adapter: sqlite3
+    adapter:
+      active_record: sqlite3
+      sequel: sqlite
     database: ":memory:"
   postgres:
     adapter: postgresql

data/spec/ajax_spec.rb

@@ -1,5 +1,4 @@
 require_relative 'support/server'
-require_relative 'support/model'
 
 RSpec.describe "server with AJAX", type: :feature, js: true do
   before do

data/spec/config.yml.example

@@ -7,7 +7,9 @@ database:
     password: abcd1234
     database: transactional_capybara
   sqlite:
-    adapter: sqlite3
+    adapter:
+      active_record: sqlite3
+      sequel: sqlite
     host: localhost
     database: tmp/test.db
   postgres:

data/spec/spec_helper.rb

@@ -1,11 +1,8 @@
 require 'yaml'
-db_type = ENV['DB'] || 'sqlite'
-db_config = YAML.load_file(File.join(File.dirname(__FILE__), "config.yml"))
-db = db_config["database"][db_type]
+ENV['DB'] ||= 'sqlite'
+ENV['ORM'] ||= 'active_record'
 
-require 'active_record'
-ActiveRecord::Base.establish_connection(db)
-load File.join(File.dirname(__FILE__), "support/schema.rb")
+require_relative "support/#{ENV['ORM']}_setup.rb"
 
 require 'capybara/rspec'
 require 'capybara/poltergeist'

data/spec/support/active_record_setup.rb

@@ -0,0 +1,13 @@
+require 'active_record'
+require_relative 'db_config'
+
+config = db_config('active_record')
+ActiveRecord::Base.establish_connection(config)
+
+ActiveRecord::Schema.define do
+  create_table :test_values, :force => true do |t|
+    t.string  :content
+  end
+end
+
+require_relative 'model/active_record'

data/spec/support/db_config.rb

@@ -0,0 +1,6 @@
+def db_config orm
+  db_config = YAML.load_file(File.join(File.dirname(__FILE__), "../config.yml"))
+  db = db_config["database"][ENV['DB']]
+  db["adapter"] = db["adapter"][ENV['ORM']] unless db["adapter"].is_a? String
+  db
+end

data/spec/support/model/sequel.rb

@@ -0,0 +1,5 @@
+class TestValue < Sequel::Model
+  def self.create!(data)
+    new(data).save(raise_on_failure: true)
+  end
+end

data/spec/support/sequel_setup.rb

@@ -0,0 +1,11 @@
+require 'sequel'
+require_relative 'db_config'
+
+config = db_config('sequel').merge(single_threaded: true)
+db = Sequel.connect(config)
+
+db.create_table! :test_values do
+  primary_key :id
+  String :content
+end
+require_relative 'model/sequel'

data/spec/support/server.rb

@@ -1,11 +1,12 @@
 require 'sinatra'
 require 'tilt/erb'
-require_relative 'model'
 
 class AjaxServer < Sinatra::Base
   set :public_folder, File.dirname(__FILE__) + '/vendor'
 
-  cattr_accessor :should_return_from_ajax
+  class << self
+    attr_accessor :should_return_from_ajax
+  end
 
   get "/boring_page" do
     erb "Hi", layout: :basic

data/transactional_capybara.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sinatra"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "activerecord"
+  spec.add_development_dependency "sequel"
   spec.add_development_dependency "mysql2"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "pg"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transactional_capybara
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ian Young
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sequel
+  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: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +212,19 @@ files:
 - lib/transactional_capybara/ajax_helpers.rb
 - lib/transactional_capybara/rspec.rb
 - lib/transactional_capybara/shared_connection.rb
+- lib/transactional_capybara/shared_connection/active_record.rb
+- lib/transactional_capybara/shared_connection/sequel.rb
 - lib/transactional_capybara/version.rb
 - spec/.travis.config.yml
 - spec/ajax_spec.rb
 - spec/config.yml.example
 - spec/spec_helper.rb
+- spec/support/active_record_setup.rb
+- spec/support/db_config.rb
 - spec/support/migration.rb
-- spec/support/model.rb
-- spec/support/schema.rb
+- spec/support/model/active_record.rb
+- spec/support/model/sequel.rb
+- spec/support/sequel_setup.rb
 - spec/support/server.rb
 - spec/support/vendor/angular.js
 - spec/support/vendor/jquery.js
@@ -244,9 +263,12 @@ test_files:
 - spec/ajax_spec.rb
 - spec/config.yml.example
 - spec/spec_helper.rb
+- spec/support/active_record_setup.rb
+- spec/support/db_config.rb
 - spec/support/migration.rb
-- spec/support/model.rb
-- spec/support/schema.rb
+- spec/support/model/active_record.rb
+- spec/support/model/sequel.rb
+- spec/support/sequel_setup.rb
 - spec/support/server.rb
 - spec/support/vendor/angular.js
 - spec/support/vendor/jquery.js

data/spec/support/schema.rb

@@ -1,5 +0,0 @@
-ActiveRecord::Schema.define do
-  create_table :test_values, :force => true do |t|
-    t.string  :content
-  end
-end