swd 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    swd (0.0.1)
+    swd (0.0.2)
       activesupport (>= 3)
       attr_required (>= 0.0.3)
       httpclient (>= 2.2.1)

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/swd.rb

@@ -6,7 +6,7 @@ module SWD
     @@cache
   end
   def self.discover!(attributes = {})
-    Resource.new(attributes).discover!
+    Resource.new(attributes).discover!(attributes[:cache])
   end
 end
 

data/lib/swd/resource.rb

@@ -16,12 +16,11 @@ module SWD
         self.send "#{key}=", attributes[key]
       end
       @path ||= '/.well-known/simple-web-discovery'
-      @cache_options = attributes[:cache] || {}
       attr_missing!
     end
 
-    def discover!
-      SWD.cache.fetch(cache_key, @cache_options) do
+    def discover!(cache_options = {})
+      SWD.cache.fetch(cache_key, cache_options) do
         handle_response do
           HTTPClient.get_content endpoint.to_s
         end
@@ -44,7 +43,7 @@ module SWD
       if redirect = res[:SWD_service_redirect]
         redirect_to redirect[:location], redirect[:expires]
       else
-        Response.new res
+        to_response_object(res)
       end
     rescue HTTPClient::BadResponseError => e
       case e.res.try(:status)
@@ -65,6 +64,10 @@ module SWD
       raise Exception.new(e.message)
     end
 
+    def to_response_object(hash)
+      Response.new hash
+    end
+
     def redirect_to(location, expires)
       uri = URI.parse(location)
       @host, @path = uri.host, uri.path

metadata

@@ -2,7 +2,7 @@
 name: swd
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - nov matake
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-19 00:00:00 Z
+date: 2011-08-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json