pg_random_id 1.0.0 → 1.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: df94e62bb3e5030a92bfcd23854079f7698587f7
+  data.tar.gz: 1f468142694c905c84f8e5683476e5c1ca1c4dae
+SHA512:
+  metadata.gz: 74e0582ccab04dea4c1ffb12b30a9f7c712fbc3e7cef233fb01d016fdb56a7ef417b10b0451dc18b5eff5de0d7b1514709c0af1c18084606bf3079e8ad512067
+  data.tar.gz: a73bd3b7cfbd08f8416d2fe6b229e4a60de05310edecabbc88c450bdc275fdec55a95a69cdb10a095347a3f7b977614daa5d0dcebfc299d087b4afe5aa2d0547

data/lib/pg_random_id/sql/keytable.sql

@@ -4,15 +4,37 @@ CREATE TABLE pri_keys (
   sequence regclass PRIMARY KEY,
   key integer NOT NULL);
 
+CREATE OR REPLACE FUNCTION
+pri_random_key() RETURNS integer
+LANGUAGE sql
+VOLATILE
+AS $$
+  SELECT trunc(random() * 2^15)::integer;
+$$;
+
+CREATE OR REPLACE FUNCTION
+pri_key(_sequence regclass) RETURNS integer
+LANGUAGE plpgsql
+STRICT
+AS $$
+  DECLARE
+    _key integer = key FROM pri_keys WHERE sequence = _sequence;
+  BEGIN
+    IF _key IS NULL THEN
+      RAISE WARNING 'key not found for sequence %, generating a random one', _sequence;
+      INSERT INTO pri_keys(sequence, key) VALUES (_sequence, pri_random_key()) RETURNING key INTO _key;
+    END IF;
+    RETURN _key;
+  END
+$$;
+
 CREATE OR REPLACE FUNCTION
 pri_nextval(sequence regclass) RETURNS integer
 LANGUAGE sql
 VOLATILE
 STRICT
 AS $$
-  SELECT pri_scramble(key, nextval($1))
-    FROM pri_keys
-    WHERE sequence = $1;
+  SELECT pri_scramble(pri_key($1), nextval($1));
 $$;
 
 CREATE OR REPLACE FUNCTION
@@ -21,7 +43,5 @@ LANGUAGE sql
 VOLATILE
 STRICT
 AS $$
-  SELECT lpad(crockford(pri_scramble(key, nextval($1))), 6, '0')
-    FROM pri_keys
-    WHERE sequence = $1;
+  SELECT lpad(crockford(pri_scramble(pri_key($1), nextval($1))), 6, '0');
 $$;

data/lib/pg_random_id/version.rb

@@ -1,3 +1,3 @@
 module PgRandomId
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'active_record'
+require 'sequel'
+
 require 'pg_random_id'
 
 require 'helpers/active_record_helper'

data/spec/sql/keytable_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+require 'active_record'
+
+describe "pri_nextval(regclass)" do
+  include_context 'active_record'
+  before do
+    migration.create_random_id_functions
+    migration.create_table :foo
+    migration.random_id :foo
+  end
+
+  context "with removed key entry" do
+    before do
+      execute "DELETE FROM pri_keys"
+    end
+
+    it "doesn't quietly return null" do
+      execute("SELECT pri_nextval('foo_id_seq'::regclass)").values[0].should_not be_nil
+    end
+  end
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: pg_random_id
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.0.1
 platform: ruby
 authors:
 - Rafał Rzepecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -136,30 +123,30 @@ files:
 - spec/migrations_spec.rb
 - spec/spec_helper.rb
 - spec/sql/crockford_spec.rb
+- spec/sql/keytable_spec.rb
 - spec/sql/scramble_spec.rb
 homepage: https://github.com/inscitiv/pg_random_id
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Pseudo-random record ids in Postgres
 test_files:
 - spec/helpers/active_record_helper.rb
@@ -168,5 +155,5 @@ test_files:
 - spec/migrations_spec.rb
 - spec/spec_helper.rb
 - spec/sql/crockford_spec.rb
+- spec/sql/keytable_spec.rb
 - spec/sql/scramble_spec.rb
-has_rdoc: