mozenda 0.0.9 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7b778d497890f653d795f786969c4d8a75d76ac
-  data.tar.gz: 59f00f8ba8c5b542054978f298a0d1b605f66767
+  metadata.gz: df5e788b9aa9cdd973c584fa647f7bb582a5407e
+  data.tar.gz: 1c568fb8b970edf536f9f09baa0ba8799515c6d5
 SHA512:
-  metadata.gz: b6fb2f7639a1d4fdf665d23f2ced9e60ccbb78f10417d5eaa7777abfbc4fa78a1770896b12630d953cde001f41bfd76cce12823400fc46b4c67dbd9b389185c2
-  data.tar.gz: b336c9323aa48b9468cf2a28a75f808622dfbf9da6a988a8dc7442fc43078988a840614f9c40476cea0fc133d75f2d3c7b97ea7acd82f751fe30b9c525de8680
+  metadata.gz: 4300329d58e69be4fe6e0b76689f312f4fae8206b737cc457bebb349f57b455b9d5bf1ab23d330433f8c2fe5de14d1d59f1644b01458081b2886ce864a5a7368
+  data.tar.gz: 2344923a865c406118416d9371b30b01c51a720d43fc3cd597027e284f30a1833d4eb455508dec1b537f987ec9d093b029945ccd4a18df235cd5c09202c66c5d

data/lib/mozenda.rb

@@ -9,7 +9,6 @@ require 'nori'
 require "mozenda/version"
 require "mozenda/exception"
 require "mozenda/configuration"
-require "mozenda/replacement_values"
 require "mozenda/xml_generator"
 require "mozenda/infrastructure"
 require "mozenda/request"
@@ -24,4 +23,17 @@ module Mozenda
     config
   end
 
+  REPLACEMENT_VALUES = {
+    agent_id: "AgentID",
+    agent_name: "Agent.Name",
+    agent_description: "Agent.Description",
+    agent_domain: "Agent.Domain",
+    job_id: "JobID",
+    job_status: "Job.Status",
+    job_created: "Job.Created",
+    job_ended: "Job.Ended",
+    job_name: "Job.Name",
+    job_description: "Job.Description"
+  }.freeze
+
 end

data/lib/mozenda/model/agent.rb

@@ -14,5 +14,10 @@ module Mozenda::Model
       request.send!
     end
 
+    def get
+      request = Mozenda::Request::AgentGet.new(:agent_id => @id)
+      request.send!
+    end
+
   end
 end

data/lib/mozenda/model/collection.rb

@@ -22,8 +22,14 @@ module Mozenda::Model
     end
 
     def clear
-      request = Mozenda::Request::CollectionClear.new({
-        :collection_id => @id
+      request = Mozenda::Request::CollectionClear.new(:collection_id => @id)
+      request.send!
+    end
+
+    def publish job_params = {}
+      request = Mozenda::Request::CollectionPublish.new({
+        :collection_id => @id,
+        :job_params => job_params
       })
       request.send!
     end

data/lib/mozenda/model/job.rb

@@ -2,16 +2,22 @@ module Mozenda::Model
   class Job < Mozenda::Model::Base
 
     def self.get job_id
-      request = Mozenda::Request::JobGet.new({
-        :job_id => job_id
-      })
+      request = Mozenda::Request::JobGet.new(:job_id => job_id)
       request.send!
     end
 
     def self.resume job_id
-      request = Mozenda::Request::JobResume.new({
-        :job_id => job_id
-      })
+      request = Mozenda::Request::JobResume.new(:job_id => job_id)
+      request.send!
+    end
+
+    def self.pause job_id
+      request = Mozenda::Request::JobPause.new(:job_id => job_id)
+      request.send!
+    end
+
+    def self.cancel job_id
+      request = Mozenda::Request::JobCancel.new(:job_id => job_id)
       request.send!
     end
 

data/lib/mozenda/request.rb

@@ -4,9 +4,13 @@ module Mozenda
 end
 
 require 'mozenda/request/base'
+require 'mozenda/request/agent_get'
 require 'mozenda/request/agent_run'
 require 'mozenda/request/collection_add_item'
 require 'mozenda/request/collection_add_item_bulk'
 require 'mozenda/request/collection_clear'
+require 'mozenda/request/collection_publish'
 require 'mozenda/request/job_get'
+require 'mozenda/request/job_cancel'
+require 'mozenda/request/job_pause'
 require 'mozenda/request/job_resume'

data/lib/mozenda/request/agent_get.rb

@@ -0,0 +1,15 @@
+module Mozenda::Request
+  class AgentGet < Mozenda::Request::Base
+
+    def initialize options
+      super
+      put_additional_param("AgentID", options[:agent_id])
+    end
+
+    private
+
+    OPERATION = "Agent.Get"
+    REQUIRED_PARAMS = ["AgentID", "Operation"].freeze
+
+  end
+end

data/lib/mozenda/request/agent_run.rb

@@ -17,29 +17,5 @@ module Mozenda::Request
     OPERATION = "Agent.Run"
     REQUIRED_PARAMS = ["AgentID", "Operation"].freeze
 
-    def include_status_url? params
-      status_url = params[:status_url] || ""
-      replacement_values = params[:replacement_values] || {}
-      !(status_url.empty? || replacement_values.empty?)
-    end
-
-    def format_status_url params
-      status_url = params[:status_url] || ""
-      replacement_values = params[:replacement_values] || {}
-      unless status_url.empty? || replacement_values.empty?
-        uri = URI(status_url)
-        params = URI.decode_www_form(uri.query || [])
-        replacement_values.each_pair do |name, value|
-          params << [name, value]
-        end
-        uri.query = URI.encode_www_form(params)
-        status_url = uri.to_s
-        Mozenda::ReplacementValues::ALL.each do |replacement_value|
-          status_url = status_url.gsub(replacement_value, "%#{replacement_value}%")
-        end
-      end
-      status_url
-    end
-
   end
 end

data/lib/mozenda/request/base.rb

@@ -17,6 +17,33 @@ module Mozenda::Request
       end
     end
 
+    protected
+
+    def include_status_url? params
+      status_url = params[:status_url] || ""
+      replacement_values = params[:replacement_values] || []
+      !(status_url.empty? || replacement_values.empty?)
+    end
+
+    def format_status_url params
+      status_url = params[:status_url] || ""
+      replacement_values = params[:replacement_values] || []
+      unless status_url.empty? || replacement_values.empty?
+        uri = URI(status_url)
+        params = URI.decode_www_form(uri.query || [])
+        replacement_values.each do |name|
+          value = Mozenda::REPLACEMENT_VALUES[name]
+          params << [name, value]
+        end
+        uri.query = URI.encode_www_form(params)
+        status_url = uri.to_s
+        Mozenda::REPLACEMENT_VALUES.values.each do |replacement_value|
+          status_url = status_url.gsub(replacement_value, "%#{replacement_value}%")
+        end
+      end
+      status_url
+    end
+
     private
 
     def response_class

data/lib/mozenda/request/collection_publish.rb

@@ -0,0 +1,17 @@
+module Mozenda::Request
+  class CollectionPublish < Mozenda::Request::Base
+
+    def initialize options
+      super
+      put_additional_param("CollectionID", options[:collection_id])
+      job_params = options[:job_params] || {}
+      put_additional_param("Job.StatusUrl", format_status_url(job_params)) unless job_params.empty?
+    end
+
+    private
+
+    OPERATION = "Collection.Publish"
+    REQUIRED_PARAMS = ["CollectionID", "Operation"].freeze
+
+  end
+end

data/lib/mozenda/request/job_cancel.rb

@@ -0,0 +1,15 @@
+module Mozenda::Request
+  class JobCancel < Mozenda::Request::Base
+
+    def initialize options
+      super
+      put_additional_param("JobID", options[:job_id])
+    end
+
+    private
+
+    OPERATION = "Job.Cancel"
+    REQUIRED_PARAMS = ["JobID", "Operation"].freeze
+
+  end
+end

data/lib/mozenda/request/job_pause.rb

@@ -0,0 +1,15 @@
+module Mozenda::Request
+  class JobPause < Mozenda::Request::Base
+
+    def initialize options
+      super
+      put_additional_param("JobID", options[:job_id])
+    end
+
+    private
+
+    OPERATION = "Job.Pause"
+    REQUIRED_PARAMS = ["JobID", "Operation"].freeze
+
+  end
+end

data/lib/mozenda/response.rb

@@ -4,8 +4,12 @@ module Mozenda
 end
 
 require 'mozenda/response/base'
+require 'mozenda/response/agent_get'
 require 'mozenda/response/agent_run'
 require 'mozenda/response/collection_add_item'
 require 'mozenda/response/collection_clear'
+require 'mozenda/response/collection_publish'
 require 'mozenda/response/job_get'
+require 'mozenda/response/job_cancel'
+require 'mozenda/response/job_pause'
 require 'mozenda/response/job_resume'

data/lib/mozenda/response/agent_get.rb

@@ -0,0 +1,17 @@
+module Mozenda::Response
+  class AgentGet < Mozenda::Response::Base
+
+    def agent_id
+      body_hash["AgentID"]
+    end
+
+    def collection_id
+      body_hash["CollectionID"]
+    end
+
+    private
+
+    NAME = "AgentGetResponse"
+
+  end
+end

data/lib/mozenda/response/collection_publish.rb

@@ -0,0 +1,13 @@
+module Mozenda::Response
+  class CollectionPublish < Mozenda::Response::Base
+
+    def job_id
+      body_hash["JobID"]
+    end
+
+    private
+
+    NAME = "CollectionPublishResponse"
+
+  end
+end

data/lib/mozenda/response/job_cancel.rb

@@ -0,0 +1,9 @@
+module Mozenda::Response
+  class JobCancel < Mozenda::Response::Base
+
+    private
+
+    NAME = "JobCancelResponse"
+
+  end
+end

data/lib/mozenda/response/job_pause.rb

@@ -0,0 +1,9 @@
+module Mozenda::Response
+  class JobPause < Mozenda::Response::Base
+
+    private
+
+    NAME = "JobPauseResponse"
+
+  end
+end

data/lib/mozenda/version.rb

@@ -1,5 +1,5 @@
 module Mozenda
 
-  VERSION = "0.0.9"
+  VERSION = "0.1.3"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mozenda
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.3
 platform: ruby
 authors:
 - Piotr Woloszun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -117,21 +117,28 @@ files:
 - lib/mozenda/model/base.rb
 - lib/mozenda/model/collection.rb
 - lib/mozenda/model/job.rb
-- lib/mozenda/replacement_values.rb
 - lib/mozenda/request.rb
+- lib/mozenda/request/agent_get.rb
 - lib/mozenda/request/agent_run.rb
 - lib/mozenda/request/base.rb
 - lib/mozenda/request/collection_add_item.rb
 - lib/mozenda/request/collection_add_item_bulk.rb
 - lib/mozenda/request/collection_clear.rb
+- lib/mozenda/request/collection_publish.rb
+- lib/mozenda/request/job_cancel.rb
 - lib/mozenda/request/job_get.rb
+- lib/mozenda/request/job_pause.rb
 - lib/mozenda/request/job_resume.rb
 - lib/mozenda/response.rb
+- lib/mozenda/response/agent_get.rb
 - lib/mozenda/response/agent_run.rb
 - lib/mozenda/response/base.rb
 - lib/mozenda/response/collection_add_item.rb
 - lib/mozenda/response/collection_clear.rb
+- lib/mozenda/response/collection_publish.rb
+- lib/mozenda/response/job_cancel.rb
 - lib/mozenda/response/job_get.rb
+- lib/mozenda/response/job_pause.rb
 - lib/mozenda/response/job_resume.rb
 - lib/mozenda/version.rb
 - lib/mozenda/xml_generator.rb

data/lib/mozenda/replacement_values.rb

@@ -1,16 +0,0 @@
-module Mozenda::ReplacementValues
-
-  AGENT_ID = "AgentID"
-  AGENT_NAME = "Agent.Name"
-  AGENT_DESCRIPTION = "Agent.Description"
-  AGENT_DOMAIN = "Agent.Domain"
-  JOB_ID = "JobID"
-  JOB_STATUS = "Job.Status"
-  JOB_CREATED = "Job.Created"
-  JOB_ENDED = "Job.Ended"
-  JOB_NAME = "Job.Name"
-  JOB_DESCRIPTION = "Job.Description"
-
-  ALL = [AGENT_ID, AGENT_NAME, AGENT_DESCRIPTION, AGENT_DOMAIN, JOB_ID, JOB_STATUS, JOB_CREATED, JOB_ENDED, JOB_NAME, JOB_DESCRIPTION].freeze
-
-end