fixer_client 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f377f792a0d1175f3fa975ffdf31d2321664b79f
-  data.tar.gz: 4d551f74892ed7baa5e81c53a7594425def70b74
+  metadata.gz: 6b2804caf3476551d2e77e70a3f4522faec86a2d
+  data.tar.gz: 2dbed2d9c37d72811806071fe515de5689576641
 SHA512:
-  metadata.gz: 8c797e2e7d191b70e6399a0eea79e500a4364a7fa9e8193c24da7267273d6da2441088d461fc7ee6c8813d5ac8cf3c70e1aa60544bc142dfa273a59a460c5640
-  data.tar.gz: eaede9a0e2bc6d0b70435afb19851250c6baad1d27b976264c8b3988f0a135822ab8b97bb7117d231b0fae9354f9a2ecb6eacb9c13143340f50184c5b31d335d
+  metadata.gz: b6ef6ef9c05f6613645a5ed1151f8c04bec81c71db0a4995ac95c3e691dfb6325a450c2138bfb5ae4b5bfebfd45c59b8d772d8303ecca03da79e029273afb011
+  data.tar.gz: 8033f880b90362bee739fe5e3f4cf27c948d919a6c360f1eddcc2757706d24e21bd674fdd451e0f950757f9f95537025e595085cd15d4d39196cd4cfc8de782a

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - "2.1.6"
+  - "2.2.1"
+env:
+  - TRAVIS=true FIXER_CLIENT_ID=1111111111111111111111111111111111111111111111111111111111111111 FIXER_CLIENT_SECRET=2222222222222222222222222222222222222222222222222222222222222222

data/README.md

@@ -1,6 +1,12 @@
-# FixerClient
+# Fixer Client
 
-Client lib for the fixer application.
+[![License](https://img.shields.io/badge/license-MIT-blue.svg)](http://opensource.org/licenses/MIT)
+[![Build Status](https://travis-ci.org/PRX/fixer_client.svg?branch=master)](https://travis-ci.org/PRX/fixer_client)
+[![Code Climate](https://codeclimate.com/github/PRX/fixer_client/badges/gpa.svg)](https://codeclimate.com/github/PRX/fixer_client)
+[![Coverage Status](https://coveralls.io/repos/PRX/fixer_client/badge.svg?branch=master)](https://coveralls.io/r/PRX/fixer_client?branch=master)
+[![Dependency Status](https://gemnasium.com/PRX/fixer_client.svg)](https://gemnasium.com/PRX/fixer_client)
+
+Client gem for the [Fixer](https://github.com/PRX/fixer.prx.org) application.
 
 ## Installation
 
@@ -76,8 +82,23 @@ j = client.jobs.create(job)
 
 ```
 
+## License
+[The MIT License](http://opensource.org/licenses/MIT)
+
 ## Contributing
 
+In a local development environment, you can use a `.env-fixer_client` file that will be loaded to set the required environment variables.
+
+For example:
+```
+touch .env-fixer_client
+echo FIXER_CLIENT_ID=1111111111111111111111111111111111111111111111111111111111111111 >> .env-fixer_client
+echo FIXER_CLIENT_SECRET=2222222222222222222222222222222222222222222222222222222222222222 >> .env-fixer_client
+
+# you can also set useful values like this for debugging
+echo EXCON_DEBUG=true
+```
+
 1. Fork it ( https://github.com/[my-github-username]/fixer_client/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)

data/examples/basic.rb

@@ -2,11 +2,12 @@ require 'dotenv'
 Dotenv.load '.env-fixer_client'
 
 require 'fixer_client'
+Fixer.reset!
 
 Fixer.configure do |c|
-  c.client_id = 'yourclientid'
-  c.client_secret = 'yoursecret'
-  c.endpoint = 'http://fixer.prx.dev/api/' # default
+  c.client_id = ENV['FIXER_CLIENT_ID']
+  c.client_secret = ENV['FIXER_CLIENT_SECRET']
+  c.endpoint = 'http://fixer.prx.dev/api/'
 end
 
 client = Fixer::Client.new

data/examples/sequence.rb

@@ -0,0 +1,37 @@
+require 'dotenv'
+Dotenv.load '.env-fixer_client'
+
+require 'fixer_client'
+Fixer.reset!
+
+Fixer.configure do |c|
+  c.client_id = ENV['FIXER_CLIENT_ID']
+  c.client_secret = ENV['FIXER_CLIENT_SECRET']
+  c.endpoint = 'http://fixer.prx.dev/api/'
+end
+
+client = Fixer::Client.new
+
+job = {
+  job: {
+    original: 's3://test-fixer/audio.wav',
+    job_type: 'audio',
+    tasks: [
+      sequence: {
+        tasks: [
+          {
+            task_type: 'cut',
+            options: { length: 30, fade: 0 }
+          },
+          {
+            task_type: 'transcode',
+            options: { format: 'mp3', bit_rate: 64, sample_rate: 44100 },
+            result: 's3://test-fixer/audio.mp3'
+          }
+        ]
+      }
+    ]
+  }
+}
+
+j = client.jobs.create(job)

data/examples/transcode.rb

@@ -2,11 +2,12 @@ require 'dotenv'
 Dotenv.load '.env-fixer_client'
 
 require 'fixer_client'
+Fixer.reset!
 
 Fixer.configure do |c|
   c.client_id = ENV['FIXER_CLIENT_ID']
   c.client_secret = ENV['FIXER_CLIENT_SECRET']
-  c.endpoint = 'http://fixer-dev.prx.dev/api/'
+  c.endpoint = 'http://fixer.prx.dev/api/'
 end
 
 client = Fixer::Client.new

data/fixer_client.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('rake')
   spec.add_development_dependency('minitest')
   spec.add_development_dependency('simplecov')
+  spec.add_development_dependency('coveralls')
   spec.add_development_dependency('webmock')
   spec.add_development_dependency('dotenv')
 end

data/lib/fixer/api.rb

@@ -76,12 +76,12 @@ module Fixer
 
     def create(params={})
       self.current_options = current_options.merge(args_to_options(params))
-      request(:post, base_path, {data: params})
+      request(:post, base_path, { data: params } )
     end
 
     def update(params={})
       self.current_options = current_options.merge(args_to_options(params))
-      request(:put, base_path, {data: params})
+      request(:put, base_path, { data: params } )
     end
 
     def delete(params={})

data/lib/fixer/configuration.rb

@@ -8,7 +8,7 @@ module Fixer
       :client_secret,
       :adapter,
       :endpoint,
-      :user_agent,
+      :user_agent
     ].freeze
 
     # Adapters are whatever Faraday supports - I like excon alot, so I'm defaulting it

data/lib/fixer/connection.rb

@@ -20,8 +20,8 @@ module Fixer
       options = {
         headers: {
           # generic http headers
-          'User-Agent'   => user_agent,
-          'Accept'       => "application/json;charset=utf-8"
+          'User-Agent' => user_agent,
+          'Accept'     => 'application/json;charset=utf-8'
         },
         ssl: { verify: false },
         url: endpoint
@@ -31,14 +31,10 @@ module Fixer
       options.select{|k,v| ALLOWED_OPTIONS.include?(k.to_sym)}
     end
 
-    def connection(opts={})
-      @token ||= get_token(opts)
-    end
-
     def connection(options={})
       Faraday::Connection.new(process_options(options)) do |connection|
         connection.request :authorization, 'Bearer', get_token(options).token
-        connection.request :url_encoded
+        connection.request :json
         connection.response :mashify
         connection.response :logger if options[:debug]
         connection.response :json

data/lib/fixer/version.rb

@@ -1,3 +1,3 @@
 module Fixer
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/test/fixer/client_test.rb

@@ -6,7 +6,7 @@ describe Fixer::Client do
 
   let(:client) { Fixer::Client.new }
 
-  let(:job) do
+  let(:job_params) do
     {
       job: {
         job_type: 'test',
@@ -14,26 +14,55 @@ describe Fixer::Client do
         retry_max: 10,
         retry_delay: 300,
         tasks: [
-          {
-            task_type: 'echo',
-            label: 'test1',
-            options: { foo: 'bar' },
-            call_back: 'http://cms.prx.dev/call_back'
+          sequence: {
+            tasks: [
+              {
+                task_type: 'echo',
+                label: 'test1',
+                options: { foo: 'bar' },
+                call_back: 'http://cms.prx.dev/call_back'
+              },
+              {
+                task_type: 'echo',
+                label: 'test2',
+                options: { bar: 'foo' },
+                call_back: 'http://cms.prx.dev/call_back',
+                result: 'http://cms.prx.dev/echo.txt'
+              }
+            ]
           }
         ]
       }
     }
   end
 
+  before do
+    stub_request(:post, "http://fixer.prx.dev/oauth/token").
+      with(:body => {"grant_type"=>"client_credentials"}).
+      to_return(
+        :status => 200,
+        :body => "{\"access_token\":\"4651f8250fb5d21f5dce575894446f003304e2856acad2292daf52a76de5c6e8\",\"token_type\":\"bearer\",\"expires_in\":7200,\"created_at\":#{Time.now.to_i}}",
+        :headers => {"Content-Type" => "application/json; charset=utf-8"}
+      )
+  end
+
   it 'makes a new client' do
     client.must_be_instance_of Fixer::Client
   end
 
-  # it 'gets a list of jobs' do
-  #   stub_request(:post, "http://fixer.prx.dev/oauth/token").
-  #     with(:body => {"grant_type"=>"client_credentials"}).
-  #     to_return(:status => 200, :body => "", :headers => {})
+  it 'gets a list of jobs' do
+    stub_request(:get, "http://fixer.prx.dev/api/jobs/").
+      with(:headers => {'Accept'=>'application/json;charset=utf-8'}).
+      to_return(:status => 200, :body => {}.to_json, :headers => {})
+
+    jobs = client.jobs.list
+  end
+
+  it 'creates a complex job' do
+    stub_request(:post, "http://fixer.prx.dev/api/jobs/").
+      with(:headers => { 'Accept' => 'application/json;charset=utf-8', 'Content-Type' => 'application/json' } ).
+      to_return(:status => 200, :body => "", :headers => {})
 
-  #   jobs = client.jobs.list
-  # end
-end
+    j = client.jobs.create(job_params)
+  end
+end

data/test/minitest_helper.rb

@@ -3,6 +3,14 @@
 require 'simplecov'
 SimpleCov.start
 
+if ENV['TRAVIS']
+  require 'coveralls'
+  Coveralls.wear!
+end
+
+ENV['FIXER_CLIENT_ID']     = '1111111111111111111111111111111111111111111111111111111111111111'
+ENV['FIXER_CLIENT_SECRET'] = '2222222222222222222222222222222222222222222222222222222222222222'
+
 require 'dotenv'
 Dotenv.load '.env-fixer_client'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fixer_client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Andrew Kuklewicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -200,11 +214,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - examples/basic.rb
+- examples/sequence.rb
 - examples/transcode.rb
 - fixer_client.gemspec
 - lib/fixer.rb