h2ocube_rails_helper 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76c7d94703c57273b111a9e6eda8fe4f4d12afcd
-  data.tar.gz: e880eaeee479a42a0fc53a351f7d5cafeae0a1c0
+  metadata.gz: 8a0315a87423b0f6a62cf5ba453a5bcee0614b72
+  data.tar.gz: 8bad4332c3bcc040b60672b447b64c6d8888fe1a
 SHA512:
-  metadata.gz: 4ce7f91d9df7a14ca2122e6730f26f14a22200c17e107f76586e5d5062b58049cc2f1ccf0746f6f1df97251e380569e06419a35160123acb9969999ff75c620c
-  data.tar.gz: 78bc977c0160011b95a3ba27ec35f30165121a8278d0c41b45f0c9c908d2e70e4ca5a1698832314f4d93a9812779d2f20dc06d9b0944577835b953df5d9772e9
+  metadata.gz: 69a1e62c6c421a005c2c4584c8c3103f09a51f6591d2b219b8c99968b52274689cfca4cbbeaec28c5b9359593519c51f3716319cc4e17db3a379389eedc3f22b
+  data.tar.gz: 84cb7f2c5709019739de99b2b9870b544955a43a570b2419ed985c104b28475e8760e89d6a71893157cec3db3dfa62fd1ed0efa11e6547057cc0d7ac97fc4b09

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
   - 1.9.3
+  - 2.0.0
 script: "bundle exec rake test"

data/h2ocube_rails_helper.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'h2ocube_rails_helper'
-  gem.version       = '0.0.13'
+  gem.version       = '0.0.14'
   gem.authors       = ['Ben']
   gem.email         = ['ben@h2ocube.com']
   gem.description   = %q{Just an helper collection}
@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  
+
   gem.add_dependency 'settingslogic'
   gem.add_dependency 'rack-mobile-detect'
 end

data/lib/h2ocube_rails_helper.rb

@@ -39,7 +39,7 @@ end
 def _title opts = {}
   return [@_title] if defined?(@_title)
   if defined?(@title)
-    title = @title.class.to_s == 'Array' ? @title : [ @title.strip ]
+    title = @title.class.to_s == 'Array' ? @title : [ @title.to_s.strip ]
   else
     if defined?(@item)
       if @item.respond_to?(:title) && !@item.title.blank?
@@ -69,7 +69,7 @@ def _keywords opts = {}
   else
     keywords = opts.has_key?(:keywords) ? opts[:keywords] : HelperSettings.keywords
   end
-  [keywords].flatten.compact.map{ |k| k.strip.split(/(,|，)/) }.flatten.map{ |k| k.gsub(/(,|，)/, '').blank? ? nil : k }.compact.uniq
+  [keywords].flatten.compact.map{ |k| k.to_s.strip.split(/(,|，)/) }.flatten.map{ |k| k.gsub(/(,|，)/, '').blank? ? nil : k }.compact.uniq
 end
 
 def render_keywords opts = {}
@@ -103,10 +103,11 @@ end
 
 def render_ga opts = {}
   return '' if Rails.env.development?
-  ga = opts[:ga] || HelperSettings.ga
+  ga = opts.has_key?(:ga) ? opts[:ga] : HelperSettings.ga
+  return '' if ga.nil?
   if defined?(Garelic)
     return ("<script>_gaq=[['_trackPageview'],['_trackPageLoadTime']];</script>" << Garelic.monitoring(ga)).html_safe
   else
     return "<script>var _gaq=[['_setAccount','#{ga}'],['_trackPageview'],['_trackPageLoadTime']];(function(){var ga=document.createElement('script');ga.type='text/javascript';ga.async=true;ga.src=('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';var s=document.getElementsByTagName('script')[0];s.parentNode.insertBefore(ga,s);})();</script>".html_safe
   end
-end
+end

data/test/render_ga_test.rb

@@ -1,29 +1,36 @@
 require 'test_helper'
 
 class RenderGaClass < ActionView::TestCase
-  test 'simple' do
+  test 'default' do
     assert render_ga.include?('ga_code')
+  end
+
+  test 'with option' do
     assert render_ga(ga: '123').include?('123')
   end
+
+  test 'with nil' do
+    assert (render_ga(ga: nil) == '')
+  end
 end
 
 class HelperSettings
   def self.title
     'title'
   end
-  
+
   def self.keywords
     'keywords'
   end
-  
+
   def self.description
     'description'
   end
-  
+
   def self.ga
     'ga_code'
   end
-  
+
   def self.domain
     'domain'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: h2ocube_rails_helper
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Ben
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-14 00:00:00.000000000 Z
+date: 2013-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: settingslogic