guillotine 1.1.0 → 1.2.0

data/test/mongo_adapter_test.rb

@@ -7,7 +7,7 @@ begin
     def setup
       @collection = Mongo::Connection.new.db('test').collection('guillotine')
       @collection.drop
-      @db = Guillotine::Adapters::MongoAdapter.new(@collection)
+      @db = Guillotine::MongoAdapter.new(@collection)
     end
 
     def test_adding_a_link_returns_code

data/test/redis_adapter_test.rb

@@ -5,7 +5,7 @@ begin
 
   class RedisAdapterTest < Guillotine::TestCase
     redis = Redis.new
-    ADAPTER = Guillotine::Adapters::RedisAdapter.new redis
+    ADAPTER = Guillotine::RedisAdapter.new redis
 
     def setup
       @db = ADAPTER

data/test/riak_adapter_test.rb

@@ -12,14 +12,14 @@ begin
   # Assumes a local dev install of riak is setup
   #
   #   http://wiki.basho.com/Building-a-Development-Environment.html
-  # 
+  #
   # Riak should be accessible from:
   #
   #   http://localhost:8091/riak/guillotine-test
   class RiakAdapterTest < Guillotine::TestCase
     CODE_BUCKET = RIAK_TEST_CLIENT["guillotine-code-test-#{Process.pid}"]
     URL_BUCKET  = RIAK_TEST_CLIENT["guillotine-url-test-#{Process.pid}"]
-    ADAPTER = Guillotine::Adapters::RiakAdapter.new CODE_BUCKET, URL_BUCKET
+    ADAPTER = Guillotine::RiakAdapter.new CODE_BUCKET, URL_BUCKET
 
     def setup
       @db = ADAPTER
@@ -55,7 +55,7 @@ begin
       code = "#{url}_code"
       sha  = @db.url_key url
       url_obj = URL_BUCKET.new sha
-      url_obj.content_type = Guillotine::Adapters::RiakAdapter::PLAIN
+      url_obj.content_type = Guillotine::RiakAdapter::PLAIN
       url_obj.data = code
       url_obj.store
 

data/test/sequel_adapter_test.rb

@@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
 begin
   require 'sequel'
   class SequelAdapterTest < Guillotine::TestCase
-    ADAPTER = Guillotine::Adapters::SequelAdapter.new Sequel.sqlite
+    ADAPTER = Guillotine::SequelAdapter.new Sequel.sqlite
     ADAPTER.setup
 
     def setup

data/test/service_test.rb

@@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
 module Guillotine
   class ServiceTest < TestCase
     def setup
-      @db = Adapters::MemoryAdapter.new
+      @db = MemoryAdapter.new
       @service = Service.new @db
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guillotine
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-26 00:00:00.000000000 Z
+date: 2012-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70212478964620 !ruby/object:Gem::Requirement
+  requirement: &70351788208980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70212478964620
+  version_requirements: *70351788208980
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70212478964160 !ruby/object:Gem::Requirement
+  requirement: &70351788208520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70212478964160
+  version_requirements: *70351788208520
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70212478980140 !ruby/object:Gem::Requirement
+  requirement: &70351788208140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,13 +43,14 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212478980140
+  version_requirements: *70351788208140
 description: Adaptable private URL shortener
 email: technoweenie@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -64,11 +65,13 @@ files:
 - lib/guillotine/adapters/riak_adapter.rb
 - lib/guillotine/adapters/sequel_adapter.rb
 - lib/guillotine/app.rb
+- lib/guillotine/host_checkers.rb
 - lib/guillotine/service.rb
 - script/cibuild
 - test/active_record_adapter_test.rb
 - test/app_test.rb
 - test/helper.rb
+- test/host_checker_test.rb
 - test/memory_adapter_test.rb
 - test/mongo_adapter_test.rb
 - test/redis_adapter_test.rb
@@ -87,9 +90,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2311963122741215687
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -105,6 +105,7 @@ summary: Adaptable private URL shortener
 test_files:
 - test/active_record_adapter_test.rb
 - test/app_test.rb
+- test/host_checker_test.rb
 - test/memory_adapter_test.rb
 - test/mongo_adapter_test.rb
 - test/redis_adapter_test.rb