leases 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0272b4ffe02c9178666b100a884fc4377ca77dc
-  data.tar.gz: efbd8eff430aa8e69310bd76bd9dcb4df80aba6e
+  metadata.gz: bb8fbe7ce60a87fdba0e7ea0ce8159420f150d69
+  data.tar.gz: 975345ad77583f621310fe30cabf2d7ff3b61e06
 SHA512:
-  metadata.gz: f6aaba2581ca5bd0b3f8b5c9d255ff64c84d20e717da9d7e7eea74e342460a15e9c0d251431d0f5bd97943b08f648caf5fb6154fd3fd31e17d81c48b8aa7e50d
-  data.tar.gz: 082ac37d51838378389fdaa8591a4b2c101c98cdc21da4c33ec743c0e5a1294d47c90d9545225dff6db0b24125ee167a42563678b95f7d5d584c7f53d395352f
+  metadata.gz: f0ecf0a18ff3eced2ec6043bb459039df5b3334572e424ac1183fe9d0b806b4b11ed3af9df10562ce4a19cb89b1291cd9c7ca986e63218ae394cc9e5f7e225b8
+  data.tar.gz: a6f4c00e62892417ccecc73c76f109cc165b7ebb560c148f75745b966fb58b28634b8e079ebde37cdb6aa97d26ba51e902ef4d13f8e3d86c44d730416ae99bf8

data/.travis.yml

@@ -7,7 +7,6 @@ rvm:
   - ruby-head
 
 env:
-  - "RAILS_VERSION=3.1.0"
   - "RAILS_VERSION=3.2.0"
   - "RAILS_VERSION=4.0.0"
   - "RAILS_VERSION=4.1.0"

data/README.md

@@ -6,7 +6,6 @@ Database multi-tenancy for Rails.
 
 ## Supported Rails versions
 
-- Rails 3.1.x
 - Rails 3.2.x
 - Rails 4.0.x
 - Rails 4.1.x

data/lib/leases.rb

@@ -21,8 +21,6 @@ module Leases
     self.leasers << object.name
     self.leasers.uniq!
 
-    Apartment.tenant_names = Proc.new { Leases.leaser_names }
-
     object
   end
 
@@ -37,12 +35,10 @@ module Leases
   #
   # [Array] List of leaser names
   #
-  def leaser_names(preload=true)
-    Rails.application.eager_load! if preload
-
+  def leaser_names
     leasers.map do |l|
       model = l.constantize
-      model.all.collect(&:leaser_name)
+      model.leaser_names
     end.flatten
   end
 

data/lib/leases/model/base.rb

@@ -11,6 +11,42 @@ module Leases
 
       end
 
+      module ClassMethods
+
+        ##
+        # Returns array of leaser names (schema names).
+        #
+        # === Example
+        #
+        # Account.leaser_names # => ['account-1', 'account-2']
+        #
+        # === Returns
+        #
+        # [Array] List of leaser names
+        #
+        def leaser_names
+          name = self.leases_options[:name]
+
+          if name.is_a?(Symbol)
+            # Simply pluck the column
+            self.pluck(name)
+          elsif name.is_a?(Proc)
+            # Name is a proc, find record in matches
+            names = []
+            self.find_each do |object|
+              names << object.leaser_name
+            end
+            names
+          else
+            # Default option: pluck ids and prefix it
+            prefix  = self.name.parameterize
+            ids     = self.pluck(:id)
+            ids.collect { |id| [prefix, id].join('-') }
+          end
+        end
+
+      end
+
       ##
       # Name of the leaser, used for naming the database.
       # This can be set in the leaser_options. Must be unique.
@@ -18,12 +54,12 @@ module Leases
       def leaser_name
         name = self.class.leases_options[:name]
 
-        if name.nil?
-          [self.class.name.parameterize, id].join('-')
-        elsif name.is_a?(Symbol)
+        if name.is_a?(Symbol)
           send(name)
         elsif name.is_a?(Proc)
           name.call(self)
+        else
+          [self.class.name.parameterize, id].join('-')
         end
       end
 

data/lib/leases/version.rb

@@ -1,3 +1,3 @@
 module Leases
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

data/spec/leases/model/base_spec.rb

@@ -17,6 +17,43 @@ describe Leases::Model::Base do
 
   subject { account }
 
+  describe :leaser_names do
+
+    let!(:account_1) { Account.create(:name => 'John Doe', :slug => 'john-doe') }
+    let!(:account_2) { Account.create(:name => 'Jane Doe', :slug => 'jane-doe') }
+
+    context 'with default' do
+
+      let(:options) { {} }
+
+      it 'should return list of names' do
+        Account.leaser_names.should == ["account-#{account_1.id}", "account-#{account_2.id}"]
+      end
+
+    end
+
+    context 'with symbol' do
+
+      let(:options) { { :name => :slug } }
+
+      it 'should return list of names' do
+        Account.leaser_names.should == ['john-doe', 'jane-doe']
+      end
+
+    end
+
+    context 'with proc' do
+
+      let(:options) { { :name => Proc.new { |a| [a.id, a.name].join('-') } } }
+
+      it 'should return list of names' do
+        Account.leaser_names.should == ["#{account_1.id}-#{account_1.name}", "#{account_2.id}-#{account_2.name}"]
+      end
+
+    end
+
+  end
+
   describe :leaser_name do
 
     context 'default' do

data/spec/leases_spec.rb

@@ -23,6 +23,8 @@ describe Leases do
 
   describe :leaser_names do
 
+    before(:each) { Apartment.tenant_names = Proc.new { Leases.leaser_names } }
+
     let!(:account_1) { Account.create }
     let!(:account_2) { Account.create }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: leases
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Arjen Oosterkamp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler