dogo 0.0.1 → 0.0.2

data/README.md

@@ -30,9 +30,9 @@ You can create shortened urls by using `Dogo::Url.new`.
 
 ```ruby
 shortened = Dogo::Url.new("http://hellobits.com")
-shortened.id    #=> return some an integer
-shortened.url   #=> return the long url
-shortened.full  #=> return full shortened url
+shortened.id    #=> return some an integer in base 36
+shortened.url   #=> return the shortened url
+shortened.full  #=> return full url
 ```
 
 Starting the server:

data/examples/config.ru

@@ -2,6 +2,7 @@ $:.unshift File.expand_path("../../lib", __FILE__)
 
 require "dogo"
 
+Dogo.host = "http://localhost:9292"
 Dogo.api_key = "abc"
 Dogo.default_url = "http://hellobits.com"
 

data/lib/dogo/server.rb

@@ -17,12 +17,11 @@ module Dogo
     end
 
     get "/shorten" do
-      require "pry"; binding.pry
       halt 401, erb(:"401") unless Dogo.api_key == params[:api_key]
 
       if Dogo::Url.valid?(params[:url])
         shortened = Dogo::Url.new(params[:url])
-        "#{request.scheme}://#{request.host_with_port}/#{shortened.id}"
+        shortened.url
       else
         status 422
         erb(:"422")
@@ -30,10 +29,10 @@ module Dogo
     end
 
     get "/:id" do
-      url = find_or_pass(params[:id])
+      shortened = find_or_pass(params[:id])
+      shortened.click!
 
-      url.click!
-      redirect url.url
+      redirect shortened.full
     end
 
     not_found do

data/lib/dogo/url.rb

@@ -1,6 +1,6 @@
 module Dogo
   class Url
-    attr_reader :url, :id
+    attr_reader :full, :id
 
     # Check if the given URL is valid, according the the
     # +URI+ regular expression.
@@ -17,11 +17,15 @@ module Dogo
       new Dogo.redis.get(key)
     end
 
-    def initialize(url)
-      @url = url
+    def initialize(full)
+      @full = full
       load_or_create
     end
 
+    def url
+      File.join(Dogo.host, id)
+    end
+
     # Increment the click counter for this URL.
     def click!
       Dogo.redis.incr(click_key)
@@ -48,12 +52,12 @@ module Dogo
         @id = key.split(":").last
       else
         @id = next_id.to_s(36)
-        Dogo.redis.set("urls:#{hash}:#{id}", url)
+        Dogo.redis.set("urls:#{hash}:#{id}", full)
       end
     end
 
     def hash
-      @hash ||= Digest::MD5.hexdigest(url)
+      @hash ||= Digest::MD5.hexdigest(full)
     end
   end
 end

data/lib/dogo/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: dogo
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Nando Vieira