Add all actions and spec

Author: brunto

.rubocop.yml

@@ -0,0 +1,18 @@
+Documentation:
+  Enabled: false
+Metrics/LineLength:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: false
+Style/BlockComments:
+  Enabled: false
+AllCops:
+  RunRailsCops: true
+  Include:
+    - '**/Gemfile'
+    - '**/Rakefile'
+  Exclude:
+   - 'bin/*'
+   - 'db/seeds.rb'
+   - 'db/schema.rb'
+   - 'vendor/bundle/**/*'

Rakefile

@@ -1,5 +1,5 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 

lib/ievkit.rb

@@ -1,5 +1,5 @@
-#require 'logger'
-#require 'rest-client'
+# require 'logger'
+# require 'rest-client'
 require 'figaro'
 require 'faraday_middleware'
 require 'ievkit/version'

lib/ievkit/client.rb

@@ -1,82 +1,103 @@
 module Ievkit
   class Client
-    attr_reader :iev_url_prefix, :iev_url_suffix, :referential
+    attr_reader :iev_url_prefix, :iev_url_suffix, :iev_url_jobs, :referential
 
     def initialize(referential)
       @payload = {}
-      @iev_url_prefix = set_iev_url_prefix
       @referential = referential
+      @iev_url_prefix = init_iev_url_prefix
+      @iev_url_jobs = init_iev_url_jobs
     end
 
-    def parse_links_headers(links)
-      links2 = {}
-      links.each do |part|
-        section = part.split(';')
-        url = section[0][/<(.*)>/,1]
-        name = section[1][/rel="(.*)"/,1].to_sym
-        links2[name] = url
-      end
-      links2
-    end
-
-
     def prepare_post_request(type, options)
-      set_files(options)
-      @iev_url_suffix = set_iev_url_suffix(type)
+      init_files(options)
+      @iev_url_suffix = init_iev_url_suffix(type)
       init_connection(iev_url_prefix)
-      @connection.post(@iev_url_suffix, @payload)
+      response = @connection.post(@iev_url_suffix, @payload)
+      parse_response(response)
     end
 
-    def prepare_get_request(url)
+    def prepare_request(url, http_method)
       init_connection(url)
-      @connection.get
+      response = @connection.send(http_method)
+      parse_response(response)
     end
 
     def init_connection(url)
       @connection = Faraday.new(url: url) do |conn|
-        #conn.use Faraday::Response::RaiseError
         conn.request :multipart if @payload.any?
         conn.headers = headers
         conn.response :json, content_type: 'application/json'
         conn.adapter Faraday.default_adapter
       end
     end
 
-    def set_files(options)
-      if options
-        iev_file = options[:iev_file]
-        @payload[:file[0]] = Faraday::UploadIO.new(options[:iev_params], 'application/json', 'parameters.json')
-        if iev_file
-          filename = File.basename(iev_file)
-          @payload[:file[1]] = Faraday::UploadIO.new(iev_file, 'application/zip', filename)
+    def init_files(options)
+      return unless options
+      iev_file = options[:iev_file]
+      @payload[:file[0]] = Faraday::UploadIO.new(options[:iev_params], 'application/json', 'parameters.json')
+      return unless iev_file
+      filename = File.basename(iev_file)
+      @payload[:file[1]] = Faraday::UploadIO.new(iev_file, 'application/zip', filename)
+    end
+
+    protected
+
+    def headers
+      {}.merge(init_iev_version)
+    end
+
+    def parse_links_headers(response)
+      return true unless response.headers['link'].present?
+      {}.tap do |hash|
+        response.headers['link'].split(',').each do |part|
+          section = part.split(';')
+          name = section[1][/rel="(.*)"/, 1].to_sym
+          hash[name] = section[0][/<(.*)>/, 1]
         end
       end
     end
 
+    def parse_response(response)
+      case response.status
+      when 202
+        response.headers['location']
+      when 303
+        response.headers['location']
+      when 200
+        parse_links_headers(response)
+      else
+        JSON.parse(response.body)['error_code']
+      end
+    rescue => e
+      @logger.fatal("Unable to parse response: #{e}")
+    end
+
     private
 
-    def set_iev_url_prefix
+    def init_iev_url_prefix
       [
-          "#{ENV['IEV_HOST']}:#{ENV['IEV_PORT']}",
-          ENV['IEV_PATH']
+        "#{ENV['IEV_HOST']}:#{ENV['IEV_PORT']}",
+        ENV['IEV_PATH'],
+        'referentials',
+        @referential,
+        ''
       ].compact * '/'
     end
 
-    def set_iev_url_suffix(type=nil)
+    def init_iev_url_suffix(type = nil)
       [
-          'referentials',
-          @referential,
-          caller_locations(2,2)[0].label,
-          type
+        caller_locations(2, 2)[0].label,
+        type
       ].compact * '/'
     end
 
-    def set_iev_version
-      { :'Accept-Version' => ENV['IEV_VERSION'] }
+    def init_iev_url_jobs
+      [@iev_url_prefix, 'jobs'].join
     end
 
-    def headers
-      { }.merge(set_iev_version)
+    def init_iev_version
+      { 'Accept-Version': ENV['IEV_VERSION'] }
     end
   end
 end

lib/ievkit/job.rb

@@ -3,22 +3,31 @@ class Job
     attr_reader :client, :response
 
     def initialize(referential_id)
-      #RestClient.log = @logger = Logger.new(STDERR)
       @client = Ievkit::Client.new(referential_id)
     end
 
-    def execute(action, type=nil, options={})
-      @response = send(action, type, options)
-      parse_response
+    def post_job(action, type = nil, options = {})
+      send(action, type, options)
     end
 
-    def check_job(url)
-      @response = @client.prepare_get_request(url)
-      parse_response
+    def get_job(url)
+      do_job(url, :get)
+    end
+
+    def delete_job(url)
+      do_job(url, :delete)
+    end
+
+    def delete_jobs
+      do_job(@client.iev_url_jobs, :delete)
     end
 
     protected
 
+    def do_job(url, http_method)
+      @client.prepare_request(url, http_method)
+    end
+
     def importer(type, options)
       @client.prepare_post_request(type, options)
     end
@@ -30,19 +39,5 @@ def exporter(type, options)
     def validator(type, options)
       @client.prepare_post_request(type, options)
     end
-
-    def parse_response
-      case @response.status
-        when 202
-          @response.headers['location']
-        when 303
-          @response.headers['location']
-        when 200
-          links = @response.headers['link'].split(',')
-          @client.parse_links_headers(links)
-        else
-          @response.body
-      end
-    end
   end
 end

lib/ievkit/version.rb

@@ -1,3 +1,3 @@
 module Ievkit
-  VERSION = "0.1.0"
+  VERSION = '0.1.0'
 end

spec/ievkit_export_spec.rb

@@ -1,21 +1,20 @@
 require 'spec_helper'
 
 describe Ievkit do
-
-  before(:all) { @referential = 't04' }
+  before(:all) { @referential = ENV['REFERENTIAL_TEST'] }
   before(:all) { @job = Ievkit::Job.new(@referential) }
 
   context '#export' do
-    before(:all) { @export_forwarding_url = @job.execute(:exporter, :neptune, { iev_file: nil, iev_params: ENV['iev_export_params'] }) }
+    before(:all) { @export_forwarding_url = @job.post_job(:exporter, :neptune, iev_file: nil, iev_params: ENV['IEV_EXPORT_PARAMS_TEST']) }
     it 'return correct url suffix' do
-      expect(@job.client.iev_url_suffix).to end_with("referentials/#{@referential}/exporter/neptune")
+      expect("#{@job.client.iev_url_prefix}#{@job.client.iev_url_suffix}").to end_with("referentials/#{@referential}/exporter/neptune")
     end
     it 'return forwarding url' do
       expect(@export_forwarding_url).to match('/scheduled_jobs/')
     end
 
     context 'when check forwarding url' do
-      before(:all) { @links = @job.check_job(@export_forwarding_url) }
+      before(:all) { @links = @job.get_job(@export_forwarding_url) }
       it 'return parameters link' do
         expect(@links[:parameters]).to end_with('/parameters.json')
       end
@@ -30,16 +29,16 @@
       end
       it 'forward to terminated_jobs' do
         terminated_job_url = nil
-        until terminated_job_url =~ /terminated_jobs/ do
-          terminated_job_url = @job.check_job(@export_forwarding_url)
+        until terminated_job_url =~ /terminated_jobs/
+          terminated_job_url = @job.get_job(@export_forwarding_url)
           sleep(2)
         end
       end
     end
 
     context 'when check terminated job' do
-      before(:all) { @terminated_job_url = @job.check_job(@export_forwarding_url) }
-      before(:all) { @links = @job.check_job(@terminated_job_url) }
+      before(:all) { @terminated_job_url = @job.get_job(@export_forwarding_url) }
+      before(:all) { @links = @job.get_job(@terminated_job_url) }
       it 'return parameters link' do
         expect(@links[:parameters]).to end_with('/parameters.json')
       end

spec/ievkit_import_spec.rb

@@ -1,21 +1,20 @@
 require 'spec_helper'
 
 describe Ievkit do
-
-  before(:all) { @referential = 't04' }
+  before(:all) { @referential = ENV['REFERENTIAL_TEST'] }
   before(:all) { @job = Ievkit::Job.new(@referential) }
 
   context '#import' do
-    before(:all) { @import_forwarding_url = @job.execute(:importer, :gtfs, { iev_file: ENV['iev_import_file'], iev_params: ENV['iev_import_params'] }) }
+    before(:all) { @import_forwarding_url = @job.post_job(:importer, :gtfs, iev_file: ENV['IEV_IMPORT_FILE_TEST'], iev_params: ENV['IEV_IMPORT_PARAMS_TEST']) }
     it 'return correct url suffix' do
-      expect(@job.client.iev_url_suffix).to end_with("referentials/#{@referential}/importer/gtfs")
+      expect("#{@job.client.iev_url_prefix}#{@job.client.iev_url_suffix}").to end_with("referentials/#{@referential}/importer/gtfs")
     end
     it 'return forwarding url' do
       expect(@import_forwarding_url).to match('/scheduled_jobs/')
     end
 
     context 'when check forwarding url' do
-      before(:all) { @links = @job.check_job(@import_forwarding_url) }
+      before(:all) { @links = @job.get_job(@import_forwarding_url) }
       it 'return parameters link' do
         expect(@links[:parameters]).to end_with('/parameters.json')
       end
@@ -33,16 +32,16 @@
       end
       it 'forward to terminated_jobs' do
         terminated_job_url = nil
-        until terminated_job_url =~ /terminated_jobs/ do
-          terminated_job_url = @job.check_job(@import_forwarding_url)
+        until terminated_job_url =~ /terminated_jobs/
+          terminated_job_url = @job.get_job(@import_forwarding_url)
           sleep(2)
         end
       end
     end
 
     context 'when check terminated job' do
-      before(:all) { @terminated_job_url = @job.check_job(@import_forwarding_url) }
-      before(:all) { @links = @job.check_job(@terminated_job_url) }
+      before(:all) { @terminated_job_url = @job.get_job(@import_forwarding_url) }
+      before(:all) { @links = @job.get_job(@terminated_job_url) }
       it 'return parameters link' do
         expect(@links[:parameters]).to end_with('/parameters.json')
       end
@@ -61,6 +60,15 @@
       it 'return validation_report link' do
         expect(@links[:validation_report]).to end_with('/validation_report.json')
       end
+      it 'return true on delete' do
+        expect(@job.delete_job(@links[:delete])).to be true
+      end
+      it 'raise an error on already deleted' do
+        expect(@job.delete_job(@links[:delete])).to eq('UNKNOWN_JOB')
+      end
+      it 'return true on deleted all jobs' do
+        expect(@job.delete_jobs).to be true
+      end
     end
   end
 end

spec/ievkit_validator_spec.rb

@@ -1,21 +1,20 @@
 require 'spec_helper'
 
 describe Ievkit do
-
-  before(:all) { @referential = 't04' }
+  before(:all) { @referential = ENV['REFERENTIAL_TEST'] }
   before(:all) { @job = Ievkit::Job.new(@referential) }
 
   context '#validator' do
-    before(:all) { @validator_forwarding_url = @job.execute(:validator, :gtfs, { iev_file: ENV['iev_import_file'], iev_params: ENV['iev_validate_params'] }) }
+    before(:all) { @validator_forwarding_url = @job.post_job(:validator, :gtfs, iev_file: ENV['IEV_IMPORT_FILE_TEST'], iev_params: ENV['IEV_VALIDATE_PARAMS_TEST']) }
     it 'return correct url suffix' do
-      expect(@job.client.iev_url_suffix).to end_with("referentials/#{@referential}/validator/gtfs")
+      expect("#{@job.client.iev_url_prefix}#{@job.client.iev_url_suffix}").to end_with("referentials/#{@referential}/validator/gtfs")
     end
     it 'return forwarding url' do
       expect(@validator_forwarding_url).to match('/scheduled_jobs/')
     end
 
     context 'when check forwarding url' do
-      before(:all) { @links = @job.check_job(@validator_forwarding_url) }
+      before(:all) { @links = @job.get_job(@validator_forwarding_url) }
       it 'return parameters link' do
         expect(@links[:parameters]).to end_with('/parameters.json')
       end
@@ -30,16 +29,16 @@
       end
       it 'forward to terminated_jobs' do
         terminated_job_url = nil
-        until terminated_job_url =~ /terminated_jobs/ do
-          terminated_job_url = @job.check_job(@validator_forwarding_url)
+        until terminated_job_url =~ /terminated_jobs/
+          terminated_job_url = @job.get_job(@validator_forwarding_url)
           sleep(2)
         end
       end
     end
 
     context 'when check terminated job' do
-      before(:all) { @terminated_job_url = @job.check_job(@validator_forwarding_url) }
-      before(:all) { @links = @job.check_job(@terminated_job_url) }
+      before(:all) { @terminated_job_url = @job.get_job(@validator_forwarding_url) }
+      before(:all) { @links = @job.get_job(@terminated_job_url) }
       it 'return parameters link' do
         expect(@links[:parameters]).to end_with('/parameters.json')
       end