sid 0.0.2 → 0.0.3

data/README.md

@@ -14,6 +14,7 @@ In the models, add:
 
     class Page < ActiveRecord::Base
       has_sid :account_id
+      # has_sid, :account_id, :sid_column => :some_other_column # you can specify what column it will consider the sid column. Defaults to `sid`
     end
 
 ## Contributing to sid

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.3

data/lib/sid/class_methods.rb

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

data/lib/sid/instance_methods.rb

@@ -1,14 +1,23 @@
 module Sid
   module InstanceMethods
+    def sid_column=(value)
+      self.send :"#{self.class.sid_config[:sid_column]}=", value
+    end
+
+    def sid_column
+      self.send :"#{self.class.sid_config[:sid_column]}"
+    end
+
     private
 
     def set_sid_column
-      collection = self.class.where(self.class.scoped_by => self.send(self.class.scoped_by))
+      scoped_by = self.class.sid_config[:scoped_by]
+      collection = self.class.where(scoped_by => self.send(scoped_by))
 
       if collection.count.zero?
-        self.sid = 1
+        self.sid_column = 1
       else
-        self.sid = collection.reorder('id').last.sid + 1
+        self.sid_column = collection.reorder('id').last.sid_column + 1
       end
     end
   end

data/lib/sid.rb

@@ -2,9 +2,11 @@ require 'sid/class_methods'
 require 'sid/instance_methods'
 
 module Sid
-  def has_sid(scoped_by)
-    cattr_accessor :scoped_by
-    self.scoped_by = scoped_by
+  def has_sid(scoped_by, options={})
+    cattr_accessor :sid_config
+    self.sid_config={}
+    self.sid_config[:scoped_by] = scoped_by
+    self.sid_config[:sid_column] = options[:sid_column] || :sid
 
     include Sid::ClassMethods
     include Sid::InstanceMethods

data/sid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sid}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ramon Tayag"]
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     "lib/sid/class_methods.rb",
     "lib/sid/instance_methods.rb",
     "sid.gemspec",
+    "spec/fixtures/category.rb",
     "spec/fixtures/page.rb",
     "spec/sid_spec.rb",
     "spec/spec_helper.rb",

data/spec/fixtures/category.rb

@@ -0,0 +1,3 @@
+class Category < ActiveRecord::Base
+  has_sid :account_id, :sid_column => :alternative_sid
+end

data/spec/sid_spec.rb

@@ -18,4 +18,8 @@ describe 'Sid' do
     Page.find_by_sid(2).destroy
     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
 end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'active_record'
 require 'rspec'
 require 'sid'
 require 'spec/fixtures/page'
+require 'spec/fixtures/category'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
@@ -21,13 +22,17 @@ RSpec.configure do |config|
 end
 
 def reset_database
-  %W(pages).each do |table_name|
+  %W(pages categories).each do |table_name|
     ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS '#{table_name}'")
   end
   ActiveRecord::Base.connection.create_table(:pages) do |t|
     t.string :name
     t.integer :account_id
     t.integer :sid
-    t.integer :sid_alternative
+  end
+  ActiveRecord::Base.connection.create_table(:categories) do |t|
+    t.string :name
+    t.integer :account_id
+    t.integer :alternative_sid
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sid
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Ramon Tayag
@@ -162,6 +162,7 @@ files:
 - lib/sid/class_methods.rb
 - lib/sid/instance_methods.rb
 - sid.gemspec
+- spec/fixtures/category.rb
 - spec/fixtures/page.rb
 - spec/sid_spec.rb
 - spec/spec_helper.rb