qa 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2bdd4569dfb4ab638c33d27795cfbb461f2559d
-  data.tar.gz: 1ac7796c5f9a0dd23e5721a9c3c5f65e579674d2
+  metadata.gz: 480d64287a822e05e82705e1ff868e963c65cd24
+  data.tar.gz: dc6f5d1daf37f5618a5c39fc10f239c1c4bdad0a
 SHA512:
-  metadata.gz: f0e9691da5a0d9d980ed2cc7192ad705601c646820a4042366440db60061cdaa953a9cd627c74378442dc06816149f2e38a810c2719c1bbbbe8735ced44fa81a
-  data.tar.gz: d8d96b05bc5e2d3b6ddd808e432df99b0c264a941b4dce2c617e2b854e4fc723e0282464084163af4fd612807262531c4fea13fcae3d5432bd62333e248d2b86
+  metadata.gz: f766d2479209faf8b67ec4bb682f8dc820b774eb4e8404eaca6910c50137cf4f70ac858f3f8accfa3508525f64025d9de578dfa737a9d814ee6c2c4237c04005
+  data.tar.gz: 9515a364e8d1bf4f0dbfafe45affbdf07257c8617b0b752052c9cbec76d1d562750aa666f32f16c7d7113d3db4e2c03a941796b78c320612b4087eca022cce68

data/app/controllers/qa/terms_controller.rb

@@ -14,7 +14,7 @@ class Qa::TermsController < ApplicationController
 
   # Return a list of terms based on a query
   def search
-    terms = @authority.search(url_search)
+    terms = @authority.method(:search).arity == 2 ? @authority.search(url_search, self) : @authority.search(url_search)
     render json: terms
   end
 

data/lib/qa/authorities/assign_fast/generic_authority.rb

@@ -10,6 +10,16 @@ module Qa::Authorities
 
     include WebServiceBase
 
+    require 'qa/authorities/assign_fast/space_fix_encoder'
+    # FAST requires spaces to be encoded as %20 and will not accept + which is Faraday's default encoding
+    def response(url)
+      space_fix_encoder = AssignFast::SpaceFixEncoder.new
+      Faraday.get(url) do |req|
+        req.options.params_encoder = space_fix_encoder
+        req.headers['Accept'] = 'application/json'
+      end
+    end
+
     # Search the FAST api
     #
     # @param [String] the query

data/lib/qa/authorities/assign_fast/space_fix_encoder.rb

@@ -0,0 +1,13 @@
+module Qa::Authorities
+  # for use with Faraday; encode spaces as '%20' not '+'
+  class AssignFast::SpaceFixEncoder
+    def encode(hash)
+      encoded = Faraday::NestedParamsEncoder.encode(hash)
+      encoded.gsub('+', '%20')
+    end
+
+    def decode(str)
+      Faraday::NestedParamsEncoder.decode(str)
+    end
+  end
+end

data/lib/qa/version.rb

@@ -1,3 +1,3 @@
 module Qa
-  VERSION = "0.10.2".freeze
+  VERSION = "0.11.0".freeze
 end

data/spec/controllers/terms_controller_spec.rb

@@ -47,6 +47,26 @@ describe Qa::TermsController, type: :controller do
   end
 
   describe "#search" do
+    context "when a local authority expects two arguments" do
+      before do
+        class Qa::Authorities::Local::TwoArgs < Qa::Authorities::Base
+          attr_reader :subauthority
+          def initialize(subauthority)
+            @subauthority = subauthority
+          end
+
+          def search(_arg1, _arg2)
+            true
+          end
+        end
+        Qa::Authorities::Local.register_subauthority('two_args', 'Qa::Authorities::Local::TwoArgs')
+      end
+      it "succeeds" do
+        get :search, q: "a query", vocab: "local", subauthority: "two_args"
+        expect(response).to be_success
+      end
+    end
+
     context "loc" do
       before do
         stub_request(:get, "http://id.loc.gov/search/?format=json&q=Berry&q=cs:http://id.loc.gov/authorities/names")

data/spec/lib/authorities/space_fix_encoder.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Qa::Authorities::AssignFast::SpaceFixEncoder do
+  let(:encoder) { described_class.new }
+
+  it 'encodes spaces as %20 instead of +' do
+    input = { "query" => "word ling", "queryIndex" => "suggestall", "queryReturn" => "suggestall,idroot,auth,type", "suggest" => "autoSubject", "rows" => "20" }
+    expected = "query=word%20ling&queryIndex=suggestall&queryReturn=suggestall%2Cidroot%2Cauth%2Ctype&rows=20&suggest=autoSubject"
+    expect(encoder.encode(input)).to eq expected
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qa
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Stephen Anderson
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -57,14 +57,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
@@ -211,14 +211,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.8.0
 description: Provides a set of uniform RESTful routes to query any controlled vocabulary
   or set of authority terms.
 email:
@@ -260,6 +260,7 @@ files:
 - lib/qa/authorities.rb
 - lib/qa/authorities/assign_fast.rb
 - lib/qa/authorities/assign_fast/generic_authority.rb
+- lib/qa/authorities/assign_fast/space_fix_encoder.rb
 - lib/qa/authorities/assign_fast_subauthority.rb
 - lib/qa/authorities/authority_with_sub_authority.rb
 - lib/qa/authorities/base.rb
@@ -329,6 +330,7 @@ files:
 - spec/lib/authorities/mesh_spec.rb
 - spec/lib/authorities/mysql_table_based_authority_spec.rb
 - spec/lib/authorities/oclcts_spec.rb
+- spec/lib/authorities/space_fix_encoder.rb
 - spec/lib/authorities/table_based_authority_spec.rb
 - spec/lib/authorities/tgnlang_spec.rb
 - spec/lib/authorities_loc_subauthorities.rb
@@ -359,7 +361,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: You should question your authorities.
@@ -402,6 +404,7 @@ test_files:
 - spec/lib/authorities/mesh_spec.rb
 - spec/lib/authorities/mysql_table_based_authority_spec.rb
 - spec/lib/authorities/oclcts_spec.rb
+- spec/lib/authorities/space_fix_encoder.rb
 - spec/lib/authorities/table_based_authority_spec.rb
 - spec/lib/authorities/tgnlang_spec.rb
 - spec/lib/authorities_loc_subauthorities.rb