lapis-common 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b47a86ec3a01f1c627e8ef76b589cde22a07fceb
-  data.tar.gz: c5a838b8881d1c032096c93b2d78e68f2b7b25b2
+  metadata.gz: 1679496db3f2c1ebd08176c885f972d39a2bf299
+  data.tar.gz: db84544ca727992e10b80116b8add44c21d37555
 SHA512:
-  metadata.gz: dbc72c5c73ec5f0faee27fadcddbe928343d703be3c0f79bb529903a00a125d0bcacf296527a4c38ca7d891327d5c9a3e3522c678f87ccbb464d3c1b33ee3ae8
-  data.tar.gz: aeceda5bc89dd4eceeefdc6013cc47df6d41fdf8e9f47510a7f37c471e6400b5b02cf2499da6d93f004b9cc2d2720fcb0e8c733cb810bb9680992dc8f1cb1861
+  metadata.gz: 4f6b9359296e663cf3e06927ce623325ba27653f07a0e1b825fd7e90ed953952f19de1c7c0c41431c148b54409fafcbb9e2f4f36ca03533f43b54152aa285972
+  data.tar.gz: b4cf97edc59983d333c1545a51bca30b0003139535b9388a6ca0ff312c0b110af094b07a57586c2c406ffde7fe85563db20166d6455ad56a8a8e55ef1aab82cd

data/lib/lapis/uuid.rb

@@ -52,7 +52,7 @@ module Lapis
         if uuid_str.is_a? String
           # Check the formatting.
           # Note that the validity of the UUID isn't checked.
-          !!/^[0-9a-f]{8}(-?)[0-9a-f]{4}\1[0-9a-f]{4}\1[0-9a-f]{4}\1[0-9a-f]{12}$/i.match(uuid_str)
+          !!/^\A[0-9a-f]{8}(-?)[0-9a-f]{4}\1[0-9a-f]{4}\1[0-9a-f]{4}\1[0-9a-f]{12}\z$/i.match(uuid_str)
         else
           # A string wasn't passed in.
           fail ArgumentError

data/lib/lapis/version.rb

@@ -1,3 +1,3 @@
 module Lapis
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/factories/uuid_factory.rb

@@ -14,10 +14,10 @@ FactoryGirl.define do
 
   factory :uuid_value, class: String do
     transient do
-      association :uuid_str, :strategy => :build
+      association :source, :factory => :uuid_str, :strategy => :build
     end
 
-    initialize_with { uuid_str.delete('-').scan(/../).map(&:hex).pack('C*') }
+    initialize_with { source.delete('-').scan(/../).map(&:hex).pack('C*') }
   end
 
   factory :uuid, class: Lapis::Uuid do
@@ -35,7 +35,7 @@ FactoryGirl.define do
           if source.length == 16
             Lapis::Uuid.new(source)
           else
-            Lapis::Uuid.new(build(:uuid_value, :uuid_str => source))
+            Lapis::Uuid.new(build(:uuid_value, :source => source))
           end
       end
     end

data/spec/lapis/uuid_spec.rb

@@ -2,7 +2,7 @@ require_relative '../spec_helper'
 
 RSpec::Matchers.define :be_a_valid_uuid_string do
   match do |actual|
-    !!/^[0-9a-f]{8}(-?)[0-9a-f]{4}\1[1-5][0-9a-f]{3}\1[89ab][0-9a-f]{3}\1[0-9a-f]{12}$/mi.match(actual)
+    !!/^\A[0-9a-f]{8}(-?)[0-9a-f]{4}\1[1-5][0-9a-f]{3}\1[89ab][0-9a-f]{3}\1[0-9a-f]{12}\z$/i.match(actual)
   end
 
   description do
@@ -32,7 +32,7 @@ RSpec.describe Lapis::Uuid do
     end
   end
   
-  describe '#new' do
+  describe '#initialize' do
     context 'with a valid value' do
       let(:uuid_value) { build(:uuid_value) }
       subject(:uuid) { Lapis::Uuid.new(uuid_value) }
@@ -55,11 +55,10 @@ RSpec.describe Lapis::Uuid do
     end
   end
 
-  context '.generate' do
+  describe '.generate' do
     subject(:uuid) { Lapis::Uuid.generate }
 
     describe 'the value' do
-      let(:other) { build(:uuid) }
       subject { uuid.value }
 
       # The UUID standards don't allow generated UUID to be all zeroes.
@@ -69,6 +68,7 @@ RSpec.describe Lapis::Uuid do
 
       # The chances of two randomly generated UUIDs being identical is virtually impossible.
       it 'is random' do
+        other = build(:uuid)
         is_expected.to_not eq other
       end
     end
@@ -83,12 +83,15 @@ RSpec.describe Lapis::Uuid do
   end
 
   describe '.parse' do
-    let(:uuid_str) { build(:uuid_str) }
     subject { Lapis::Uuid.parse(uuid_str) }
 
-    context 'with a valid UUID' do
-      it 'parses correctly' do
-        is_expected.to eq uuid_str
+    context 'with a valid argument' do
+      context 'with dashes' do
+        let(:uuid_str) { build(:uuid_str) }
+
+        it 'parses correctly' do
+          is_expected.to eq uuid_str
+        end
       end
 
       context 'without dashes' do
@@ -115,6 +118,14 @@ RSpec.describe Lapis::Uuid do
         expect { subject }.to raise_error(ArgumentError)
       end
     end
+
+    context 'with newlines' do
+      let(:uuid_str) { "\n" + build(:uuid_str) + "\n" }
+
+      it 'returns nil' do
+        is_expected.to be_nil
+      end
+    end
   end
 
   describe '#value' do
@@ -129,12 +140,8 @@ RSpec.describe Lapis::Uuid do
       is_expected.to be_frozen
     end
 
-    describe 'its length' do
-      subject { value.length }
-
-      it 'is 16 bytes' do
-        is_expected.to be 16
-      end
+    it 'is 16 bytes' do
+      expect(value.length).to be 16
     end
   end
 
@@ -306,7 +313,7 @@ RSpec.describe Lapis::Uuid do
 
     context 'with a lesser value' do
       let(:first)  { build(:uuid, :source => greater) }
-      let(:second) { build(:uuid_value, :uuid_str => lesser) }
+      let(:second) { build(:uuid_value, :source => lesser) }
 
       it 'is 1' do
         is_expected.to eq 1
@@ -315,7 +322,7 @@ RSpec.describe Lapis::Uuid do
 
     context 'with a greater value' do
       let(:first)  { build(:uuid, :source => lesser) }
-      let(:second) { build(:uuid_value, :uuid_str => greater) }
+      let(:second) { build(:uuid_value, :source => greater) }
 
       it 'is -1' do
         is_expected.to eq(-1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lapis-common
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Michael Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-10 00:00:00.000000000 Z
+date: 2016-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler