seojs 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb6bc5e152cbdeb05722abe53fbe14d57c3d3b34
-  data.tar.gz: e156d998e963b51e3f744c53b0891361273393a3
+  metadata.gz: 1ff41c44815271af27f16d7419a59a8820f270f0
+  data.tar.gz: edeb8d13e24cf062cd5faa3b0294668e103ef68a
 SHA512:
-  metadata.gz: e4390a2d80cdca1c301d78e88c95bbbf453e5b4027bdb248c29a3137dc47baecb9876d50f9c9e746241c92be7f166a6b7ff3246d0c058e91bdd610b0e79acd16
-  data.tar.gz: 3f97266ee32222f2cf58e46a055fbe97803bd25d0dfd67e95f7f58b90469e5e904b84140e062561a0d7c7178d7b9a92862227ea19bc5bd62ffab5ee885632a70
+  metadata.gz: 31b473f7b05c647e43102021e76fc1bebc8f699571c319c243af46838c677c49279609db7d8c6cd8e18e052801cea9ff5913cdd4d0c798e7172be15e10915ece
+  data.tar.gz: 94290ae8623c1cf71847442f7964063ffc25014e1c0a0106dffb714087dbfd8f8db8fcf7e1672106c548f4a0477654770c6b83bac5dcc0b8baa137bf23e7e203

data/Gemfile

@@ -6,7 +6,6 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 
-gem 'rack-rewrite'
 gem 'rack-proxy'
 
 group :development do

data/Gemfile.lock

@@ -51,7 +51,6 @@ GEM
     rack (1.5.2)
     rack-proxy (0.5.1)
       rack
-    rack-rewrite (1.4.01)
     rake (10.1.0)
     rdoc (3.12.2)
       json (~> 1.4)
@@ -72,6 +71,5 @@ DEPENDENCIES
   bundler (~> 1.0)
   jeweler (~> 1.8.7)
   rack-proxy
-  rack-rewrite
   rdoc (~> 3.12)
   shoulda

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/seojs.rb

@@ -1,20 +1,5 @@
 module Seojs
-  @strategy = :forward
 
-  def self.strategy=(value)
-    allowed_values = [:forward, :redirect]
-    unless allowed_values.map(&:to_s).include?(value.to_s)
-      puts "Seojs.strategy must be one of the following values:\n\t#{allowed_values}"
-      return
-    else
-      @strategy = value.to_sym
-    end
-  end
-
-  def self.strategy
-    @strategy
-  end
-  
   def self.token=(value)
     @url = "http://cdn.getseojs.com/snapshots/#{value}"
   end
@@ -26,10 +11,11 @@ module Seojs
   def self.url
     @url
   end
-  
-  self.token = ENV['SEOJS_TOKEN'] if ENV['SEOJS_TOKEN']
-  self.url = ENV['SEOJS_URL'] if ENV['SEOJS_URL']
+
 end
 
+Seojs.token = ENV['SEOJS_TOKEN'] if ENV['SEOJS_TOKEN']
+Seojs.url = ENV['SEOJS_URL'] if ENV['SEOJS_URL']
+
 require 'seojs/middleware'
 require 'seojs/railtie' if defined?(Rails::Railtie)

data/lib/seojs/middleware.rb

@@ -6,18 +6,9 @@ module Seojs
 
     def initialize(app)
       @app   = app
-      
-      backend = "#{Seojs.url}/v3"
-
-      @rack_rewrite = ::Rack::Rewrite.new(app) do |env|
-        r301 %r{(.*_escaped_fragment_.*)}, lambda { |match, rack_env|
-          "#{backend}/#{rack_env['rack.url_scheme']}://#{rack_env['SERVER_NAME']}:#{rack_env['SERVER_PORT']}#{match[0]}"
-        }
-      end
-
-      proxy_app = Rack::Proxy.new(backend: backend, streaming: false)
-
+      proxy_app = Rack::Proxy.new(backend: "#{Seojs.url}/v3", streaming: false)
       @rack_proxy = Rack::Cascade.new([proxy_app, app], [200, 301, 302, 304])
+      puts "init"
     end
 
     def call(env)
@@ -25,9 +16,7 @@ module Seojs
 
       if test?
         [ 200, {"Content-Type" => "text/html"}, self ]
-      elsif Seojs.strategy == :redirect && Seojs.token && escaped_fragment_query?
-        @rack_rewrite.call(env)
-      elsif Seojs.strategy == :forward && Seojs.token && escaped_fragment_query?
+      elsif Seojs.url && escaped_fragment_query?
         @rack_proxy.call(env)
       else
         @app.call(env)

data/lib/seojs/rack/proxy.rb

@@ -13,17 +13,72 @@ module Seojs
         end
       end
       
+      # TODO: Submit PR to rack-proxy for target_response.to_hash
       def perform_request(env)
-        super(env)
+        source_request = ::Rack::Request.new(env)
+
+        # Initialize request
+        if source_request.fullpath == ""
+          full_path = URI.parse(env['REQUEST_URI']).request_uri
+        else
+          full_path = source_request.fullpath
+        end
+
+        target_request = Net::HTTP.const_get(source_request.request_method.capitalize).new(full_path)
+
+        # Setup headers
+        target_request.initialize_http_header(extract_http_request_headers(source_request.env))
+
+        # Setup body
+        if target_request.request_body_permitted? && source_request.body
+          target_request.body_stream    = source_request.body
+          target_request.content_length = source_request.content_length.to_i
+          target_request.content_type   = source_request.content_type if source_request.content_type
+        end
+
+
+        # Create a streaming response (the actual network communication is deferred, a.k.a. streamed)
+        if @streaming
+          if @backend
+            target_response = HttpStreamingResponse.new(target_request, @backend.host, @backend.port)
+
+            target_response.use_ssl = "https" == @backend.scheme
+          else
+            target_response = HttpStreamingResponse.new(target_request, source_request.host, source_request.port)
+
+            target_response.use_ssl = "https" == source_request.scheme
+          end
+
+          triplet = [target_response.status, target_response.headers, target_response.body]
+        else
+          host = (@backend && @backend.host) || source_request.host
+          port = (@backend && @backend.port) || source_request.port
+          target_response = Net::HTTP.start(host, port) do |http|
+            http.request(target_request)
+          end
+
+          if target_response.respond_to?(:headers)
+            headers = target_response.headers
+          elsif target_response.respond_to?(:to_hash)
+            headers = target_response.to_hash
+          else
+            headers = {}
+          end
+
+          body = target_response.body
+          body = [body] unless body.respond_to?(:each)
+
+          triplet = [target_response.code, headers, body]
+        end
+
+        triplet
       end
+
       
       def call(env)
-        Timeout.timeout(20) do
-          code, headers, body = super(env)
-          body = [body] unless body.respond_to?(:each)
-          return [code, headers, body]
+        Timeout.timeout(10) do
+          return super(env)
         end
-        [500, {}, ["Request timed out"]]
       rescue Exception => e
         [500, {}, [e.to_s]]
       end

data/lib/seojs/railtie.rb

@@ -1,5 +1,3 @@
-require 'rack/rewrite'
-
 module Seojs
   class Railtie < ::Rails::Railtie
     initializer "seojs.add_middleware" do |app|

data/seojs.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "seojs"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["getseojs.com"]
-  s.date = "2013-09-30"
+  s.date = "2013-10-01"
   s.description = "SEO.js makes your BackboneJS, AngularJS or EmberJS apps crawlable by Google to make them appear in search results."
   s.email = "hello@getseojs.com"
   s.extra_rdoc_files = [
@@ -43,14 +43,12 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rack-rewrite>, [">= 0"])
       s.add_runtime_dependency(%q<rack-proxy>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.7"])
     else
-      s.add_dependency(%q<rack-rewrite>, [">= 0"])
       s.add_dependency(%q<rack-proxy>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
@@ -58,7 +56,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
     end
   else
-    s.add_dependency(%q<rack-rewrite>, [">= 0"])
     s.add_dependency(%q<rack-proxy>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: seojs
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - getseojs.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rack-rewrite
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-proxy
   requirement: !ruby/object:Gem::Requirement