tenancy 0.2.0 → 1.0.0

metadata

@@ -1,141 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: tenancy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
-- chamnap
+- Chamnap Chhorn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.12.0
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.5.0
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.12
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.12
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.7
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.7
-- !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: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.5
-description: A simple multitenancy with activerecord through scoping
+description: A simple multitenancy with activerecord/mongoid through scoping
 email:
 - chamnapchhorn@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rvmrc
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".rspec"
+- ".rvmrc"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - gemfiles/active_record_32.gemfile
 - gemfiles/active_record_40.gemfile
+- gemfiles/mongoid_3.gemfile
+- gemfiles/mongoid_4.gemfile
 - lib/tenancy.rb
 - lib/tenancy/matchers.rb
 - lib/tenancy/resource.rb
 - lib/tenancy/resource_scope.rb
+- lib/tenancy/scoping.rb
+- lib/tenancy/scoping/active_record.rb
+- lib/tenancy/scoping/mongoid.rb
+- lib/tenancy/tenant.rb
 - lib/tenancy/version.rb
-- spec/lib/resource_scope_spec.rb
 - spec/lib/resource_spec.rb
+- spec/lib/scoping/active_record_spec.rb
+- spec/lib/scoping/mongoid_spec.rb
 - spec/lib/shoulda_matchers_spec.rb
 - spec/spec_helper.rb
-- spec/support/models.rb
-- spec/support/schema.rb
+- spec/support/active_record/models.rb
+- spec/support/active_record/schema.rb
+- spec/support/mongoid/connection.rb
+- spec/support/mongoid/models.rb
+- spec/support/mongoid/mongoid.yml
 - tenancy.gemspec
 homepage: https://github.com/yoolk/tenancy
 licenses:
@@ -147,24 +89,28 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
-summary: A simple multitenancy with activerecord through scoping
+summary: A simple multitenancy with activerecord/mongoid through scoping
 test_files:
-- spec/lib/resource_scope_spec.rb
 - spec/lib/resource_spec.rb
+- spec/lib/scoping/active_record_spec.rb
+- spec/lib/scoping/mongoid_spec.rb
 - spec/lib/shoulda_matchers_spec.rb
 - spec/spec_helper.rb
-- spec/support/models.rb
-- spec/support/schema.rb
+- spec/support/active_record/models.rb
+- spec/support/active_record/schema.rb
+- spec/support/mongoid/connection.rb
+- spec/support/mongoid/models.rb
+- spec/support/mongoid/mongoid.yml

data/spec/lib/resource_scope_spec.rb

@@ -1,125 +0,0 @@
-require 'spec_helper'
-
-describe "Tenancy::ResourceScope" do
-  let(:camyp)     { Portal.create(domain_name: 'yp.com.kh') }
-  let(:panpages)  { Portal.create(domain_name: 'panpages.com') }
-  let(:listing)   { Listing.create(name: 'Listing 1', portal_id: camyp.id) }
-
-  after(:all) do
-    Portal.delete_all
-  end
-
-  describe Listing do
-    it { should belong_to(:portal) }
-
-    it { should validate_presence_of(:portal) }
-
-    it { should validate_uniqueness_of(:name).scoped_to(:portal_id).case_insensitive }
-
-    it "have default_scope with :portal_id field" do
-      Portal.current = camyp
-
-      expect(Listing.where(nil).to_sql).to eq(Listing.where(portal_id: Portal.current_id).to_sql)
-    end
-
-    it "doesn't have default_scope when it doesn't have current portal" do
-      Portal.current = nil
-
-      expect(Listing.where(nil).to_sql).not_to include(%{"listings"."portal_id" = #{Portal.current_id}})
-    end
-  end
-
-  describe Communication do
-    it { should belong_to(:portal) }
-
-    it { should validate_presence_of(:portal) }
-
-    it { should belong_to(:listing) }
-
-    it { should validate_presence_of(:listing) }
-
-    it { should validate_uniqueness_of(:value).scoped_to(:portal_id, :listing_id) }
-
-    it "have default_scope with :portal_id field" do
-      Portal.current  = camyp
-      Listing.current = listing
-
-      Communication.where(nil).to_sql.should == Communication.where(portal_id: Portal.current_id, listing_id: Listing.current_id).to_sql
-    end
-
-    it "doesn't have default_scope when it doesn't have current portal and listing" do
-      Portal.current  = nil
-      Listing.current = nil
-
-      expect(Communication.where(nil).to_sql).not_to include(%{"communications"."portal_id" = #{Portal.current_id}})
-      expect(Communication.where(nil).to_sql).not_to include(%{"communications"."listing_id" = #{Listing.current_id}})
-    end
-  end
-
-  describe ExtraCommunication do
-    it { should belong_to(:portal) }
-
-    it { should belong_to(:listing) }
-
-    it "raise exception when passing two resources and options" do
-      expect { ExtraCommunication.scope_to(:portal, :listing, class_name: 'Listing') }.to raise_error(ArgumentError)
-    end
-
-    it "uses the correct scope" do
-      listing2 = Listing.create(name: 'Name 2', portal: camyp)
-
-      Portal.current = camyp
-      Listing.current = listing2
-
-      extra_communication = ExtraCommunication.new
-      expect(extra_communication.listing_id).to eq(listing2.id)
-      expect(extra_communication.portal_id).to eq(camyp.id)
-    end
-  end
-
-  describe "belongs_to method override" do
-    before(:each) { Portal.current = camyp }
-    after(:each)  { Portal.current = nil }
-
-    it "reload belongs_to when passes true" do
-      listing.portal.domain_name = 'abc.com'
-      expect(listing.portal(true).object_id).not_to eq(Portal.current.object_id)
-    end
-
-    it "doesn't reload belongs_to" do
-      listing.portal.domain_name = 'abc.com'
-      expect(listing.portal.object_id).to eq(Portal.current.object_id)
-    end
-
-    it "returns different object" do
-      listing.portal_id = panpages.id
-      expect(listing.portal.object_id).not_to eq(Portal.current.object_id)
-    end
-
-    it "doesn't touch db" do
-      current_listing = listing
-
-      Portal.establish_connection(adapter: "sqlite3", database: "spec/invalid.sqlite3")
-      expect(current_listing.portal.object_id).to eq(Portal.current.object_id)
-
-      Portal.establish_connection(ActiveRecord::Base.connection_config)
-    end
-  end
-
-  describe "#without_scope" do
-    before(:each) { Portal.current = camyp }
-    after(:each)  { Portal.current = nil and Listing.current = nil }
-
-    it "unscopes :current_portal" do
-      expect(Listing.without_scope(:portal).to_sql).not_to include(%{"listings"."portal_id" = #{Portal.current_id}})
-    end
-
-    it "unscopes :current_portal and :current_listing" do
-      Listing.current = listing
-
-      expect(Communication.without_scope(:portal).to_sql).not_to include(%{"communications"."portal_id" = #{Portal.current_id}})
-      expect(Communication.without_scope(:listing).to_sql).not_to include(%{"communications"."listing_id" = #{Listing.current_id}})
-      expect(Communication.without_scope(:portal, :listing).to_sql).to eq(%{SELECT "communications".* FROM "communications"  WHERE "communications"."is_active" = 't'})
-    end
-  end
-end