model_set 1.1.2 → 1.1.3

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/vendor/sphinx_client/lib/sphinx/request.rb

@@ -9,17 +9,17 @@ module Sphinx
     
     # Put int(s) to request.
     def put_int(*ints)
-      ints.each { |i| @request << [i].pack('N') }
+      ints.each { |i| request << [i].pack('N') }
     end
 
     # Put 64-bit int(s) to request.
     def put_int64(*ints)
-      ints.each { |i| @request << [i].pack('q').reverse }#[i >> 32, i & ((1 << 32) - 1)].pack('NN') }
+      ints.each { |i| request << [i].pack('q').reverse }#[i >> 32, i & ((1 << 32) - 1)].pack('NN') }
     end
 
     # Put string(s) to request (first length, then the string itself).
     def put_string(*strings)
-      strings.each { |s| @request << [s.length].pack('N') + s }
+      strings.each { |s| request << [s.bytesize].pack('N') + convert_to_binary(s) }
     end
     
     # Put float(s) to request.
@@ -27,7 +27,7 @@ module Sphinx
       floats.each do |f|
         t1 = [f].pack('f') # machine order
         t2 = t1.unpack('L*').first # int in machine order
-        @request << [t2].pack('N')
+        request << [t2].pack('N')
       end
     end
     
@@ -44,7 +44,26 @@ module Sphinx
     
     # Returns the entire message
     def to_s
-      @request
+      request
     end
+
+  private
+
+    def request
+      if @request.respond_to?(:force_encodng)
+        @request.force_encoding('ASCII-8BIT')
+      else
+        @request
+      end
+    end
+
+    def convert_to_binary(s)
+      if s.respond_to?(:force_encoding)
+        s.dup.force_encoding('ASCII-8BIT')
+      else
+        s
+      end
+    end
+
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: model_set
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-22 00:00:00 -07:00
-default_executable: 
+date: 2013-11-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
@@ -263,7 +262,6 @@ files:
 - vendor/sphinx_client/sphinx.yml.tpl
 - vendor/sphinx_client/tasks/sphinx.rake
 - vendor/sphinx_client/test.rb
-has_rdoc: true
 homepage: https://github.com/ninjudd/model_set
 licenses: 
 - MIT
@@ -293,7 +291,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Easy manipulation of sets of ActiveRecord models