trax_model 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17e59a1849ad78e2b278f59a71ceef88bbf34416
-  data.tar.gz: 26557fe84e77a9fb2091f6f5433c4ea06da81edc
+  metadata.gz: aadee7f297ba78ffcf101d66d949fd921528e6aa
+  data.tar.gz: 31fc37ab41fbef66ac534734b9c34d223cdc71b7
 SHA512:
-  metadata.gz: 5f9217c38ac8bfa6e3be1236c0ea3fb0ae5bb31da21214c68b6a100da4f383c856f222c6823185e01909f707d967cd740a38e09d297860c4333198487b8a4b01
-  data.tar.gz: 4604d68478af8603c4168bd2aa73c71a57db9db718482806f010c6a7f92077889a4604aaac1aa9865c7f89d5e551216005f6922efb135db614cbf9c7c0b9588f
+  metadata.gz: 135a818db486a91cace4e5787d3de8d7c1685247df963f861af5fc6aabbe0054e0def7f60f66d6bbca2c2cea6f2b690320d5da98fecdf292bfff72a11e913e4c
+  data.tar.gz: d9df19307c0741ac126a5c9a574715f393e4a1947096a1cb17114466d649720ea5f208e8eba65a6dcfdeb815ba37d7474a2cb959df3343a09ec3406ff4bfc4dd

data/Gemfile

@@ -1,7 +1,3 @@
-source 'https://8JwshTDZWLNCc53CjfAb@gem.fury.io/jasonayre/'
 source 'https://rubygems.org'
 
-gem 'trax_core', :git => 'git@github.com:jasonayre/trax_core.git'
-
-# Specify your gem's dependencies in trax_model.gemspec
 gemspec

data/lib/trax/model.rb

@@ -3,7 +3,6 @@ require 'default_value_for'
 require 'hashie/dash'
 require 'hashie/mash'
 require_relative './string'
-
 require_relative './validators/email_validator'
 require_relative './validators/frozen_validator'
 require_relative './validators/future_validator'
@@ -19,6 +18,7 @@ module Trax
     autoload :Freezable
     autoload :Registry
     autoload :UUID
+    autoload :UUIDPrefix
     autoload :UniqueId
     autoload :Matchable
     autoload :Validators
@@ -39,7 +39,6 @@ module Trax
       delegate :register_trax_model, :to => "::Trax::Model::Registry"
       delegate :[], :to => :find
 
-
       def defaults(options = {})
         options.each_pair do |key, val|
           self.trax_defaults.__send__("#{key}=", val)

data/lib/trax/model/config.rb

@@ -4,7 +4,8 @@ module Trax
       ERROR_MESSAGES = {
         :invalid_uuid_prefix => [
           "UUID prefix must be 2 characters long",
-          "and can only include a-f0-9",
+          "First Character must be an integer 0-9",
+          "Second character must be a letter a-f",
           "for hexadecimal id compatibility"
         ].join("\n")
       }.freeze
@@ -13,11 +14,11 @@ module Trax
       property :uuid_column, :default => :id
 
       def uuid_prefix=(prefix)
-        if prefix.length != 2 || prefix !~ /[a-f0-9]{2}/
+        if prefix.length != 2 || prefix.chars.first !~ /[0-9]/ || prefix.chars.last !~ /[a-f]/
           raise ERROR_MESSAGES[:invalid_uuid_prefix]
         end
 
-        self[:uuid_prefix] = prefix
+        self[:uuid_prefix] = ::Trax::Model::UUIDPrefix.new(prefix)
       end
     end
   end

data/lib/trax/model/registry.rb

@@ -8,6 +8,11 @@ module Trax
       class << self
         delegate :key?, :to => :models
         delegate :each, :to => :models
+        delegate :all, :to => :collection
+      end
+
+      def self.collection
+        models.try(:values)
       end
 
       def self.register_trax_model(model)
@@ -22,6 +27,30 @@ module Trax
         uuid_map.fetch(prefix)
       end
 
+      def self.next_prefix
+        current_prefix = models.values
+                               .reject!{|model| !model.try(:uuid_prefix) }
+                               .map(&:uuid_prefix)
+                               .sort
+                               .last
+
+        current_prefix.next
+      end
+
+      def self.model_prefixes
+        models.try(:keys)
+      end
+
+      def self.previous_prefix
+        current_prefix = models.values
+                               .reject!{|model| !model.try(:uuid_prefix) }
+                               .map(&:uuid_prefix)
+                               .sort
+                               .last
+
+        current_prefix.previous
+      end
+
       def self.uuid_map
         @uuid_map ||= models.values.reject!{|model| !model.try(:uuid_prefix) }.inject(::Hashie::Mash.new) do |result, model|
           result[model.uuid_prefix] = model

data/lib/trax/model/uuid_prefix.rb

@@ -0,0 +1,80 @@
+module Trax
+  module Model
+    class UUIDPrefix < String
+      HEX_LETTER_RANGE = ('a'..'f').to_a.freeze
+      HEX_DIGIT_RANGE = (0..9).to_a.freeze
+      #9f = 96 so we need to begin at 96 when mapping back down [str,int]
+      DIVIDING_VALUE = 96
+
+      def self.all
+        @all ||= begin
+          lower_value_prefixes = HEX_DIGIT_RANGE.map do |digit|
+            values = HEX_LETTER_RANGE.map do |character|
+              prefix = [digit, character].join
+              new(prefix)
+            end
+
+            values
+          end
+
+          higher_value_prefixes = HEX_LETTER_RANGE.map do |digit|
+            values = HEX_DIGIT_RANGE.map do |character|
+              prefix = [digit, character].join
+              new(prefix)
+            end
+
+            values
+          end
+
+          [lower_value_prefixes, higher_value_prefixes].flatten!.sort!
+        end
+      end
+
+      def self.build_from_integer(value)
+        value_str = "#{value}"
+        return new([value_str.chars.first.to_i, HEX_LETTER_RANGE[value_str.chars.last.to_i]].join)
+      end
+
+      def <=>(comparison_prefix)
+        self.to_i <=> comparison_prefix.to_i
+      end
+
+      def in_higher_partition?
+        "#{self}"[0] =~ /[a-f]/
+      end
+
+      def in_lower_partition?
+        !in_higher_partition?
+      end
+
+      def index
+        self.class.all.index(self)
+      end
+
+      def next
+        self.class.all.at(index + 1)
+      end
+
+      def previous
+        self.class.all.at(index - 1)
+      end
+
+      def to_digits
+        digits = self.chars.map do |character|
+          (character.downcase =~ /[a-f]/ ? HEX_LETTER_RANGE.index(character.downcase) : character)
+        end
+
+        #kind of wonky but multiply by 2 will ensure the letter prefixes begin with a higher value
+        in_higher_partition? ? "#{((digits.join.to_i + DIVIDING_VALUE * 2))}".chars : digits
+      end
+
+      def to_i
+        return self.to_digits.join.to_i
+      end
+
+      def to_s
+        "#{self}"
+      end
+    end
+  end
+end

data/lib/trax_model/version.rb

@@ -1,3 +1,3 @@
 module TraxModel
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/support/schema.rb

@@ -41,19 +41,26 @@ ActiveRecord::Schema.define(:version => 1) do
     t.datetime "created_at",        :null => false
     t.datetime "updated_at",        :null => false
   end
+
+  create_table "things", :force => true do |t|
+    t.string "name"
+    t.string "uuid"
+    t.datetime "created_at",        :null => false
+    t.datetime "updated_at",        :null => false
+  end
 end
 
 class Product < ::ActiveRecord::Base
   include ::Trax::Model
   include ::Trax::Model::UniqueId
 
-  defaults :uuid_prefix => "a1", :uuid_column => "uuid"
+  defaults :uuid_prefix => "1a", :uuid_column => "uuid"
 end
 
 class Widget < ::ActiveRecord::Base
   include ::Trax::Model
 
-  defaults :uuid_prefix => "a2", :uuid_column => "uuid"
+  defaults :uuid_prefix => "2a", :uuid_column => "uuid"
 
   validates :subdomain, :subdomain => true, :allow_nil => true
   validates :email_address, :email => true, :allow_nil => true
@@ -64,7 +71,7 @@ class Message < ::ActiveRecord::Base
   include ::Trax::Model
   include ::Trax::Model::Freezable
 
-  defaults :uuid_prefix => "a3", :uuid_column => "uuid"
+  defaults :uuid_prefix => "3a", :uuid_column => "uuid"
 
   enum :status => [:queued, :scheduled, :delivered, :failed_delivery]
 
@@ -76,3 +83,9 @@ class Message < ::ActiveRecord::Base
 
   freezable_by_enum :status => [:delivered, :failed_delivery]
 end
+
+class Thing < ::ActiveRecord::Base
+  include ::Trax::Model
+
+  defaults :uuid_prefix => "0a", :uuid_column => "uuid"
+end

data/spec/trax/model/config_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+
 describe ::Trax::Model::Config do
   describe "uuid_prefix" do
     context "bad prefixes" do

data/spec/trax/model/matchable_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+
 describe ::Trax::Model::Matchable do
   let(:product) { ::Product.create(:name => "27 inch iMac") }
   subject{ product }

data/spec/trax/model/registry_spec.rb

@@ -4,7 +4,7 @@ describe ::Trax::Model::Registry do
   subject{ described_class }
 
   its(:models) { should be_instance_of(::Hashie::Mash) }
-  its(:uuid_map) { should have_key("a1") }
+  its(:uuid_map) { should have_key("1a") }
   its(:uuid_map) { should be_instance_of(::Hashie::Mash) }
 
   it "should have registered product model" do
@@ -12,6 +12,6 @@ describe ::Trax::Model::Registry do
   end
 
   it "model_type_for_uuid" do
-    subject.model_type_for_uuid("a1asdasdasd").should eq Product
+    subject.model_type_for_uuid("1absdasdasd").should eq Product
   end
 end

data/spec/trax/model/unique_id_spec.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 describe ::Trax::Model::UniqueId do
   subject{ ::Product }
 
+  its(:uuid_prefix) {
+    should be_instance_of(::Trax::Model::UUIDPrefix)
+  }
+
   describe "uuid_prefix" do
     context "bad prefixes" do
       ["a", "1p", "a1a", "bl", "1", "111"].each do |prefix|

data/spec/trax/model/uuid_prefix_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+describe ::Trax::Model::UUIDPrefix do
+  subject{ Trax::Model::UUIDPrefix.new('1a') }
+
+  describe "#to_i" do
+    {"1a" => 10, "2a" => 20, "9e" => 94, "8d" => 83, "0a" => 0, "0b" => 1, "f9" => 251}.each_pair do |prefix_string, assertion|
+      it "#{prefix_string} should eq #{assertion}" do
+        prefix = ::Trax::Model::UUIDPrefix.new(prefix_string)
+
+        prefix.to_i.should eq assertion
+      end
+    end
+  end
+
+  describe ".all" do
+    it { described_class.all.should include("9a") }
+    it { described_class.all.length.should eq 120 }
+  end
+
+  describe ".build_from_integer" do
+    it { described_class.build_from_integer(10).should eq "1a" }
+  end
+
+  describe "#next" do
+    let(:test_subject) { Product.uuid_prefix }
+
+    it { test_subject.next.should eq '1b' }
+
+    context "lower to higher register transitions" do
+      let(:test_subject) { ::Trax::Model::UUIDPrefix.new('9f') }
+      it { test_subject.next.should eq 'a0'}
+    end
+  end
+
+  describe "#previous" do
+    let(:test_subject) { Product.uuid_prefix }
+
+    it { test_subject.previous.should eq '0f' }
+  end
+
+  describe "#to_i" do
+    context "when prefix in {int,str} order" do
+      let(:test_subject) { Product.uuid_prefix }
+
+      it { test_subject.to_i.should eq 10 }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trax_model
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jason Ayre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trax_core
@@ -271,6 +271,7 @@ files:
 - lib/trax/model/registry.rb
 - lib/trax/model/unique_id.rb
 - lib/trax/model/uuid.rb
+- lib/trax/model/uuid_prefix.rb
 - lib/trax/model/validators.rb
 - lib/trax/string.rb
 - lib/trax/validators/email_validator.rb
@@ -287,6 +288,7 @@ files:
 - spec/trax/model/matchable_spec.rb
 - spec/trax/model/registry_spec.rb
 - spec/trax/model/unique_id_spec.rb
+- spec/trax/model/uuid_prefix_spec.rb
 - spec/trax/model/uuid_spec.rb
 - spec/trax/model_spec.rb
 - spec/trax/string_spec.rb
@@ -327,6 +329,7 @@ test_files:
 - spec/trax/model/matchable_spec.rb
 - spec/trax/model/registry_spec.rb
 - spec/trax/model/unique_id_spec.rb
+- spec/trax/model/uuid_prefix_spec.rb
 - spec/trax/model/uuid_spec.rb
 - spec/trax/model_spec.rb
 - spec/trax/string_spec.rb