gio-redis 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52f7795d1fcb334f1b765925b960e4d9915fe462
-  data.tar.gz: 4a8086109f8c8a89a4f932693d4004eb9c0c7376
+  metadata.gz: d75e20471a85809648d47357c950211657aec17a
+  data.tar.gz: ee2f7eaed1760cdacca425ec109e29dde1baa3a5
 SHA512:
-  metadata.gz: 8f62e8485ca8ea1e3c464f3e013830bf583e32bf3e75236abbb8615fc3d5893b1cab14ee3f7e94df727bc7b30175dd3cc0964d41c1d7dbc4e38be1178e9b87ca
-  data.tar.gz: 84180211093a88517bbd2cdc12d3abef2c03b18a058f4cba4965b912ee4662f4971220c8bb1c57424b5aa7043cbb6ce54c66dd3fdce181e0abe7d1aec219e1d2
+  metadata.gz: 8ceda2a4a3566d4a1e1e0bcc891ed1a8db2538108a9b83017df6e879437c7ac2eb3f187f6c05c774baa4207414eaee8a0b0c1545e7fc8dbaf8f51c4e822429ac
+  data.tar.gz: 5197119e9a0d53e6307f6aee00e7dba23c5b1f86534f795608638f8fd14ae052e77a3ce946d5fae840230a2276be482bcd87e6c0393c486475356164e4ac97d7

data/gio-redis.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'hiredis'
   spec.add_dependency 'gio2'
   spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency 'redis'
   spec.add_development_dependency "rake"
   spec.add_development_dependency "gtk2"
 end

data/lib/gio/redis/version.rb

@@ -1,5 +1,5 @@
 module Gio
   class Redis
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/gio/redis.rb

@@ -7,15 +7,24 @@ module Gio
     # Your code goes here...
     def initialize(host = '127.0.0.1', port = 6379, mainloop = nil)
 
-      @addr = Gio::InetSocketAddress.new(Gio::InetAddress.new_from_string(host), port)
-      @sock =  Gio::Socket.new(:ipv4, :stream, :tcp)
+      @addr = Gio::InetSocketAddress.new(inet_address_from_string(host), port)
+      @sock = Gio::Socket.new(:ipv4, :stream, :tcp)
 
       @sock.connect(@addr)
       @sock.set_blocking(false)
 
-      @reader = Hiredis::Reader.new
+      @redis_reader = Hiredis::Reader.new
+
+      if defined?(Gio::PollableInputStream)
+        @reader = Gio::UnixInputStream.new(@sock.fd, false)
+        @source = @reader.create_source(&method(:read_response))
+        @writer = Gio::UnixOutputStream.new(@sock.fd, false)
+      else
+        @source = @sock.create_source(GLib::IOCondition::IN, &method(:read_response))
+        @writer = @sock
+        @reader = @sock
+      end
 
-      @source = @sock.create_source(GLib::IOCondition::IN, &method(:read_response))
       @source.attach
       @pong = false
       @callbacks = {}
@@ -41,6 +50,14 @@ module Gio
     end
 
   private
+    def inet_address_from_string(host)
+      if Gio::InetAddress.respond_to?(:new_from_string)
+        Gio::InetAddress.new_from_string(host)
+      else
+        Gio::InetAddress.new(host)
+      end
+    end
+    
     def call_command(*args)
       command = "*#{args.size}\r\n"
       args.each { |a|
@@ -48,14 +65,18 @@ module Gio
         command << a.to_s
         command << "\r\n"
       }
-      @sock.send command
+      if @writer.respond_to?(:write_nonblocking)
+        @writer.write_nonblocking command
+      else
+        @writer.send command
+      end
     end
 
     def read_response(source=nil, condition=nil)
       while data = read(4096)
-        @reader.feed(data)
+        @redis_reader.feed(data)
 
-        while response = @reader.gets
+        while response = @redis_reader.gets
           case response
           when 'PONG'
             @pong = true
@@ -77,9 +98,17 @@ module Gio
     end
 
     def read(n)
-      @sock.receive(n)
-    rescue Gio::IO::WouldBlockError => e
-      nil
+      if @reader.respond_to?(:read_nonblocking)
+        begin @reader.read_nonblocking(n)
+        rescue Gio::IOError::WouldBlock => e
+          nil
+        end
+      else
+        begin  @reader.receive(n)
+        rescue Gio::IO::WouldBlockError => e
+          nil
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gio-redis
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - |
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hiredis
@@ -53,6 +53,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -118,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: gio2 based redis pub/sub listener