exvo_warez 0.2.0 → 0.2.1

data/Rakefile

@@ -22,9 +22,8 @@ begin
     gemspec.homepage = "http://github.com/defkode/rack-useragent"
     gemspec.summary = "ExvoWarez"
     gemspec.add_dependency("rack-useragent-filter", "0.1.8")
-    gemspec.add_dependency("rack-google-analytics", "0.9.2")
     gemspec.add_dependency("rack_referral", "0.0.1")
-    gemspec.add_dependency("exvo-auth", "~>0.9.2")
+    gemspec.add_dependency("exvo-auth", "0.9.6")
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/exvo_warez.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{exvo_warez}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tomasz Mazur"]
-  s.date = %q{2010-09-21}
+  s.date = %q{2010-09-29}
   s.email = %q{defkode@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -44,20 +44,17 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack-useragent-filter>, ["= 0.1.8"])
-      s.add_runtime_dependency(%q<rack-google-analytics>, ["= 0.9.2"])
       s.add_runtime_dependency(%q<rack_referral>, ["= 0.0.1"])
-      s.add_runtime_dependency(%q<exvo-auth>, ["~> 0.9.2"])
+      s.add_runtime_dependency(%q<exvo-auth>, ["= 0.9.6"])
     else
       s.add_dependency(%q<rack-useragent-filter>, ["= 0.1.8"])
-      s.add_dependency(%q<rack-google-analytics>, ["= 0.9.2"])
       s.add_dependency(%q<rack_referral>, ["= 0.0.1"])
-      s.add_dependency(%q<exvo-auth>, ["~> 0.9.2"])
+      s.add_dependency(%q<exvo-auth>, ["= 0.9.6"])
     end
   else
     s.add_dependency(%q<rack-useragent-filter>, ["= 0.1.8"])
-    s.add_dependency(%q<rack-google-analytics>, ["= 0.9.2"])
     s.add_dependency(%q<rack_referral>, ["= 0.0.1"])
-    s.add_dependency(%q<exvo-auth>, ["~> 0.9.2"])
+    s.add_dependency(%q<exvo-auth>, ["= 0.9.6"])
   end
 end
 

data/lib/exvo_warez.rb

@@ -1,5 +1,4 @@
 require "rack/exvo/seo"
-require "rack/google-analytics"
 require "rack/useragent/filter"
 require "rack_referral"
 require 'exvo-auth'
@@ -13,18 +12,21 @@ module Rack
     end
 
     def apply_middlewares
-      unless env == "development"
+      if env == "development"
+        #
+      end
+      
+      if env == "staging"
         apply_referral
-        # apply_useragent_filter
+        apply_useragent_filter
       end
       
-      if env == "production"
-        apply_analytics
+      if env == "production"ss
+        apply_referral
+        apply_useragent_filter
+        apply_seo if ExvoAuth::Config.client_id
       end
 
-      if ExvoAuth::Config.client_id
-        apply_seo
-      end
     end
 
     def call(env)
@@ -45,9 +47,7 @@ module Rack
       required_products = [
         ["Internet Explorer", "8.0"],
         ["Opera", "10.0"],
-        ["Firefox", "3.0"],
-        ["Safari", "4.0"],
-        ["Chrome", "4"]
+        ["Firefox", "3.0"]
       ]
 
       @app = Rack::UserAgent::Filter.new(@app, required_products, :force_with_cookie => "deprecated_browser")
@@ -61,10 +61,6 @@ module Rack
     def apply_referral
       @app = Rack::Referral.new(@app, :url => "#{auth_host}/referrals/<REF>?return_to=<RETURN_TO>")
     end
-
-    def apply_analytics
-      @app = Rack::GoogleAnalytics.new(@app, :tracker => 'UA-2491324-1', :multiple => true, :domain => ".exvo.com")
-    end
     
   end
 end

data/lib/rack/exvo/seo.rb

@@ -8,7 +8,14 @@ module Rack
       end
 
       def call(env)
+        request = Rack::Request.new(env)
+
         status, headers, @body = @app.call(env)
+        
+        if request.xhr?
+          return [status, headers, @body]
+        end
+        
         if html?(headers)
           if cl = headers["Content-Length"]
             headers["Content-Length"] = (cl.to_i + @payload.length).to_s
@@ -35,7 +42,7 @@ module Rack
       end
       
       def html?(headers)
-        /html/ === headers['Content-Type']
+        headers['Content-Type'] == "text/html"
       end
       
       def end_of_body?(chunk)

data/lib/rack/exvo/templates/links.erb

@@ -2,4 +2,18 @@
 <% @apps.each do |app| %>
 <a href="<%= app["url"] %>"><%= app["name"] %></a>
 <% end %>
-</footer>
+</footer>
+<script type='text/javascript'>
+  //<![CDATA[
+    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+  //]]>
+</script>
+<script type='text/javascript'>
+  //<![CDATA[
+    try {
+      var pageTracker = _gat._getTracker("UA-2491324-1");
+      pageTracker._trackPageview();
+    } catch(err) {}
+  //]]>
+</script>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: exvo_warez
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Tomasz Mazur
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-21 00:00:00 +02:00
+date: 2010-09-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,26 +34,10 @@ dependencies:
         version: 0.1.8
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rack-google-analytics
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
-        version: 0.9.2
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rack_referral
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -65,23 +49,23 @@ dependencies:
         - 1
         version: 0.0.1
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: exvo-auth
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 55
         segments: 
         - 0
         - 9
-        - 2
-        version: 0.9.2
+        - 6
+        version: 0.9.6
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 description: 
 email: defkode@gmail.com
 executables: []