mad_id 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66e2d89517f6426565c0664badeb7157ab79e1b7
-  data.tar.gz: 2146b87b423e6c912683c0421622b6491dd419c7
+  metadata.gz: fed2ca12f59a902c0578e6fa8e8001fa80e45ae9
+  data.tar.gz: 2b714b98ea52f14774df6b7e731bf0241595f12c
 SHA512:
-  metadata.gz: 0b1507dae5c4d98528f73bca48acd7625ac7cee6c8f52032ee1c242361b6e045e1c1317dbd10ed61367205dc34ec43bedb4717fe3f08dad53f4cc026ae1ba500
-  data.tar.gz: 4cd65a70acf6023f8b5c4d15dbe17e8a77a23863057602aa401ee266e0f32ccae45ea65f39bb43e707109a66718e13d162101d715639c520f1c7ccc008f0422b
+  metadata.gz: 3c9f2fe65978d9621e7949e80b112190268fa7fa84d71e883ef8e89283acc575e55c1ba4afe3a8fdd6eb914a424402364c890dd596b630b555cbe448a5295efa
+  data.tar.gz: fd30b90a66517bafae7fd49a7ede19234e442f090ae9299bc13df46b611cd1beb87c1c0dc3b0e8080b0cf39144a4224fc0ef57f8479c69d74b5bd98b3a5152df

data/lib/mad_id/finder_methods.rb

@@ -1,10 +1,18 @@
 module MadID::FinderMethods
 
   def find_by_mad_id!(id)
-    find_by!(identifier: id.to_s.downcase)
+    find_by!(mad_id_column => id.to_s.downcase)
   end
   def find_by_mad_id(id)
-    find_by(identifier: id.to_s.downcase)
+    find_by(mad_id_column => id.to_s.downcase)
+  end
+
+  def mad_id_column
+    @mad_id_column || 'id'
+  end
+
+  def mad_id_column=(val)
+    @mad_id_column = val
   end
 
 end

data/lib/mad_id/identity_methods.rb

@@ -3,6 +3,12 @@ module MadID
   module IdentityMethods
     extend ActiveSupport::Concern
 
+    module UrlMethods
+      def to_param
+        self.identifier
+      end
+    end
+
     included do
       before_create :set_identifier
       attr_readonly :identifier
@@ -20,9 +26,13 @@ module MadID
       self.identifier[0..11]
     end
 
-    def to_param
-      self.identifier
+    def identifier=(value)
+      write_attribute(self.class.mad_id_column, value)
     end
-  end
 
+    def identifier
+      read_attribute(self.class.mad_id_column)
+    end
+
+  end
 end

data/lib/mad_id/version.rb

@@ -1,3 +1,3 @@
 module MadID
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/lib/mad_id.rb

@@ -30,11 +30,13 @@ module MadID
   end
 
   included do
-    def self.identify_with(value)
+    extend(MadID::FinderMethods)
+    def self.identify_with(value, options = {})
+      self.mad_id_column = options[:column] || 'identifier'
       @identifier = value
       MadID.registry[value.to_s] = self
       self.send(:include, MadID::IdentityMethods)
-      self.extend(MadID::FinderMethods)
+      self.send(:include, MadID::IdentityMethods::UrlMethods) unless options[:to_param] == false # include by default
     end
   end
 end

data/spec/mad_id_spec.rb

@@ -9,7 +9,12 @@ class LittlePony < Pony
 end
 
 class GreatPony < Pony
-  identify_with :grtpny
+  identify_with :grtpny, to_param: false
+end
+
+class Dog < ActiveRecord::Base
+  include MadID
+  identify_with :dog, column: 'mad_id'
 end
 
 describe MadID do
@@ -18,6 +23,16 @@ describe MadID do
     expect(Pony.respond_to?(:identify_with)).to be(true)
   end
 
+  describe 'default finders' do
+    let(:pony) { Pony.create }
+    it { expect(Pony.mad_id_column).to eql('id') }
+    it { expect(Pony.find_by_mad_id(pony.id)).to eql(pony) }
+  end
+
+  describe 'configurable column' do
+    it { expect(Dog.mad_id_column).to eql('mad_id') }
+  end
+
   it 'wont set any callbacks' do
     expect(Pony._create_callbacks.select {|cb| cb.filter == :set_identifier}).to be_empty
   end
@@ -48,6 +63,13 @@ describe MadID do
       it 'will start with the #identify_with argument' do
         expect(subject.identifier).to match(/pny-.+/)
       end
+
+      describe 'custom identifier column' do
+        subject { Dog.new }
+        before { subject.set_identifier }
+        it { expect(subject.mad_id).to_not be_nil }
+        it { expect(subject.identifier).to eql(subject.mad_id) }
+      end
     end
 
     describe 'callbacks' do
@@ -71,6 +93,16 @@ describe MadID do
     end
   end
 
+  describe "to param" do
+    let!(:little_pony) { LittlePony.create }
+    let!(:great_pony) { GreatPony.create }
+
+    it do
+      expect(little_pony.to_param).to eql(little_pony.identifier)
+      expect(great_pony.to_param).to eql(great_pony.id.to_s)
+    end
+  end
+
   describe 'Registry' do
     it 'includes identifiable objects with stringified key' do
       expect(MadID.registry).to include('pny' => LittlePony)

data/spec/support/schema.rb

@@ -2,4 +2,7 @@ ActiveRecord::Schema.define(version: 1) do
   create_table "ponies", force: true do |t|
     t.string  "identifier"
   end
+  create_table "dogs", force: true do |t|
+    t.string "mad_id"
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mad_id
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Lars Brillert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord