canonical-rails 0.0.11 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fc32582b03c52b6d078aca9c78e6224f7e81399
-  data.tar.gz: 8dc67c8aafe07d08fe76eff909708bade93e6856
+  metadata.gz: 6dbb138db50b84284c942035e43ee69bf159df10
+  data.tar.gz: b74bab55d53c5f52e0ed132c30d2e34037853545
 SHA512:
-  metadata.gz: f29a895a0abf30542ebb0c43ebdd18574806a4cccc1fd58c97d11b4cd58ea4113ad42409743a6891c1e81bc479d60c9e56a89bce3a92043f9787db223f8d6b77
-  data.tar.gz: 104db3568e9005bd56e02b8ba4d30b08d1073f44b253bf666ebde52a3d3784ce9479d36cc3b9b0f96a88b1e6110e1326a8b440e721eb60a30ac3159d7c4975f2
+  metadata.gz: 95fdb9912513679fd6b345b609b987b4b4f8cf1106c2b155fb4cb4115be9fe285454893009a7ef73e87378dc6b5af69b96d533a37cd6a10be8cc4ceac689402b
+  data.tar.gz: c56a57c38691e76c075e7161f99abcb991c8081f7ded42610950e43bcec3d94675f0881ec9feb04bfba7281a32ea54f458d83910722e01105828dbee3a3501a0

data/README.md

@@ -1,6 +1,7 @@
 CanonicalRails
 ==============
 [![Dependency Status](https://gemnasium.com/jumph4x/canonical-rails.png)](https://gemnasium.com/jumph4x/canonical-rails)
+[![Build Status](https://travis-ci.org/jumph4x/canonical-rails.svg?branch=master)](https://travis-ci.org/jumph4x/canonical-rails)
 
 This project rocks and uses MIT-LICENSE, foh sho. Works with rails 3 and 4.
 

data/app/helpers/canonical_rails/tag_helper.rb

@@ -1,12 +1,11 @@
 module CanonicalRails
   module TagHelper
-
     def trailing_slash_needed?
       CanonicalRails.sym_collection_actions.include? request.params['action'].to_sym
     end
 
     def trailing_slash_if_needed
-      "/" if trailing_slash_needed? and request.path != '/'
+      "/" if trailing_slash_needed? && request.path != '/'
     end
 
     def path_without_html_extension
@@ -21,18 +20,22 @@ module CanonicalRails
       CanonicalRails.host || request.host
     end
 
-    def canonical_href(host=canonical_host)
-      raw "#{canonical_protocol}#{host}#{path_without_html_extension}#{trailing_slash_if_needed}#{whitelisted_query_string}"
+    def canonical_port
+      (CanonicalRails.port || request.port).to_i
+    end
+
+    def canonical_href(host = canonical_host, port = canonical_port)
+      port = port.present? && port.to_i != 80 ? ":#{port}" : ''
+      raw "#{canonical_protocol}#{host}#{port}#{path_without_html_extension}#{trailing_slash_if_needed}#{whitelisted_query_string}".downcase
     end
 
-    def canonical_tag(host=canonical_host)
-      tag(:link, :href => canonical_href(host), :rel => 'canonical')
+    def canonical_tag(host = canonical_host, port = canonical_port)
+      tag(:link, href: canonical_href(host, port), rel: :canonical)
     end
 
     def whitelisted_params
       request.params.select do |key, value|
-        value.present? and
-        CanonicalRails.sym_whitelisted_parameters.include? key.to_sym
+        value.present? && CanonicalRails.sym_whitelisted_parameters.include?(key.to_sym)
       end
     end
 
@@ -47,7 +50,7 @@ module CanonicalRails
       # Rack 1.6.0 has it
       # https://github.com/rack/rack/blob/65a7104b6b3e9ecd8f33c63a478ab9a33a103507/test/spec_utils.rb#L251
 
-      "?" + Rack::Utils.build_nested_query(Hash[whitelisted_params.map{|k,v| v.is_a?(Numeric) ? [k,v.to_s] : [k,v]}]) if whitelisted_params.present?
+      "?" + Rack::Utils.build_nested_query(Hash[whitelisted_params.map { |k, v| v.is_a?(Numeric) ? [k, v.to_s] : [k, v] }]) if whitelisted_params.present?
     end
   end
 end

data/lib/canonical-rails.rb

@@ -14,6 +14,9 @@ module CanonicalRails
   mattr_accessor :host
   @@host = nil
 
+  mattr_accessor :port
+  @@port = nil
+
   mattr_accessor :protocol
   @@protocol = nil
 

data/lib/canonical-rails/version.rb

@@ -1,3 +1,3 @@
 module CanonicalRails
-  VERSION = "0.0.11"
+  VERSION = "0.1.0"
 end

data/lib/generators/canonical_rails/install/templates/canonical_rails.rb

@@ -9,7 +9,8 @@ CanonicalRails.setup do |config|
   # This is the main host, not just the TLD, omit slashes and protocol. If you have more than one, pick the one you want to rank in search results.
   
   config.host# = 'www.mywebstore.com'
-  
+  config.port# = '3000'
+
   # http://en.wikipedia.org/wiki/URL_normalization
   # Trailing slash represents semantics of a directory, ie a collection view - implying an :index get route;
   # otherwise we have to assume semantics of an instance of a resource type, a member view - implying a :show get route

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canonical-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.1.0
 platform: ruby
 authors:
 - Denis Ivanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +50,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: 3.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: 3.4.2
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'Configurable, but assumes a conservative strategy by default with a
   goal to solve many search engine index problems: multiple hostnames, inbound links
   with arbitrary parameters, trailing slashes. '