crate_ruby 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3ff57320c97fd0469f294c16516f805ac815380
-  data.tar.gz: 15b6f0ea26f2d8b64892f706b45a2f23dc753fda
+  metadata.gz: 89005d37bce3036b7cc74a9cf521a85493f8695e
+  data.tar.gz: d92405d8c41d5c191cd6a943cc45a3227fd2c01b
 SHA512:
-  metadata.gz: 4b887ed5e8bfa23435bfa9ad3eecbf8deee91fc5c95242ce7086a80bcfb9fbed64fd8403cdcf4a0ea95c97f05e54a5104d6620aa8df32d6b875163a2b47d565d
-  data.tar.gz: 338c270195d22fd4fb127cefea310317a2a6b79170f3972f6c597aff6df375ff3e3b6ef4017f0658c2dbb37a019a24e5a13be16c4fc0be1c0296be9d719ffbdf
+  metadata.gz: 7fc3c5596813c4de4565c91f4d4a8b8ff5447143a66734956fbf342d997209cde01b042949721184868948c916e0beabd0a985353722bbc7c5d7e17b5afce279
+  data.tar.gz: f7dd74c16239b2e5f6bb5811529c44513b184c77a4849bf45431c4e3ddfa1bf6ebcb121ca71c4b044886f545ee48d1b02bf8cfdff7374b064877e50dcfec3d40

data/lib/crate_ruby/client.rb

@@ -7,13 +7,13 @@ module CrateRuby
 
     attr_accessor :logger
 
+    # Currently only a single server is supported. Fail over will be implemented in upcoming versions
+    # @param [Array] servers An Array of servers including ports [127.0.0.1:4200, 10.0.0.1:4201]
     # @param [opts] Optional paramters
-    # * host: ip or host name, defaults to 127.0.0.1
-    # * port: defaults to 4200
-    def initialize(opts = {})
-      @host = opts[:host] || DEFAULT_HOST
-      @port = opts[:port] || DEFAULT_PORT
-      @uri = "http://#{DEFAULT_HOST}:#{DEFAULT_PORT}"
+    # * logger: Custom Logger
+    def initialize(servers = [], opts = {})
+      @servers = servers
+      @servers << "#{DEFAULT_HOST}:#{DEFAULT_PORT}" if servers.empty?
       @logger = opts[:logger] || CrateRuby.logger
     end
 
@@ -68,7 +68,7 @@ module CrateRuby
     def execute(sql)
       req = Net::HTTP::Post.new("/_sql", initheader = {'Content-Type' => 'application/json'})
       req.body = {"stmt" => sql}.to_json
-      response = Net::HTTP.new(@host, @port).start { |http| http.request(req) }
+      response = request(req)
       success = case response.code
                   when "200"
                     ResultSet.new response.body
@@ -91,8 +91,7 @@ module CrateRuby
       @logger.debug("BLOB PUT #{uri}")
       req = Net::HTTP::Put.new(blob_path(table, digest))
       req.body = data
-      #req["Content-Type"] = "multipart/form-data, boundary=#{boundary}"
-      response = Net::HTTP.new(@host, @port).start { |http| http.request(req) }
+      response = request(req)
       success = case response.code
                   when "201"
                     true
@@ -100,7 +99,7 @@ module CrateRuby
                     @logger.info("Response #{response.code}: " + response.body)
                     false
                 end
-      success     
+      success
     end
 
     # Download blob
@@ -112,9 +111,7 @@ module CrateRuby
       uri = blob_path(table, digest)
       @logger.debug("BLOB GET #{uri}")
       req = Net::HTTP::Get.new(uri)
-      response = Net::HTTP.new(@host, @port).start do |http|
-        http.request(req)
-      end
+      response = request(req)
       case response.code
         when "200"
           response.body
@@ -133,7 +130,7 @@ module CrateRuby
       uri = blob_path(table, digest)
       @logger.debug("BLOB DELETE #{uri}")
       req = Net::HTTP::Delete.new(uri)
-      response = Net::HTTP.new(@host, @port).start { |http| http.request(req) }
+      response = request(req)
       success = case response.code
                   when "200"
                     true
@@ -150,6 +147,14 @@ module CrateRuby
       "/_blobs/#{table}/#{digest}"
     end
 
+    def connection
+      host, port = @servers.first.split(':');
+      Net::HTTP.new(host, port)
+    end
+    
+    def request(req)
+      connection.start { |http| http.request(req) }
+    end
 
   end
 end

data/lib/crate_ruby/version.rb

@@ -1,3 +1,3 @@
 module CrateRuby
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/crate_ruby/client_spec.rb

@@ -96,10 +96,8 @@ describe CrateRuby::Client do
 
       it 'should use host and ports parameters' do
         logger = double()
-        client = CrateRuby::Client.new host: "10.0.0.1", port: 5000, logger: logger
-        client.instance_variable_get(:@host).should eq("10.0.0.1")
-        client.instance_variable_get(:@port).should eq(5000)
-        client.instance_variable_get(:@logger).should == logger
+        client = CrateRuby::Client.new ["10.0.0.1:5000"],logger: logger
+        client.instance_variable_get(:@servers).should eq(["10.0.0.1:5000"])
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crate_ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Christoph Klocker