active_tenant 0.0.3 → 0.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7fa0c167c2362f5a5607a6a4878e6034ed688f4e
+  data.tar.gz: 9e53c45d8cf62f35a11fa8438bce720ced160ba4
+SHA512:
+  metadata.gz: 807eeb38d4015e849c47deb5474b9958fd619d24eed2ae5dcc92cf4589e69ab87c7e4b5683abdabd7bed8c901a8e5a4d66b8cb5473469d512288372a5364f46a
+  data.tar.gz: 94265114cb478840a041882a0288019e7d1084ea7353405e483199c615ca1dfc82dd548a60d095aaf69a6a87a51c329a5c832bea24a04ecfd420db515defb8d9

data/.ruby-gemset

@@ -0,0 +1 @@
+active_tenant

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
-script: bundle exec rspec spec
+  - 2.0
+  - 2.1
+  - jruby

data/README.md

@@ -1,5 +1,6 @@
 # ActiveTenant
 
+[![Gem Version](https://badge.fury.io/rb/active_tenant.png)](https://rubygems.org/gems/active_tenant)
 [![Build Status](https://travis-ci.org/gabynaiman/active_tenant.png?branch=master)](https://travis-ci.org/gabynaiman/active_tenant)
 
 ActiveRecord extensions for multi tenant applications

data/Rakefile

@@ -1,2 +1,17 @@
-#!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |task|
+  task.rspec_opts = '--tty --color -f documentation'
+  task.verbose = false
+end
+
+task default: :spec
+
+desc 'Pry console'
+task :console do
+  require 'active_tenant'
+  require 'pry'
+  ARGV.clear
+  Pry.start
+end

data/active_tenant.gemspec

@@ -15,9 +15,16 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
-  s.add_dependency 'rails', '>= 3.2.0'
+  s.add_dependency 'activerecord', '~> 3'
 
-  s.add_development_dependency 'pg'
-  s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'rspec'
+  if RUBY_ENGINE == 'jruby'
+    s.add_development_dependency 'activerecord-jdbcpostgresql-adapter'
+    s.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
+  else
+    s.add_development_dependency 'pg'
+    s.add_development_dependency 'sqlite3'
+  end
+  s.add_development_dependency 'rspec', '~> 2.14.0'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'pry'
 end

data/lib/active_tenant.rb

@@ -1,8 +1,7 @@
-require 'rails'
 require 'active_record'
 
 require 'active_tenant/version'
-require 'active_tenant/engine'
+require 'active_tenant/engine' if defined?(Rails)
 require 'active_tenant/adapters/sqlite_adapter'
 require 'active_tenant/adapters/postgres_adapter'
 require 'active_tenant/base'

data/lib/active_tenant/adapters/sqlite_adapter.rb

@@ -14,7 +14,7 @@ module ActiveTenant
     def create(name)
       unless all.include? name
         current_config = connection_config
-        establish_connection current_config.merge(database: file_name(name))
+        establish_connection connection_settings(name)
         connection
         establish_connection current_config
       end
@@ -43,7 +43,7 @@ module ActiveTenant
     end
 
     def connection_settings(name)
-      connection_config.merge(database: file_name(name))
+      connection_config.merge(database: file_name(name), url: nil)
     end
 
     def name

data/lib/active_tenant/base.rb

@@ -34,7 +34,7 @@ module ActiveTenant
     private
 
     def adapter
-      @adapter ||= ADAPTERS[::ActiveRecord::Base.connection_config[:adapter].to_sym].new
+      @adapter ||= ADAPTERS[::ActiveRecord::Base.connection_config[:adapter].to_s.gsub('jdbc', '').to_sym].new
     end
 
   end

data/lib/active_tenant/version.rb

@@ -1,3 +1,3 @@
 module ActiveTenant
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/spec_helper.rb

@@ -1,9 +1,7 @@
 require 'active_tenant'
+require 'logger'
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 ActiveRecord::Base.logger = Logger.new($stdout)
-ActiveRecord::Migrator.migrations_path = "#{File.dirname(__FILE__)}/migrations"
-
-RSpec.configure do |config|
-end
+ActiveRecord::Migrator.migrations_path = "#{File.dirname(__FILE__)}/migrations"

data/spec/support/adapter_test_helper.rb

@@ -24,7 +24,8 @@ module AdapterTestHelper
 
   def self.sqlite3_before_each
     ActiveTenant.configuration.global = 'test'
-    ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: "#{temp_path}/test.sqlite3"
+    adapter = RUBY_ENGINE == 'jruby' ? 'jdbcsqlite3' : 'sqlite3'
+    ActiveRecord::Base.establish_connection adapter: adapter, database: "#{temp_path}/test.sqlite3"
     ActiveRecord::Base.connection
     load 'models.rb'
   end
@@ -52,12 +53,12 @@ module AdapterTestHelper
     load 'models.rb'
   end
 
-  def self.postgresql_after_all
-    config = ActiveRecord::Base.connection_config
-    ActiveRecord::Base.establish_connection config.merge database: 'postgres'
-    ActiveRecord::Base.disconnect!
-    ActiveRecord::Base.connection.drop_database config[:database]
-  end
+  # TODO: Remove database after run all tests
+  # def self.postgresql_after_all
+  #   config = ActiveRecord::Base.connection_config
+  #   ActiveRecord::Base.establish_connection config.merge database: 'postgres'
+  #   ActiveRecord::Base.connection.drop_database config[:database]
+  # end
 
   private
 

metadata

@@ -1,78 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: active_tenant
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: pg
   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: sqlite3
   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: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.14.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.14.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  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: pry
+  requirement: !ruby/object:Gem::Requirement
+    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: ActiveRecord extensions for multi tenant applications
@@ -82,8 +101,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".ruby-gemset"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -108,33 +128,26 @@ files:
 - spec/support/adapter_test_helper.rb
 homepage: https://github.com/gabynaiman/active_tenant
 licenses: []
+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'
-      segments:
-      - 0
-      hash: -95515491
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -95515491
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ActiveRecord extensions for multi tenant applications
 test_files:
 - spec/adapters_spec.rb