trexrb 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2e7466f0ae48623f28f020285ff34eb0f3ebce8
-  data.tar.gz: 32aa5713cab8237066bcb13feb97436cd09c5f46
+  metadata.gz: 0275222130a56cc32a2d798d2a9cc07348645d57
+  data.tar.gz: ef3b4d92a01ecad82b6eb5c25f46ba27047c3bad
 SHA512:
-  metadata.gz: 3cafaedd8efa8ea382e97c32a2f8f580b0c4577a4eaa827b9cbedd333de1640a76a1fe068071fa05884789094197ad8ee99c9442894633f91ff656b683cfd01a
-  data.tar.gz: 0183cb43d24f51cff81236aaf10740e5c7a6ef6bc5bda8e5e8092dc26c5c6032c7f3b3f7b28f3585602e6a7face17ac4b635f71cf5cfe23d24efd91c76a24077
+  metadata.gz: 6cb4743922e20bda32ac49b8633da74061bf2797bd56aa0e842b27e9d126c2aa9acbc00efa27af2a41d33ac9d422d2a32e33a5896a7629c4ff8c8c74484ecfb0
+  data.tar.gz: 87eaabbe2d9f2a3e6cc49a509bcdbf3c355030a454af1c2b1a4c7e9e254eda8bb5d24a8cb2307002f3c848ea3e7425208d38b8214c59c40851217c9060ef3e06

data/lib/trexrb.rb

@@ -1,9 +1,106 @@
-require "trexrb/version"
-require "trexrb/storage"
-require "trexrb/backend"
+require 'trexrb/version'
+require 'socket'
+require 'yaml'
 
-module Trexrb
-  def self.store
-    @store ||= Storage.new
+class Trexrb
+  DEFAULT_HOST = 'localhost'
+  DEFAULT_PORT = 4040
+
+  def initialize(host = nil, port = nil)
+    @host = host || DEFAULT_HOST
+    @port = port || DEFAULT_PORT
+  end
+
+  def get(key)
+    with_connection do |conn|
+      conn.print Request.new.get(key)
+
+      Response.new(conn.read).body
+    end
+  end
+
+  def set(key, value)
+    with_connection do |conn|
+      conn.print Request.new.set(key, value)
+
+      Response.new(conn.read).body
+    end
+  end
+
+  def keys
+    with_connection do |conn|
+      conn.print Request.new.list
+      result = Response.new(conn.read).body
+
+      result || []
+    end
+  end
+
+  alias_method :[], :get
+  alias_method :[]=, :set
+
+  private
+
+  attr_reader :host, :port
+
+  def with_connection
+    socket = Socket.tcp(host, port)
+    yield socket
+  rescue => ex
+    puts "Connection error: #{ex.inspect}"
+  ensure
+    socket.close_write
+  end
+
+  Response = Struct.new(:data) do
+    def body
+      return if no_data?
+
+      YAML.load(cleaned_data)
+    rescue => ex
+      puts ex.inspect
+      cleaned_data
+    end
+
+    private
+
+    def no_data?
+      data.to_s.strip.length == 0
+    end
+
+    def cleaned_data
+      remove_message_type_marker(data).rstrip
+    end
+
+    # RESP http://redis.io/topics/protocol uses first byte of the
+    # response to mark type of the message
+    def remove_message_type_marker(data)
+      data[1..-1]
+    end
+  end
+  private_constant :Response
+
+  Request = Class.new do
+    FIELD_SEPARATOR = "\t"
+    TERMINATOR = "\r\n"
+
+    def get(key)
+      build("GET", key)
+    end
+
+    def set(key, value)
+      build("SET", key, YAML.dump(value))
+    end
+
+    def list
+      build("LIST")
+    end
+
+    private
+
+    def build(command_name, *params)
+      ([command_name] + params).join(FIELD_SEPARATOR) + TERMINATOR
+    end
   end
+  private_constant :Request
 end

data/lib/trexrb/version.rb

@@ -1,3 +1,3 @@
-module Trexrb
-  VERSION = "0.1.0"
+class Trexrb
+  VERSION = "0.1.2"
 end

data/trexrb.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rails-i18n", '~> 4.0.0'
+  spec.add_development_dependency "pry"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trexrb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Ignacy Moryc
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,19 +54,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rails-i18n
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
 description: 
 email:
 - imoryc@gmail.com
@@ -84,8 +84,6 @@ files:
 - bin/console
 - bin/setup
 - lib/trexrb.rb
-- lib/trexrb/backend.rb
-- lib/trexrb/storage.rb
 - lib/trexrb/version.rb
 - trexrb.gemspec
 homepage: https://github.com/ignacy/trexrb
@@ -113,3 +111,4 @@ signing_key:
 specification_version: 4
 summary: Client library for trex I18n store
 test_files: []
+has_rdoc: 

data/lib/trexrb/backend.rb

@@ -1,11 +0,0 @@
-require 'rails-i18n'
-
-module Trexrb
-  class Backend < I18n::Backend::KeyValue
-    include I18n::Backend::Memoize
-
-    def initialize
-      super(Trexrb.store)
-    end
-  end
-end

data/lib/trexrb/storage.rb

@@ -1,83 +0,0 @@
-module Trexrb
-  class Storage
-    DEFAULT_HOST = 'localhost'
-    DEFAULT_PORT = 4040
-
-    def initialize(host = nil, port = nil)
-      @host = host || DEFAULT_HOST
-      @port = port || DEFAULT_PORT
-    end
-
-    def get(key)
-      with_connection { |conn| conn.print Request.new.get(key) }
-    end
-
-    def set(key, value)
-      with_connection { |conn| conn.print Request.new.set(key, value) }
-    end
-
-    def keys
-      with_connection { |conn| conn.print Request.new.list }
-    end
-
-    alias_method :[], :get
-    alias_method :[]=, :set
-
-    private
-
-    attr_reader :host, :port
-
-    def with_connection
-      socket = Socket.tcp(host, port)
-      yield socket
-    rescue => ex
-      puts "Connection error: #{ex.inspect}"
-    ensure
-      socket.close_write
-      return Response.new(socket.read).body
-    end
-
-    Response = Struct.new(:data) do
-      def body
-        return "{}" if no_data?
-        YAML.load(cleaned_data)
-      rescue => ex
-        puts ex.inspect
-        cleaned_data
-      end
-
-      private
-
-      def no_data?
-        data.to_s.strip.length == 0
-      end
-
-      def cleaned_data
-        data.rstrip
-      end
-    end
-
-    Request = Class.new do
-      FIELD_SEPARATOR = "\t"
-      TERMINATOR = "\r\n"
-
-      def get(key)
-        build("GET", key)
-      end
-
-      def set(key, value)
-        build("SET", key, YAML.dump(value))
-      end
-
-      def list
-        build("LIST")
-      end
-
-      private
-
-      def build(command_name, *params)
-        ([command_name] + params).join(FIELD_SEPARATOR) + TERMINATOR
-      end
-    end
-  end
-end