ruby-ipfs-api 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c77ff43cc141faaf34d664f16c0c7b10e8d42a00
-  data.tar.gz: 4ab2dcd154b4f87a49e14370fd7434aca890bcd3
+  metadata.gz: 6ed5bd942765642e4bd3c2d5288cabc376fc63fd
+  data.tar.gz: a4b6662afce323e336b7b5e89837e13a148c3d76
 SHA512:
-  metadata.gz: ad07486909d6881a3fa13c952a088be1264b201cae2fda691e98df9cda1404b3c4158cfc79a1f80d2476cc211063c8405dcf72a45d62e2ecd7255586c9cc738c
-  data.tar.gz: d1dbd86b6ab786e8c393c59922f35689b8cced15f9268108806950fc1476f6cfb8f3b953f957b98a67c95c6eea7ca872bcf229842e64d73dac483fa4f443ae5c
+  metadata.gz: 911bf26795481cac044b2d68f572f197a6b96deffd9ac35862d3ee8897424f4cb67bce6800b69b6b32b90d69c0c10b945629f66d11334688791839c59ab2ade1
+  data.tar.gz: 6912913ce0388053688d9308748023bacb37b1e0ca42c18d110852ef6b7561a02bb4923de45613c070e11bd0d2afc2abcfd725cd73f8ec6d832d7f01e5702b69

data/lib/api/command.rb

@@ -0,0 +1,26 @@
+require_relative '../multihash'
+
+require_relative '../request/basic_request'
+require_relative '../request/file_upload_request'
+
+require_relative './generic/id'
+require_relative './generic/version'
+require_relative './files/cat'
+require_relative './files/ls'
+require_relative './files/add'
+
+module Ipfs
+  module Command
+    def self.build_request(path, **arguments)
+      keys = arguments.keys
+
+      if keys.include?(:multihash)
+        BasicRequest.new(path, multihash: arguments[:multihash])
+      elsif keys.include?(:filepath)
+        FileUploadRequest.new(path, arguments[:filepath])
+      else
+        BasicRequest.new(path)
+      end
+    end
+  end
+end

data/lib/api/files/add.rb

@@ -0,0 +1,15 @@
+module Ipfs
+  module Command
+    class Add
+      PATH = '/add'
+
+      def self.build_request(filepath)
+        Command.build_request(PATH, filepath: filepath)
+      end
+
+      def self.parse_response(response)
+        JSON.parse response
+      end
+    end
+  end
+end

data/lib/api/files/cat.rb

@@ -1,17 +1,12 @@
 require_relative '../../dagstream'
-require_relative '../../errors'
 
 module Ipfs
   module Command
     class Cat
       PATH = '/cat'
 
-      def self.build_request(multi_hash)
-        {
-          verb: :get,
-          path: PATH,
-          options: { params: { arg: multi_hash.raw } }
-        }
+      def self.build_request(multihash)
+        Command.build_request(PATH, multihash: Ipfs::Multihash.new(multihash))
       end
 
       def self.parse_response(response)

data/lib/api/files/ls.rb

@@ -3,12 +3,8 @@ module Ipfs
     class Ls
       PATH = '/ls'
 
-      def self.build_request(multi_hash)
-        {
-          verb: :get,
-          path: PATH,
-          options: { params: { arg: multi_hash.raw } }
-        }
+      def self.build_request(multihash)
+        Command.build_request(PATH, multihash: Ipfs::Multihash.new(multihash))
       end
 
       def self.parse_response(response)

data/lib/api/generic/id.rb

@@ -4,10 +4,7 @@ module Ipfs
       PATH = '/id'
 
       def self.build_request
-        {
-          verb: :post,
-          path: PATH
-        }
+        Command.build_request(PATH)
       end
 
       def self.parse_response(response)

data/lib/api/generic/version.rb

@@ -4,10 +4,7 @@ module Ipfs
       PATH = '/version'
 
       def self.build_request
-        {
-          verb: :get,
-          path: PATH
-        }
+        Command.build_request(PATH)
       end
 
       def self.parse_response(response)

data/lib/client.rb

@@ -1,8 +1,5 @@
 require_relative './http_api'
-require_relative './api/generic/id'
-require_relative './api/generic/version'
-require_relative './api/files/cat'
-require_relative './api/files/ls'
+require_relative './api/command'
 require_relative './multihash'
 
 module Ipfs
@@ -19,12 +16,16 @@ module Ipfs
       execute Command::Version
     end
 
-    def cat(multi_hash)
-      execute Command::Cat, Multihash.new(multi_hash)
+    def cat(multihash)
+      execute Command::Cat, multihash
     end
 
-    def ls(multi_hash)
-      execute Command::Ls, Multihash.new(multi_hash)
+    def ls(multihash)
+      execute Command::Ls, multihash
+    end
+
+    def add(filepath)
+      execute Command::Add, filepath
     end
 
     private
@@ -33,4 +34,4 @@ module Ipfs
       command.parse_response @http_api.call command.build_request *args
     end
   end
-end
+end

data/lib/http_api.rb

@@ -17,9 +17,9 @@ module Ipfs
 
     def call(command)
       HTTP.request(
-        command[:verb],
-        url(command[:path]),
-        command[:options] ? command[:options] : {}
+        command.verb,
+        url(command.path),
+        command.options
       )
     end
 

data/lib/ipfs_api.rb

@@ -2,6 +2,6 @@ require_relative './client'
 
 module Ipfs
   class Client
-    VERSION = '0.4.1'
+    VERSION = '0.5.0'
   end
 end

data/lib/request/basic_request.rb

@@ -0,0 +1,17 @@
+require_relative './request'
+
+module Ipfs
+  class BasicRequest < Request
+    def initialize(path, **arguments)
+      super(path, :get)
+
+      @multihash = arguments[:multihash]
+    end
+
+    def options
+      @multihash \
+        ? { params: { arg: @multihash.raw } }
+        : {}
+    end
+  end
+end

data/lib/request/file_upload_request.rb

@@ -0,0 +1,19 @@
+require_relative './request'
+
+module Ipfs
+  class FileUploadRequest < Request
+    def initialize(path, filepath)
+      super(path, :post)
+
+      @filepath = filepath
+    end
+
+    def options
+      {
+        form: {
+          arg: HTTP::FormData::File.new(@filepath)
+        }
+      }
+    end
+  end
+end

data/lib/request/request.rb

@@ -0,0 +1,14 @@
+module Ipfs
+  class Request
+    attr_reader :path, :verb
+
+    def initialize(path, verb)
+      @path = path
+      @verb = verb
+    end
+
+    def options
+      {}
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-ipfs-api
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Tom Benett
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-27 00:00:00.000000000 Z
+date: 2017-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -31,6 +31,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/api/command.rb
+- lib/api/files/add.rb
 - lib/api/files/cat.rb
 - lib/api/files/ls.rb
 - lib/api/generic/id.rb
@@ -42,6 +44,9 @@ files:
 - lib/http_api.rb
 - lib/ipfs_api.rb
 - lib/multihash.rb
+- lib/request/basic_request.rb
+- lib/request/file_upload_request.rb
+- lib/request/request.rb
 homepage: https://github.com/mahloun/ruby-ipfs-api
 licenses:
 - MIT