symgate 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f4f91b95b5eb8619118ef63e206b9a502f5045d
-  data.tar.gz: 83400e22cfc9e7219f249298ac518b425adbb224
+  metadata.gz: ff7740ff5f9152bd4f3cb84514f5eef0321dcd83
+  data.tar.gz: c448385487c3563ec1c8ca38c8ed9f24ccd48caf
 SHA512:
-  metadata.gz: be59f161c3efbc921e1a221ba8f836e21d0073bfc990bd4ba6f101b9043619e1c69c7737fe275ddb7ad04cc9dfd556a5cd0f0b480e1bfaa20e66edbabd9da521
-  data.tar.gz: 11ffd3aaabb30344f73678fa338a1aaf8d38d938ab6e767fcb49612139f3d1cb3b2b52c69090a507e36284dcbfd09a157eb617325d860888108756559ed266db
+  metadata.gz: cf1198a9ffa373baf1c06c9ab1dfbb331919124d85fc223534add2b758178224363688d6cb58e90e6c66bf6b4164048e2e6a8db94cadd4705068433234b71f69
+  data.tar.gz: 672fac7436ee70a62e0587e8be9aec6c3e9d51ff17105a18a24402192111abba7a41ea30ecbdd63bdacd79eb283eb114c838c6479020160d1eec4f98ea9a4fae

data/.rubocop.yml

@@ -17,3 +17,9 @@ Style/NumericLiterals:
 
 Metrics/ClassLength:
   Max: 120
+
+Metrics/BlockLength:
+  Max: 1000
+
+Naming/UncommunicativeMethodParamName:
+  MinNameLength: 2

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.2.3 (2018-10-23)
+
+Fix for invalid SOAP XML due to duplicate attributes (issue #3) 
+
+## 0.2.2 (2017-05-17)
+
+Require wordlist entry class in wordlist client so that get_wordlist_entries method works without
+requiring wordlist entry class separately
+
 ## 0.2.1 (2016-09-13)
 
 Updated hash syntax to be compatible with Ruby 2.1 in tests

data/Rakefile

@@ -24,7 +24,7 @@ begin
     spec.pattern = 'test/integration/**/*_spec.rb'
   end
 rescue LoadError
-  $stderr.puts 'Unable to find rspec gem'
+  $stderr.warn 'Unable to find rspec gem'
 end
 
 desc 'Runs the rubocop linting tool'
@@ -33,7 +33,7 @@ task :rubocop do
 end
 
 desc 'Run all tests'
-task test: [:rubocop, :spec]
+task test: %i[rubocop spec]
 
 namespace :teamcity do
   desc 'Runs rubocop with junit output'
@@ -55,10 +55,10 @@ namespace :teamcity do
   task :test do
     first_exception = nil
 
-    %w(teamcity:rubocop
+    %w[teamcity:rubocop
        teamcity:spec
        teamcity:zip_coverage
-       teamcity:spec:integration).each do |task_name|
+       teamcity:spec:integration].each do |task_name|
       begin
         Rake::Task[task_name].invoke
       rescue Exception => e
@@ -98,3 +98,5 @@ namespace :vagrant do
            chdir: 'symboliser-vagrant'
   end
 end
+
+# rubocop:enable Lint/RescueException

data/lib/symgate/auth/user.rb

@@ -30,7 +30,7 @@ module Symgate
       protected
 
       def attributes
-        %i(user_id is_group_admin)
+        %i[user_id is_group_admin]
       end
     end
   end

data/lib/symgate/client.rb

@@ -52,9 +52,8 @@ module Symgate
     end
 
     def validate_is_passwordy
-      unless [@key, @password, @token].one?
-        raise Symgate::Error, 'You must supply one of key, password or token'
-      end
+      raise Symgate::Error, 'You must supply one of key, password or token' unless
+          [@key, @password, @token].one?
     end
 
     def create_savon_client
@@ -102,21 +101,18 @@ module Symgate
     end
 
     def arrayize_option(singular, plural, opts)
-      if opts.include? singular # else nothing to do
-        if opts.include? plural
-          raise Symgate::Error, "Options can't include both #{singular} and #{plural}"
-        end
+      return unless opts.include? singular # else nothing to do
+      raise Symgate::Error, "Options can't include both #{singular} and #{plural}" if
+          opts.include? plural
 
-        opts[plural] = [opts[singular]]
-        opts.delete(singular)
-      end
+      opts[plural] = [opts[singular]]
+      opts.delete(singular)
     end
 
     def check_option_is_array_of(classname, key, opts)
-      if opts.include? key
-        raise Symgate::Error, "#{key} must be an array" unless opts[key].is_a? Array
-        check_array_for_type(opts[key], classname)
-      end
+      return unless opts.include? key
+      raise Symgate::Error, "#{key} must be an array" unless opts[key].is_a? Array
+      check_array_for_type(opts[key], classname)
     end
 
     def check_for_unknown_opts(keys, opts)

data/lib/symgate/cml/symbol.rb

@@ -41,7 +41,7 @@ module Symgate
       protected
 
       def attributes
-        %i(symset main top_left top_right bottom_left bottom_right full_left full_right top extra)
+        %i[symset main top_left top_right bottom_left bottom_right full_left full_right top extra]
       end
     end
   end

data/lib/symgate/error.rb

@@ -24,7 +24,7 @@ module Symgate
 
     def self.message_from_savon_error(error)
       "#{error.message}. #{error.to_hash[:fault][:detail]}"
-    rescue
+    rescue StandardError
       # :nocov:
       error.message
       # :nocov:

data/lib/symgate/metadata/client.rb

@@ -2,7 +2,7 @@ require 'symgate/client'
 require 'symgate/error'
 require 'symgate/metadata/data_item'
 
-# rubocop:disable Style/AccessorMethodName
+# rubocop:disable Naming/AccessorMethodName
 
 module Symgate
   module Metadata
@@ -65,8 +65,10 @@ module Symgate
       def parse_get_metadata_opts(opts)
         arrayize_option(:key, :keys, opts)
         check_option_is_array_of(String, :keys, opts)
-        check_for_unknown_opts(%i(keys scope), opts)
+        check_for_unknown_opts(%i[keys scope], opts)
       end
     end
   end
 end
+
+# rubocop:enable Naming/AccessorMethodName

data/lib/symgate/metadata/data_item.rb

@@ -27,7 +27,7 @@ module Symgate
       protected
 
       def attributes
-        %i(key value scope)
+        %i[key value scope]
       end
     end
   end

data/lib/symgate/namespaces.rb

@@ -1,9 +1,9 @@
 module Symgate
   NAMESPACES = {
-    %s(xmlns:auth) => 'http://ws.widgit.com/schema/auth/1.2',
-    %s(xmlns:wl) => 'http://ws.widgit.com/schema/wordlist/1.2',
-    %s(xmlns:cml) => 'http://ws.widgit.com/schema/cml/2.0',
-    %s(xmlns:gt) => 'http://ws.widgit.com/schema/globaltypes/1.2',
-    %s(xmlns:symboliser) => 'http://ws.widgit.com/schema/symboliser/1.2'
+    'xmlns:auth' => 'http://ws.widgit.com/schema/auth/1.2',
+    'xmlns:wl' => 'http://ws.widgit.com/schema/wordlist/1.2',
+    'xmlns:cml' => 'http://ws.widgit.com/schema/cml/2.0',
+    'xmlns:gt' => 'http://ws.widgit.com/schema/globaltypes/1.2',
+    'xmlns:symboliser' => 'http://ws.widgit.com/schema/symboliser/1.2'
   }.freeze
 end

data/lib/symgate/version.rb

@@ -1,3 +1,3 @@
 module Symgate
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.3'.freeze
 end

data/lib/symgate/wordlist/client.rb

@@ -2,6 +2,7 @@ require 'base64'
 require 'symgate/client'
 require 'symgate/error'
 require 'symgate/wordlist/info'
+require 'symgate/wordlist/entry'
 
 module Symgate
   module Wordlist
@@ -11,7 +12,7 @@ module Symgate
       # optionally, supply one or more wordlist contexts as a string or string array parameter
       # to only retrieve wordlist information about that context. e.g.:
       # enumerate_wordlists('User')
-      # enumerate_wordlists(%w(Topic SymbolSet))
+      # enumerate_wordlists(%w[Topic SymbolSet])
       def enumerate_wordlists(context = [])
         response = savon_request(:enumerate_wordlists) do |soap|
           soap.message(context: [context].flatten)
@@ -72,8 +73,8 @@ module Symgate
       #   match (string) - only return wordlist entries matching this word
       #   entry (string, uuid) - return the entry specified by the uuid
       def get_wordlist_entries(uuid, opts = {})
-        check_for_unknown_opts(%i(match entry attachments), opts)
-        check_for_multiple_opts(%i(match entry), opts)
+        check_for_unknown_opts(%i[match entry attachments], opts)
+        check_for_multiple_opts(%i[match entry], opts)
 
         response = savon_request(:get_wordlist_entries) do |soap|
           soap.message(wordlistid: uuid, getattachments: opts[:attachments])

data/lib/symgate/wordlist/entry.rb

@@ -41,7 +41,7 @@ module Symgate
       protected
 
       def attributes
-        %i(word uuid priority concept_code symbols custom_graphics last_change)
+        %i[word uuid priority concept_code symbols custom_graphics last_change]
       end
     end
   end

data/lib/symgate/wordlist/graphic_attachment.rb

@@ -30,7 +30,7 @@ module Symgate
       protected
 
       def attributes
-        %i(type uuid data)
+        %i[type uuid data]
       end
     end
   end

data/lib/symgate/wordlist/info.rb

@@ -23,7 +23,7 @@ module Symgate
       protected
 
       def attributes
-        %i(name context uuid entry_count last_change engine scope)
+        %i[name context uuid entry_count last_change engine scope]
       end
     end
   end

data/symgate-gem.gemspec

@@ -1,5 +1,4 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'symgate'
 
@@ -19,16 +18,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.9'
+  spec.add_development_dependency 'codecov'
+  spec.add_development_dependency 'mysql2', '~> 0.4.1'
+  spec.add_development_dependency 'rack', '~> 1.6.4'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.4.0'
-  spec.add_development_dependency 'rubocop', '~> 0.41.1'
+  spec.add_development_dependency 'rspec', '~> 3.8.0'
   spec.add_development_dependency 'rspec_junit_formatter', '~> 0.2.3'
+  spec.add_development_dependency 'rubocop', '~> 0.57.0'
   spec.add_development_dependency 'rubocop-junit-formatter', '~> 0.1.3'
-  spec.add_development_dependency 'rack', '~> 1.6.4'
-  spec.add_development_dependency 'mysql2', '~> 0.4.1'
   spec.add_development_dependency 'simplecov', '~> 0.12.0'
   spec.add_development_dependency 'simplecov-teamcity-summary', '~> 0.1.2'
-  spec.add_development_dependency 'codecov'
 
   spec.add_dependency 'savon', '~> 2.11.0'
   spec.add_dependency 'tryit', '~> 0.0.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: symgate
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Simon Detheridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2018-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,145 +25,145 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: codecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 0.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.41.1
+        version: 1.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.41.1
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-junit-formatter
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 3.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: 0.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.57.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.57.0
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop-junit-formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
-  name: simplecov-teamcity-summary
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
-  name: codecov
+  name: simplecov-teamcity-summary
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement