Removing require rubygems from sources

Removed require rubygems from lib. All samples updated. Rakefile sets rubygems to RUBYOPT if env variable does not exist. You can see more info at http://tomayko.com/writings/require-rubygems-antipattern
alxpborges · May 23, 2012 · 8ae09c7 · 8ae09c7
1 parent fc223c3
commit 8ae09c7
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 23 deletions.
diff --git a/Rakefile b/Rakefile
@@ -1,6 +1,8 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
+ENV["RUBYOPT"] = "rubygems" if ENV["RUBYOPT"].nil?
+
 Rake::TestTask.new do |t|
   t.libs.push "lib"
   t.libs.push "test"

diff --git a/lib/restfolia.rb b/lib/restfolia.rb
@@ -1,7 +1,6 @@
 require "net/http"
 require "uri"
 
-require "rubygems"
 require "multi_json"
 
 require "restfolia/version"

diff --git a/samples/changing_links_parse.rb b/samples/changing_links_parse.rb
@@ -1,8 +1,7 @@
 
 # Run this sample from root project:
-# $ ruby samples/changing_links_parse.rb
+# $ ruby -rubygems samples/changing_links_parse.rb
 
-require "rubygems"
 $LOAD_PATH << "lib"
 require "restfolia"
 

diff --git a/samples/cookies_options.rb b/samples/cookies_options.rb
@@ -1,11 +1,11 @@
 
 # Run this sample from root project:
-# $ ruby samples/cookies_options.rb
+# $ ruby -rubygems samples/cookies_options.rb
 
-require "rubygems"
 $LOAD_PATH << "lib"
 require "restfolia"
 
+# Running https://github.com/rogerleite/simple_api
 SERVICE_URL = "http://localhost:9292/recursos/busca"
 
 sample_cookie = "PREF=ID=988f14fa5edd3243:TM=1335470032:LM=1335470032:S=KVBslNbyz6bG0DqU; expires=Sat, 26-Apr-2014 19:53:52 GMT; path=/; domain=.google.com, NID=59=peUyZQuLWQ_0gELr1yDf0FT4ZlT7ZdITNrO5OhkEnAvp_8MZ4TT6pHq7_q_Su-puTw7vGml_Ok6du8fLreGHzfpMs4Qh1v-qBCFYGuCNbzpwN670x5MFbGKy0KUXA3WP; expires=Fri, 26-Oct-2012 19:53:52 GMT; path=/; domain=.google.com; HttpOnly"

diff --git a/samples/headers_options.rb b/samples/headers_options.rb
@@ -1,11 +1,11 @@
 
 # Run this sample from root project:
-# $ ruby samples/headers_options.rb
+# $ ruby -rubygems samples/headers_options.rb
 
-require "rubygems"
 $LOAD_PATH << "lib"
 require "restfolia"
 
+# Running https://github.com/rogerleite/simple_api
 SERVICE_URL = "http://localhost:9292/recursos/busca"
 
 # accessing headers attribute

diff --git a/samples/http_behaviour.rb b/samples/http_behaviour.rb
@@ -1,14 +1,14 @@
 
 # Run this sample from root project:
-# $ ruby samples/http_behaviour.rb
+# $ ruby -rubygems samples/http_behaviour.rb
 
-require "rubygems"
 $LOAD_PATH << "lib"
 require "restfolia"
-require "ostruct"
 
 Restfolia::HTTP.behaviours do
 
+  clear  #clean all defined behaviours
+
   on(200) do |http_response|
     content_type = (http_response["content-type"] =~ /application\/json/)
     if !content_type
@@ -36,17 +36,13 @@
   #  custom_helper
   #end
 
-  #helpers do
-  #  def custom_helper
-  #    'lixo'
-  #  end
-  #end
-
 end
 
+# Running https://github.com/rogerleite/simple_api
 SERVICE_URL = "http://localhost:9292/recursos/busca"
+
 resource = Restfolia.at(SERVICE_URL).get
-puts resource.inspect
+puts resource.inspect  # => #<Restfolia::Resource ...>
 
 Restfolia.at("http://google.com").get
 # => "3xx error"
diff --git a/samples/using_custom_factory.rb b/samples/using_custom_factory.rb
@@ -1,16 +1,16 @@
 
 # Run this sample from root project:
-# $ ruby samples/using_custom_factory.rb
+# $ ruby -rubygems samples/using_custom_factory.rb
 
-require "rubygems"
 $LOAD_PATH << "lib"
 require "restfolia"
 require "ostruct"
 
+# Running https://github.com/rogerleite/simple_api
 SERVICE_URL = "http://localhost:9292/recursos/busca"
 
 resource = Restfolia.at(SERVICE_URL).get
-puts resource.inspect # => #<Restfolia::Resource ...>
+#puts resource.inspect # => #<Restfolia::Resource ...>
 
 # Here you have the "pure" json from response body.
 # You can do anything.

diff --git a/samples/using_custom_resource.rb b/samples/using_custom_resource.rb
@@ -1,16 +1,16 @@
 
 # Run this sample from root project:
-# $ ruby samples/using_custom_resource.rb
+# $ ruby -rubygems samples/using_custom_resource.rb
 
-require "rubygems"
 $LOAD_PATH << "lib"
 require "restfolia"
 require "ostruct"
 
+# Running https://github.com/rogerleite/simple_api
 SERVICE_URL = "http://localhost:9292/recursos/busca"
 
 resource = Restfolia.at(SERVICE_URL).get
-puts resource.inspect # => #<Restfolia::Resource ...>
+#puts resource.inspect # => #<Restfolia::Resource ...>
 
 # Here you have the advantage to use a custom resource
 # and the same time you have the recursive lookup at hash