e20_ops_middleware 2.0.1 → 2.1.0

data/Gemfile

@@ -3,6 +3,6 @@ source :rubyforge
 gem "jeweler", "~> 1.4.0"
 gem "rspec", "~> 1.3.0"
 gem "rake", "~> 0.8.7"
-gem "uuid", "~> 2.1.0"
+gem "uuidtools"
 gem "activesupport", "~> 2.3.8"
 gem "json_pure", "= 1.4.3"

data/Gemfile.lock

@@ -9,13 +9,11 @@ GEM
       git (>= 1.2.5)
       rubyforge (>= 2.0.0)
     json_pure (1.4.3)
-    macaddr (1.0.0)
     rake (0.8.7)
     rspec (1.3.0)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
-    uuid (2.1.1)
-      macaddr (~> 1.0)
+    uuidtools (2.1.1)
 
 PLATFORMS
   ruby
@@ -26,4 +24,4 @@ DEPENDENCIES
   json_pure (= 1.4.3)
   rake (~> 0.8.7)
   rspec (~> 1.3.0)
-  uuid (~> 2.1.0)
+  uuidtools

data/Rakefile

@@ -11,7 +11,7 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/efficiency20/ops_middleware"
   gem.description = "Adds middleware for debugging purposes"
   gem.authors = ["Efficiency 2.0"]
-  gem.add_dependency "uuid", "~> 2.1.0"
+  gem.add_dependency "uuidtools", "~> 2.1"
   gem.add_development_dependency "rspec", "~> 1.3.0"
 end
 

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.1.0

data/lib/e20/ops/middleware/transaction_id_middleware.rb

@@ -1,4 +1,4 @@
-require "uuid"
+require "uuidtools"
 require "logger"
 
 module E20
@@ -8,12 +8,12 @@ module E20
 
         def initialize(app, options = {})
           @app = app
-          @uuid_generator = options[:uuid_generator] || UUID.new
+          @uuid_generator = options[:uuid_generator] || UUIDTools::UUID.method(:random_create)
           @logger = options[:logger] || Logger.new(STDOUT)
         end
 
         def call(env)
-          uuid = @uuid_generator.generate
+          uuid = @uuid_generator.call.to_s
           @logger.info "[#{self.class.name}] Transaction ID: #{uuid}"
 
           status, headers, body = @app.call(env)

data/spec/ops/middleware/transaction_id_middleware_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe E20::Ops::Middleware::TransactionIdMiddleware do
   let(:app)    { Proc.new { |env| [200, {}, "OK!"] } }
-  let(:uuid)   { stub(:generate => "abc123") }
+  let(:uuid)   { stub(:call => "abc123") }
   let(:logger) { Logger.new(StringIO.new) }
 
   it "is initialized with an app" do

data/spec/ops/revision_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require "tmpdir"
 
 describe E20::Ops::Revision do
   context "when a REVISION file is present" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: e20_ops_middleware
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 2
-  - 0
   - 1
-  version: 2.0.1
+  - 0
+  version: 2.1.0
 platform: ruby
 authors: 
 - Efficiency 2.0
@@ -15,24 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-29 00:00:00 -04:00
+date: 2010-09-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  name: uuid
+  name: uuidtools
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 1
         segments: 
         - 2
         - 1
-        - 0
-        version: 2.1.0
+        version: "2.1"
   requirement: *id001
 - !ruby/object:Gem::Dependency 
   prerelease: false