runit-man 1.9.6 → 1.9.7

data/lib/runit-man/app.rb

@@ -1,5 +1,5 @@
 require 'fileutils'
-require 'yajl/json_gem'
+require 'yajl'
 require 'erubis'
 require 'sinatra/base'
 require 'sinatra/r18n'
@@ -50,7 +50,7 @@ class RunitMan < Sinatra::Base
   end
 
   get '/services.json' do
-    service_infos.to_json
+    Yajl::Encoder.encode(service_infos)
   end
 
   def log_of_service(name, count)

data/lib/runit-man/service_info.rb

@@ -12,7 +12,7 @@ class ServiceInfo
     @log_status = ServiceStatus.new(data_from_file(File.join(log_supervise_folder, 'status')))
   end
 
-  def to_json(*a)
+  def to_hash
     data = {}
     [
       :name, :stat, :active?, :logged?, :switchable?,
@@ -28,7 +28,11 @@ class ServiceInfo
     ].each do |sym|
       data[sym] = @status.send(sym)
     end
-    data.to_json(*a)
+    data
+  end
+
+  def to_json(*args)
+    Yajl::Encoder.encode(to_hash, *args)
   end
 
   def logged?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: runit-man
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 1
   - 9
-  - 6
-  version: 1.9.6
+  - 7
+  version: 1.9.7
 platform: ruby
 authors: 
 - Akzhan Abdulin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-13 00:00:00 +03:00
+date: 2011-01-25 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency