sid 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/sid/class_methods.rb

@@ -3,7 +3,7 @@ module Sid
     extend ActiveSupport::Concern
     included do
       before_create :set_sid_column
-      validates sid_config[:sid_column], :uniqueness => true
+      validates sid_config[:sid_column], :uniqueness => {:scope => sid_config[:scoped_by]}
     end
   end
 end

data/lib/sid/instance_methods.rb

@@ -13,11 +13,12 @@ module Sid
     def set_sid_column
       scoped_by = self.class.sid_config[:scoped_by]
       collection = self.class.where(scoped_by => self.send(scoped_by))
+      last = collection.reorder('id').last
 
-      if collection.count.zero?
-        self.sid_column = 1
+      self.sid_column = if last
+        last.sid_column + 1
       else
-        self.sid_column = collection.reorder('id').last.sid_column + 1
+        1
       end
     end
   end

data/sid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sid}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ramon Tayag"]
-  s.date = %q{2011-07-24}
+  s.date = %q{2011-07-31}
   s.description = %q{Useful for multi-tenant apps where the data lives on the same database, but you want the elements of a tenant to associate with each other via relative ids, not the absolute database id.}
   s.email = %q{ramon@tayag.net}
   s.extra_rdoc_files = [

data/spec/sid_spec.rb

@@ -6,20 +6,26 @@ describe 'Sid' do
   end
 
   it "should auto increment the sid field of a model" do
-    Page.create(:account_id => 1).sid.should == 1
-    Page.create(:account_id => 1).sid.should == 2
-    Page.create(:account_id => 1).destroy
-    Page.create(:account_id => 1).sid.should == 3
+    Page.create!(:account_id => 1).sid.should == 1
+    Page.create!(:account_id => 1).sid.should == 2
+    Page.create!(:account_id => 1).destroy
+    Page.create!(:account_id => 1).sid.should == 3
 
-    Page.create(:account_id => 2).sid.should == 1
-    Page.create(:account_id => 1).sid.should == 4
-    Page.create(:account_id => 2).sid.should == 2
+    Page.create!(:account_id => 2).sid.should == 1
+    Page.create!(:account_id => 1).sid.should == 4
+    Page.create!(:account_id => 2).sid.should == 2
 
     Page.find_by_sid(2).destroy
-    Page.create(:account_id => 1).sid.should == 5
+    Page.create!(:account_id => 1).sid.should == 5
   end
 
   it "should allow setting of sid column" do
     Category.create(:account_id => 1).alternative_sid.should == 1
   end
+
+  it "should validate uniqueness of sid within the scope" do
+    Page.new(:account_id => 1, :sid => 1).save
+    Page.new(:account_id => 1, :sid => 1).should_not be_valid
+    Page.new(:account_id => 2, :sid => 1).should be_valid
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sid
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Ramon Tayag
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-24 00:00:00 +08:00
+date: 2011-07-31 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency