atomsphere 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25eae7b31f1b5dd9f640ec1a7942192a1fbec4c2aeffda74f9af08ce31879224
-  data.tar.gz: d4e1d956c1abbf2e74125b24c725b0664b8be0fc57078804e2eb120f43ab822b
+  metadata.gz: 4bb21b9a66774a9fee3486b96ce9d8f52e7ed633013c828f391bc9cafa56c4d3
+  data.tar.gz: 7f849cfd2473ada55b2cec071583d114658a8b403295dc9c9a26423d077f5351
 SHA512:
-  metadata.gz: 675f2fca40b7842b44b4abdb04993cd8af67f37095d3fcc1f039ba75f151b3166a4bfaa5fc63b94ee0b3f58d91eac332ce1bbcc3454cdc7c1a819e5a8b6459f4
-  data.tar.gz: edfc117e3812d520b4de08efbb1eee30052f6b58bd4bb42d15ab15200516f58b06bed5c9694de61728e0a17141afe85bfd619ef6bcb24adae12bf09b62117bf6
+  metadata.gz: 632193c167af5174b7c050714c9bb05c844ae863eab4a6330daba8c9a372603e2414e77ce0acd61fe41536ba1032398af536af1ae41963326af0bc95c9881824
+  data.tar.gz: 3f4c067af23f0b447dd9692eff618a6107f901025e2ce253db119d744febe119729046d03296df660a02a5b429f0447fd719986362b6ce7b619e57f251f55ffa

data/README.md

@@ -8,6 +8,15 @@ Implements authentication (including OTP), querying, and some actions. See *Usag
 
 ## Usage
 
+Install the `atomsphere` gem from rubygems or add it to your `Gemfile`:
+
+```ruby
+source 'https://rubygems.org'
+gem 'atomsphere'
+```
+
+and require `atomsphere`:
+
 ```ruby
 require 'atomsphere'
 ```

data/atomsphere.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'atomsphere'
-  s.version       = '0.1.6'
+  s.version       = '0.1.7'
   s.licenses      = ['MIT']
   s.summary       = "Unofficial Ruby client for the Dell Boomi Atomsphere API"
   s.authors       = ["Warren Guy"]

data/lib/atomsphere.rb

@@ -1,5 +1,5 @@
 module Atomsphere
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
   ROOT = "#{File.expand_path(__dir__)}/atomsphere"
 
   %w(configuration query api action).each{ |m| require "#{ROOT}/#{m}" }

data/lib/atomsphere/api/client.rb

@@ -83,7 +83,41 @@ module Atomsphere
 
       def http_request request
         request['X-Boomi-OTP'] = generate_otp if config.otp_secret
-        response = Response.new(request, http.request(request))
+
+        begin
+          response = Response.new(request, http.request(request))
+        rescue => e
+          raise ApiError.new(request, response)
+        else
+          raise ApiError.new(
+            request,
+            response,
+            e,
+            'response code was nil'
+          ) if response.code.nil?
+
+          raise ApiError.new(
+            request,
+            response,
+            e,
+            "API responded with error #{response.code}: #{response.message}"
+          ) if response.code >= 400
+        end
+
+        response
+      end
+    end
+
+    class ApiError < StandardError
+      attr_reader :request, :response, :original, :message
+
+      def initialize(request, response, original=nil, message=nil)
+        @request  = request
+        @response = response
+        @original = original
+        @message  = message
+
+        super(message)
       end
     end
   end

data/lib/atomsphere/api/response.rb

@@ -3,12 +3,13 @@ require 'json'
 module Atomsphere
   module Api
     class Response
-      attr_reader :request, :code, :response
+      attr_reader :request, :code, :response, :message
 
       def initialize(request, response)
         @request  = request
         @response = response
-        @code     = response.code if response
+        @code     = response.nil? ? nil : response.code.to_i
+        @message  = response.nil? ? nil : response.message
       end
 
       def to_hash

data/lib/atomsphere/query.rb

@@ -5,26 +5,24 @@ module Atomsphere
 
     def initialize object_type=nil
       @object_type ||= object_type
-      @page = nil
+      @page = 0
       @result_pages = []
       @filter = GroupingExpression.new
     end
 
     def validate!
-      methods.select{ |m| m =~ /^validate_[a-z0-9_]\!$/ }.each{ |v| send(v) }
+      private_methods.select{ |m| m =~ /^validate_[a-z0-9_]+\!$/ }.each{ |v| send(v) }
       filter.validate!
+
       true
     end
 
     def run
-      @result_pages[0] ||= api_client.post [object_type, :query], to_hash
-      @page = 0
-
-      result_pages[0]
+      next_page
     end
     
     def results
-      result_pages.map(&:to_hash).map{ |h| h['result'] }.flatten(1)
+      result_pages.map(&:to_hash).map{ |h| h['result'] }.map(&:compact).flatten(1)
     end
 
     def all_results
@@ -33,21 +31,25 @@ module Atomsphere
     end
 
     def last_page?
-      !page.nil? && query_token.nil?
+      !page.eql?(0) && query_token.nil?
     end
 
     def next_page
       return false if last_page?
-      return run if page.nil?
 
       begin
-        @result_pages[@page += 1] = api_client.post [object_type, :queryMore], query_token
+        response = if query_token.nil?
+          @page = 1
+          api_client.post([object_type, :query], to_hash)
+        else
+          api_client.post([object_type, :queryMore], query_token)
+        end
       rescue => e
         @page -= 1
         raise e
       end
 
-      result_pages[page]
+      result_pages[page-1] = response
     end
 
     def to_hash
@@ -76,7 +78,11 @@ module Atomsphere
     end
 
     def query_token
-      page.nil? ? nil : result_pages.last.to_hash['queryToken']
+      if result_pages.last.nil? || !result_pages.last.to_hash.keys.include?('queryToken')
+        nil
+      else
+        result_pages.last.to_hash['queryToken']
+      end
     end
   end
 

data/lib/atomsphere/query/grouping_expression.rb

@@ -18,8 +18,9 @@ module Atomsphere
       end
 
       def validate!
-        methods.select{ |m| m =~ /^validate_[a-z0-9_]\!$/ }.each{ |v| send(v) }
+        private_methods.select{ |m| m =~ /^validate_[a-z0-9_]+\!$/ }.each{ |v| "#{v}"; send(v) }
         @nested_expression.each(&:validate!)
+
         true
       end
 

data/lib/atomsphere/query/simple_expression.rb

@@ -27,12 +27,12 @@ module Atomsphere
         }.merge(params)
 
         %w(operator property argument).each do |v|
-          send :"#{v}=", params[v.to_sym]
+          instance_variable_set :"@#{v}", params[v.to_sym]
         end
       end
 
       def validate!
-        methods.select{ |m| m =~ /^validate_[a-z0-9_]\!$/ }.each{ |v| send(v) }
+        private_methods.select{ |m| m =~ /^validate_[a-z0-9_]+\!$/ }.each{ |v| send(v) }
         true
       end
 
@@ -50,6 +50,14 @@ module Atomsphere
         to_hash.to_json
       end
 
+      def operator= arg
+        unless OPERATORS.keys.include? arg.to_sym
+          raise ArgumentError, "operator must be one of: #{OPERATORS.keys.join(', ')}"
+        end
+
+        instance_variable_set :@operator, arg.to_sym
+      end
+
       private
       def validate_operator!
         unless OPERATORS.include? operator
@@ -62,7 +70,7 @@ module Atomsphere
       end
 
       def validate_argument!
-        unless argument.is_a?(Array) && argument.size.eql?(OPERATORS[operator])
+        unless [*argument].size.eql?(OPERATORS[operator])
           raise ArgumentError, "'#{operator}' expects #{OPERATORS[operator]} argument(s)"
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atomsphere
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Warren Guy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-12 00:00:00.000000000 Z
+date: 2019-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rotp