agris 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20e4fbd4cf0eeba824e44803db53a7257616bc29
-  data.tar.gz: 4ee76f64b8c6a5b7d6d3ac56d6a31ee2686eb2e5
+  metadata.gz: a4d090ac08f37e8b68e3c5573667111b9f42f1b7
+  data.tar.gz: 2bb7298c5c672b810b2c35c50c0be3dd205660dc
 SHA512:
-  metadata.gz: 30f1ef8a65c1b59721d0e4ac265ad53adad2c095fdd63ce9a09872e437c0fa688364ccccd915dd06647b517ddfd9f15e5c4ee15782d36f35c150ca7edbae5ccd
-  data.tar.gz: 7a4e1980e79f214ee8b317c1744b187ff84f5262701fb12175b184a9e265ece448d3c4d667e1c3b297a44472f578b0c706b2f14fea91dcfe18a5954ac2394069
+  metadata.gz: 21762b562cff9392c8976854e4b3c52dab34b00f2900ac764b93dddd16f38a585baba01e6f11c0b8466a84ec1e90bf4a83fc4d259ac59078ec34b77e0bdb2b4c
+  data.tar.gz: 2dce9ba1d5a2f50502c091da42a3372c8c4593b5165681c45d5aca1dec5a08ce91b826562ddac2c0a9d571857d3567fd87975333b4d4db9b5e0a89928d98826c

data/.hound-rubocop.yml

@@ -241,79 +241,3 @@ Lint/LiteralInCondition:
 Lint/LiteralInInterpolation:
   Description: Checks for literals used in interpolation.
   Enabled: false
-
-##################### Rails ##################################
-
-Rails/ActionFilter:
-  Description: 'Enforces consistent use of action filter methods.'
-  Enabled: true
-Rails/Date:
-  Description: >-
-                  Checks the correct usage of date aware methods,
-                  such as Date.today, Date.current etc.
-  Enabled: true
-Rails/Delegate:
-  Description: 'Prefer delegate method for delegations.'
-  Enabled: true
-Rails/Exit:
-  Description: >-
-                  Favor `fail`, `break`, `return`, etc. over `exit` in
-                  application or library code outside of Rake files to avoid
-                  exits during unit testing or running in production.
-  Enabled: true
-Rails/FindBy:
-  Description: 'Prefer find_by over where.first.'
-  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#find_by'
-  Enabled: true
-Rails/FindEach:
-  Description: 'Prefer all.find_each over all.find.'
-  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#find-each'
-  Enabled: true
-Rails/HasAndBelongsToMany:
-  Description: 'Prefer has_many :through to has_and_belongs_to_many.'
-  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#has-many-through'
-  Enabled: true
-Rails/HttpPositionalArguments:
-  Description: 'Rails 5 only, disabled to keep Hound quiet'
-  Enabled: false
-Rails/NotNullColumn:
-  Description: 'Do not add a NOT NULL column without a default value'
-  Enabled: false
-Rails/Output:
-  Description: 'Checks for calls to puts, print, etc.'
-  Enabled: true
-Rails/OutputSafety:
-  Description: 'The use of `html_safe` or `raw` may be a security risk.'
-  Enabled: true
-Rails/PluralizationGrammar:
-  Description: 'Checks for incorrect grammar when using methods like `3.day.ago`.'
-  Enabled: true
-Rails/ReadWriteAttribute:
-  Description: >-
-                 Checks for read_attribute(:attr) and
-                 write_attribute(:attr, val).
-  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#read-attribute'
-  Enabled: true
-Rails/RequestReferer:
-  Description: 'Use consistent syntax for request.referer.'
-  Enabled: true
-Rails/SafeNavigation:
-  Description: "Use Ruby's safe navigation operator (`&.`) instead of `try!`"
-  Enabled: true
-Rails/ScopeArgs:
-  Description: 'Checks the arguments of ActiveRecord scopes.'
-  Enabled: true
-Rails/TimeZone:
-  Description: 'Checks the correct usage of time zone aware methods.'
-  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#time'
-  Reference: 'http://danilenko.org/2012/7/6/rails_timezones'
-  Enabled: true
-Rails/UniqBeforePluck:
-  Description: 'Prefer the use of uniq or distinct before pluck.'
-  Enabled: true
-Rails/Validation:
-  Description: 'Use validates :attribute, hash of validations.'
-  Enabled: true
-Security/JSONLoad:
-  Description : 'Prefer usage of JSON.parse'
-  Enabled: true

data/.rubocop.yml

@@ -1,7 +1,5 @@
 inherit_from: .hound-rubocop.yml
 
-Rails:
-  Enabled: true
 AllCops:
   TargetRubyVersion: 2.3
   Exclude:

data/Rakefile

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new
 
-task default: :spec
+task default: %w(spec rubocop)

data/agris.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activesupport', '~> 5.0'
   spec.add_dependency 'savon', '~> 2.11'
 
   spec.add_development_dependency 'bundler', '~> 1.14'

data/lib/agris.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 $LOAD_PATH.unshift File.dirname(__FILE__)
 
-require 'active_support/core_ext/hash/conversions'
-require 'active_support/core_ext/hash/slice'
+require 'hash'
 require 'savon'
 
 module Agris

data/lib/agris/api/document_query_response.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:disable Rails/TimeZone
 module Agris
   module Api
     class DocumentQueryResponse

data/lib/agris/api/support.rb

@@ -69,7 +69,6 @@ module Agris
           import_message.message_number,
           import_message.to_xml
         )
-
         PostResult.new(response)
       end
     end

data/lib/agris/process_message_response.rb

@@ -10,7 +10,7 @@ module Agris
     end
 
     def error?
-      ag_error_str_p.present?
+      !ag_error_str_p.to_s.strip.empty?
     end
 
     def error_info
@@ -18,7 +18,7 @@ module Agris
     end
 
     def error_hash
-      @error_hash ||= Hash.from_xml(ag_error_str_p)
+      @error_hash ||= error? ? Hash.from_xml(ag_error_str_p) : {}
     end
 
     def output_hash

data/lib/agris/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Agris
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/agris/xml_model.rb

@@ -25,8 +25,9 @@ module Agris
 
       def to_xml_hash
         ignore_attributes = (xml_ignore_attributes + [:hash]).map(&:to_s)
+        match_attributes = attributes.keys - ignore_attributes
         attributes
-          .slice(*(attributes.keys - ignore_attributes))
+          .select { |key, _value| match_attributes.include?(key) }
           .each_with_object({}) do |(name, value), new_hash|
           new_hash["@#{name.delete('_')}".to_sym] = value
           new_hash

data/lib/hash.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'nokogiri'
+
+class Hash
+  class << self
+    def from_xml(xml_io)
+      result = Nokogiri::XML(xml_io)
+
+      { key_value(result.root) => xml_node_to_hash(result.root) }
+    end
+
+    protected
+
+    def xml_node_to_hash(node)
+      # If we are at the root of the document, start the hash
+      return node.content.to_s unless node.element?
+
+      result_hash = {}
+      if node.attributes != {}
+        attributes = {}
+        node.attributes.each_key do |key|
+          attributes[
+            key_value(node.attributes[key])
+          ] = node.attributes[key].value
+        end
+      end
+
+      return attributes if node.children.empty?
+
+      node.children.each do |child|
+        result = xml_node_to_hash(child)
+
+        if child.name == 'text'
+          unless child.next_sibling || child.previous_sibling
+            return result unless attributes
+            result_hash[key_value(child)] = result
+          end
+        elsif result_hash[key_value(child)]
+
+          if result_hash[key_value(child)].is_a?(Object::Array)
+            result_hash[key_value(child)] << result
+          else
+            result_hash[key_value(child)] = [
+              result_hash[key_value(child)]
+            ] << result
+          end
+        else
+          result_hash[key_value(child)] = result
+        end
+      end
+      if attributes
+        # Add code to remove non-data attributes e.g. xml schema, namespace
+        # here, if there is a collision then node content supersets
+        # attributes
+        result_hash = attributes.merge(result_hash)
+      end
+      result_hash
+    end
+
+    def key_value(node)
+      node.name
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: agris
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - John Gray
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-27 00:00:00.000000000 Z
+date: 2018-02-06 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
@@ -194,6 +180,7 @@ files:
 - lib/agris/user_agent.rb
 - lib/agris/version.rb
 - lib/agris/xml_model.rb
+- lib/hash.rb
 homepage: https://github.com/westernmilling/agris.rb
 licenses:
 - MIT