onliest 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 231435f376731f8c8e9ea57de9c5fa72c93584f6
-  data.tar.gz: fae174999ac03c89d9847efc9f26687cd1b9336a
+  metadata.gz: efb038a4ae13fe3e96144555528df22c58069f09
+  data.tar.gz: 253159af40687da8125e46543ffbdf28a95cb646
 SHA512:
-  metadata.gz: 75b616b372f8431dbbebd7395fefb3c0ab8737672568f931585cb25e0d2ff7973d23ccd1cfb5d8610a9868bb80d107dc197d5a756d8a95189ab1784aee0c7b9d
-  data.tar.gz: 7a55e1ee34960ce44e98dc0ce63c00a9cfd03462dd8b96b9c68ad1de3dede8da9619c6392acd92fd2d88a5eeaa11e4251826d032bb7acf0f09a08ccc018e6ffa
+  metadata.gz: a3ad14aebd918aabb5b046f4b769220ed41fa4f668371b84126e084ca6522d98f47d109adf0099af6a426610bdb99ba5b23f8f67e23e5e7b9d1a555e67160df2
+  data.tar.gz: 976cc81e29400a059d515b6406ceb17ce6d55a10463b839d1128ab1a21eb71325b92eb3895f6fd67fa855a352a250fed769427a8e191acb331c2bdaea504b137

data/lib/onliest/snowflake.rb

@@ -0,0 +1,42 @@
+require 'onliest'
+
+class Onliest::Snowflake < Onliest
+  attr_reader :worker_number, :sequence
+
+  # This comes from twitter snowflake. I'm not
+  # sure how they arrived at this number.
+  # November 3, 2010 at 11:42:55
+  EPOCH = 1288834974657
+  
+  def initialize(worker_number)
+    @worker_number = worker_number
+    @sequence = 0
+    @older_time = 0
+    super(fields: [{ bits: 1, generator: ->{ 0 } },
+                   { bits: 41, generator: ->{ time } },
+                   { bits: 10, generator: ->{ worker_number } },
+                   { bits: 12, generator: ->{ sequence_nextval } }])
+  end
+
+  private
+  
+  def sequence_nextval
+    i = @sequence
+    @sequence = @sequence.succ
+    i
+  end
+
+  def time
+    while (t = time_now) < @older_time
+      #puts @older_time
+      #puts t
+      sleep((@older_time - t) / 1000)
+    end
+    @older_time = t
+    t
+  end
+  
+  def time_now
+    ((Time.now.to_f * 1000).to_i - EPOCH)
+  end
+end

data/lib/onliest.rb

@@ -24,23 +24,28 @@ class Onliest
   # +SecureRandom+. An object that implements +:random_number+
   # returning a random integer >= 0 and less than value provided as
   # the first argument.
-  def initialize(rng = DEFAULT_RNG)
-    @rng = rng
+  def initialize(rng: DEFAULT_RNG, fields: false)
+    @fields = fields ? fields : default_fields(rng)
   end
 
-  # Return the unique 72-bit value
+  # Construct and return the unique value
   def value
-    (some_time_bits << RANDOM_BITS) +
-      some_random_bits
+    total_bits = 0
+    total_value = 0
+    @fields.reverse.each do |field|
+      bits = field.fetch(:bits)
+      field_value = Integer(field.fetch(:generator).call) & ((2**bits) - 1)
+      total_value += (field_value << total_bits)
+      total_bits += bits
+    end
+    total_value
   end
 
   private
 
-  def some_random_bits
-    @rng.random_number(RANDOM_BITMASK + 1)
-  end
-
-  def some_time_bits
-    Time.now.to_i & TIME_BITMASK
+  def default_fields(rng)
+    [{ bits: TIME_BITS, generator: -> { Time.now.to_i } },
+     { bits: RANDOM_BITS,
+       generator: -> { rng.random_number(RANDOM_BITMASK + 1) } }]
   end
 end

data/test/{test_onliest.rb → test_onliest_default.rb}

@@ -1,8 +1,9 @@
-require 'minitest/autorun'
-
+require_relative './test_setup'
 require 'onliest'
 
-class OnliestTest < Minitest::Unit::TestCase
+# Tests for the dkjefault scheme
+
+class OnliestDefaultTest < TestCase
   def test_generates_a_number
     assert_kind_of(Integer, Onliest.value)
   end
@@ -16,31 +17,25 @@ class OnliestTest < Minitest::Unit::TestCase
     fake_prng.expect(:random_number, value, [2**47])
   end
 
-  def at(value)
-    Time.stub(:now, Time.at(value)) do
-      yield
-    end
-  end
-
   def test_with_a_time_and_a_prng
     at((2**25) + 1) do
       random_value = 2
-      gen = Onliest.new(fake_prng(random_value))
-      assert_equal(gen.value, (1 << 47) + random_value)
+      gen = Onliest.new(rng: fake_prng(random_value))
+      assert_equal((1 << 47) + random_value, gen.value)
     end
   end
 
   def test_the_littlest_onliest
     at(0) do
-      gen = Onliest.new(fake_prng(0))
+      gen = Onliest.new(rng: fake_prng(0))
       assert_equal(gen.value, 0)
     end
   end
 
   def test_the_largest_onliest
     at(2**25 - 1) do
-      gen = Onliest.new(fake_prng(2**47 - 1))
-      assert_equal(gen.value, 2**72 - 1)
+      gen = Onliest.new(rng: fake_prng(2**47 - 1))
+      assert_equal(2**72 - 1, gen.value)
     end
   end
 end

data/test/test_onliest_snowflake.rb

@@ -0,0 +1,54 @@
+require_relative './test_setup'
+require 'onliest/snowflake'
+
+class SnowflakeTests < TestCase
+  def worker_number
+    '13'
+  end
+  
+  def generator
+    Onliest::Snowflake.new(worker_number)
+  end
+
+  def test_snowflake_sign_bit_is_zero
+    assert_equal(0, generator.value & (1 << 63))
+  end
+
+  def test_snowflake_time_with_millisecond_precision
+    at(1.1234 + (Onliest::Snowflake::EPOCH.to_f / 1000)) do
+      assert_equal(1123, generator.value >> 22)
+    end
+  end
+
+  def test_snowflake_worker_number
+    assert_equal(worker_number.to_i, (generator.value & (2**22 - 1)) >> 12)
+  end
+
+  def test_snowflake_sequence_starts_at_zero
+    assert_equal(0, generator.value & ((2**12 - 1)))
+  end
+
+  def test_snowflake_sequence_increments
+    at(Time.now.to_i) do
+      gen = generator
+      assert_equal(gen.value, gen.value - 1)
+    end
+  end
+  
+  def test_snowflake_epoch_starts_at_1288834974_657
+    at(1288834974657.to_f / 1000) do
+      assert_equal(0, generator.value >> 22)
+    end
+  end
+
+  def test_time_always_goes_forward
+    gen = generator
+    times = [Onliest::Snowflake::EPOCH + 0.10,
+             Onliest::Snowflake::EPOCH,
+             Onliest::Snowflake::EPOCH + 0.11]
+    
+    Time.stub(:now, ->{ times.shift } ) do
+      assert(gen.value < gen.value)
+    end
+  end
+end

metadata

@@ -1,37 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: onliest
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Robert Church
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA9MQ8wDQYDVQQDDAZjaHJj
-  aHIxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2NvbTAe
-  Fw0xNDExMTcwMzU0NDZaFw0xNTExMTcwMzU0NDZaMD0xDzANBgNVBAMMBmNocmNo
-  cjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29tMIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxYcGTCEi6hbbKJf8NtH1UIGg
-  OFlMQjzp/QgN4IQV8wJbePzkm9Zfy0I19u/0Q+WmepkpwGLwEb84yiInpHpYKhVW
-  7MQOekiS+JxfGgXfAUtUZLLeeCe+R5IO9mZx+8PmA+S/WWaZngGuJE9vAi0Cobr7
-  dKpsSeavB/mkE0V0jGnaUc6rJeO8sB/nzOeJ9OqxgUUI4698POpGLknhq9of//Yx
-  51WwQul6sItx/AELZKEM/Zuu+nvMCYFU0oM0OHMYaN5EDERjLGVXAYBTyKuUq0js
-  kAydz6hfkrTBw8Aa/2s7w12EFq5jTBPS8fhvTFdGbveoF8HZuYV0PNEnSbhRpQID
-  AQABo3MwcTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUQT0zqrtG
-  cFXJ2o4qWOe8Rq2FsEEwGwYDVR0RBBQwEoEQY2hyY2hyQGdtYWlsLmNvbTAbBgNV
-  HRIEFDASgRBjaHJjaHJAZ21haWwuY29tMA0GCSqGSIb3DQEBBQUAA4IBAQBRdlDl
-  dXzKVcuK/w1EwgfPlI3BVMbSBGx9evofmH8pSWOV7Pqu3ZU9u91SGzMtMULVj+03
-  SJRx2pS3sVfzTt+jPfIqQk37rfc9iYLPCwM5G5RypT3iAIM/V/rJv5+z9lYwE/76
-  8ZrYVUK9zx91u/xkFseEig5ZqCCZIiBGKleos2uruy+eG5On1w5ShGqIaoxQvCa0
-  W6y4KVKgJJKunt/R+DNGrFnPFkd+gzWOyinOhQoVeHvyhslkA+ptgJSk2Q/KwTXO
-  3TLzfUddZ0/HMBNYO9OALcF70YnWb/usnr4lwVfhbJ+fcejAsp5Seurmhw7FeMoZ
-  f4Rtc1iUIHYWfDpz
-  -----END CERTIFICATE-----
-date: 2014-11-15 00:00:00.000000000 Z
-dependencies: []
+cert_chain: []
+date: 2015-04-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
 description: Generate unique values with numeric locality.
 email: chrchr@gmail.com
 executables:
@@ -39,9 +45,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/onliest.rb
 - bin/onliest
-- test/test_onliest.rb
+- lib/onliest.rb
+- lib/onliest/snowflake.rb
+- test/test_onliest_default.rb
+- test/test_onliest_snowflake.rb
 homepage: https://github.com/chrchr/onliest
 licenses:
 - MIT
@@ -52,20 +60,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: 'Onliest: generate unique values with numeric locality'
 test_files:
-- test/test_onliest.rb
-has_rdoc: 
+- test/test_onliest_default.rb
+- test/test_onliest_snowflake.rb

data.tar.gz.sig

@@ -1,4 +0,0 @@
-����o�����0�%�.��I	���?�Ү}7��
-�<胧�H�8�;{�,p䰰N�s��k�?���L���A_6��>����6"���+]��۸����w�#���s$=��_ܪRNj8�M)���`O��
-
-���
���j�B�R\i$���vG�
Ŀ�1�hLP�Ys}�*��{�|���F�Rv`�h�U�11D��6e�s%�r��U�9η�o��.�0fm�J��P��/�0�oQ��$�

metadata.gz.sig

@@ -1,2 +0,0 @@
-U�`@
-hг*��Fs>��