sugar 0.0.37 → 0.0.38

data/VERSION

@@ -1 +1 @@
-0.0.37
+0.0.38

data/lib/sugar/actionview/stats.rb

@@ -8,25 +8,21 @@ module Sugar
         initializers = []
 
         if piwik = options.delete(:piwik)
-          static_includes << "//#{piwik[:site]}/piwik.js"
-          initializers = %{
-            var piwikTracker = Piwik.getTracker("#{piwik[:site]}/piwik.php", #{piwik[:id]});
-            piwikTracker.trackPageView();
-            piwikTracker.enableLinkTracking();
-          }
-          noscript_includes << %[<img src="//#{piwik[:site]}/piwik.php?idsite=#{piwik[:id]}" alt="" style="border:0"  />]
+          static_includes   << "//#{piwik[:site]}/piwik.js"
+          initializers      << "var piwikTracker=Piwik.getTracker('#{piwik[:site]}/piwik.php', #{piwik[:id]});piwikTracker.trackPageView();piwikTracker.enableLinkTracking();"
+          noscript_includes << "//#{piwik[:site]}/piwik.php?idsite=#{piwik[:id]}"
         end
 
-        if options[:metrika]
-          static_includes << '//mc.yandex.ru/resource/watch.js'
-          initializers << "var yaCounter#{options[:metrika]} = new Ya.Metrika(#{options[:metrika]});"
-          noscript_includes << %(<img src="//mc.yandex.ru/watch/#{options[:metrika]}" alt="" />)
+        if metrika = options.delete(:metrika)
+          static_includes   << '//mc.yandex.ru/resource/watch.js'
+          initializers      << "var yaCounter#{metrika} = new Ya.Metrika(#{metrika});"
+          noscript_includes << "//mc.yandex.ru/watch/#{metrika}"
         end
 
-        if options[:analytics]
+        if analytics = options.delete(:analytics)
           dynamic_includes << 'var gaJsHost=("https:"==document.location.protocol)?"https://ssl.":"http://www.";'
           dynamic_includes << 'document.write(unescape("%3Cscript src=\'"+gaJsHost+"google-analytics.com/ga.js"\' type=\'text/javascript\'%3E%3C/script%3E));'
-          initializers << "var pageTracker = _gat._getTracker('#{options}'); pageTracker._trackPageview();"
+          initializers     << "var pageTracker = _gat._getTracker('#{analytics}'); pageTracker._trackPageview();"
         end
 
         returning('') do |result|
@@ -41,9 +37,12 @@ module Sugar
             result << javascript_tag(initializers)
           end
           unless noscript_includes.empty?
+            includes = noscript_includes.collect do |noscript|
+              %(<img src="#{noscript}" style="border:0" alt="" />)
+            end.join("\n")
             result << content_tag(:noscript,
                                   content_tag(:div,
-                                              noscript_includes.join,
+                                              includes,
                                               :style => 'position: absolute'))
           end
         end

data/sugar.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sugar}
-  s.version = "0.0.37"
+  s.version = "0.0.38"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Semyonov"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sugar
 version: !ruby/object:Gem::Version 
-  version: 0.0.37
+  version: 0.0.38
 platform: ruby
 authors: 
 - Alexander Semyonov