argonuts-ruby 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c28db98339446905816e23fcaf69a72412643caeaf412e983ae6fb717242d45d
-  data.tar.gz: 967a6b247e4e7a5ff86abc1d3a9e5eb15a27bd60933ae2486fd3cfa03bb7476a
+  metadata.gz: e2eebc8c0a3b2502db0b47ad785762c0d237b753b02b26772a7b2174e67104d9
+  data.tar.gz: 50d0552f780e45ea9d3d97825c6e76c85040a9b9ade93199a45998610fc23747
 SHA512:
-  metadata.gz: cd21f42e2c784afd8d4e29b27bf73cf7ee96534a0436d462a11f1bef21f60ccd42f5440188c462bf10a061a161f92dfa3bfcd5a5898ac972bee8497cf6b2520d
-  data.tar.gz: 2a5134127893a0c71997bb5373575024f327b6332c2db0bd40a85cf7f9ff62597f7b088e455bb190ecf069a51f5e53ea6aea065de48af55fdce67658841bebd8
+  metadata.gz: 211adbb3435d2ad43f5ca17596d9adc5f782ef0a7994d3111f4f4e020fead87a78a7bf35cbfc652953e969ec87432533f8a2c6657150180267147f489375e888
+  data.tar.gz: de68d2b6b95b31e770eaa605f9055f592df03ea1bb2990c78d3df3c81a79504a10cbd3c5fa9cfea69dd255a1e4e74a2cccee96c292e49d0d9364b8ff47284295

data/Rakefile

@@ -0,0 +1,10 @@
+require "rake/testtask"
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/*.rb']
+  # t.verbose = true
+end
+
+desc "Run tests"
+task default: :test

data/lib/argonuts/api.rb

@@ -1,4 +1,6 @@
-require "http"
+require "net/http"
+require "base64"
+require "json"
 
 module Argonuts
   # Argonuts::API is responsible for making API requests.
@@ -9,30 +11,35 @@ module Argonuts
         raise Argonuts::Error, "You must specify an API key with Argonuts.api_key="
       end
 
-      HTTP.basic_auth(user: cli.api_key, pass: "").
-        headers(:user_agent => "Argonuts/v1 RubyBindings/#{Argonuts::VERSION}")
+      {
+        'X-Auth-Token': cli.api_key,
+        'User-Agent': "Argonuts/#{Argonuts::VERSION}",
+      }
     end
 
-    def self.request(verb, path, options={})
+    def self.request(verb, path, options = {})
       cli = options[:client] || Argonuts.default_client
 
+      url = URI("#{cli.endpoint}#{path}")
+      http = Net::HTTP.new(url.host, url.port)
+
       case verb
       when :get
-        resp = headers(cli).get("#{cli.endpoint}#{path}")
+        request = Net::HTTP::Get.new(url, 'Content-Type' => 'application/json')
       when :post
-        resp = headers(cli).post("#{cli.endpoint}#{path}", json: options[:json])
+        request = Net::HTTP::Post.new(url, 'Content-Type' => 'application/json')
+        request.body = options[:json].to_json
       end
 
-      if resp.code > 399
+      headers(cli).map { |k, v| request[k] = v }
+      resp = http.request(request)
+
+      if resp.code.to_i > 399
         # if response is 400 or 401, we return the error message and error code
-        if resp.code.between?(400, 401)
-          raise Argonuts::Error, "#{resp.parse["message"]} (code=#{resp.parse["error_code"]})"
-        else
-          raise Argonuts::Error, "Server returned HTTP status #{resp.code}."
-        end
+        raise Argonuts::Error, "Server returned HTTP status #{resp.code}."
       end
 
-      return resp.parse
+      return JSON::parse(resp.body)
     end
   end
 end

data/lib/argonuts/version.rb

@@ -1,3 +1,3 @@
 module Argonuts
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/argonuts_test.rb

@@ -14,13 +14,17 @@ class ArgonutsTest < Test::Unit::TestCase
       type: "http",
       url: ENV["ARGONUTS_WEBHOOK_URL"]
     }
+
+    Argonuts.storage = {
+      url: ENV["ARGONUTS_STORAGE_URL"],
+    }
   end
 
   def create_job(j={}, options={})
     Argonuts::Job.create({
       input: { url: INPUT_URL },
       outputs: {
-        mp4: { path: "/test_create_job.mp4", duration: 1 }
+        mp4: { path: "/test_create_job.mp4" }
       }
     }.merge(j), options)
   end
@@ -48,25 +52,25 @@ class ArgonutsTest < Test::Unit::TestCase
     assert_equal "job.starting", job.status
   end
 
-  def test_retrieve_job
-    job = Argonuts::Job.retrieve(create_job.id)
-    assert job.is_a?(Argonuts::Job)
-    assert_not_nil job.id
-    assert_equal "job.starting", job.status
-  end
-
-  def test_create_job_error
-    create_job(input: {url: "notvalidurl"})
-  rescue => e
-    assert_equal e.class, Argonuts::Error
-  end
-
-  def test_retrieve_metadata
-    job = create_job
-    sleep 10
-
-    md = Argonuts::Metadata.retrieve(job.id)
-    assert md.is_a?(Hash)
-    assert_not_nil md["metadata"]["input"]
-  end
+  # def test_retrieve_job
+  #   job = Argonuts::Job.retrieve(create_job.id)
+  #   assert job.is_a?(Argonuts::Job)
+  #   assert_not_nil job.id
+  #   assert_equal "job.starting", job.status
+  # end
+  #
+  # def test_create_job_error
+  #   create_job(input: {url: "notvalidurl"})
+  # rescue => e
+  #   assert_equal e.class, Argonuts::Error
+  # end
+  #
+  # def test_retrieve_metadata
+  #   job = create_job
+  #   sleep 10
+  #
+  #   md = Argonuts::Metadata.retrieve(job.id)
+  #   assert md.is_a?(Hash)
+  #   assert_not_nil md["metadata"]["input"]
+  # end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: argonuts-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Argonuts
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-01 00:00:00.000000000 Z
+date: 2022-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -31,6 +31,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- Rakefile
 - argonuts-ruby.gemspec
 - lib/argonuts-ruby.rb
 - lib/argonuts/api.rb