rack-cachely 0.0.1 → 0.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-cachely (0.0.1)
+    rack-cachely (0.1.0)
       rack
 
 GEM

data/lib/rack-cachely/config.rb

@@ -6,8 +6,7 @@ module Rack
 
       def initialize(options = {})
         self.options = options
-        self.options[:cachely_api_key] ||= ENV["CACHELY_API_KEY"]
-        self.options[:cachely_url] = "#{(self.options[:cachely_url] ||= ENV["CACHELY_URL"])}/v1/cache?_token=#{self.options[:cachely_api_key]}"
+        self.options[:cachely_url] = "#{(self.options[:cachely_url] ||= ENV["CACHELY_URL"])}/v1/cache"
       end
 
       def method_missing(sym, *args, &block)

data/lib/rack-cachely/store.rb

@@ -9,8 +9,17 @@ module Rack
 
       def get(key)
         remote do
-          uri = URI("#{config.cachely_url}&url=#{CGI.escape(key.to_s)}")
-          response = Net::HTTP.get_response(uri)
+          url = "#{config.cachely_url}?url=#{CGI.escape(key.to_s)}"
+          uri = URI(url)
+          http = Net::HTTP.new(uri.host, uri.port)
+          request = Net::HTTP::Get.new(uri.request_uri)
+          matches = url.scan(/\/\/(.+)@/).flatten
+
+          if matches.any?
+            u, p = matches.first.split(":")
+            request.basic_auth(u, p)
+          end
+          response = http.request(request)
           if config.verbose
             logger.info "Cachely [uri]: #{uri}"
             logger.info "Cachely [response.code]: #{response.code}"
@@ -34,8 +43,7 @@ module Rack
             "document[url]" => key,
             "document[status]" => rack[0].to_i,
             "document[body]" => body,
-            "document[age]" => options[:age] || 0,
-            "_token" => Rack::Cachely.config.cachely_api_key
+            "document[age]" => options[:age] || 0
           }
           rack[1].each do |key, value|
             data["document[headers][#{key}]"] = value
@@ -53,7 +61,7 @@ module Rack
       end
 
       def delete(pattern)
-        Net::HTTP.post_form(URI(config.cachely_url), {_method: "DELETE", pattern: pattern, _token: config.cachely_api_key})
+        Net::HTTP.post_form(URI(config.cachely_url), {_method: "DELETE", pattern: pattern})
       end
 
       def remote(&block)

data/lib/rack-cachely/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Cachely
-    VERSION = "0.0.1"
+    VERSION = "0.1.0"
   end
 end

data/spec/rack-cachely/store_spec.rb

@@ -8,9 +8,14 @@ describe Rack::Cachely::Store do
   describe "get" do
   
     it "retreives a page from the service" do
-      mock = double(code: "200", body: "hello!")
-      mock.stub!(:each_header).and_yield("Content-Type", "text/html")
-      Net::HTTP.stub!(:get_response).and_return(mock)
+      response_mock = double(code: "200", body: "hello!")
+      response_mock.stub!(:each_header).and_yield("Content-Type", "text/html")
+      Net::HTTP::Get.should_receive(:new).with("/v1/cache?url=http%3A%2F%2Fexample.com").and_return {
+        m = double
+        m.should_receive(:basic_auth).with("1234567890", nil)
+        m
+      }
+      Net::HTTP.should_receive(:new).with("www.cachelyapp.com", 80).and_return(double(request: response_mock))
 
       res = store.get(key)
       res[0].should eql(200)
@@ -42,8 +47,7 @@ describe Rack::Cachely::Store do
         "document[status]" => 200, 
         "document[body]" => "hello!", 
         "document[age]" => 30, 
-        "document[headers][Content-Type]"=>"text/html",
-        "_token" => Rack::Cachely.config.cachely_api_key
+        "document[headers][Content-Type]" => "text/html"
       }
     end
     

data/spec/spec_helper.rb

@@ -6,12 +6,14 @@ require 'rack-cachely' # and any other gems you need
 require 'active_support/core_ext'
 require 'vcr'
 
+ENV["CACHELY_URL"] = "http://1234567890@www.cachelyapp.com"
+
 Dir[File.expand_path(File.join("support", "**", "*.rb"), File.dirname(__FILE__))].each {|f| require f}
 
 RSpec.configure do |config|
 
   config.before do
-    Rack::Cachely.config = Rack::Cachely::Config.new(cachely_api_key: '1234567890', cachely_url: "http://localhost:9292")
+    Rack::Cachely.config = Rack::Cachely::Config.new
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-cachely
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors: