dogo 0.0.2 → 0.0.3

data/lib/dogo/server.rb

@@ -19,7 +19,9 @@ module Dogo
     get "/shorten" do
       halt 401, erb(:"401") unless Dogo.api_key == params[:api_key]
 
-      if Dogo::Url.valid?(params[:url])
+      if Dogo::Url.shortened?(params[:url])
+        params[:url]
+      elsif Dogo::Url.valid?(params[:url])
         shortened = Dogo::Url.new(params[:url])
         shortened.url
       else

data/lib/dogo/url.rb

@@ -8,8 +8,14 @@ module Dogo
       URI::DEFAULT_PARSER.regexp[:ABS_URI] =~ url.to_s
     end
 
-    #
-    #
+    # Check if the given URL is already shortened.
+    # This will consider the host name and check if the url is already saved.
+    def self.shortened?(url)
+      url.start_with?(Dogo.host) &&
+      find(url.split("/").last)
+    end
+
+    # Find a URL by its shortened id.
     def self.find(id)
       key = Dogo.redis.keys("urls:*:#{id}").first
       return unless key

data/lib/dogo/version.rb

@@ -1,3 +1,3 @@
 module Dogo
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,80 +1,80 @@
 --- !ruby/object:Gem::Specification
 name: dogo
 version: !ruby/object:Gem::Version
+  version: 0.0.3
   prerelease: 
-  version: 0.0.2
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2012-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
   name: redis
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  type: :runtime
   name: sinatra
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  type: :development
   name: pry
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  type: :development
   name: awesome_print
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 description: A Redis-backed shortener url service.
 email:
 - fnando.vieira@gmail.com
@@ -103,17 +103,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23