otrs_connector 0.5.4 → 0.5.6

data/Gemfile

@@ -4,6 +4,7 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 
 gem 'rails', ">= 3.0.0"
+gem 'require_all'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -73,6 +73,7 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
+    require_all (1.2.1)
     shoulda (3.0.1)
       shoulda-context (~> 1.0.0)
       shoulda-matchers (~> 1.0.0)
@@ -97,4 +98,5 @@ DEPENDENCIES
   jeweler (~> 1.8.3)
   rails (>= 3.0.0)
   rdoc (~> 3.12)
+  require_all
   shoulda

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.5.6

data/lib/otrs.rb

@@ -1,84 +1,86 @@
-class OTRS
-  include ActiveModel::Conversion
-  include ActiveModel::Naming
-  include ActiveModel::Validations
-  extend ActiveModel::Callbacks
-  require File.dirname(__FILE__) + '/otrs'
+module OTRS
+  class OTRS
+    include ActiveModel::Conversion
+    include ActiveModel::Naming
+    include ActiveModel::Validations
+    extend ActiveModel::Callbacks
+    require_rel 'otrs'
   
-  define_model_callbacks :create, :update, :save
+    define_model_callbacks :create, :update, :save
 
-  # @@otrs_host is the address where the OTRS server presides
-  # api_url is the base URL used to connect to the json api of OTRS, this will be the custom json.pl as the standard doesn't include ITSM module
-  @@otrs_api_url ||= "https://loalhost/otrs/json.pl"
-  # Username / password combo should be an actual OTRS agent defined on the OTRS server
-  # I have not tested this with other forms of OTRS authentication
-  @@otrs_user ||= 'rails'
-  @@otrs_pass ||= 'rails'
+    # @@otrs_host is the address where the OTRS server presides
+    # api_url is the base URL used to connect to the json api of OTRS, this will be the custom json.pl as the standard doesn't include ITSM module
+    @@otrs_api_url ||= "https://loalhost/otrs/json.pl"
+    # Username / password combo should be an actual OTRS agent defined on the OTRS server
+    # I have not tested this with other forms of OTRS authentication
+    @@otrs_user ||= 'rails'
+    @@otrs_pass ||= 'rails'
   
-  def self.user
-    @@otrs_user
-  end
-  def self.user=(username)
-    @@otrs_user = username
-  end
+    def self.user
+      @@otrs_user
+    end
+    def self.user=(username)
+      @@otrs_user = username
+    end
   
-  def self.password
-    @@otrs_pass
-  end
-  def self.password=(password)
-    @@otrs_pass = password
-  end
+    def self.password
+      @@otrs_pass
+    end
+    def self.password=(password)
+      @@otrs_pass = password
+    end
   
-  def self.api_url
-    @@otrs_api_url
-  end
-  def self.api_url=(url)
-    @@otrs_api_url = url
-  end
+    def self.api_url
+      @@otrs_api_url
+    end
+    def self.api_url=(url)
+      @@otrs_api_url = url
+    end
   
-  def attributes
-    attributes = {}
-    self.instance_variables.each do |v|
-      attributes[v.to_s.gsub('@','').to_sym] = self.instance_variable_get(v)
+    def attributes
+      attributes = {}
+      self.instance_variables.each do |v|
+        attributes[v.to_s.gsub('@','').to_sym] = self.instance_variable_get(v)
+      end
+      attributes
     end
-    attributes
-  end
   
-  def self.connect(params)
-    require 'net/https'
-    base_url = self.api_url
-    logon = URI.encode("User=#{self.user}&Password=#{self.password}")
-    object = URI.encode(params[:object])
-    method = URI.encode(params[:method])
-    data = params[:data].to_json
-    data = URI.encode(data)
-    data = URI.escape(data, '=\',\\/+-&?#.;')
-    uri = URI.parse("#{base_url}?#{logon}&Object=#{object}&Method=#{method}&Data=#{data}")
+    def self.connect(params)
+      require 'net/https'
+      base_url = self.api_url
+      logon = URI.encode("User=#{self.user}&Password=#{self.password}")
+      object = URI.encode(params[:object])
+      method = URI.encode(params[:method])
+      data = params[:data].to_json
+      data = URI.encode(data)
+      data = URI.escape(data, '=\',\\/+-&?#.;')
+      uri = URI.parse("#{base_url}?#{logon}&Object=#{object}&Method=#{method}&Data=#{data}")
     
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = true
-    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    request = Net::HTTP::Get.new(uri.request_uri)
-    response = http.request(request)
-    result = ActiveSupport::JSON::decode(response.body)
-    if result["Result"] == 'successful'
-      result["Data"]
-    else
-      raise "Error:#{result["Result"]} #{result["Data"]}"
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      request = Net::HTTP::Get.new(uri.request_uri)
+      response = http.request(request)
+      result = ActiveSupport::JSON::decode(response.body)
+      if result["Result"] == 'successful'
+        result["Data"]
+      else
+        raise "Error:#{result["Result"]} #{result["Data"]}"
+      end
     end
-  end
 
-  def self.object_preprocessor(object)
-    unless object.empty? or object.nil?
-      a = Hash[*object]
-      self.new(a.symbolize_keys)
-    else
-      raise 'NoSuchObject'
+    def self.object_preprocessor(object)
+      unless object.empty? or object.nil?
+        a = Hash[*object]
+        self.new(a.symbolize_keys)
+      else
+        raise 'NoSuchObject'
+      end
     end
-  end
 
   
-  def connect(params)
-    self.class.connect(params)
+    def connect(params)
+      self.class.connect(params)
+    end
   end
 end

data/lib/otrs/service.rb

@@ -1,5 +1,4 @@
-class OTRS::Service# < OTRS
-  extend OTRS
+class OTRS::Service < OTRS
   attr_accessor :config_items, :tickets, :cur_inci_state, :valid_id, :service_id, :cur_inci_state_type, :type,
     :cur_inci_state, :create_by, :cur_inci_state_type_from_c_is, :change_time, :change_by, :create_time,
     :criticality, :comment, :criticality, :name_short, :type_id, :name, :parent_id, :cur_inci_state_id,
@@ -23,7 +22,7 @@ class OTRS::Service# < OTRS
   def self.find(id)
     data = { 'ServiceID' => id, 'UserID' => 1 }
     params = { :object => 'ServiceObject', :method => 'ServiceGet', :data => data }
-    self.object_preprocessor connect(params)
+    self.object_preprocessor self.connect(params)
   end
     
   def attributes

data/otrs_connector.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "otrs_connector"
-  s.version = "0.5.4"
+  s.version = "0.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Goff"]
@@ -56,12 +56,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<require_all>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.1.1"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
     else
       s.add_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_dependency(%q<require_all>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.1.1"])
@@ -69,6 +71,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<rails>, [">= 3.0.0"])
+    s.add_dependency(%q<require_all>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.1.1"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: otrs_connector
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: require_all
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -141,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -48961225612251288
+      hash: -2176562409639717085
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: