lib/it/parser.rb in it-0.8.0 vs lib/it/parser.rb in it-1.0.0

@@ -1,29 +1,29 @@
 module It
   # Parses the string and replaces all interpolations accordingly.
   class Parser
-    attr_accessor :string, :options
+    attr_reader :string, :options
 
-    INTERPOLATION_REGEXP = /%\{[^{}}]+\}/
+    INTERPOLATION_REGEXP = /%\{[^{}]+\}/
 
     def self.backend_options(options)
       options.with_indifferent_access.slice(:default, :locale, :scope)
     end
 
     def initialize(string, options)
-      self.string = string
-      self.options = options
+      @string = string
+      @options = options
     end
 
     def process
       handle_pluralization
       escape_string
 
       # For deep nesting, we repeat the process until we have no interpolations anymore
       while contains_interpolation?
         string.gsub!(INTERPOLATION_REGEXP) do |interpolation|
-          Interpolation.new(interpolation, options).process
+          Interpolation.call(interpolation, options)
         end
       end
       string.html_safe
     end
 
@@ -34,17 +34,17 @@
     end
 
     def handle_pluralization
       return if !string.is_a?(Hash) || !options.key?('count')
 
-      self.string = I18n.backend.send(:pluralize, locale, string, options['count'])
+      @string = I18n.backend.send(:pluralize, locale, string, options['count'])
     end
 
     def locale
       options['locale'] || I18n.locale
     end
 
     def escape_string
-      self.string = String.new(ERB::Util.h(string))
+      @string = String.new(ERB::Util.h(string))
     end
   end
 end