pretty_id 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7f1120896f3956cc8a5706975b38fcec7f4fdeb
-  data.tar.gz: 8d816ca3e1a09fff5db1550088b87ce5e3343f8b
+  metadata.gz: 4b63bbfa09c064af3e67d8d99b8d371c29382341
+  data.tar.gz: 14a2cd3a898fa3fef57c5ea6b8e69e7562869c22
 SHA512:
-  metadata.gz: d80a89411bee051f8fc265ea1dbe676a98f455f1c78d5b960a6d18449b5c6c724787f8784738b3385ca65909f547961a5359473c3769dba0f1db26b73e8dafad
-  data.tar.gz: ab3657e910acdb234d8c1ba15c81ab6745c1d0d5823576ed6eafd745058143d53b2020d25addd7401638cb37fc66d3068b3beb7af1bcd253d874a70a4a0fea54
+  metadata.gz: 5eabd575be2823eb3b84e30cc6c41f264fa1cf2ec9bbe8cbf813e87721feb5b5f356c08d41393f6a9af1ddf50b89da1f145d012a4f251114eca4c8f027a3e205
+  data.tar.gz: a754a9a7ac417eba6bfbc8f47c92583417bc88e40fad35a0321626389a09a419716cba03af9e4071a7f791f6d3c44ba750139ed60aab2e5832d748a0836fe83b

data/README.md

@@ -46,7 +46,8 @@ SecureRandom.urlsafe_base64(options[:length] / 1.333)
 class Book < ActiveRecord::Base
   has_pretty_id method: :urlsafe_base64,          # default: :pretty
                 column: :another_string_column,   # default: :pretty_id
-                length: 12                        # default: 8
+                length: 12,                       # default: 8
+                uniq: false                       # default: true
 end
 ```
 

data/lib/pretty_id/core.rb

@@ -8,7 +8,8 @@ module PrettyId
       def has_pretty_id(options = {})
         default_options = {
           column: :pretty_id,
-          method: :pretty
+          method: :pretty,
+          uniq: true
         }
 
         options = default_options.merge(options)
@@ -32,6 +33,7 @@ module PrettyId
         define_method(:"generate_#{options[:column]}") do
           new_pretty_id = loop do
             random_pretty_id = options[:generate_proc].call
+            break random_pretty_id if !options[:uniq]
             exists_hash = {}
             exists_hash[options[:column]] = random_pretty_id
             break random_pretty_id unless self.class.exists?(exists_hash)

data/lib/pretty_id/version.rb

@@ -1,3 +1,3 @@
 module PrettyId
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/pretty_id_spec.rb

@@ -5,6 +5,11 @@ class UserWithPrettyId < ActiveRecord::Base
   has_pretty_id
 end
 
+class UserWithNonUniquePrettyId < ActiveRecord::Base
+  self.table_name = 'users'
+  has_pretty_id uniq: false
+end
+
 class UserWithLongerPrettyId < ActiveRecord::Base
   self.table_name = 'users'
   has_pretty_id length: 16
@@ -25,6 +30,12 @@ class UserWithPrettyIdAlt < ActiveRecord::Base
   has_pretty_id column: :pretty_id_alt
 end
 
+class UserWithTwoPrettyIds < ActiveRecord::Base
+  self.table_name = 'users'
+  has_pretty_id
+  has_pretty_id column: :pretty_id_alt
+end
+
 describe PrettyId do
   it 'assigns before creation' do
     u = UserWithPrettyId.new
@@ -46,6 +57,12 @@ describe PrettyId do
     expect(u.pretty_id_alt).to be_present
   end
 
+  it 'fails on unknown method' do
+    expect {
+      UserWithPrettyId.send(:has_pretty_id, method: :foobar)
+    }.to raise_error(/Unknown \:method/)
+  end
+
   describe 'preventing duplicates' do
     before do
       UserWithPrettyId.stub(:exists?).and_return(true, false)
@@ -56,6 +73,18 @@ describe PrettyId do
       u = UserWithPrettyId.create
       expect(u.pretty_id).to eq 'cccccccc'
     end
+
+    context 'uniq = false' do
+      before do
+        UserWithNonUniquePrettyId.stub(:exists?).and_return(true, false)
+        UserWithNonUniquePrettyId.stub(:rand).and_return(1, 2)
+      end
+
+      it 'prevents duplicates' do
+        u = UserWithNonUniquePrettyId.create
+        expect(u.pretty_id).to eq 'bccccccc'
+      end
+    end
   end
 
   describe 'method = pretty' do
@@ -76,13 +105,13 @@ describe PrettyId do
     it 'assigns ~21 characters' do
       u = UserWithUrlsafeBase64PrettyId.new
       u.generate_pretty_id
-      expect(u.pretty_id.length).to eq be_within(1).of(21)
+      expect(u.pretty_id.length).to be_within(1).of(21)
     end
 
     it 'assigns more characters' do
       u = UserWithLongerUrlsafeBase64PrettyId.new
       u.generate_pretty_id
-      expect(u.pretty_id.length).to eq be_within(1).of(32)
+      expect(u.pretty_id.length).to be_within(1).of(32)
     end
   end
 
@@ -105,4 +134,24 @@ describe PrettyId do
       user.regenerate_pretty_id!
     end
   end
+
+  describe 'two pretty_ids' do
+    let(:user) { UserWithTwoPrettyIds.create }
+
+    it 'assigns both' do
+      expect(user.pretty_id).to be_present
+      expect(user.pretty_id_alt).to be_present
+      expect(user.pretty_id).to_not eq user.pretty_id_alt
+    end
+
+    it 'can regenerate one but not the other' do
+      expect {
+        user.regenerate_pretty_id
+      }.to change { user.pretty_id }
+
+      expect {
+        user.regenerate_pretty_id_alt
+      }.to_not change { user.pretty_id }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pretty_id
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Adam Becker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -132,3 +132,4 @@ test_files:
 - spec/pretty_id_spec.rb
 - spec/setup.rb
 - spec/spec_helper.rb
+has_rdoc: