social-avatar-proxy 0.0.4 → 0.0.5

data/lib/social_avatar_proxy/app.rb

@@ -56,7 +56,7 @@ module SocialAvatarProxy
             directives << "no-cache" if cc[:no_cache]
             directives << "max-stale=#{cc[:max_stale]}" if cc[:max_stale]
             directives << "max-age=#{cc[:max_age]}" if cc[:max_age]
-            directives << cc[:public] ? "public" : "private"
+            directives << (cc[:public] ? "public" : "private")
             response["Cache-Control"] = directives.join("; ")
           end
           # set the data

data/lib/social_avatar_proxy/version.rb

@@ -1,3 +1,3 @@
 module SocialAvatarProxy
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/social_avatar_proxy/app_spec.rb

@@ -3,10 +3,13 @@ require "rack"
 
 describe SocialAvatarProxy::App do
   subject do
-    app = SocialAvatarProxy::App
     Rack::MockRequest.new(app)
   end
   
+  let(:app) { SocialAvatarProxy::App.new(options) }
+
+  let(:options) { Hash.new }
+  
   let(:successful_response) do
     response = Net::HTTPSuccess.new("1.1", 200, "Success")
     response.stub(:stream_check).and_return(true)
@@ -25,6 +28,15 @@ describe SocialAvatarProxy::App do
     klass.any_instance.stub(:response).and_return(response)
   end
   
+  describe "::call" do
+    let(:response) { successful_response }
+    let(:app) { SocialAvatarProxy::App }
+
+    it "should be callable from the class" do
+      expect(subject.get("/twitter/dave").status).to eq(200)
+    end
+  end
+  
   context "given an invalid path" do
     it "should return a 404 response" do
       path = "/unknown"
@@ -35,11 +47,59 @@ describe SocialAvatarProxy::App do
   context "given a valid path" do
     context "that finds an existing avatar" do
       let(:response) { successful_response }
+      let(:path) { "/facebook/61413673" }
       
       it "should return a 200 response" do
-        path = "/facebook/61413673"
         expect(subject.get(path).status).to eq(200)
       end
+      
+      it "should return a Cache-Control header by default" do
+        expect(subject.get(path).headers["Cache-Control"]).to eq("max-stale=86400; max-age=86400; public")
+      end
+      
+      it "should return a Expires header by default" do
+        expect(subject.get(path).headers["Expires"]).to eq((Time.now + 86400).httpdate)
+      end
+      
+      context "given Cache-Control is turned off" do
+        let(:options) do
+          { cache_control: false }
+        end
+        
+        it "should not return a Cache-Control header" do
+          expect(subject.get(path).headers["Cache-Control"]).to be_nil
+        end
+      end
+      
+      context "given Cache-Control is set to private" do
+        let(:options) do
+          { cache_control: { public: false } }
+        end
+        
+        it "should return a Cache-Control header marked for private use" do
+          expect(subject.get(path).headers["Cache-Control"]).to match(/private$/)
+        end
+      end
+      
+      context "given Expires is turned off" do
+        let(:options) do
+          { expires: false }
+        end
+        
+        it "should not return a Cache-Control header" do
+          expect(subject.get(path).headers["Expires"]).to be_nil
+        end
+      end
+      
+      context "given Expires is set to two days" do
+        let(:options) do
+          { expires: (86400 * 2) }
+        end
+        
+        it "should not return a Cache-Control header" do
+          expect(subject.get(path).headers["Expires"]).to eq((Time.now + (86400 * 2)).httpdate)
+        end
+      end
     end
     
     context "that fails to find an avatar" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social-avatar-proxy
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -136,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 308556052636751640
+      hash: -2134945313775672714
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 308556052636751640
+      hash: -2134945313775672714
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24