propertybase_id 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8643adb6124aba399189a527653bdcd28280a778
-  data.tar.gz: 76bd327742cfb04ee9e29befc306b91425b32347
+  metadata.gz: 1333ef678322fc89dfff3adc990624e6f17c25de
+  data.tar.gz: 44f789d27adb46ce42b3a90e667f6dd7dc193f8c
 SHA512:
-  metadata.gz: 5298e1e086d89822a60397eb8c17b048e75d8ba8a9e9be46b44768105b01cefb0a8d07abb899056e3447be82b0f621472cedd1e6a6731f2cac07e878a4d4c26d
-  data.tar.gz: 874bdfc5ca289a7ea4c253ad9bc88ec1eab948b5e65f556d42e9fa307dadaade091a6cb00cf790b5b29cc2d8bb4607e29a02996a8779d5727afe98c1dcb4c9f1
+  metadata.gz: 36b54a8284b3341635c8ff522c5eb667f7b8361ba4017168b8fc33dd371eb0d2803328bcf451b9f734b211abfedfda02175167f5b76755c209fde471bd813314
+  data.tar.gz: f5582927e52d8f718a06e82bec071678f89c102a87be5d11e5e63cbb299ea1c08d8255c1ff6f4d13fa40b586febfea81aeb0ae3810dbbfdba7f3639b0e733fbb

data/.travis.yml

@@ -2,10 +2,8 @@ language: ruby
 cache: bundler
 bundler_args: --without documentation production
 rvm:
-  - 2.0.0
   - 2.1.5
-  - 2.2.0
-  - jruby-19mode
+  - 2.2.1
   - rbx
   - ruby-head
   - jruby-head

data/README.md

@@ -20,22 +20,22 @@ Or install it yourself as:
 
 ## Usage
 
-### Create
+### Generate
 
-    id = PropertybaseId.create(objectt: "team", server: 1)
-    => #<PropertybaseId:0x007fe855071a58 @_object_id=2, @local_random=738414242805187245, @object="team", @server=1>
+    id = PropertybaseId.generate(object: "team")
+    =>  #<PropertybaseId:0x007f90e3dcf048 @counter=1, @host_id=1203, @object_id=2, @process_id=254, @time=1427867006>
 
 For string representation do:
 
     id.to_s
-    => "02015lyq044bfuel"
+    => "002xfnm458e7200001"
 
 ### Parsing
 
 To get a PropertybaseId object from a string representation do:
 
-    PropertybaseId.parse("02015lyq044bfuel")
-    => #<PropertybaseId:0x007f9943cb48a8 @_object_id=2, @local_random=738414242805187245, @object="team", @server=1>
+    PropertybaseId.parse("002xfnm458e7200001")
+    => #<PropertybaseId:0x007f90e3d57f48 @counter=1, @host_id=1203, @object_id=2, @process_id=254, @time=1427867006>
 
 ## Development
 

data/lib/propertybase_id/generator.rb

@@ -1,4 +1,5 @@
 require "digest/sha1"
+require "socket"
 
 class PropertybaseId
   class Generator
@@ -8,26 +9,23 @@ class PropertybaseId
     end
 
     def generate(object: )
-      @mutex.lock
-      begin
-        count = next_counter
-      ensure
-        @mutex.unlock rescue nil
+      @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: object,
-        host_id: host_id,
-        time: time,
-        process_id: process_id,
-        counter: count
-      )
     end
 
     private
 
-    def time
-      @_time ||= ::Time.now.to_i
+    def pb_object_id(object)
+      PropertybaseId::Mappings.objects.fetch(object) do
+        raise ArgumentError, "Object #{object.inspect} not found"
+      end
     end
 
     def host_id
@@ -35,7 +33,7 @@ class PropertybaseId
     end
 
     def next_counter
-      @counter = (@counter + 1) % max_value(3)
+      @counter = (@counter + 1) % max_value(5)
     end
 
     def process_id

data/lib/propertybase_id/version.rb

@@ -1,3 +1,3 @@
 class PropertybaseId
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/propertybase_id.rb

@@ -1,22 +1,24 @@
 require "propertybase_id/version"
-require "propertybase_id/local_random"
 require "propertybase_id/generator"
 require "propertybase_id/mappings"
 
 class PropertybaseId
-  attr_reader :object
+  attr_reader :object_id
   attr_reader :host_id
   attr_reader :time
   attr_reader :process_id
   attr_reader :counter
 
-  def initialize(object:, host_id:, time:, process_id:, counter:)
-    @object = object && object.dup.freeze
+  def initialize(object_id:, host_id:, time:, process_id:, counter:)
+    @object_id = object_id
     @host_id = host_id
     @time = time
     @process_id = process_id
     @counter = counter
-    validate!
+  end
+
+  def object
+    @_object ||= self.class.team_from_object_id(@object_id || "")
   end
 
   def to_s
@@ -25,7 +27,7 @@ class PropertybaseId
       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, 3)
+      counter_str = format_number(@counter, 5)
 
       "#{object_str}#{host_str}#{time_str}#{process_str}#{counter_str}"
     end
@@ -33,7 +35,7 @@ class PropertybaseId
 
   def ==(o)
     self.class == o.class &&
-    self.object == o.object &&
+    self.object_id == o.object_id &&
     self.host_id == o.host_id &&
     self.process_id == o.process_id &&
     self.time == o.time &&
@@ -44,32 +46,27 @@ class PropertybaseId
 
   def hash
     [
-      @object_id,
-      @host_id,
-      @time,
-      @process_id,
-      @counter,
+      object_id,
+      host_id,
+      time,
+      process_id,
+      counter,
     ].hash
   end
 
   def self.generate(object:)
-    @_generator ||= begin
-      PropertybaseId::Generator.new
-    end
-    @_generator.generate(object: object)
+    @@generator.generate(object: object)
   end
 
   def self.parse(input_id)
-    raise ArgumentError, "invalid length (#{input_id.size})" if input_id.size != 16
+    raise ArgumentError, "invalid length (#{input_id.size})" if input_id.size != 18
 
-    _, object_id, host_id, time, process_id, counter = input_id.match(/(\w{3})(\w{2})(\w{6})(\w{2})(\w{3})/).to_a
+    _, object_id, host_id, time, process_id, counter = input_id.match(/(\w{3})(\w{2})(\w{6})(\w{2})(\w{5})/).to_a
 
-    object, _ = PropertybaseId::Mappings.objects.select{|_, v| v == object_id.to_i(36) }.first
-
-    raise ArgumentError, "No object to id #{object_id}" if object.nil?
+    team_from_object_id(object_id.to_i(36))
 
     new(
-      object: object,
+      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),
@@ -79,13 +76,15 @@ class PropertybaseId
 
   private
 
-  def validate!
-    @object_id ||= PropertybaseId::Mappings.objects.fetch(object) do
-      raise ArgumentError, "Object #{object.inspect} not found"
-    end
-  end
-
   def format_number(integer, length)
     integer.to_s(36).rjust(length, "0")
   end
+
+  def self.team_from_object_id(input_id)
+    obj, _ = PropertybaseId::Mappings.objects.select{|_, v| v == input_id }.first
+    raise ArgumentError, "No object to id #{input_id.to_s(36)}" if obj.nil?
+    obj
+  end
+
+  @@generator = PropertybaseId::Generator.new
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: propertybase_id
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Leif Gensert
@@ -73,7 +73,6 @@ files:
 - lib/propertybase_id.rb
 - lib/propertybase_id/data/objects.json
 - lib/propertybase_id/generator.rb
-- lib/propertybase_id/local_random.rb
 - lib/propertybase_id/mappings.rb
 - lib/propertybase_id/version.rb
 - propertybase_id.gemspec

data/lib/propertybase_id/local_random.rb

@@ -1,23 +0,0 @@
-class PropertybaseId
-  class LocalRandom
-    MAX_INTEGER = 10000
-    TIME_MULTIPLIER = 10000
-
-    attr_reader :time
-
-    def initialize(time=Time.now)
-      @time = time
-    end
-
-    def to_i
-      @_integer ||= begin
-        rand_int = SecureRandom.random_number(MAX_INTEGER)
-        max_digits = (MAX_INTEGER - 1).to_s.size
-        prefix = "%0#{max_digits}d" % rand_int
-        time_with_miliseconds = (time.to_f * TIME_MULTIPLIER).to_i
-
-        "#{prefix}#{time_with_miliseconds}".to_i
-      end
-    end
-  end
-end