atlas_middleware 0.0.4 → 0.0.5

data/lib/arcgis_server_rest_proxy.rb

@@ -2,14 +2,22 @@ require 'rack'
 require 'httparty'
 
 class ArcgisServerRestProxy
-  def call(env)
-    request = Rack::Request.new(env)
-    url = request.params.delete('url')
-    call_proxy(url)
+  def call(env)    
+    call_proxy!(Rack::Request.new(env))
   end
 
-  def call_proxy(url)
-    response = HTTParty.get(url, :query => { :f => :json })
-    [response.code, response.headers, response.body]
+  def call_proxy!(request)
+    url = request.params.delete('url')
+    proxy_response = HTTParty.get(url, :query => { :f => :json })
+    response = Rack::Response.new(proxy_response.body, proxy_response.code, {})
+    # HTTParty returns request headers in lowercase
+    if proxy_response.code == 200
+      if proxy_response.headers['cache-control']
+        response.headers['Cache-Control'] = proxy_response.headers['cache-control'].to_s.sub(/private/, 'public')
+      else
+        response.headers['Cache-Control'] = "public, max-age=#{1.day}"
+      end
+    end
+    response.to_a
   end
 end

data/lib/cgns_search.rb

@@ -13,8 +13,9 @@ class CgnsSearch
 
     headers = { "Content-Type" => "application/json" }
     begin
-      response = Rack::Response.new(find(request.params), 200, headers)
-      response = maybe_cache_response(response)
+      response = Rack::Response.new(find(request.params), 200, headers)      
+      # set caching information
+      response.headers['Cache-Control'] = "public, max-age=#{1.week}"
     rescue Exception => e
       response = Rack::Response.new({ :error => e.message }.to_json, 500, headers)
     end
@@ -26,15 +27,4 @@ class CgnsSearch
   def find(query = {})
     CgnsSearch.get('/gnss-srt/api', { :query => query }).to_json
   end
-
-  def maybe_cache_response(response)
-    begin
-      # using rack cache
-      cached_response = Rack::Cache::Response.new(response.status, response.headers, response.body)
-      cached_response.max_age = 1.month
-      cached_response
-    rescue
-      response # just return the original response
-    end
-  end
 end

data/lib/ignore_ext_js_cache_buster.rb

@@ -0,0 +1,14 @@
+# encoding: utf-8
+
+class IgnoreExtJsCacheBuster
+  def initialize(app, cache_param = '_dc')
+    @app = app
+    @cache_param = cache_param
+  end
+
+  def call(env)
+    env["QUERY_STRING"] = env["QUERY_STRING"].to_s.sub(/#{@cache_param}=\d+/, "#{@cache_param}=")
+    @status, @header, @body = @app.call(env)
+    [@status, @header, @body]
+  end
+end

data/lib/map_server_legend_info.rb

@@ -9,7 +9,8 @@ class MapServerLegendInfo
 
     begin
       response = Rack::Response.new(get_legends(request), 200, headers)
-      response = maybe_cache_response(response)
+      # set caching information
+      response.headers['Cache-Control'] = "public, max-age=#{1.week}"
     rescue Exception => e
       response = Rack::Response.new({ :error => e.message }.to_json, 500, headers)
     end
@@ -24,15 +25,4 @@ class MapServerLegendInfo
     legend = map_server.get_legend_info(:map_name => map_name, :image_return_url => true)
     legend.to_json
   end
-
-  def maybe_cache_response(response)
-    begin
-      # using rack cache
-      cached_response = Rack::Cache::Response.new(response.status, response.headers, response.body)
-      cached_response.max_age = 1.week
-      cached_response
-    rescue
-      response # just return the original response
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: atlas_middleware
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Colin Casey
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-14 00:00:00 -03:00
+date: 2009-11-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,6 +95,7 @@ files:
 - lib/arcgis_server_rest_proxy.rb
 - lib/cgns_search.rb
 - lib/export_map_services.rb
+- lib/ignore_ext_js_cache_buster.rb
 - lib/map_server_legend_info.rb
 - lib/postal_code_lookup.rb
 - lib/print_map/job.rb
@@ -131,7 +132,7 @@ requirements:
 - If using Ruby - gem install rmagick (2.11.0)
 - If using JRuby - gem install rmagick4j (0.3.7)
 rubyforge_project: 
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Middleware components for Atlas Projects