tiny_url 0.0.3 → 0.0.4

data/{README.rdoc → README.md}

@@ -1,28 +1,40 @@
-= tiny_url
+# TinyUrl
 
 A gem for tinifying urls
 
-== Installation
+## Installation
 
-  $ gem install tiny_url
+  `$ gem install tiny_url`
 
 Or in the Gemfile
 
-  gem "tiny_url"
-    
-== Usage
+```ruby
+
+gem "tiny_url"
+
+```
+
+## Usage
 
 From the command-line:
 
-  $ tiny_url http://accidentalchinesehipsters.tumblr.com/
+  `$ tiny_url http://accidentalchinesehipsters.tumblr.com/`
+
+  `$ tiny_url -o http://accidentalchinesehipsters.tumbler.com/` - Opens the page in the browser
 
 Anywhere else in Ruby:
-  
-  TinyUrl.silently_tinify "http://thereifixedit.failblog.org/"
 
-== Licence
+```ruby
+
+require "tiny_url"
+
+TinyUrl.make_request "http://thereifixedit.failblog.org/"
+
+```
+
+## Licence
 
-Copyright 2011 Rodrigo Vieira. http://www.rodrigoalvesvieira.com
+Copyright 2011-2012 Rodrigo Alves Vieira. http://www.rodrigoalvesvieira.com
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,15 +1,21 @@
-#require "bundler/gem_tasks"
-
 require 'rake'
 require 'rdoc/task'
 require 'fileutils'
 
-task :test => :spec
+task test: :spec
 
-task :default => :spec
+task default: :spec
 
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = '--backtrace --color'
 end
 
+desc 'Generate documentation for TinyUrl.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'TinyUrl'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README.md')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/bin/tiny_url

@@ -1,10 +1,12 @@
 #!/usr/bin/env ruby
-
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
+require 'tiny_url'
+
+if(ARGV.empty? || ["-h","--help"].include?(ARGV.first))
 help = <<HELP
 
-NAME
+TinyURL Ruby CLI
 
 A command line tool for tinifying urls
 
@@ -13,22 +15,20 @@ BASIC USAGE
 tiny_url [OPTIONS].. [URL]
 
 OPTIONS:
-  --open
-    -o      # Opens the web site in the browser immediately after getting the tiny url.
-  
+  [-o/--open]      # Opens the web site in the browser immediately after getting the tiny url.
+  [-c/--copy]      # Copy the shortened tiny url to your clipboard
+  [-h/--help]      # Show this help message and quit
+
 EXAMPLES:
   
-  tiny_url http://accidentalchinesehipsters.tumblr.com/ # Returns the tinified version of the url, copies it to the clipboard and opens the webpage in your browser.
-  tiny_url -o http://google.com
+  tiny_url http://accidentalchinesehipsters.tumblr.com/ # Returns the tinified version of the url
+  tiny_url -o http://google.com                         # Returns the tinified version of the url and open it in default browser
+  tiny_url -c -o http://defidelis.com                   # Returns the tinified version of the url , open it in browser and copy the tiny url to clipboard
   
 HELP
-
-require 'tiny_url'
-
-if ARGV.size.zero?
-  puts help
-elsif ARGV[0] == "-o" || ARGV[0] == "--open"
-  TinyUrl.tinify(ARGV[0], op="o")
+  puts help and exit
 else
-  TinyUrl.tinify(ARGV[0])
+	open = !(["-o","--open"] & ARGV).empty?
+	copy = !(["-c","--copy"] & ARGV).empty?
+	TinyUrl.tinify(ARGV.last, open, copy)
 end

data/lib/tiny_url.rb

@@ -1,33 +1,29 @@
+# encoding: UTF-8
 require "tiny_url/version"
 require "net/http"
 require "clipboard"
 
 module TinyUrl
-  def self.tinify(url, op=nil)
-    
-    uri = URI.parse "http://tinyurl.com/api-create.php?url=http://#{url}"
-    http = Net::HTTP.new(uri.host, uri.port)
-    request = Net::HTTP::Get.new(uri.request_uri)
-    response = http.request(request)
-    tiny_url = response.body
-    
-    Clipboard.copy tiny_url
-    
-    puts "Copied tiny url to clipboard!"
-    puts "The generated tiny url is #{tiny_url}" if op.nil?
-    
-    if op
-      puts "The generated tiny url is #{tiny_url}, you're gonna see the page..."
-      sleep 1
-      `open #{tiny_url}`
+  # API Base URL
+  BASE_URL = "http://tinyurl.com/api-create.php?url=%s"
+
+  module_function
+  def tinify(url, open=nil, copy_to_clipboard=true)
+    if tiny_url = make_request(url)
+      sucess_message(tiny_url, open, copy_to_clipboard)
+      return true
     end
+    puts "Something wrong..." and return false
+  end
+
+  def sucess_message(tiny_url,open,copy)
+    Clipboard.copy(tiny_url) and puts "Copied the shortened tinyurl to clipboard!" if copy
+    puts "The generated tiny url is #{tiny_url}"
+    system("open",tiny_url) if open
   end
-  
-  def self.silently_tinify(url)
-    uri = URI.parse "http://tinyurl.com/api-create.php?url=http://#{url}"
-    http = Net::HTTP.new(uri.host, uri.port)
-    request = Net::HTTP::Get.new(uri.request_uri)
-    response = http.request(request)
-    tiny_url = response.body
+
+  def make_request(url)
+    URI.parse(url) rescue raise(ArgumentError.new("Invalid URL"))
+    Net::HTTP.get(URI.parse(BASE_URL % url)) rescue return false
   end
 end

data/lib/tiny_url/version.rb

@@ -1,3 +1,3 @@
 module TinyUrl
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/tiny_url_spec.rb

@@ -7,7 +7,7 @@ describe TinyUrl do
   end
   
   it "can tinify url" do
-    url = TinyUrl.silently_tinify "google.com"
+    url = TinyUrl.make_request "google.com"
     url.should_not be_nil    
   end
 end

data/tiny_url.gemspec

@@ -5,9 +5,9 @@ require "tiny_url/version"
 Gem::Specification.new do |s|
   s.name        = "tiny_url"
   s.version     = TinyUrl::VERSION
-  s.authors     = ["Rodrigo Vieira"]
+  s.authors     = ["Rodrigo Alves Vieira"]
   s.email       = ["rodrigovieira1994@gmail.com"]
-  s.homepage    = "http://rodrigoalvesvieira.com/tiny_url"
+  s.homepage    = "http://www.rodrigoalvesvieira.com"
   s.summary     = %q{A gem for tinifying urls}
   s.description = %q{A gem for tinifying urls. With a command-line interface.}
 

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: tiny_url
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
-- Rodrigo Vieira
+- Rodrigo Alves Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-11 00:00:00.000000000 Z
+date: 2012-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
-  requirement: &70107717076440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70107717076440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70107717075940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *70107717075940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
 description: A gem for tinifying urls. With a command-line interface.
 email:
 - rodrigovieira1994@gmail.com
@@ -43,7 +53,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
-- README.rdoc
+- README.md
 - Rakefile
 - bin/tiny_url
 - lib/tiny_url.rb
@@ -51,7 +61,7 @@ files:
 - spec/spec_helper.rb
 - spec/tiny_url_spec.rb
 - tiny_url.gemspec
-homepage: http://rodrigoalvesvieira.com/tiny_url
+homepage: http://www.rodrigoalvesvieira.com
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -71,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: tiny_url
-rubygems_version: 1.8.13
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A gem for tinifying urls