restfully 0.8.7 → 0.8.8

data/bin/restfully

@@ -68,9 +68,9 @@ if given_uri = ARGV.shift
   @options["uri"] = given_uri
 end
 
-def session
-  @session ||= Restfully::Session.new(@options)
-end
+@session = Restfully::Session.new(@options)
+
+def session; @session; end
 
 def root 
   @root ||= session.root

data/lib/restfully/session.rb

@@ -1,5 +1,7 @@
 require 'logger'
 require 'uri'
+require 'open-uri'
+
 require 'restclient'
 require 'restclient/components'
 require 'rack/cache'
@@ -47,13 +49,13 @@ module Restfully
       config_file = File.expand_path(config_file) if config_file
       if config_file && File.file?(config_file) && File.readable?(config_file)
         @logger.info "Using configuration file located at #{config_file}."
-        @config = YAML.load_file(config_file).symbolize_keys.merge(@config)
-      end
-
-      # Require additional media-types:
-      (@config[:require] || []).each do |r|
-        @logger.info "Requiring #{r} media-type..."
-        require "restfully/media_type/#{r.underscore}"
+        @config = YAML.load_file(config_file).symbolize_keys.merge(@config) do |key, oldval, newval|
+          case oldval
+          when Array then oldval.push(newval).flatten
+          when Hash then oldval.merge(newval)
+          else newval
+          end
+        end
       end
 
       @config[:retry_on_error] ||= 5
@@ -73,6 +75,27 @@ module Restfully
       authenticate(@config)
       setup_cache(@config.delete(:cache))
 
+      # Require additional types (e.g.: media-types):
+      (@config[:require] || []).each do |r|
+        @logger.info "Requiring #{r}..."
+        if ::File.exist?(file=File.expand_path(r))
+          require file
+        elsif r =~ /^https?:\/\//i
+          begin
+            resource = get(r)
+            file = Tempfile.new(['restfully', '.rb'])
+            file << resource.response.body
+            file.close
+            require file.path.gsub(/\.rb^/,'')
+          rescue HTTP::Error => e
+            logger.fatal "Can't fetch #{r} from the Internet. Aborting."
+            raise e
+          end
+        else
+          require "restfully/media_type/#{r.underscore}"
+        end
+      end
+
       yield root, self if block_given?
     end
 

data/lib/restfully/version.rb

@@ -1,3 +1,3 @@
 module Restfully
-  VERSION = "0.8.7"
+  VERSION = "0.8.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restfully
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-28 00:00:00.000000000 +02:00
+date: 2011-09-21 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2153574600 !ruby/object:Gem::Requirement
+  requirement: &2153881280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2153574600
+  version_requirements: *2153881280
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2153574140 !ruby/object:Gem::Requirement
+  requirement: &2153880820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *2153574140
+  version_requirements: *2153880820
 - !ruby/object:Gem::Dependency
   name: rest-client-components
-  requirement: &2153573760 !ruby/object:Gem::Requirement
+  requirement: &2153912940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153573760
+  version_requirements: *2153912940
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &2153573300 !ruby/object:Gem::Requirement
+  requirement: &2153912480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153573300
+  version_requirements: *2153912480
 - !ruby/object:Gem::Dependency
   name: backports
-  requirement: &2153572880 !ruby/object:Gem::Requirement
+  requirement: &2153912060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153572880
+  version_requirements: *2153912060
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &2153572460 !ruby/object:Gem::Requirement
+  requirement: &2153911640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153572460
+  version_requirements: *2153911640
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153571960 !ruby/object:Gem::Requirement
+  requirement: &2153911140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *2153571960
+  version_requirements: *2153911140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153603940 !ruby/object:Gem::Requirement
+  requirement: &2153910640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *2153603940
+  version_requirements: *2153910640
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2153603560 !ruby/object:Gem::Requirement
+  requirement: &2153910260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153603560
+  version_requirements: *2153910260
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &2153603100 !ruby/object:Gem::Requirement
+  requirement: &2153909800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153603100
+  version_requirements: *2153909800
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &2153602680 !ruby/object:Gem::Requirement
+  requirement: &2153909380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,7 +132,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153602680
+  version_requirements: *2153909380
 description: Consume RESTful APIs effortlessly
 email:
 - cyril.rohr@gmail.com