urlshort 0.1.1 → 0.2.0

data/.document

@@ -1,5 +1,5 @@
-README.rdoc
 lib/**/*.rb
 bin/*
+- 
 features/**/*.feature
-LICENSE
+LICENSE.txt

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

@@ -0,0 +1,14 @@
+source "http://rubygems.org"
+# Add dependencies required to use your gem here.
+# Example:
+#   gem "activesupport", ">= 2.3.5"
+
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development do
+  gem "rspec" #, "~> 2.8.0"
+  gem "rdoc" #, "~> 3.12"
+  gem "bundler" #, "~> 1.0.0"
+  gem "jeweler" #, "~> 1.8.4"
+  gem "simplecov" #, ">= 0"
+end

data/Gemfile.lock

@@ -0,0 +1,37 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.3)
+    git (1.2.5)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.7.5)
+    multi_json (1.3.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  jeweler
+  rdoc
+  rspec
+  simplecov

data/LICENSE.txt

@@ -0,0 +1,20 @@
+Copyright (c) 2012 Doug P.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,17 +1,19 @@
 = urlshort
 
-Makes URLs short using services like is.gd and TinyUrl.
+Description goes here.
 
-== Note on Patches/Pull Requests
+== Contributing to urlshort
  
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
 * Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
+* Start a feature/bugfix branch.
+* Commit and push until you are happy with your contribution.
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
 == Copyright
 
-Copyright (c) 2010 Doug P.. See LICENSE for details.
+Copyright (c) 2012 Doug P.. See LICENSE.txt for
+further details.
+

data/Rakefile

@@ -1,41 +1,44 @@
+# encoding: utf-8
+
 require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "urlshort"
-    gem.summary = %Q{Makes URLs short using services like is.gd and TinyUrl.}
-    gem.description = %Q{Makes URLs short using services like is.gd and TinyUrl.}
-    gem.email = "dougtko@gmail.com"
-    gem.homepage = "http://github.com/dougsko/urlshort"
-    gem.authors = ["Doug P."]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_dependency "httpclient"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = "urlshort"
+  gem.homepage = "http://github.com/dougsko/urlshort"
+  gem.license = "MIT"
+  gem.summary = %Q{Gem for shortening URLs}
+  gem.description = %Q{Gem for shortening URLs}
+  gem.email = "dougtko@gmail.com"
+  gem.authors = ["Doug P."]
+  # dependencies defined in Gemfile
 end
+Jeweler::RubygemsDotOrgTasks.new
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end
 
-task :spec => :check_dependencies
-
 task :default => :spec
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/bin/isgd

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'urlshort'
+
+res = IsGd.shorten(ARGV[0])
+if(res == 1)
+    exit 1
+else
+    puts res
+end

data/bin/vgd

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'urlshort'
+
+res = VGd.shorten(ARGV[0])
+if(res == 1)
+    exit 1
+else
+    puts res
+end

data/lib/urlshort.rb

@@ -3,24 +3,97 @@
 ## URL Shortener
 ##
 #
-require 'rubygems'
+
 require 'httpclient'
 
-module UrlShort
+class BadRequest < RuntimeError
+    def initialize(msg)
+        puts "There was a problem with the original long URL provided."
+        puts msg
+    end
+end
 
-    class IsGd
-        def self.shorten(link)
-            clnt = HTTPClient.new
-            clnt.get('http://is.gd/api.php', {:longurl => link} ).content
-        end
+class NotAcceptable < RuntimeError
+    def initialize(msg)
+        puts "There was a problem with the short URL provided."
+        puts msg
     end
+end
 
-    class TinyUrl
-        def self.shorten(link)
-            clnt = HTTPClient.new
-            clnt.get('http://tinyurl.com/api-create.php', {:url => link} ).content
-        end
+class BadGateway < RuntimeError
+    def initialize(msg)
+        puts "Our rate limit was exceeded."
+        puts msg
+    end
+end
+    
+class ServiceUnavailable < RuntimeError
+    def initialize(msg)
+        puts "This service is temporarily unavailable."
+        puts msg
     end
+end
 
+class IsGd
+    def self.shorten(link)
+        err = 0
+        clnt = HTTPClient.new
+        resp = clnt.get('http://is.gd/create.php', 
+                 {:format => 'simple', :url => link} )#.content
+        begin
+            case resp.status_code
+            when 200
+                return resp.content
+            when 400
+                raise BadRequest.new(resp.content)
+            when 406
+                raise NotAcceptable.new(resp.content)
+            when 502
+                raise BadGateway.new(resp.content)
+            when 503
+                raise ServiceUnavailable.new(resp.content)
+            end
+        rescue BadRequest
+            err = 1
+        rescue NotAcceptable
+            err = 1
+        rescue BadGateway
+            err = 1
+        rescue ServiceUnavailable
+            err = 1
+        end
+        return err
+    end
+end
 
+class VGd
+    def self.shorten(link)
+        err = 0
+        clnt = HTTPClient.new
+        resp = clnt.get('http://v.gd/create.php', 
+                 {:format => 'simple', :url => link} )#.content
+        begin
+            case resp.status_code
+            when 200
+                return resp.content
+            when 400
+                raise BadRequest.new(resp.content)
+            when 406
+                raise NotAcceptable.new(resp.content)
+            when 502
+                raise BadGateway.new(resp.content)
+            when 503
+                raise ServiceUnavailable.new(resp.content)
+            end
+        rescue BadRequest
+            err = 1
+        rescue NotAcceptable
+            err = 1
+        rescue BadGateway
+            err = 1
+        rescue ServiceUnavailable
+            err = 1
+        end
+        return err
+    end
 end

data/spec_helper.rb

@@ -0,0 +1,12 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'rspec'
+require 'urlshort'
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+RSpec.configure do |config|
+  
+end

data/urlshort.gemspec

@@ -0,0 +1,72 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "urlshort"
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Doug P."]
+  s.date = "2012-09-29"
+  s.description = "Gem for shortening URLs"
+  s.email = "dougtko@gmail.com"
+  s.executables = ["isgd", "vgd"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bin/isgd",
+    "bin/vgd",
+    "lib/.urlshort.rb.swp",
+    "lib/urlshort.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "spec/urlshort_spec.rb",
+    "spec_helper.rb",
+    "urlshort.gemspec",
+    "urlshort_spec.rb"
+  ]
+  s.homepage = "http://github.com/dougsko/urlshort"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Gem for shortening URLs"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
+    else
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
+  end
+end
+

data/urlshort_spec.rb

@@ -0,0 +1,7 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Urlshort" do
+  it "fails" do
+    fail "hey buddy, you should probably rename this file and start specing for real"
+  end
+end

metadata

@@ -1,98 +1,127 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: urlshort
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Doug P.
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-05-22 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: &75249970 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *75249970
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &75249130 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *75249130
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &75248710 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
+  version_requirements: *75248710
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &75248340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: httpclient
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
-description: Makes URLs short using services like is.gd and TinyUrl.
+  version_requirements: *75248340
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &75247800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *75247800
+description: Gem for shortening URLs
 email: dougtko@gmail.com
-executables: []
-
+executables:
+- isgd
+- vgd
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
+- LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
-- .gitignore
+- .rspec
+- Gemfile
+- Gemfile.lock
 - LICENSE
+- LICENSE.txt
 - README.rdoc
 - Rakefile
 - VERSION
+- bin/isgd
+- bin/vgd
+- lib/.urlshort.rb.swp
 - lib/urlshort.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/urlshort_spec.rb
-has_rdoc: true
+- spec_helper.rb
+- urlshort.gemspec
+- urlshort_spec.rb
 homepage: http://github.com/dougsko/urlshort
-licenses: []
-
+licenses:
+- MIT
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 173180691
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Makes URLs short using services like is.gd and TinyUrl.
-test_files: 
-- spec/urlshort_spec.rb
-- spec/spec_helper.rb
+summary: Gem for shortening URLs
+test_files: []

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC