runit-man 2.2.7 → 2.2.8

data/i18n/en.yml

@@ -4,8 +4,6 @@ en:
     title: "%{p1} - %{p2}"
     header: "%{p1}: %{p2}"
     error: Error encountered while accessing resource
-    errors:
-      invalid_encoding: "File contains octets that cannot be parsed as UTF-8 character sequences."
     loading: "Please wait while loading…"
     footer: "State of services updated automatically every %{sec} seconds."
     services:

data/i18n/ru.yml

@@ -4,8 +4,6 @@ ru:
     title: "%{p1} - %{p2}"
     header: "%{p1}: %{p2}"
     error: Ошибка обращения к ресурсу
-    errors:
-      invalid_encoding: "Файл содержит октеты, которые не получается распознать как символьные последовательности UTF-8."
     loading: "Идёт загрузка…"
     footer: "Состояние сервисов обновляется автоматически каждые %{sec} секунд."
     services:

data/lib/runit-man/app.rb

@@ -9,6 +9,11 @@ require 'file/tail'
 require 'runit-man/helpers'
 require 'runit-man/version'
 
+if RUBY_VERSION >= '1.9'
+  Encoding.default_external = "utf-8"
+  Encoding.default_internal = "utf-8"
+end
+
 class RunitMan < Sinatra::Base
   VERSION       = RunitManVersion::VERSION
   MIN_TAIL      = 100
@@ -123,20 +128,10 @@ class RunitMan < Sinatra::Base
     srv   = ServiceInfo[name]
     return nil if srv.nil? || !srv.logged?
     text = ''
-    begin
-      text.force_encoding('utf-8') if text.respond_to?(:force_encoding)
-      File::Tail::Logfile.open(srv.log_file_location, :backward => count, :return_if_eof => true) do |log|
-        log.tail do |line|
-          if line.respond_to?(:force_encoding)
-            line.force_encoding('utf-8')
-            raise ArgumentError.new('wrong encoding') unless line.valid_encoding?
-          end
-          line.force_encoding('utf-8') if line.respond_to?(:force_encoding)
-          text += line
-        end
+    File::Tail::Logfile.open(srv.log_file_location, :backward => count, :return_if_eof => true) do |log|
+      log.tail do |line|
+        text += line
       end
-    rescue ArgumentError
-      text = I18n.t('runit.errors.invalid_encoding')
     end
 
     {
@@ -154,12 +149,6 @@ class RunitMan < Sinatra::Base
     file_path = request.GET['file']
     return nil unless all_files_to_view.include?(file_path)
     text = IO.read(file_path)
-    begin
-      text.force_encoding('utf-8') if text.respond_to?(:force_encoding)
-      raise ArgumentError.new('wrong encoding') unless text.valid_encoding?
-    rescue ArgumentError
-      text = I18n.t('runit.errors.invalid_encoding')
-    end
     {
        :name => file_path,
        :text => text

data/lib/runit-man/service_info.rb

@@ -294,7 +294,11 @@ private
 
     def real_data_from_file(file_name)
       return nil unless File.readable?(file_name)
-      data = IO.read(file_name)
+      if RUBY_VERSION >= '1.9'
+        data = IO.read(file_name, :external_encoding => 'ASCII-8BIT')
+      else
+        data = IO.read(file_name)
+      end
       data.chomp! unless data.nil?
       data.empty? ? nil : data
     end

data/lib/runit-man/version.rb

@@ -1,4 +1,4 @@
 module RunitManVersion
-  VERSION = '2.2.7'.freeze
+  VERSION = '2.2.8'.freeze
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: runit-man
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 23
   prerelease: 
   segments: 
   - 2
   - 2
-  - 7
-  version: 2.2.7
+  - 8
+  version: 2.2.8
 platform: ruby
 authors: 
 - Akzhan Abdulin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-06 00:00:00 +04:00
+date: 2011-05-19 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency