propertybase_id 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac838b018ad983510c03dce597ba9ccfac7dcf71
-  data.tar.gz: c317f3ccbbca7711dbeac609de19b0ee3b4120f9
+  metadata.gz: 4d0822383ba08e57c55f45eb116a0577b49bccff
+  data.tar.gz: f672a9f1b0fa2a7ee724bb7a880079af0b026cf6
 SHA512:
-  metadata.gz: dc73eac7d74ac9d07ec85d2a170cb468824608df7c12e24a99579f1bd343df8c51ea6248fa2ed6dc0d40c9a9e636068ae90e487739434e98bc8965f921404e81
-  data.tar.gz: 57d96e6e466ba87b9e4a3f32f198a91b14e0fa8a9db594ce7bb94ddb6d12bfabf06183d4ff8cd9cedd38a6be1aa35f771ba3ac767f867c656b84c8a603c44469
+  metadata.gz: 5e9940e69dce5eac1844f63fdaa9ee50422be5e107da2d9f5220cbd1bee73a94129f11d0ca1d30a17df932e485afbaaaf125715dd5c81b95611b813e99c1bc3f
+  data.tar.gz: 8b040542ed0fccbdda7325c2e8a3966c8bf67e06bea2afe9342dabc6ddcca32fcf51b6f221193caf38bd49fa9cebc5debc9bd8a4ad40d5c5732f4d4250bb364b

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/bundle

data/.travis.yml

@@ -2,8 +2,9 @@ language: ruby
 cache: bundler
 bundler_args: --without documentation production
 rvm:
-  - 2.1.5
-  - 2.2.1
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
   - rbx
   - ruby-head
   - jruby-head

data/lib/propertybase_id.rb

@@ -4,17 +4,13 @@ require "propertybase_id/mappings"
 
 class PropertybaseId
   attr_reader :object_id
-  attr_reader :host_id
   attr_reader :time
-  attr_reader :process_id
-  attr_reader :counter
+  attr_reader :random_int
 
-  def initialize(object_id:, host_id:, time:, process_id:, counter:)
+  def initialize(object_id:, time:, random_int:)
     @object_id = object_id
-    @host_id = host_id
     @time = time
-    @process_id = process_id
-    @counter = counter
+    @random_int = random_int
   end
 
   def object
@@ -23,23 +19,19 @@ class PropertybaseId
 
   def to_s
     @_string ||= begin
-      object_str = format_number(@object_id, 3)
-      host_str = format_number(@host_id, 2)
-      time_str = format_number(@time, 6)
-      process_str = format_number(@process_id, 2)
-      counter_str = format_number(@counter, 5)
+      object_str = format_number(@object_id, 2)
+      time_str = format_number(@time, 7)
+      random_str = format_number(@random_int, 6)
 
-      "#{object_str}#{host_str}#{time_str}#{process_str}#{counter_str}"
+      "#{object_str}#{time_str}#{random_str}"
     end
   end
 
   def ==(o)
     self.class == o.class &&
     self.object_id == o.object_id &&
-    self.host_id == o.host_id &&
-    self.process_id == o.process_id &&
     self.time == o.time &&
-    self.counter == o.counter
+    self.random_int == o.random_int
   end
 
   alias_method :eql?, :==
@@ -47,10 +39,8 @@ class PropertybaseId
   def hash
     [
       object_id,
-      host_id,
       time,
-      process_id,
-      counter,
+      random_int,
     ].hash
   end
 
@@ -61,21 +51,19 @@ class PropertybaseId
   def self.parse(input_id)
     raise ArgumentError, "invalid length (#{input_id.size})" if input_id.size != max_length
 
-    _, object_id, host_id, time, process_id, counter = input_id.match(/(\w{3})(\w{2})(\w{6})(\w{2})(\w{5})/).to_a
+    _, object_id, time, random_str = input_id.match(/(\w{2})(\w{7})(\w{6})/).to_a
 
     team_from_object_id(object_id.to_i(36))
 
     new(
       object_id: object_id.to_i(36),
-      host_id: host_id.to_i(36),
       time: time.to_i(36),
-      process_id: process_id.to_i(36),
-      counter: counter.to_i(36),
+      random_int: random_str.to_i(36),
     )
   end
 
   def self.max_length
-    18
+    15
   end
 
   def self.max_value(digits = max_length)

data/lib/propertybase_id/generator.rb

@@ -1,23 +1,15 @@
 require "digest/sha1"
 require "socket"
+require "securerandom"
 
 class PropertybaseId
   class Generator
-    def initialize
-      @counter = 0
-      @mutex = Mutex.new
-    end
-
     def generate(object: )
-      @mutex.synchronize do
-        PropertybaseId.new(
-          object_id: pb_object_id(object),
-          host_id: host_id,
-          time: ::Time.now.to_i,
-          process_id: process_id,
-          counter: next_counter
-        )
-      end
+      PropertybaseId.new(
+        object_id: pb_object_id(object),
+        time: ::Time.now.to_i,
+        random_int: random_32
+      )
     end
 
     private
@@ -32,6 +24,10 @@ class PropertybaseId
       @_host_id ||= Digest::SHA1.hexdigest(Socket.gethostname).to_i(16) % PropertybaseId.max_value(2)
     end
 
+    def random_32
+      SecureRandom::random_number("zzzzzz".to_i(36) + 1)
+    end
+
     def next_counter
       @counter = (@counter + 1) % PropertybaseId.max_value(5)
     end

data/lib/propertybase_id/version.rb

@@ -1,3 +1,3 @@
 class PropertybaseId
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propertybase_id
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Leif Gensert
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-31 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Gem for creating Propertybase compatible IDs