lib/yandex/metrika.rb in yandex_metrika-0.0.1 vs lib/yandex/metrika.rb in yandex_metrika-0.0.2

@@ -11,23 +11,24 @@
       # Normally you won't need to call this directly; the +add_yandex_metrika_code+
       # after filter will insert it for you.
       def metrika_code
         Metrika.code if Metrika.enabled?(request.format)
       end
-      
+
       # An after_filter to automatically add the metrika code.
       def add_yandex_metrika_code
-        if Metrika.defer_load
-          response.body.sub! /<\/[bB][oO][dD][yY]>/, "#{metrika_code}</body>" if response.body.respond_to?(:sub!)
-        else
-          response.body.sub! /(<[bB][oO][dD][yY][^>]*>)/, "\\1#{metrika_code}" if response.body.respond_to?(:sub!)
-        end
+        response.body =
+          if Metrika.defer_load
+            response.body.sub /<\/[bB][oO][dD][yY]>/, "#{metrika_code}</body>"
+          else
+            response.body.sub /(<[bB][oO][dD][yY][^>]*>)/, "\\1#{metrika_code}"
+          end
       end
     end
 
     class ConfigurationError < StandardError #:nodoc:
-      DEFAULT_MESSAGE = "Yandex::Metrika.counter_id is not set in config/environment.rb or config/initializers/yandex_metrika.rb"
+      DEFAULT_MESSAGE = "Yandex::Metrika.counter_id is not set in config/initializers/yandex_metrika.rb"
 
       def initialize(message = nil)
         super(message || DEFAULT_MESSAGE)
       end
     end
@@ -35,19 +36,19 @@
     @@counter_id = nil
     ##
     # :singleton-method:
     # Specify the Yandex.Metrika COUNTER_ID for this web site. This can be found
     # as the value of "new Ya.Metrika(123456)", where 123456 is the actual ID.
-    cattr_accessor :counter_id  
+    cattr_accessor :counter_id
 
     @@environments = ['production']
     ##
     # :singleton-method:
     # The environments in which to enable the Yandex.Metrika code. Defaults
     # to 'production' only. Supply an array of environment names to change this.
     cattr_accessor :environments
-    
+
     @@formats = [:html, :all]
     ##
     # :singleton-method:
     # The request formats where tracking code should be added. Defaults to +[:html, :all]+. The entry for
     # +:all+ is necessary to make Yandex recognize that tracking is installed on a
@@ -56,22 +57,22 @@
     cattr_accessor :formats
 
     @@defer_load = true
     ##
     # :singleton-method:
-    # Set this to true (the default) if you want to load the Metrika javascript at 
+    # Set this to true (the default) if you want to load the Metrika javascript at
     # the bottom of page. Set this to false if you want to load the Metrika
     # javascript at the top of the page. The page will render faster if you set this to
     # true.
     cattr_accessor :defer_load
-    
+
     # Return true if the Yandex.Metrika system is enabled and configured
     # correctly for the specified format
     def self.enabled?(format)
       raise ConfigurationError if counter_id.blank?
-      environments.include?(RAILS_ENV) && formats.include?(format.to_sym)
+      environments.include?(Rails.env) && formats.include?(format.to_sym)
     end
-    
+
     # Construct the javascript code to be inserted on the calling page.
     def self.code
       <<-EOHTML
         <!-- Yandex.Metrika -->
         <script src="//mc.yandex.ru/resource/watch.js" type="text/javascript"></script>