super-poller 0.3.1 → 1.0.0

data/Rakefile

@@ -1,5 +1,5 @@
 require "rubygems"
-require "rake/gempackagetask"
+require "rubygems/package_task"
 
 task :default => :test
 
@@ -10,4 +10,4 @@ Rake::TestTask.new do |t|
   t.verbose = true
 end
 
-Rake::GemPackageTask.new(eval(File.read('super-poller.gemspec'))){ }
+Gem::PackageTask.new(eval(File.read('super-poller.gemspec'))){ }

data/lib/super_poller/starling_queue.rb

@@ -42,12 +42,21 @@ class SuperPoller::StarlingQueue
     end
   end
 
-  protected
+  if "".respond_to? :force_encoding
+    def fix_encoding(v)
+      v.force_encoding('UTF-8')
+    end
+  else
+    def fix_encoding(v)
+      v
+    end
+  end
+
   def coerce(message)
-    if message.start_with?('{')
-      MultiJson.decode(message)
-    else
-      Marshal.load(message)
+    unless message.start_with?('{')
+      message = MultiJson.dump(Marshal.load(message))
     end
+    message = fix_encoding(message)
+    MultiJson.decode(message)
   end
 end

data/test/starling_queue_test.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require File.join(File.dirname(__FILE__), "test_helper")
 
 class StarlingQueueTest < Test::Unit::TestCase
@@ -41,6 +42,16 @@ class StarlingQueueTest < Test::Unit::TestCase
       assert queue.empty?
     end
 
+    if ''.respond_to? :encoding
+      should 'force encoding to UTF8' do
+        instance = StarlingQueue.allocate
+        ascii_string = Marshal.dump({"a" => "\xC3\xA3".force_encoding('ascii')})
+        object = instance.coerce(ascii_string)
+
+        assert_equal "ã", object["a"]
+        assert_equal Encoding.find('utf-8'), object["a"].encoding
+      end
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: super-poller
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70231121376020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70231121376020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Small modular library for dealing with queues and pollers.
 email: contrib@tomlea.co.uk
 executables:
@@ -82,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Tools for dealing with queues.