ress 0.0.4 → 0.0.5

data/lib/ress/canonical_version.rb

@@ -19,19 +19,17 @@ module Ress
     # Create a tag of this format:
     #  `<link rel="canonical" href="http://www.example.com/page-1" >`
     def link_tag(protocol, fullpath, subdomain, view)
-      view.tag :link, :rel => 'canonical', :href => href(protocol, fullpath, subdomain)
+      view.tag :link, :rel => 'canonical', :href => url(protocol, fullpath, subdomain)
     end
 
-    private
-
-      def href(protocol, fullpath, subdomain)
-        fullpath = fullpath[(subdomain.length + 1)..-1] unless subdomain.empty?
-        if self.subdomain
-          "#{protocol}#{self.subdomain}.#{fullpath}"
-        else
-          "#{protocol}#{fullpath}"
-        end
+    def url(protocol, fullpath, subdomain)
+      fullpath = fullpath[(subdomain.length + 1)..-1] unless subdomain.empty?
+      if self.subdomain
+        "#{protocol}#{self.subdomain}.#{fullpath}"
+      else
+        "#{protocol}#{fullpath}"
       end
+    end
 
   end
 

data/lib/ress/controller_additions.rb

@@ -5,10 +5,18 @@ module Ress
 
     def self.included(base)
       base.helper_method :canonical_request?
-      base.before_filter :prepend_category_view_path
+      base.helper_method :force_canonical_url
+      base.before_filter :set_force_canonical_cookie
+      base.before_filter :prepend_alternate_view_path
     end
 
-    def prepend_category_view_path
+    def set_force_canonical_cookie
+      if params[:force_canonical]
+         cookies[:force_canonical] = 1
+      end
+    end
+
+    def prepend_alternate_view_path
       Ress.alternate_versions.each do |cat|
         prepend_view_path(cat.view_path) if cat.matches?(request.subdomain)
       end
@@ -18,6 +26,14 @@ module Ress
       Ress.canonical_version.matches?(request.subdomain)
     end
 
+    def force_canonical_url
+      path = "#{request.host_with_port}#{request.fullpath}"
+      url = Ress.canonical_version.url(request.protocol, path, request.subdomain)
+      sep = url.include?('?') ? '&' : '?'
+
+      "#{url}#{sep}force_canonical=1"
+    end
+
   end
 end
 

data/lib/ress/version.rb

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

data/spec/ress/controller_additions_spec.rb

@@ -23,10 +23,10 @@ end
 describe Ress::ControllerAdditions do
 
   it 'adds a before_filter to all actions when it is included' do
-    ActionControllerStub.action.should == :prepend_category_view_path
+    ActionControllerStub.action.should == :prepend_alternate_view_path
   end
 
-  describe '#prepend_category_view_path' do
+  describe '#prepend_alternate_view_path' do
 
     let(:controller) { ActionControllerStub.new }
 
@@ -40,7 +40,7 @@ describe Ress::ControllerAdditions do
       Ress.stub(:alternate_versions => [category])
 
       controller.should_receive(:prepend_view_path).with('foo/bar')
-      controller.prepend_category_view_path
+      controller.prepend_alternate_view_path
     end
 
     it 'does not prepend view paths of alternate_versions that dont match' do
@@ -48,7 +48,7 @@ describe Ress::ControllerAdditions do
       Ress.stub(:alternate_versions => [category])
 
       controller.should_not_receive(:prepend_view_path)
-      controller.prepend_category_view_path
+      controller.prepend_alternate_view_path
     end
 
   end
@@ -69,4 +69,29 @@ describe Ress::ControllerAdditions do
 
   end
 
+  describe '#force_canonical_url' do
+
+    let(:controller) { ActionControllerStub.new }
+
+    before do
+      @request = stub({
+        :subdomain => 'foo',
+        :host_with_port => 'foo.bar.com',
+        :protocol => 'http://'
+      })
+      controller.stub(:request => @request)
+    end
+
+    it 'appends params to the current url properly if there are no GET params' do
+      @request.stub(:fullpath => '/some_place')
+      controller.force_canonical_url.should == 'http://bar.com/some_place?force_canonical=1'
+    end
+
+    it 'appends params to the current url properly when there are GET params' do
+      @request.stub(:fullpath => '/some_place?param=something')
+      controller.force_canonical_url.should == 'http://bar.com/some_place?param=something&force_canonical=1'
+    end
+
+  end
+
 end

data/vendor/assets/javascripts/ress.js

@@ -5,7 +5,7 @@
 (function(exports) {
 
   var MQ_TOUCH = /\(touch-enabled: (.*?)\)/;
-  var FORCE_COOKIE = 'force-cannonical';
+  var FORCE_COOKIE = 'force_canonical';
 
  /**
   * Class responsible for deciding which version of the application to

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: ress
 version: !ruby/object:Gem::Version
-  version: 0.0.4
   prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - Matthew Robertson
@@ -12,32 +12,32 @@ cert_chain: []
 date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: actionpack
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
     none: false
+  name: actionpack
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
     none: false
 - !ruby/object:Gem::Dependency
-  name: rspec
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
     none: false
+  name: rspec
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version