universal_identifiable 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bc5d482d8dbeb285bec83b006c9433fd0cef381
-  data.tar.gz: 9e90ab652ffd0544d54f5564b997efc31b08d20c
+  metadata.gz: 91f7d2b36d371e5ffbc7f20025af65735e6d1c3f
+  data.tar.gz: 48b468318c9352dc9ed4dfc9e833285ea58e3681
 SHA512:
-  metadata.gz: 5294c8ca97397018e88770739b39c6e1505bfc3229ff8dab4e03f56d941171791bd68488616f5c23c61e1f63ea35111ee6eb33880c2f35d3a53987e9665b7574
-  data.tar.gz: 4d2de664d3b195532e5a92dbaf294ff9a5c589a45baf45bc80418c79186e130f5b9d7a9a7d6b38c2ca38a556ed31bea87d812e99d562434c53d276b053a082ef
+  metadata.gz: 7a9c1fbf3d720d8178b3d139b6a7ec51aaa18c5f68352c9b7617a4d6824869f1548167368d78e2eab4aac491f7fb8b306059768967a8ce45203d60d60cd31b67
+  data.tar.gz: 84cb8169e8002633e070fbe634c1af3cc8233ae3a41dadd278eb5e9965e138affbb773f4e0b99e7d00cc3f608f80b962ad759da9d415398162248f8df8b338ca

data/lib/universal_identifiable.rb

@@ -1,11 +1,11 @@
 require "universal_identifiable/version"
 require 'active_record'
+require 'active_support/core_ext/string'
 
 module UniversalIdentifiable
-  # sample uuid: 'hotel.ritz'
-  # TODO: store underscored modelname as prefix automatically. e.G. '#{modelname}.ritz' when assigning attribute
 
   NAMESPACER = "."
+  REGEX      = Regexp.new("\\#{NAMESPACER}(.*)")
 
   def self.included(base)
     base.validates :uuid, :presence => true, :uniqueness => true
@@ -16,9 +16,16 @@ module UniversalIdentifiable
     options[:namespaced] ? read_attribute(:uuid) : short_uuid
   end
 
+  def uuid=(uuid)
+    uuid = "#{self.class.name.underscore}#{NAMESPACER}#{uuid}" if uuid
+    super uuid
+  end
+
   private
 
   def short_uuid
-    read_attribute(:uuid).split(NAMESPACER).last
+    value = read_attribute(:uuid)
+    value.match(REGEX)[1] if value
   end
+
 end

data/lib/universal_identifiable/version.rb

@@ -1,3 +1,3 @@
 module UniversalIdentifiable
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/test/test_helper.rb

@@ -6,7 +6,7 @@ require 'universal_identifiable'
 class TestCase < Minitest::Spec
 end
 
-class FakeRecord < ActiveRecord::Base
+class Airport < ActiveRecord::Base
   include UniversalIdentifiable
 end
 
@@ -18,7 +18,7 @@ ActiveRecord::Base.establish_connection(
 ActiveRecord::Schema.define do
   self.verbose = false
 
-  create_table :fake_records, :force => true do |t|
+  create_table :airports, :force => true do |t|
     t.string :uuid
   end
 end

data/test/universal_identifier/universal_identifier_test.rb

@@ -5,7 +5,8 @@ module UniversalIdentifiable
   class UniversalIdentifiableTest < TestCase
 
     before do
-      @identifiable_model = FakeRecord.new(:uuid => "airport#{UniversalIdentifiable::NAMESPACER}dortmund")
+      Airport.delete_all
+      @identifiable_model = Airport.new(:uuid => "dortmund")
     end
 
     it "is valid" do
@@ -18,7 +19,7 @@ module UniversalIdentifiable
 
     it "must have attributes present" do
       @identifiable_model.uuid = nil
-      @identifiable_model.valid?
+      refute @identifiable_model.valid?
 
       assert @identifiable_model.errors.full_messages.any? do |message|
         message.include? "blank"
@@ -28,9 +29,9 @@ module UniversalIdentifiable
     it "must be unique" do
       @identifiable_model.save!
 
-      new_model = FakeRecord.new
-      new_model.uuid = @identifiable_model.uuid
-      new_model.valid?
+      new_model = Airport.new
+      new_model.uuid = @identifiable_model.uuid(:namespaced => false)
+      refute new_model.valid?
 
       assert new_model.errors.full_messages.any? do |message|
         message.include? "taken"
@@ -44,6 +45,31 @@ module UniversalIdentifiable
       assert_equal "airport#{UniversalIdentifiable::NAMESPACER}dortmund", @identifiable_model.uuid(:namespaced => true)
     end
 
+    it "prefixes uuid with class name" do
+      airport = Airport.create(:uuid => "dortmund")
+
+      assert_equal "airport#{UniversalIdentifiable::NAMESPACER}dortmund", airport.uuid(:namespaced => true)
+      airport.uuid = "dusseldorf"
+      assert_equal "airport#{UniversalIdentifiable::NAMESPACER}dusseldorf", airport.uuid(:namespaced => true)
+      airport.update_attribute(:uuid, "dortmund")
+      assert_equal "airport#{UniversalIdentifiable::NAMESPACER}dortmund", airport.uuid(:namespaced => true)
+      airport.update_attributes(:uuid => "dusseldorf")
+      assert_equal "airport#{UniversalIdentifiable::NAMESPACER}dusseldorf", airport.uuid(:namespaced => true)
+    end
+
+    it "anything preceeding first namespacer is considered to be the uuid" do
+      airport = Airport.new(:uuid => "dortmund.foo.bar")
+
+      assert_equal "airport#{UniversalIdentifiable::NAMESPACER}dortmund.foo.bar", airport.uuid(:namespaced => true)
+      assert_equal "dortmund.foo.bar", airport.uuid(:namespaced => false)
+
+      airport.uuid = ""
+      assert_equal "", airport.uuid(:namespaced => false)
+
+      airport.uuid = nil
+      assert_equal nil, airport.uuid(:namespaced => false)
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: universal_identifiable
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Andreas Busold
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler