multitenant 0.2.0 → 0.3.0

data/.gitignore

@@ -0,0 +1,9 @@
+*.gem
+.bundle
+Gemfile.lock
+pkg/*
+
+# test files
+spec/*.log
+spec/*.sqlite3
+

data/.rspec

@@ -1 +1,3 @@
 --color
+--format documentation
+--backtrace

data/Gemfile

@@ -1,14 +1,4 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-gemspec
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "rspec", "~> 2.3.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
-  gem 'sqlite3', '~> 1.3.3'
-end
+# Specify your gem's dependencies in multitenant.gemspec
+gemspec

data/README.rdoc

@@ -5,17 +5,17 @@ When building multitenant applications, never let an unscoped Model.all accident
 == Usage
 
   class User < ActiveRecord::Base
-    belongs_to :company
-    belongs_to_tenant :company
+    belongs_to :tenant
+    belongs_to_multitenant
   end
 
-  Multitenant.with_tenant current_company do
+  Multitenant.with_tenant current_tenant do
     # queries within this block are automatically
-    # scoped to the current company
+    # scoped to the current tenant
     User.all
 
     # new objects created within this block are automatically
-    # assigned to the current company
+    # assigned to the current tenant
     User.create :name => 'Bob'
   end
 

data/Rakefile

@@ -1,49 +1,6 @@
-require 'rubygems'
 require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
+Bundler::GemHelper.install_tasks
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "multitenant"
-  gem.homepage = "http://github.com/wireframe/multitenant"
-  gem.license = "MIT"
-  gem.summary = %Q{scope database queries to current tenant}
-  gem.description = %Q{never let an unscoped Model.all accidentally leak data to an unintended audience.}
-  gem.email = "ryan@codecrate.com"
-  gem.authors = ["Ryan Sonnek"]
-  gem.add_runtime_dependency "activerecord", "~> 3.0.3"
-  gem.add_runtime_dependency "activesupport", "~> 3.0.3"
-  gem.add_runtime_dependency 'dynamic_default_scoping', '~> 0.0.3'
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rspec/core'
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
-
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
+RSpec::Core::RakeTask.new('spec')
 task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "multitenant #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/lib/multitenant.rb

@@ -1,6 +1,4 @@
 require 'active_record'
-require 'active_support/all'
-require 'dynamic_default_scoping'
 
 # Multitenant: making cross tenant data leaks a thing of the past...since 2011
 module Multitenant
@@ -20,16 +18,14 @@ module Multitenant
   module ActiveRecordExtensions
     # configure the current model to automatically query and populate objects based on the current tenant
     # see Multitenant#current_tenant
-    def belongs_to_tenant(association = :tenant)
-      include DynamicDefaultScoping
+    def belongs_to_multitenant(association = :tenant)
       reflection = reflect_on_association association
       before_validation Proc.new {|m|
         return unless Multitenant.current_tenant
         m.send "#{association}=".to_sym, Multitenant.current_tenant
       }, :on => :create
-      default_scope :scoped_to_tenant, lambda {
-        return {} unless Multitenant.current_tenant
-        where({reflection.primary_key_name => Multitenant.current_tenant.id})
+      default_scope lambda {
+        where({reflection.primary_key_name => Multitenant.current_tenant.id}) if Multitenant.current_tenant
       }
     end
   end

data/lib/multitenant/version.rb

@@ -0,0 +1,3 @@
+module Multitenant
+  VERSION = "0.3.0"
+end

data/multitenant.gemspec

@@ -1,94 +1,25 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "multitenant/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{multitenant}
-  s.version = "0.2.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Ryan Sonnek"]
-  s.date = %q{2011-02-07}
+  s.name        = "multitenant"
+  s.version     = Multitenant::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Ryan Sonnek"]
+  s.email       = ["ryan@codecrate.com"]
+  s.homepage    = "http://github.com/wireframe/multitenant"
+  s.summary     = %q{scope database queries to current tenant}
   s.description = %q{never let an unscoped Model.all accidentally leak data to an unintended audience.}
-  s.email = %q{ryan@codecrate.com}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/multitenant.rb",
-    "multitenant.gemspec",
-    "spec/database.yml",
-    "spec/multitenant_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/wireframe/multitenant}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.0}
-  s.summary = %q{scope database queries to current tenant}
-  s.test_files = [
-    "spec/multitenant_spec.rb",
-    "spec/spec_helper.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.rubyforge_project = "multitenant"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<multitenant>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<sqlite3>, ["~> 1.3.3"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<sqlite3>, ["~> 1.3.3"])
-      s.add_runtime_dependency(%q<activerecord>, ["~> 3.0.3"])
-      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.3"])
-      s.add_runtime_dependency(%q<dynamic_default_scoping>, ["~> 0.0.3"])
-    else
-      s.add_dependency(%q<multitenant>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<sqlite3>, ["~> 1.3.3"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<sqlite3>, ["~> 1.3.3"])
-      s.add_dependency(%q<activerecord>, ["~> 3.0.3"])
-      s.add_dependency(%q<activesupport>, ["~> 3.0.3"])
-      s.add_dependency(%q<dynamic_default_scoping>, ["~> 0.0.3"])
-    end
-  else
-    s.add_dependency(%q<multitenant>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<sqlite3>, ["~> 1.3.3"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<sqlite3>, ["~> 1.3.3"])
-    s.add_dependency(%q<activerecord>, ["~> 3.0.3"])
-    s.add_dependency(%q<activesupport>, ["~> 3.0.3"])
-    s.add_dependency(%q<dynamic_default_scoping>, ["~> 0.0.3"])
-  end
-end
+  s.add_dependency(%q<activerecord>, ['~>3.1.rc1'])
+  s.add_development_dependency(%q<sqlite3>, ["~> 1.3.3"])
+  s.add_development_dependency(%q<rspec>, ['~>2.6.0'])
 
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end

data/spec/multitenant_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 ActiveRecord::Schema.define(:version => 1) do
   create_table :companies, :force => true do |t|
@@ -26,7 +26,7 @@ class Company < ActiveRecord::Base
 end
 class User < ActiveRecord::Base
   belongs_to :company
-  belongs_to_tenant :company
+  belongs_to_multitenant :company
 end
 
 class Tenant < ActiveRecord::Base
@@ -34,7 +34,7 @@ class Tenant < ActiveRecord::Base
 end
 class Item < ActiveRecord::Base
   belongs_to :tenant
-  belongs_to_tenant
+  belongs_to_multitenant
 end
 
 describe Multitenant do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: multitenant
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,88 +15,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 -06:00
-default_executable: 
+date: 2011-05-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: multitenant
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  name: activerecord
   prerelease: false
-  type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15424223
         segments: 
-        - 2
         - 3
-        - 0
-        version: 2.3.0
-  prerelease: false
-  type: :development
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
         - 1
-        - 0
-        - 0
-        version: 1.0.0
-  prerelease: false
-  type: :development
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
+        - rc
         - 1
-        - 5
-        - 2
-        version: 1.5.2
-  prerelease: false
-  type: :development
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  type: :development
-  requirement: *id005
+        version: 3.1.rc1
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sqlite3
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -107,161 +48,50 @@ dependencies:
         - 3
         - 3
         version: 1.3.3
-  prerelease: false
   type: :development
-  requirement: *id006
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
-        version: 2.3.0
   prerelease: false
-  type: :development
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         hash: 23
         segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  prerelease: false
-  type: :development
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
         - 2
-        version: 1.5.2
-  prerelease: false
-  type: :development
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
+        - 6
         - 0
-        version: "0"
-  prerelease: false
-  type: :development
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 3
-        - 3
-        version: 1.3.3
-  prerelease: false
+        version: 2.6.0
   type: :development
-  requirement: *id011
-- !ruby/object:Gem::Dependency 
-  name: activerecord
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 0
-        - 3
-        version: 3.0.3
-  prerelease: false
-  type: :runtime
-  requirement: *id012
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 0
-        - 3
-        version: 3.0.3
-  prerelease: false
-  type: :runtime
-  requirement: *id013
-- !ruby/object:Gem::Dependency 
-  name: dynamic_default_scoping
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 0
-        - 3
-        version: 0.0.3
-  prerelease: false
-  type: :runtime
-  requirement: *id014
+  version_requirements: *id003
 description: never let an unscoped Model.all accidentally leak data to an unintended audience.
-email: ryan@codecrate.com
+email: 
+- ryan@codecrate.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE.txt
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .document
+- .gitignore
 - .rspec
 - Gemfile
 - LICENSE.txt
 - README.rdoc
 - Rakefile
-- VERSION
 - lib/multitenant.rb
+- lib/multitenant/version.rb
 - multitenant.gemspec
 - spec/database.yml
 - spec/multitenant_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/wireframe/multitenant
-licenses: 
-- MIT
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -287,11 +117,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.5.0
+rubyforge_project: multitenant
+rubygems_version: 1.8.1
 signing_key: 
 specification_version: 3
 summary: scope database queries to current tenant
 test_files: 
+- spec/database.yml
 - spec/multitenant_spec.rb
 - spec/spec_helper.rb

data/VERSION

@@ -1 +0,0 @@
-0.2.0