argonuts-ruby 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab46eeb7dec91ab90a48e01bf6082116a8eb941b4777104d5b4d388952d1cbfb
-  data.tar.gz: 496bd20b0cb8c7f9a8556684840a1a3e91ae2eb9340f7da81b4bde6bbe21ad31
+  metadata.gz: 8f8e2a68fc344e060726da5927b02d9cf98f524f1445972648893e224aed869f
+  data.tar.gz: 7ee74e811fc91535f2526a2e7aed4bea495054ebd3acd909defcd11caeedd8f6
 SHA512:
-  metadata.gz: f55e87dda4006506fd344ef0706f46bc1d8bd269102d8e7afdc9a33ed2ab28b85e83ab02b18c1ba1a63a84db31ad2403eeae6c3c6a8748ccb53fbbeda1dd81a7
-  data.tar.gz: f28df646ced2df3ecea1c6ec7e6659f054a98a89c12fabcb53fdb7c30237a8baa42debebbd6be438b146037740e589d5bd381f6d78babd5cb7d87068dff25e18
+  metadata.gz: 21589065fa54df1fabf446050acb0cda07696fc90e3f4f2fce81096f74ae95b0dc67437b799c0344a524b6bd58c5a6ab40d03d5af12352e47d6166238b73c902
+  data.tar.gz: 36e10d5e2fc59331b730df88aa874cc61241cb92f8f8627cf11035da9b2cf581f1632c4e6195b5a45d0c3042c6079eb2da0538306223f918d3045382b57b50df

data/README.md

@@ -30,14 +30,13 @@ bundle install
 
 ## Usage
 
-The library needs you to set your API key which can be found in your [dashboard](https://argonuts.co/dashboard).
+The library needs you to set your API key which can be found in your [profile](https://argonuts.co/profile).
 
 
 ```ruby
 Argonuts.api_key = 'api-key'
 
 Argonuts.notification = {
-  type: "http",
   url: "https://yoursite.co/api/argonuts/webhook"
 }
 
@@ -49,7 +48,7 @@ Argonuts.storage = {
 ## Creating a job
 
 ```ruby
-Argonuts::Job.create(
+job = Argonuts::Job.create({
   input: { url: "https://yoursite.co/path/file.mp4" },
   outputs: {
     "jpg:300x": { path: "/image.jpg" },
@@ -58,27 +57,13 @@ Argonuts::Job.create(
       hls: { path: "hls/" }
     }
   }
-)
+})
 ```
 
 ## Getting information about a job
 
 ```ruby
-Argonuts::Job.retrieve("OolQXaiU86NFki")
-```
-
-## Retrieving metadata
-
-```ruby
-Argonuts::Metadata.retrieve("OolQXaiU86NFki")
-
-```
-
-## Per-request configuration
-
-```ruby
-cli = Argonuts::Client.new(api_key: "api-key-prod")
-Argonuts::Job.create(job, client: cli)
+Argonuts::Job.retrieve(job.id)
 ```
 
 *Released under the [MIT license](http://www.opensource.org/licenses/mit-license.php).*

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/client.rb

@@ -1,18 +1,18 @@
 module Argonuts
   def self.default_client
     Client.new({
-      api_key: Argonuts.api_key,
-      region: Argonuts.region,
-      endpoint: Argonuts.endpoint
-    })
+                 api_key: Argonuts.api_key,
+                 # region: Argonuts.region,
+                 endpoint: Argonuts.endpoint
+               })
   end
 
   class Client
-    attr_accessor :api_key, :endpoint, :region
+    attr_accessor :api_key, :endpoint #, :region
 
-    def initialize(options={})
+    def initialize(options = {})
       @api_key = options[:api_key]
-      @region = options[:region]
+      # @region = options[:region]
       @endpoint = options[:endpoint]
     end
 

data/lib/argonuts/version.rb

@@ -1,3 +1,3 @@
 module Argonuts
-  VERSION = "0.1.0"
+  VERSION = "0.1.3"
 end

data/lib/argonuts-ruby.rb

@@ -6,7 +6,7 @@ require "argonuts/metadata"
 require "argonuts/version"
 
 module Argonuts
-  ENDPOINT = "https://argonuts.co/api/v1"
+  ENDPOINT = "https://argonuts.co/api/v1/"
 
   def self.api_key=(key)
     @api_key = key
@@ -16,13 +16,13 @@ module Argonuts
     @api_key
   end
 
-  def self.region=(region)
-    @region = region
-  end
-
-  def self.region
-    @region
-  end
+  # def self.region=(region)
+  #   @region = region
+  # end
+  #
+  # def self.region
+  #   @region
+  # end
 
   def self.endpoint=(endpoint)
     @endpoint = endpoint

data/test/argonuts_test.rb

@@ -11,16 +11,19 @@ class ArgonutsTest < Test::Unit::TestCase
     Argonuts.endpoint = ENV["ARGONUTS_ENDPOINT"]
 
     Argonuts.notification = {
-      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
@@ -55,18 +58,18 @@ class ArgonutsTest < Test::Unit::TestCase
     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_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.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Argonuts
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-01 00:00:00.000000000 Z
+date: 2022-09-08 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