rosette_api 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0e44fba62441db386c9de6162b96d0ef5ee5d53
-  data.tar.gz: 37709ba67b19f1f2adf6b7935a13381b87e3b96e
+  metadata.gz: 518dc7208214566ddaeb979cba5bb276c7f05558
+  data.tar.gz: 840bcfdfe10f7de5fab352ab164d8c94fa36f325
 SHA512:
-  metadata.gz: 26a24f30812075f6d8d19f397751ac4f5fa3f9ae3c1ffb7adcd558a9da88dd61d1c3a9568756c967fbc6ec4c3a09b12a538441d147a7aeb2c05d66997210666a
-  data.tar.gz: d45e7ef7849f7e4fc05f60d202640b92251854c8606c4caf6a08cd08d1ed96ceb84f7e5bae402cb0c2ccc418da7bc66c48925c2b495d4ce6acc70d8c90dda5c1
+  metadata.gz: d6a861e66e8893f501759c33099098e03e4ab8438f37c3780c36d2304af0afb6823c58fcde40b8e59416ceaed4ce190362efb1fbfaa3bc390a8748b4365c3cd8
+  data.tar.gz: 083ec97fa03d5c621c197e132247d6caed164b22a7628aa20d53add57daa9eebe2fa0b11d6f3b017823c6583f396ff0b9afbba5187fad939be35411323712960

data/.rubocop.yml

@@ -0,0 +1,312 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-12-07 10:52:04 -0500 using RuboCop version 0.46.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# Configuration parameters: Include.
+# Include: **/Gemfile, **/gems.rb
+Bundler/OrderedGems:
+  Exclude:
+    - 'Gemfile'
+
+# Offense count: 2
+Lint/Void:
+  Exclude:
+    - 'examples/sentences.rb'
+    - 'examples/sentiment.rb'
+
+# Offense count: 3
+Metrics/AbcSize:
+  Max: 41
+
+# Offense count: 4
+# Configuration parameters: CountComments.
+Metrics/BlockLength:
+  Max: 425
+
+# Offense count: 2
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 140
+
+# Offense count: 142
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 408
+
+# Offense count: 6
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 42
+
+# Offense count: 1
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  Max: 6
+
+# Offense count: 94
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle, SupportedLastArgumentHashStyles.
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Style/AlignHash:
+  Exclude:
+    - 'tests/tests_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
+# SupportedStyles: line_count_based, semantic, braces_for_chaining
+# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
+# FunctionalMethods: let, let!, subject, watch
+# IgnoredMethods: lambda, proc, it
+Style/BlockDelimiters:
+  Exclude:
+    - 'tests/tests_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/BlockEndNewline:
+  Exclude:
+    - 'tests/tests_spec.rb'
+
+# Offense count: 18
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, SingleLineConditionsOnly.
+# SupportedStyles: assign_to_condition, assign_inside_condition
+Style/ConditionalAssignment:
+  Enabled: false
+
+# Offense count: 40
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: leading, trailing
+Style/DotPosition:
+  Exclude:
+    - 'tests/tests_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowAdjacentOneLineDefs.
+Style/EmptyLineBetweenDefs:
+  Exclude:
+    - 'lib/rosette_api.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+Style/EmptyLines:
+  Exclude:
+    - 'examples/sentiment.rb'
+    - 'lib/request_builder.rb'
+    - 'rosette_api.gemspec'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: empty_lines, no_empty_lines
+Style/EmptyLinesAroundBlockBody:
+  Exclude:
+    - 'tests/tests_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/EmptyLinesAroundMethodBody:
+  Exclude:
+    - 'lib/request_builder.rb'
+
+# Offense count: 3
+# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts.
+Style/FileName:
+  Exclude:
+    - 'examples/morphology_compound-components.rb'
+    - 'examples/morphology_han-readings.rb'
+    - 'examples/morphology_parts-of-speech.rb'
+
+# Offense count: 2
+# Configuration parameters: SupportedStyles.
+# SupportedStyles: for, each
+Style/For:
+  EnforcedStyle: for
+
+# Offense count: 30
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: when_needed, always
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+# Offense count: 4
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/name_similarity_parameters.rb'
+    - 'lib/name_translation_parameters.rb'
+    - 'lib/request_builder.rb'
+
+# Offense count: 90
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
+Style/HashSyntax:
+  Exclude:
+    - 'tests/tests_spec.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: normal, rails
+Style/IndentationConsistency:
+  Exclude:
+    - 'examples/sentences.rb'
+    - 'examples/sentiment.rb'
+    - 'lib/rosette_api.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: Width.
+Style/IndentationWidth:
+  Exclude:
+    - 'examples/morphology_han-readings.rb'
+    - 'lib/request_builder.rb'
+    - 'tests/tests_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/MultilineBlockLayout:
+  Exclude:
+    - 'tests/tests_spec.rb'
+
+# Offense count: 41
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: aligned, indented, indented_relative_to_receiver
+Style/MultilineMethodCallIndentation:
+  Exclude:
+    - 'tests/tests_spec.rb'
+
+# Offense count: 15
+# Cop supports --auto-correct.
+Style/MutableConstant:
+  Exclude:
+    - 'lib/rosette_api.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/NegatedIf:
+  Exclude:
+    - 'lib/name_translation_parameters.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: IncludeSemanticChanges.
+Style/NonNilCheck:
+  Exclude:
+    - 'lib/request_builder.rb'
+
+# Offense count: 2
+Style/OptionalArguments:
+  Exclude:
+    - 'lib/request_builder.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Exclude:
+    - 'rosette_api.gemspec'
+
+# Offense count: 8
+# Cop supports --auto-correct.
+# Configuration parameters: SupportedStyles.
+# SupportedStyles: compact, exploded
+Style/RaiseArgs:
+  EnforcedStyle: compact
+
+# Offense count: 7
+# Cop supports --auto-correct.
+Style/RedundantSelf:
+  Exclude:
+    - 'lib/document_parameters.rb'
+    - 'lib/name_parameter.rb'
+    - 'lib/name_similarity_parameters.rb'
+    - 'lib/name_translation_parameters.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/SpaceAfterColon:
+  Exclude:
+    - 'examples/name_similarity.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment.
+Style/SpaceAroundOperators:
+  Exclude:
+    - 'examples/language.rb'
+    - 'rosette_api.gemspec'
+
+# Offense count: 56
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SupportedStyles.
+# SupportedStyles: space, no_space, compact
+Style/SpaceInsideHashLiteralBraces:
+  Exclude:
+    - 'examples/language.rb'
+    - 'tests/tests_spec.rb'
+
+# Offense count: 44
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiterals:
+  Exclude:
+    - 'Gemfile'
+    - 'examples/categories.rb'
+    - 'examples/entities.rb'
+    - 'examples/language.rb'
+    - 'examples/morphology_complete.rb'
+    - 'examples/morphology_compound-components.rb'
+    - 'examples/morphology_han-readings.rb'
+    - 'examples/name_similarity.rb'
+    - 'examples/name_translation.rb'
+    - 'examples/sentiment.rb'
+    - 'examples/syntax_dependencies.rb'
+    - 'examples/tokens.rb'
+    - 'tests/tests_spec.rb'
+
+# Offense count: 14
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: final_newline, final_blank_line
+Style/TrailingBlankLines:
+  Exclude:
+    - 'examples/info.rb'
+    - 'examples/language.rb'
+    - 'examples/morphology_compound-components.rb'
+    - 'examples/morphology_han-readings.rb'
+    - 'examples/morphology_lemmas.rb'
+    - 'examples/morphology_parts-of-speech.rb'
+    - 'examples/name_similarity.rb'
+    - 'examples/name_translation.rb'
+    - 'examples/ping.rb'
+    - 'examples/sentences.rb'
+    - 'examples/sentiment.rb'
+    - 'examples/tokens.rb'
+    - 'lib/rosette_api.rb'
+    - 'lib/rosette_api_error.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/TrailingWhitespace:
+  Exclude:
+    - 'lib/request_builder.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+Style/UnneededPercentQ:
+  Exclude:
+    - 'rosette_api.gemspec'

data/lib/document_parameters.rb

@@ -56,10 +56,10 @@ class DocumentParameters
   #
   # Returns the new Hash.
   def load_params
-    self.validate_params
-    self.to_hash.select { |_key, value| !value.nil? }
-        .map { |key, value| [key.to_s.split('_').map(&:capitalize).join.sub!(/\D/, &:downcase), value] }
-        .to_h
+    validate_params
+    to_hash.select { |_key, value| !value.nil? }
+           .map { |key, value| [key.to_s.split('_').map(&:capitalize).join.sub!(/\D/, &:downcase), value] }
+           .to_h
   end
 
   # Converts this class to Hash.

data/lib/request_builder.rb

@@ -19,13 +19,16 @@ class RequestBuilder
   attr_accessor :binding_version
 
 
-  def initialize(user_key, alternate_url, http_client, params = {}, binding_version) #:notnew:
+  def initialize(user_key, alternate_url, http_client, params = {}, url_parameters = nil, binding_version)
     @user_key = user_key
     @alternate_url = alternate_url
     @http_client = http_client
     @params = params
     @binding_version = binding_version
 
+    return unless url_parameters
+    @alternate_url = @alternate_url + '?' + URI.encode_www_form(url_parameters)
+
   end
 
   # Prepares a plain POST request for Rosette API.
@@ -43,7 +46,7 @@ class RequestBuilder
       raise RosetteAPIError.new 'connectionError', 'Failed to establish connection with Rosette API server.'
     end
 
-    if params['customHeaders'] != nil
+    if params['customHeaders']
       keys_array = params['customHeaders'].keys
       for k in keys_array
         if k.to_s =~ /^X-RosetteAPI-/
@@ -141,20 +144,20 @@ class RequestBuilder
     end
     request['X-RosetteAPI-Key'] = @user_key
 
-    self.get_response @http_client, request
+    get_response @http_client, request
   end
 
   # Sends a POST request to Rosette API.
   #
   # Returns JSON response or raises RosetteAPIError if encountered.
   def send_post_request
-    if !params['filePath'].nil?
-      http, request = self.prepare_multipart_request params
+    if params['filePath']
+      http, request = prepare_multipart_request params
     else
-      http, request = self.prepare_plain_request params
+      http, request = prepare_plain_request params
     end
 
-    self.get_response http, request
+    get_response http, request
   end
 
   # Gets response from HTTP connection.

data/lib/rosette_api.rb

@@ -9,35 +9,35 @@ require_relative 'bad_request_format_error'
 # This class allows you to access all Rosette API endpoints.
 class RosetteAPI
   # Version of Ruby binding
-  BINDING_VERSION = '1.4.0'
+  BINDING_VERSION = '1.5.0'
   # Rosette API language endpoint
-  LANGUAGE_ENDPOINT = '/language'
+  LANGUAGE_ENDPOINT = '/language'.freeze
   # Rosette API morphology endpoint
-  MORPHOLOGY_ENDPOINT = '/morphology'
+  MORPHOLOGY_ENDPOINT = '/morphology'.freeze
   # Rosette API entities endpoint
-  ENTITIES_ENDPOINT = '/entities'
+  ENTITIES_ENDPOINT = '/entities'.freeze
   # Rosette API categories endpoint
-  CATEGORIES_ENDPOINT = '/categories'
+  CATEGORIES_ENDPOINT = '/categories'.freeze
   # Rosette API relationships endpoint
-  RELATIONSHIPS_ENDPOINT = '/relationships'
+  RELATIONSHIPS_ENDPOINT = '/relationships'.freeze
   # Rosette API sentiment endpoint
-  SENTIMENT_ENDPOINT = '/sentiment'
+  SENTIMENT_ENDPOINT = '/sentiment'.freeze
   # Rosette API name-translation endpoint
-  NAME_TRANSLATION_ENDPOINT = '/name-translation'
+  NAME_TRANSLATION_ENDPOINT = '/name-translation'.freeze
   # Rosette API name-similarity endpoint
-  NAME_SIMILARITY_ENDPOINT = '/name-similarity'
+  NAME_SIMILARITY_ENDPOINT = '/name-similarity'.freeze
   # Rosette API tokens endpoint
-  TOKENS_ENDPOINT = '/tokens'
+  TOKENS_ENDPOINT = '/tokens'.freeze
   # Rosette API sentences endpoint
-  SENTENCES_ENDPOINT = '/sentences'
+  SENTENCES_ENDPOINT = '/sentences'.freeze
   # Rosette API info endpoint
-  INFO = '/info'
+  INFO = '/info'.freeze
   # Rosette API ping endpoint
-  PING = '/ping'
+  PING = '/ping'.freeze
   # Text Embedding endpoint
-  TEXT_EMBEDDING = '/text-embedding'
+  TEXT_EMBEDDING = '/text-embedding'.freeze
   # Syntactic Dependencies endpoint
-  SYNTACTIC_DEPENDENCIES_ENDPOINT = '/syntax/dependencies'
+  SYNTACTIC_DEPENDENCIES_ENDPOINT = '/syntax/dependencies'.freeze
 
   # Rosette API key
   attr_accessor :user_key
@@ -45,10 +45,13 @@ class RosetteAPI
   attr_accessor :alternate_url
   # custom Rosette API headers
   attr_accessor :custom_headers
+  # URL query parameter(s)
+  attr_accessor :url_parameters
 
-  def initialize(user_key, alternate_url = 'https://api.rosette.com/rest/v1') #:notnew:
+  def initialize(user_key, alternate_url = 'https://api.rosette.com/rest/v1')
     @user_key = user_key
     @alternate_url = alternate_url
+    @url_parameters = nil
 
     if @alternate_url.to_s.end_with?('/')
       @alternate_url = alternate_url.to_s.slice(0..-2)
@@ -71,7 +74,7 @@ class RosetteAPI
 
     params = params.load_params
 
-    RequestBuilder.new(@user_key, @alternate_url + LANGUAGE_ENDPOINT, @http_client, params, BINDING_VERSION)
+    RequestBuilder.new(@user_key, @alternate_url + LANGUAGE_ENDPOINT, @http_client, params, @url_parameters, BINDING_VERSION)
                   .send_post_request
   end
 
@@ -89,7 +92,7 @@ class RosetteAPI
 
     params = params.load_params
 
-    RequestBuilder.new(@user_key, @alternate_url + MORPHOLOGY_ENDPOINT + '/complete', @http_client, params, BINDING_VERSION)
+    RequestBuilder.new(@user_key, @alternate_url + MORPHOLOGY_ENDPOINT + '/complete', @http_client, params, @url_parameters, BINDING_VERSION)
                   .send_post_request
   end
 
@@ -106,7 +109,7 @@ class RosetteAPI
 
     params = params.load_params
 
-    RequestBuilder.new(@user_key, @alternate_url + MORPHOLOGY_ENDPOINT + '/compound-components', @http_client, params, BINDING_VERSION)
+    RequestBuilder.new(@user_key, @alternate_url + MORPHOLOGY_ENDPOINT + '/compound-components', @http_client, params, @url_parameters, BINDING_VERSION)
                   .send_post_request
   end
 
@@ -123,7 +126,7 @@ class RosetteAPI
 
     params = params.load_params
 
-    RequestBuilder.new(@user_key, @alternate_url + MORPHOLOGY_ENDPOINT + '/han-readings', @http_client, params, BINDING_VERSION)
+    RequestBuilder.new(@user_key, @alternate_url + MORPHOLOGY_ENDPOINT + '/han-readings', @http_client, params, @url_parameters, BINDING_VERSION)
                   .send_post_request
   end
 
@@ -139,7 +142,7 @@ class RosetteAPI
 
     params = params.load_params
 
-    RequestBuilder.new(@user_key, @alternate_url + MORPHOLOGY_ENDPOINT + '/lemmas', @http_client, params, BINDING_VERSION)
+    RequestBuilder.new(@user_key, @alternate_url + MORPHOLOGY_ENDPOINT + '/lemmas', @http_client, params, @url_parameters, BINDING_VERSION)
                   .send_post_request
   end
 
@@ -156,7 +159,7 @@ class RosetteAPI
 
     params = params.load_params
 
-    RequestBuilder.new(@user_key, @alternate_url + MORPHOLOGY_ENDPOINT + '/parts-of-speech', @http_client, params, BINDING_VERSION)
+    RequestBuilder.new(@user_key, @alternate_url + MORPHOLOGY_ENDPOINT + '/parts-of-speech', @http_client, params, @url_parameters, BINDING_VERSION)
                   .send_post_request
   end
 
@@ -165,37 +168,18 @@ class RosetteAPI
   # ==== Attributes
   #
   # * +params+ - DocumentParameters helps to build the request body in RequestBuilder.
-  # * +resolve_entities+ - Enables entities to be linked in application endpoints.
   #
   # Returns each entity extracted from the input.
-  def get_entities(params, resolve_entities = false)
+  def get_entities(params)
     check_params params
 
-    raise BadRequestError.new('Expects boolean for resolve_entities') unless !!resolve_entities == resolve_entities
-
     params = params.load_params
 
-    endpoint = resolve_entities ? (ENTITIES_ENDPOINT + '/linked') : ENTITIES_ENDPOINT
-    RequestBuilder.new(@user_key, @alternate_url + endpoint, @http_client, params, BINDING_VERSION)
+    endpoint = ENTITIES_ENDPOINT
+    RequestBuilder.new(@user_key, @alternate_url + endpoint, @http_client, params, @url_parameters, BINDING_VERSION)
                   .send_post_request
   end
 
-  # Extracts entities from the input.
-  #
-  # ==== Attributes
-  #
-  # * +params+ - DocumentParameters helps to build the request body in RequestBuilder.
-  #
-  # Returns list of entities that have been linked to entities in the knowledge
-  # base.
-  def get_entities_linked(params)
-    warn '[DEPRECATION] `get_entities_linked` is deprecated. Please use ' \
-         '`get_entities` instead.'
-    get_entities(params, true)
-  end
-
-
-
   # Extracts Tier 1 contextual categories from the input.
   #
   # ==== Attributes
@@ -208,7 +192,7 @@ class RosetteAPI
 
     params = params.load_params
 
-    RequestBuilder.new(@user_key, @alternate_url + CATEGORIES_ENDPOINT, @http_client, params, BINDING_VERSION)
+    RequestBuilder.new(@user_key, @alternate_url + CATEGORIES_ENDPOINT, @http_client, params, @url_parameters, BINDING_VERSION)
                   .send_post_request
   end
 
@@ -224,7 +208,7 @@ class RosetteAPI
 
     params = params.load_params
 
-    RequestBuilder.new(@user_key, @alternate_url + RELATIONSHIPS_ENDPOINT, @http_client, params, BINDING_VERSION)
+    RequestBuilder.new(@user_key, @alternate_url + RELATIONSHIPS_ENDPOINT, @http_client, params, @url_parameters, BINDING_VERSION)
                   .send_post_request
   end
 
@@ -240,7 +224,7 @@ class RosetteAPI
 
     params = params.load_params
 
-    RequestBuilder.new(@user_key, @alternate_url + SENTIMENT_ENDPOINT, @http_client, params, BINDING_VERSION)
+    RequestBuilder.new(@user_key, @alternate_url + SENTIMENT_ENDPOINT, @http_client, params, @url_parameters, BINDING_VERSION)
                   .send_post_request
   end
 
@@ -256,7 +240,7 @@ class RosetteAPI
 
     params = params.load_params
 
-    RequestBuilder.new(@user_key, @alternate_url + NAME_TRANSLATION_ENDPOINT, @http_client, params, BINDING_VERSION)
+    RequestBuilder.new(@user_key, @alternate_url + NAME_TRANSLATION_ENDPOINT, @http_client, params, @url_parameters, BINDING_VERSION)
                   .send_post_request
   end
 
@@ -273,7 +257,7 @@ class RosetteAPI
 
     params = params.load_params
 
-    RequestBuilder.new(@user_key, @alternate_url + NAME_SIMILARITY_ENDPOINT, @http_client, params, BINDING_VERSION)
+    RequestBuilder.new(@user_key, @alternate_url + NAME_SIMILARITY_ENDPOINT, @http_client, params, @url_parameters, BINDING_VERSION)
                   .send_post_request
   end
 
@@ -289,7 +273,7 @@ class RosetteAPI
 
     params = params.load_params
 
-    RequestBuilder.new(@user_key, @alternate_url + TOKENS_ENDPOINT, @http_client, params, BINDING_VERSION)
+    RequestBuilder.new(@user_key, @alternate_url + TOKENS_ENDPOINT, @http_client, params, @url_parameters, BINDING_VERSION)
                   .send_post_request
   end
 
@@ -305,9 +289,10 @@ class RosetteAPI
 
     params = params.load_params
 
-    RequestBuilder.new(@user_key, @alternate_url + SENTENCES_ENDPOINT, @http_client, params, BINDING_VERSION)
+    RequestBuilder.new(@user_key, @alternate_url + SENTENCES_ENDPOINT, @http_client, params, @url_parameters, BINDING_VERSION)
                   .send_post_request
   end
+
   #
   # Returns the vectors associated with the text
   #
@@ -321,7 +306,7 @@ class RosetteAPI
 
     params = params.load_params
 
-    RequestBuilder.new(@user_key, @alternate_url + TEXT_EMBEDDING, @http_client, params, BINDING_VERSION)
+    RequestBuilder.new(@user_key, @alternate_url + TEXT_EMBEDDING, @http_client, params, @url_parameters, BINDING_VERSION)
                   .send_post_request
   end
 
@@ -338,29 +323,28 @@ class RosetteAPI
 
     params = params.load_params
 
-    RequestBuilder.new(@user_key, @alternate_url + SYNTACTIC_DEPENDENCIES_ENDPOINT, @http_client, params, BINDING_VERSION)
+    RequestBuilder.new(@user_key, @alternate_url + SYNTACTIC_DEPENDENCIES_ENDPOINT, @http_client, params, @url_parameters, BINDING_VERSION)
                   .send_post_request
   end
 
   # Gets information about the Rosette API, returns name, build number
   # and build time.
   def info
-    RequestBuilder.new(@user_key, @alternate_url + INFO, @http_client, BINDING_VERSION)
+    RequestBuilder.new(@user_key, @alternate_url + INFO, @http_client, @url_parameters, BINDING_VERSION)
                   .send_get_request
   end
 
   # Pings the Rosette API for a response indicting that the service is
   # available.
   def ping
-    RequestBuilder.new(@user_key, @alternate_url + PING, @http_client, BINDING_VERSION)
+    RequestBuilder.new(@user_key, @alternate_url + PING, @http_client, @url_parameters, BINDING_VERSION)
                   .send_get_request
   end
 
   private
 
-    # Checks that the right parameter type is being passed in.
-    def check_params(params, message = 'Expects a DocumentParameters type as an argument', type = DocumentParameters)
-      raise BadRequestError.new message unless params.is_a? type
-    end
+  # Checks that the right parameter type is being passed in.
+  def check_params(params, message = 'Expects a DocumentParameters type as an argument', type = DocumentParameters)
+    raise BadRequestError.new message unless params.is_a? type
+  end
 end
-

data/tests/tests_spec.rb

@@ -21,7 +21,7 @@ describe RosetteAPI do
                             'User-Agent' => 'Ruby',
                             'X-Rosetteapi-Key' => '0123456789',
                             'X-Rosetteapi-Binding' => 'ruby',
-                            'X-Rosetteapi-Binding-Version' => '1.4.0'}).
+                            'X-Rosetteapi-Binding-Version' => '1.5.0'}).
           to_return(:status => 200, :body => "{\"test\": \"language\"}", :headers => {})
     end
     it 'test language' do
@@ -57,7 +57,7 @@ describe RosetteAPI do
                             'User-Agent' => 'Ruby',
                             'X-Rosetteapi-Key' => '0123456789',
                             'X-Rosetteapi-Binding' => 'ruby',
-                            'X-Rosetteapi-Binding-Version' => '1.4.0'}).
+                            'X-Rosetteapi-Binding-Version' => '1.5.0'}).
           to_return(:status => 200, :body => "{\"test\": \"morphology/complete\"}", :headers => {})
     end
     it 'test morphology complete' do
@@ -78,7 +78,7 @@ describe RosetteAPI do
                             'User-Agent' => 'Ruby',
                             'X-Rosetteapi-Key' => '0123456789',
                             'X-Rosetteapi-Binding' => 'ruby',
-                            'X-Rosetteapi-Binding-Version' => '1.4.0'}).
+                            'X-Rosetteapi-Binding-Version' => '1.5.0'}).
           to_return(:status => 200, :body => "{\"test\": \"morphology/compound-components\"}", :headers => {})
     end
     it 'test morphology compound components' do
@@ -99,7 +99,7 @@ describe RosetteAPI do
                             'User-Agent' => 'Ruby',
                             'X-Rosetteapi-Key' => '0123456789',
                             'X-Rosetteapi-Binding' => 'ruby',
-                            'X-Rosetteapi-Binding-Version' => '1.4.0'}).
+                            'X-Rosetteapi-Binding-Version' => '1.5.0'}).
           to_return(:status => 200, :body => "{\"test\": \"morphology/han-readings\"}", :headers => {})
     end
     it 'test morphology han readings' do
@@ -120,7 +120,7 @@ describe RosetteAPI do
                             'User-Agent' => 'Ruby',
                             'X-Rosetteapi-Key' => '0123456789',
                             'X-Rosetteapi-Binding' => 'ruby',
-                            'X-Rosetteapi-Binding-Version' => '1.4.0'}).
+                            'X-Rosetteapi-Binding-Version' => '1.5.0'}).
           to_return(:status => 200, :body => "{\"test\": \"morphology/parts-of-speech\"}", :headers => {})
     end
     it 'test morphology parts of speech' do
@@ -141,7 +141,7 @@ describe RosetteAPI do
                             'User-Agent' => 'Ruby',
                             'X-Rosetteapi-Key' => '0123456789',
                             'X-Rosetteapi-Binding' => 'ruby',
-                            'X-Rosetteapi-Binding-Version' => '1.4.0'}).
+                            'X-Rosetteapi-Binding-Version' => '1.5.0'}).
           to_return(:status => 200, :body => "{\"test\": \"morphology/lemmas\"}", :headers => {})
     end
     it 'test morphology lemmas' do
@@ -162,7 +162,7 @@ describe RosetteAPI do
                             'User-Agent' => 'Ruby',
                             'X-Rosetteapi-Key' => '0123456789',
                             'X-Rosetteapi-Binding' => 'ruby',
-                            'X-Rosetteapi-Binding-Version' => '1.4.0'}).
+                            'X-Rosetteapi-Binding-Version' => '1.5.0'}).
           to_return(:status => 200, :body => "{\"test\": \"entities\"}", :headers => {})
     end
     it 'test entities' do
@@ -184,7 +184,7 @@ describe RosetteAPI do
                             'User-Agent' => 'Ruby',
                             'X-Rosetteapi-Key' => '0123456789',
                             'X-Rosetteapi-Binding' => 'ruby',
-                            'X-Rosetteapi-Binding-Version' => '1.4.0'}).
+                            'X-Rosetteapi-Binding-Version' => '1.5.0'}).
           to_return(:status => 200, :body => "{\"test\": \"entities\"}", :headers => {})
     end
     it 'test entities without qids' do
@@ -215,7 +215,7 @@ describe RosetteAPI do
                             'User-Agent' => 'Ruby',
                             'X-Rosetteapi-Key' => '0123456789',
                             'X-Rosetteapi-Binding' => 'ruby',
-                            'X-Rosetteapi-Binding-Version' => '1.4.0'}).
+                            'X-Rosetteapi-Binding-Version' => '1.5.0'}).
           to_return(:status => 200, :body => "{\"test\": \"categories\"}", :headers => {})
     end
     it 'test categories' do
@@ -236,7 +236,7 @@ describe RosetteAPI do
                             'User-Agent' => 'Ruby',
                             'X-Rosetteapi-Key' => '0123456789',
                             'X-Rosetteapi-Binding' => 'ruby',
-                            'X-Rosetteapi-Binding-Version' => '1.4.0'}).
+                            'X-Rosetteapi-Binding-Version' => '1.5.0'}).
           to_return(:status => 200, :body => "{\"test\": \"relationships\"}", :headers => {})
     end
     it 'test relationships' do
@@ -258,7 +258,7 @@ describe RosetteAPI do
                             'User-Agent' => 'Ruby',
                             'X-Rosetteapi-Key' => '0123456789',
                             'X-Rosetteapi-Binding' => 'ruby',
-                            'X-Rosetteapi-Binding-Version' => '1.4.0'}).
+                            'X-Rosetteapi-Binding-Version' => '1.5.0'}).
           to_return(:status => 200, :body => "{\"test\": \"name-translation\"}", :headers => {})
     end
     it 'test name translation' do
@@ -285,7 +285,7 @@ describe RosetteAPI do
                             'User-Agent' => 'Ruby',
                             'X-Rosetteapi-Key' => '0123456789',
                             'X-Rosetteapi-Binding' => 'ruby',
-                            'X-Rosetteapi-Binding-Version' => '1.4.0'}).
+                            'X-Rosetteapi-Binding-Version' => '1.5.0'}).
           to_return(:status => 200, :body => "{\"test\": \"name-similarity\"}", :headers => {})
     end
     it 'test name similarity' do
@@ -320,7 +320,7 @@ describe RosetteAPI do
                             'User-Agent' => 'Ruby',
                             'X-Rosetteapi-Key' => '0123456789',
                             'X-Rosetteapi-Binding' => 'ruby',
-                            'X-Rosetteapi-Binding-Version' => '1.4.0'}).
+                            'X-Rosetteapi-Binding-Version' => '1.5.0'}).
           to_return(:status => 200, :body => "{\"test\": \"tokens\"}", :headers => {})
     end
     it 'test tokens' do
@@ -341,7 +341,7 @@ describe RosetteAPI do
                             'User-Agent' => 'Ruby',
                             'X-Rosetteapi-Key' => '0123456789',
                             'X-Rosetteapi-Binding' => 'ruby',
-                            'X-Rosetteapi-Binding-Version' => '1.4.0'}).
+                            'X-Rosetteapi-Binding-Version' => '1.5.0'}).
           to_return(:status => 200, :body => "{\"test\": \"sentences\"}", :headers => {})
     end
     it 'test sentences' do
@@ -392,7 +392,7 @@ describe RosetteAPI do
                             'User-Agent' => 'Ruby',
                             'X-Rosetteapi-Key' => '0123456789',
                             'X-Rosetteapi-Binding' => 'ruby',
-                            'X-Rosetteapi-Binding-Version' => '1.4.0',
+                            'X-Rosetteapi-Binding-Version' => '1.5.0',
                             'X-RosetteApi-App' => 'ruby-app'}).
           to_return(:status => 200, :body => "{\"test\": \"language\"}", :headers => {})
     end
@@ -429,7 +429,7 @@ describe RosetteAPI do
                             'User-Agent' => 'Ruby',
                             'X-Rosetteapi-Key' => '0123456789',
                             'X-Rosetteapi-Binding' => 'ruby',
-                            'X-Rosetteapi-Binding-Version' => '1.4.0'}).
+                            'X-Rosetteapi-Binding-Version' => '1.5.0'}).
           to_return(:status => 200, :body => "{\"test\": \"language\"}", :headers => {})
     end
     it 'test text_embedding' do
@@ -450,7 +450,7 @@ describe RosetteAPI do
                             'User-Agent' => 'Ruby',
                             'X-Rosetteapi-Key' => '0123456789',
                             'X-Rosetteapi-Binding' => 'ruby',
-                            'X-Rosetteapi-Binding-Version' => '1.4.0'}).
+                            'X-Rosetteapi-Binding-Version' => '1.5.0'}).
           to_return(:status => 200, :body => "{\"test\": \"language\"}", :headers => {})
     end
     it 'test syntax_dependencies' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rosette_api
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Basis Technology Corp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubysl-securerandom
@@ -31,6 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rubocop.yml"
 - lib/bad_request_error.rb
 - lib/bad_request_format_error.rb
 - lib/document_parameters.rb