vidibus-uuid 0.3.6 → 0.3.7

data/.rspec

@@ -0,0 +1,2 @@
+--colour
+--format nested

data/Gemfile

@@ -0,0 +1,8 @@
+source "http://rubygems.org"
+
+gem "mongoid", "~> 2.0.0.beta.17"
+gem "uuid", "~> 2.3.1"
+
+# Development dependencies
+gem "rspec", "~> 2.0.0.beta.20"
+gem "relevance-rcov"

data/Gemfile.lock

@@ -0,0 +1,43 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.0)
+      activesupport (= 3.0.0)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activesupport (3.0.0)
+    bson (1.0.4)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
+    i18n (0.4.1)
+    macaddr (1.0.0)
+    mongo (1.0.7)
+      bson (>= 1.0.4)
+    mongoid (2.0.0.beta.17)
+      activemodel (~> 3.0.0)
+      bson (= 1.0.4)
+      mongo (= 1.0.7)
+      tzinfo (~> 0.3.22)
+      will_paginate (~> 3.0.pre)
+    relevance-rcov (0.9.2.1)
+    rspec (2.0.0.beta.20)
+      rspec-core (= 2.0.0.beta.20)
+      rspec-expectations (= 2.0.0.beta.20)
+      rspec-mocks (= 2.0.0.beta.20)
+    rspec-core (2.0.0.beta.20)
+    rspec-expectations (2.0.0.beta.20)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0.beta.20)
+    tzinfo (0.3.23)
+    uuid (2.3.1)
+      macaddr (~> 1.0)
+    will_paginate (3.0.pre2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  mongoid (~> 2.0.0.beta.17)
+  relevance-rcov
+  rspec (~> 2.0.0.beta.20)
+  uuid (~> 2.3.1)

data/README.rdoc

@@ -2,7 +2,7 @@
 
 This gem is part of the open source SOA framework Vidibus: http://www.vidibus.org
 
-It generates compact UUIDs. Basically, this is an abstraction of http://github.com/assaf/uuid
+It generates and validates compact UUIDs. Basically, this is an abstraction of http://github.com/assaf/uuid
 
 
 == Installation
@@ -18,6 +18,9 @@ Then call bundle install on your console.
 
   Vidibus::Uuid.generate
   # => "b063263064e0012d47b658b035f038ab"
+  
+  Vidibus::Uuid.validate("b063263064e0012d47b658b035f038ab")
+  # => true
 
 
 === Usage in Mongoid model
@@ -33,15 +36,15 @@ This will extend your model as follows:
 
   class MyModel
     include Mongoid::Document
-  
+    
     field :uuid
     index :uuid, :unique => true
-  
+    
     before_validation :generate_uuid
     validates :uuid, :uniqueness => true, :uuid => true
-  
+    
     private
-  
+    
     def generate_uuid
       return unless new_record?
       self.uuid ||= Vidibus::Uuid.generate

data/Rakefile

@@ -1,5 +1,8 @@
 require "rubygems"
 require "rake"
+require "rake/rdoctask"
+require "rspec"
+require "rspec/core/rake_task"
 
 begin
   require "jeweler"
@@ -10,31 +13,20 @@ begin
     gem.email = "andre@vidibus.com"
     gem.homepage = "http://github.com/vidibus/vidibus-uuid"
     gem.authors = ["Andre Pankratz"]
-    gem.add_development_dependency "rspec"
-    gem.add_development_dependency "mongoid", "= 2.0.0.beta.15"
-    gem.add_dependency "uuid"
+    gem.add_dependency "mongoid", "~> 2.0.0.beta.17"
+    gem.add_dependency "uuid", "~> 2.3.1"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require "spec/rake/spectask"
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << "lib" << "spec"
-  spec.spec_files = FileList["spec/**/*_spec.rb"]
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |t|
-  t.spec_files = FileList['spec/vidibus/**/*_spec.rb']
+Rspec::Core::RakeTask.new(:rcov) do |t|
+  t.pattern = "spec/**/*_spec.rb"
   t.rcov = true
-  t.rcov_opts = ['--exclude', '^spec,/gems/']
+  t.rcov_opts = ["--exclude", "^spec,/gems/"]
 end
 
-task :spec => :check_dependencies
-task :default => :spec
-
-require "rake/rdoctask"
 Rake::RDocTask.new do |rdoc|
   version = File.exist?("VERSION") ? File.read("VERSION") : ""
   rdoc.rdoc_dir = "rdoc"
@@ -43,4 +35,3 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include("lib/**/*.rb")
   rdoc.options << "--charset=utf-8"
 end
-

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

data/lib/vidibus-uuid.rb

@@ -4,8 +4,8 @@ require "vidibus/uuid/mongoid"
 
 if defined?(Rails)
   module Vidibus::Uuid
-    class Engine < ::Rails::Engine; end  
+    class Engine < ::Rails::Engine; end
   end
 end
 
-ActiveModel::Validations.send(:include, Vidibus::ValidateUuid)
+ActiveModel::Validations.send(:include, Vidibus::ValidateUuid)

data/lib/vidibus/uuid.rb

@@ -2,8 +2,16 @@ require "uuid"
 
 module Vidibus
   module Uuid
+    
+    # Returns a new compact UUID.
     def self.generate
       UUID.new.generate(:compact)
     end
+    
+    # Returns true if given UUID is valid.
+    def self.validate(uuid)
+      uuid = uuid.to_s
+      UUID.validate(uuid) && uuid.length == 32
+    end
   end
-end
+end

data/lib/vidibus/uuid/mongoid.rb

@@ -2,6 +2,7 @@ module Vidibus
   module Uuid
     module Mongoid
       extend ActiveSupport::Concern
+      
       included do
         field :uuid
         index :uuid, :unique => true
@@ -9,7 +10,7 @@ module Vidibus
         validates :uuid, :uniqueness => true, :uuid => true
       end
       
-      # Returns UUID as param for urls.
+      # Returns UUID as param for URLs.
       def to_param
         uuid
       end
@@ -22,4 +23,4 @@ module Vidibus
       end
     end
   end
-end
+end

data/lib/vidibus/validate_uuid.rb

@@ -2,12 +2,12 @@ module Vidibus
   module ValidateUuid
     class UuidValidator < ActiveModel::EachValidator
       
-      # Ensures that every value is of a valid compact UUID format
+      # Ensures that every value is of a valid compact UUID format.
       def validate_each(record, attribute, value)
-        unless value.to_s.match(/^[a-z0-9]{32}$/)
+        unless Vidibus::Uuid.validate(value)
           record.errors.add(attribute, :invalid_uuid)
         end
       end
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -2,10 +2,8 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 
 require "rubygems"
-require "active_support/core_ext"
-require "spec"
 require "mongoid"
-require "uuid"
+require "rspec"
 require "vidibus-uuid"
 
 Mongoid.configure do |config|
@@ -14,11 +12,10 @@ Mongoid.configure do |config|
   config.master = Mongo::Connection.new.db(name)
 end
 
-Spec::Runner.configure do |config|  
-  config.mock_with :rspec
-  config.before(:each) do  
-    Mongoid.master.collections.select { |c| c.name != 'system.indexes' }.each(&:drop)  
+RSpec.configure do |config|
+  config.after :suite do
+    Mongoid.master.collections.select {|c| c.name !~ /system/ }.each(&:drop)
   end
 end
 
-I18n.load_path += Dir[File.join('config', 'locales', '**', '*.{rb,yml}')]
+I18n.load_path += Dir[File.join('config', 'locales', '**', '*.{rb,yml}')]

data/spec/vidibus/uuid/mongoid_spec.rb

@@ -16,7 +16,7 @@ describe "Vidibus::Uuid::Mongoid" do
   let(:model) { Model.create }
   let(:new_model) { Model.new }
   let(:uuid) { Vidibus::Uuid.generate }
-
+  
   it "should add an uuid field to model" do
     model.should respond_to(:uuid)
   end

data/spec/vidibus/uuid_spec.rb

@@ -1,8 +1,49 @@
 require "spec_helper"
 
 describe "Vidibus::Uuid" do
+  describe ".generate" do
+    
+  end
   it "should return a compact UUID" do
     uuid = Vidibus::Uuid.generate
     uuid.length.should eql(32)
   end
+  
+  describe ".validate" do
+    it "should validate a valid compact UUID" do
+      Vidibus::Uuid.validate("ddeb4500668e012d47bb58b035f038ab").should be_true
+    end
+    
+    it "should validate a valid compact UUID that is given as symbol" do
+      Vidibus::Uuid.validate(:ddeb4500668e012d47bb58b035f038ab).should be_true
+    end
+    
+    it "should not validate an UUID that is not compact" do
+      Vidibus::Uuid.validate("87a96db0-9a91-012d-59e4-58b035f038ab").should be_false
+    end
+    
+    it "should not validate a string that looks like an UUID, but is too short" do
+      Vidibus::Uuid.validate("dbeb4500668e0f839aefg928930efcca").should be_false
+    end
+    
+    it "should not validate a random symbol" do
+      Vidibus::Uuid.validate(:something).should be_false
+    end
+    
+    it "should not validate a random string with 32 characters" do
+      Vidibus::Uuid.validate("somerandomstringwith32characters").should be_false
+    end
+    
+    it "should not validate a string containing non-hex characters" do
+      Vidibus::Uuid.validate("xdeb4500668e012d47bb58b035f038ab").should be_false
+    end
+    
+    it "should not validate nil" do
+      Vidibus::Uuid.validate(nil).should be_false
+    end
+    
+    it "should not validate an empty string" do
+      Vidibus::Uuid.validate("").should be_false
+    end
+  end
 end

data/spec/vidibus/validate_uuid_spec.rb

@@ -9,7 +9,7 @@ end
 
 describe "Vidibus::ValidateUuid::UuidValidator" do
   let(:model) { ModelWithValidations.new }
-
+  
   it "should be available as uuid validator for attribute required_uuid" do
     ModelWithValidations.validators_on(:required_uuid).first.should be_a_kind_of(Vidibus::ValidateUuid::UuidValidator)
   end
@@ -18,18 +18,18 @@ describe "Vidibus::ValidateUuid::UuidValidator" do
     ModelWithValidations.validators_on(:optional_uuid).first.should be_a_kind_of(Vidibus::ValidateUuid::UuidValidator)
   end
   
-  it "should validate ddeb4500668e012d47bb58b035f038ab" do
+  it "should validate valid UUIDs" do
     model.required_uuid = "ddeb4500668e012d47bb58b035f038ab"
     model.should be_valid
   end
   
-  it "should add an error for ddeb4500668e0" do
+  it "should add an error for invalid UUIDs" do
     model.required_uuid = "ddeb4500668e0"
     model.should be_invalid
     model.errors[:required_uuid].should have(1).error
     model.errors[:required_uuid].first.should eql("is not a valid UUID")
   end
-
+  
   it "should add an error on required_uuid, if empty" do
     model.required_uuid = ''
     model.should be_invalid

data/vidibus-uuid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vidibus-uuid}
-  s.version = "0.3.6"
+  s.version = "0.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andre Pankratz"]
-  s.date = %q{2010-08-11}
+  s.date = %q{2010-09-08}
   s.description = %q{Provides UUID generation for Mongoid models. It includes a validator for UUIDs.}
   s.email = %q{andre@vidibus.com}
   s.extra_rdoc_files = [
@@ -19,6 +19,9 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     ".rspec",
+     "Gemfile",
+     "Gemfile.lock",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
@@ -28,7 +31,6 @@ Gem::Specification.new do |s|
      "lib/vidibus/uuid.rb",
      "lib/vidibus/uuid/mongoid.rb",
      "lib/vidibus/validate_uuid.rb",
-     "spec/spec.opts",
      "spec/spec_helper.rb",
      "spec/vidibus/uuid/mongoid_spec.rb",
      "spec/vidibus/uuid_spec.rb",
@@ -52,18 +54,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<mongoid>, ["= 2.0.0.beta.15"])
-      s.add_runtime_dependency(%q<uuid>, [">= 0"])
+      s.add_runtime_dependency(%q<mongoid>, ["~> 2.0.0.beta.17"])
+      s.add_runtime_dependency(%q<uuid>, ["~> 2.3.1"])
     else
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<mongoid>, ["= 2.0.0.beta.15"])
-      s.add_dependency(%q<uuid>, [">= 0"])
+      s.add_dependency(%q<mongoid>, ["~> 2.0.0.beta.17"])
+      s.add_dependency(%q<uuid>, ["~> 2.3.1"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<mongoid>, ["= 2.0.0.beta.15"])
-    s.add_dependency(%q<uuid>, [">= 0"])
+    s.add_dependency(%q<mongoid>, ["~> 2.0.0.beta.17"])
+    s.add_dependency(%q<uuid>, ["~> 2.3.1"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vidibus-uuid
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Andre Pankratz
@@ -15,55 +15,43 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-11 00:00:00 +02:00
+date: 2010-09-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: mongoid
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196477
+        hash: 62196417
         segments: 
         - 2
         - 0
         - 0
         - beta
-        - 15
-        version: 2.0.0.beta.15
-  type: :development
-  version_requirements: *id002
+        - 17
+        version: 2.0.0.beta.17
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: uuid
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 3
+        - 1
+        version: 2.3.1
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 description: Provides UUID generation for Mongoid models. It includes a validator for UUIDs.
 email: andre@vidibus.com
 executables: []
@@ -76,6 +64,9 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- .rspec
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -85,7 +76,6 @@ files:
 - lib/vidibus/uuid.rb
 - lib/vidibus/uuid/mongoid.rb
 - lib/vidibus/validate_uuid.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/vidibus/uuid/mongoid_spec.rb
 - spec/vidibus/uuid_spec.rb

data/spec/spec.opts

@@ -1,2 +0,0 @@
---colour
---format nested