moc 2.5.0.5 → 2.5.0.6

data/lib/moc/controller.rb

@@ -208,11 +208,11 @@ class Controller
 		send_command :ping
 
 		read_event == :pong
-	rescue
+	rescue Exception
 		false
 	end
 
-	def quit
+	def quit!
 		send_command :quit
 
 		self

data/lib/moc/protocol/event.rb

@@ -58,6 +58,10 @@ class Event < Symbol
 
 		super
 	end
+
+	def inspect
+		"#<#{self.class.name}: #{to_s}#{" #{data.inspect}" if data}>"
+	end
 end
 
 end; end

data/lib/moc/protocol/string.rb

@@ -16,18 +16,18 @@ class String < ::String
 	def self.read (io)
 		length = Integer.read(io)
 		string = io.read(length)
-		
-		new(if string.force_encoding('UTF-8').valid_encoding?
-			string
-		elsif string.force_encoding('ISO-8859-1').valid_encoding?
-			string.encode!('UTF-8')
-		else
-			string.encode!('UTF-8', invalid: :replace, undef: :replace)
-		end)
+
+		%w[UTF-8 ISO-8859-1].each {|encoding|
+			if string.force_encoding(encoding).valid_encoding?
+				return new(string)
+			end
+		}
+
+		new(string.force_encoding('BINARY'))
 	end
 
 	def pack
-		Integer.new(bytesize).pack << encode('UTF-8').force_encoding('BINARY')
+		(Integer.new(bytesize).pack << self).force_encoding('BINARY')
 	end
 end
 

data/lib/moc/protocol/symbol.rb

@@ -25,7 +25,7 @@ class Symbol
 		@internal = value.respond_to?(:to_i) ? self.class.codes.key(value.to_i) : value.to_sym.upcase
 
 		unless @internal && self.class.codes.member?(@internal)
-			raise ArgumentError, "invalid symbol #{value}"
+			raise ArgumentError, "invalid symbol #{value} for #{self.class.name}"
 		end
 	end
 

data/lib/moc/version.rb

@@ -10,6 +10,6 @@
 
 module Moc
 	def self.version
-		'2.5.0.5'
+		'2.5.0.6'
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moc
 version: !ruby/object:Gem::Version
-  version: 2.5.0.5
+  version: 2.5.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,17 +9,17 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-24 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: meh@paranoici.org
 executables:
-- mocp.rb
+- moc-remote.rb
 extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- bin/mocp.rb
+- bin/moc-remote.rb
 - lib/moc.rb
 - lib/moc/controller.rb
 - lib/moc/controller/player.rb