seaweedrb 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40635ace82a6b849e6429965cf5fe16ff6dd42e2
-  data.tar.gz: 73393bf1d946f8b1b91a46d523d006296d9e7574
+  metadata.gz: 36688ffe6cc2c84cd454f873e24eab613b460531
+  data.tar.gz: 66fcf457e08ce4ba4f692d23c3e6502cd69fabe4
 SHA512:
-  metadata.gz: cc1ab879adfd7ee94f648c9e3ea87c113e9fd1079b5d3b9ddc858ba888ed0f26c3c1cbd171416e7f4618616ea5cb36bdc89ba5631084d1efe3b2e46f0b45f974
-  data.tar.gz: 8d4069db44c6187ac6d8c239e71857cf7cdfbce10c4a076f704a256fe514a8a3188962967ba06daf33db28ba61b2b8667c64818ee4d7feaa9706ca19cb1fe566
+  metadata.gz: a050993bac1d838bc29d002eae377d637507d0f29f91df6156088c2baba4b11f9fc16ca718995b25bf034c186de051b586bb5f7d6578dcab14e2c0251b664c36
+  data.tar.gz: a2788e24760ac5c4794ce77accaca398a543b313d281ac1a7a9bd87eb81925d3c093f45da268ebf0fcb685c1ba43676fee1ff2cca85dc28eae8d69bcbe34b781

data/LICENSE.md

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 John Guest
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -0,0 +1,31 @@
+## seaweedrb
+
+a [seaweed-fs](https://github.com/chrislusf/seaweedfs) ruby client
+
+[![Gem Version](https://badge.fury.io/rb/seaweedrb.svg)](http://badge.fury.io/rb/seaweedrb)
+
+### getting started
+
+Run `gem install seaweedrb` or include it in your project's Gemfile.
+
+```ruby
+require 'seaweed'
+Seaweed.connect host: "localhost", port: 9333
+```
+
+### operations
+
+```ruby
+# upload a file
+file = Seaweed.upload "/path/to/test.txt"
+
+# file info
+file.pretty_url # => "http://localhost:8080/1/01766888e0/test.txt"
+file.url        # => "http://localhost:8080/1,01766888e0"
+file.read       # => "hello world!"
+
+# find a file and delete it
+file = Seaweed.find "1,01766888e0"
+file.read    # => "hello world!"
+file.delete! # => true
+```

data/lib/seaweed.rb

@@ -1,6 +1,7 @@
 module Seaweed
 
-  def self.connect(host: "localhost", port: 9333)
+  def self.connect(host: "localhost", port: 9333, http_options: {})
+    Seaweed::HTTP.configure http_options
     Seaweed::Master.connect host: host, port: port
   end
 
@@ -14,21 +15,12 @@ module Seaweed
     file.upload!
   end
 
-  def self.find(fid)
+  def self.find(fid, http_options: nil)
     location = Seaweed::Master.dir_lookup fid.split(",")[0]
-    file = Seaweed::File.new fid, volume_url: location[:url]
-  end
-
-  require 'rest-client'
-  module Client
-    def parse(response)
-      if response.code.between?(200, 300)
-        return JSON.parse response, symbolize_names: true unless block_given?
-        yield
-      end
-    end
+    Seaweed::File.new fid, volume_url: location[:url]
   end
 end
 
+require 'seaweed/http'
 require 'seaweed/master'
 require 'seaweed/file'

data/lib/seaweed/file.rb

@@ -1,5 +1,4 @@
 class Seaweed::File
-  include Seaweed::Client
 
   attr_reader :id, :name, :volume_id, :volume_url, :attachment, :size
 
@@ -11,19 +10,20 @@ class Seaweed::File
   end
 
   def upload!
-    response = parse RestClient.put(url, file: File.new(@attachment, 'rb'))
-    @name = response[:name]
-    @size = response[:size]
+    response = Seaweed::HTTP.put url, file: File.new(@attachment, 'rb')
+    data = Seaweed::HTTP.parse response
+    @name = data[:name]
+    @size = data[:size]
     self
   end
 
   def delete!
-    response = parse RestClient.delete(url)
-    !response[:size].nil?
+    res = Seaweed::HTTP.delete url
+    !(Seaweed::HTTP.parse(res)[:size].nil?)
   end
 
   def read
-    RestClient.get url
+    Seaweed::HTTP.get url
   end
 
   def url

data/lib/seaweed/http.rb

@@ -0,0 +1,20 @@
+require 'rest-client'
+require 'json'
+require 'forwardable'
+
+class Seaweed::HTTP
+  class << self
+    extend Forwardable
+
+    def configure(http: RestClient, json: JSON)
+      @http = http
+      @json = json
+    end
+
+    def parse(json)
+      @json.parse json, symbolize_names: true
+    end
+
+    def_delegators :@http, :get, :put, :post, :delete
+  end
+end

data/lib/seaweed/master.rb

@@ -1,28 +1,28 @@
 class Seaweed::Master
-  extend Seaweed::Client
   class << self
 
     def connect(host: "localhost", port: 9333)
-      @host = host
-      @port = port
-      @base_url = "http://#{@host}:#{@port}"
+      @base_url = "http://#{host}:#{port}"
     end
 
     def status
-      RestClient.get "#{@base_url}/cluster/status?pretty=y"
+      res = Seaweed::HTTP.get "#{@base_url}/cluster/status?pretty=y"
+      Seaweed::HTTP.parse res
     end
 
     def dir_assign!
-      parse RestClient.post "#{@base_url}/dir/assign", {}
+      res = Seaweed::HTTP.post "#{@base_url}/dir/assign", {}
+      Seaweed::HTTP.parse res
     end
 
     def dir_lookup(volume_id)
-      data = parse RestClient.get("#{@base_url}/dir/lookup?volumeId=#{volume_id}")
-      data[:locations][0]
+      res = Seaweed::HTTP.get "#{@base_url}/dir/lookup?volumeId=#{volume_id}"
+      Seaweed::HTTP.parse(res)[:locations][0]
     end
 
     def vaccum!(threshold: 0.3)
-      parse RestClient.get "#{@base_url}/vol/vaccum?garbageThreshold=#{threshold}"
+      res = Seaweed::HTTP.get "#{@base_url}/vol/vaccum?garbageThreshold=#{threshold}"
+      Seaweed::HTTP.parse res
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: seaweedrb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - John Guest
@@ -16,8 +16,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE.md
+- README.md
 - lib/seaweed.rb
 - lib/seaweed/file.rb
+- lib/seaweed/http.rb
 - lib/seaweed/master.rb
 homepage: http://rubygems.org/gems/seaweedrb
 licenses: