canonical-rails 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c68bd97df62242170b4e6bf2857318c773d9b37
-  data.tar.gz: 6918feb08f1ba0bda70c1a026f92a6d70c3f0213
+  metadata.gz: 5eec59e3324fff400a64b6171ab133c8e28c5afe
+  data.tar.gz: b94aa1049224b4ce24b8befd90d003403a811ef3
 SHA512:
-  metadata.gz: 17f9e7fa969a16ee2cc813c2f71509e4f779ad58cc3ac6db50da564f5f0675b31097d828a592e2ca5e6a0018e5caa288c031d9fd350f14a6a1570709dcd118db
-  data.tar.gz: 67b60b299dd2e433249034b9291656bd2bded2167883d158268963565994f7c435fd26cf21f1a4f1ef9cfcaaaf6cfd294e27b6bb83a9aed27a7c7de51992a1a1
+  metadata.gz: 7e7798e0bf8918c44b5dd8a8b34655f73808ae8a22f211b551fe78a2f5565a6f139e16bcd4a315835e49aa667ade1dc5bfc2076bb0821357365978ad251686a0
+  data.tar.gz: 70f4ced48fc46b56e18d4d9226b68e129962a77df8eb138900ad85acd631ccf9eb88863848e6733b507aacddcff85535dcd98f9724cdeb41555b62d94fdfe8a4

data/app/helpers/canonical_rails/tag_helper.rb

@@ -13,12 +13,16 @@ module CanonicalRails
       request.path.sub(/\.html$/, '')
     end
 
+    def canonical_protocol
+      CanonicalRails.protocol || request.protocol
+    end
+
     def canonical_host
       CanonicalRails.host || request.host
     end
 
     def canonical_href(host=canonical_host)
-      raw "#{request.protocol}#{host}#{path_without_html_extension}#{trailing_slash_if_needed}#{whitelisted_query_string}"
+      raw "#{canonical_protocol}#{host}#{path_without_html_extension}#{trailing_slash_if_needed}#{whitelisted_query_string}"
     end
 
     def canonical_tag(host=canonical_host)

data/lib/canonical-rails.rb

@@ -6,29 +6,32 @@ module CanonicalRails
   # a fresh initializer with all configuration values.
   #
   # the config\setup concept politely observed at and borrowed from Devise: https://github.com/plataformatec/devise/blob/master/lib/devise.rb
-  
+
   def self.setup
     yield self
   end
 
   mattr_accessor :host
   @@host = nil
-  
+
+  mattr_accessor :protocol
+  @@protocol = nil
+
   mattr_accessor :collection_actions
   @@collection_actions = [:index]
-  
+
   mattr_accessor :member_actions
   @@member_actions = [:show]
-  
+
   mattr_accessor :whitelisted_parameters
   @@whitelisted_parameters = []
 
   def self.sym_collection_actions
     @@sym_collection_actions ||= self.collection_actions.map(&:to_sym)
   end
-  
+
   def self.sym_whitelisted_parameters
     @@sym_whitelisted_actions ||= self.whitelisted_parameters.map(&:to_sym)
   end
-  
+
 end

data/lib/canonical-rails/version.rb

@@ -1,3 +1,3 @@
 module CanonicalRails
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canonical-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Denis Ivanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Simple and configurable Rails canonical ref tag helper