moxiworks_platform 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42c31e2e96f745d28cce316626e3952b28fa05ac
-  data.tar.gz: 86041d7a7ad42aec57dae357c05a8206f6eaeddd
+  metadata.gz: bebec02a3de5d59b2c1a04647f27519422ba416a
+  data.tar.gz: c322209b3b2819bc2a3a9c21370f1ad38ec8fbee
 SHA512:
-  metadata.gz: a0175f05701d31299c62a6cf340440890547955e00254cf738667e797a1cf52fa259aea4128dca404b823b6d475fcd7b7d68dd08c45fd5ce23863dad2369d776
-  data.tar.gz: c3312668276b3cf23fa639aa6f773a891bfdf5508f6c9195c1dbebeb155c9e218388b954e99fcb007f14d6bfb45bab0a930c5c0406476471f077f677afa394a2
+  metadata.gz: 3737841094f6bbe208ba154dfb615f384e1ef3bae5962525e6eea9f9522732b904376eba83066c5c4f78c8990c9b61f14acec84445bb89bc6db4ab7fdc092280
+  data.tar.gz: 7faa44e1c16345a4099616efe17d51de8f376b6020dbb885e00927bed09cb57c6c5dc2c834d44b13923d637c20c7ccc6aaca789c4fe0cd2fd333ffe969951a94

data/lib/moxiworks_platform/group.rb

@@ -42,30 +42,14 @@ module MoxiworksPlatform
     #       )
     #
     def self.find(opts={})
-      required_opts = [:moxi_works_agent_id, :moxi_works_group_name]
-      required_opts.each do |opt|
-        raise ::MoxiworksPlatform::Exception::ArgumentError, "#{opt} required" if
-            opts[opt].nil? or opts[opt].empty?
-      end
       url = "#{MoxiworksPlatform::Config.url}/api/groups/#{opts[:moxi_works_group_name]}"
-      group = nil
-      RestClient::Request.execute(method: :get,
-                                  url: url,
-                                  payload: opts, headers: self.headers) do |response|
-        puts response if MoxiworksPlatform::Config.debug
-        self.check_for_error_in_response(response)
-        json = JSON.parse(response)
-        return false if not json['status'].nil? and json['status'] =='fail'
-        group = MoxiworksPlatform::Group.new(json) unless json.nil? or json.empty?
-      end
-      group
+      self.send_request(:get, opts, url)
     end
 
-
     # Search an Agent's Groups in Moxi Works Platform
     # @param [Hash] opts named parameter Hash
     # @option opts [String]  :moxi_works_agent_id *REQUIRED* The Moxi Works Agent ID for the agent to which this event is associated
-    # @option opts [String]  :moxi_works_group_name optional name to search for. If no name is provided, all of the Agent's Groups will be returned
+    # @option opts [String]  :name optional name to search for. If no name is provided, all of the Agent's Groups will be returned
     #
     # @return [Array] containing MoxiworksPlatform::Group objects formatted as follows:
     #
@@ -109,5 +93,17 @@ module MoxiworksPlatform
       end
       new_contacts
     end
+
+    protected
+    def self.send_request(method, opts={}, url=nil)
+      url ||= "#{MoxiworksPlatform::Config.url}/api/agents"
+      required_opts = [:moxi_works_agent_id]
+      required_opts.each do |opt|
+        raise ::MoxiworksPlatform::Exception::ArgumentError, "#{opt} required" if
+            opts[opt].nil? or opts[opt].empty?
+      end
+      super(method, opts, url)
+    end
+
   end
 end

data/lib/moxiworks_platform/version.rb

@@ -1,3 +1,3 @@
 module MoxiworksPlatform
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moxiworks_platform
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Tres Wong-Godfrey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-25 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler