Permalink
Browse files

Applied Apache 2.0 license

update README
  • Loading branch information...
1 parent f787603 commit f1210f5a12bed24a9a68fae97234addc904fdbe0 @whomwah whomwah committed Nov 14, 2011
Showing with 628 additions and 73 deletions.
  1. +0 −2 .gitignore
  2. +1 −0 .rvmrc
  3. +6 −0 AUTHORS
  4. +556 −0 COPYING
  5. +21 −0 Gemfile.lock
  6. +0 −22 LICENSE
  7. +44 −0 README.md
  8. +0 −48 README.org
  9. +0 −1 linkr.gemspec
View
@@ -1,5 +1,3 @@
*.gem
.bundle
-Gemfile.lock
pkg/*
-.rvmrc
View
1 .rvmrc
@@ -0,0 +1 @@
+rvm --create use 1.9.2@linkr
View
@@ -0,0 +1,6 @@
+AUTHORS
+
+British Broadcasting Corporation
+--------------------------------
+
+- Duncan Robertson <duncan.robertson at bbc.co.uk>
View
556 COPYING

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -0,0 +1,21 @@
+PATH
+ remote: .
+ specs:
+ linkr (0.1.1)
+ addressable
+
+GEM
+ remote: http://rubygems.org/
+ specs:
+ addressable (2.2.6)
+ fakeweb (1.3.0)
+ rake (0.9.2)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ bundler (>= 1.0.0)
+ fakeweb
+ linkr!
+ rake
View
22 LICENSE
@@ -1,22 +0,0 @@
-Copyright (c) 2011, Duncan Robertson, British Broadcasting Corporation
-
-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.
View
@@ -0,0 +1,44 @@
+# Linkr
+
+## Overview
+
+A Ruby library for following links. NET/HTTP does not auto-redirect when webpages
+return redirects 301's. Also with the amount of url shortening services out there
+it is common to want to resolve urls to the cononical version.
+
+Linkr fixes this problem through a simple interface.
+
+## Dependencies
+
+* Uses Net::HTTP under the hood.
+* Linkr requires the addressable Gem. This will be installed as a dependancy
+when you install Linkr
+
+## Installation
+
+ gem install linkr
+
+## Usage
+
+ require 'linkr'
+
+ # easy url resolving
+ Linkr.resolve("http://bbc.in/pdTHqe") => http://www.bbc.co.uk
+
+ # if you need more info
+ link = Linkr.new("http://bbc.in/pdTHqe", {
+ redirect_limit => 10 # default 5
+ })
+ link.body => "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Tr
+ ansitional//EN\" \"http://www.w3.org/TR/xh".......</body></html>"
+
+## Todo
+
+* currently the passed url is returned unless it is redrected, so 500 errors for example are not reflected
+* refactor resolve code
+
+## Contributing
+
+* Fork the project
+* Send a pull request
+* Don't touch the .gemspec, I'll do that when I release a new version
View
@@ -1,48 +0,0 @@
-* Linkr
-
-** Overview
-
-A Ruby library for following links. NET/HTTP does not auto-redirect when webpages
-return redirects 301's. Also with the amount of url shortening services out there
-it is common to want to resolve urls to the cononical version.
-
-Linkr fixes this problem through a simple interface.
-
-** Dependencies
-
-- Uses Net::HTTP under the hood.
-- Linkr requires the addressable Gem. This will be installed as a dependancy
-when you install Linkr
-
-** Installation
-
-: gem install linkr
-
-** Usage
-
-: require 'linkr'
-:
-: # easy url resolving
-: Linkr.resolve("http://bbc.in/pdTHqe") => http://www.bbc.co.uk
-:
-: # if you need more info
-: link = Linkr.new("http://bbc.in/pdTHqe", {
-: redirect_limit => 10 # default 5
-: })
-: link.body => "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Tr
-: ansitional//EN\" \"http://www.w3.org/TR/xh".......</body></html>"
-
-** Todo
-
-- currently the passed url is returned unless it is redrected, so 500 errors for example are not reflected
-- refactor resolve code
-
-** Contributing
-
-- Fork the project
-- Send a pull request
-- Don't touch the .gemspec, I'll do that when I release a new version
-
-** Author
-
-[[http://whomwah.com][Duncan Robertson]] - BBC R&D
View
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
s.add_development_dependency "fakeweb"
s.add_development_dependency("bundler", ">= 1.0.0")
- s.has_rdoc = false
s.files = `git ls-files`.split("\n")
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

0 comments on commit f1210f5

Please sign in to comment.