zendesk 0.1.1 → 0.1.2

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 0.1.2
+* bugfix
+  * fixed missed field entries
+  * config loading
+
 == 0.1.1
 
 * bugfix

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/zendesk.rb

@@ -6,10 +6,26 @@ require 'yaml'
 
 module Zendesk
   
-  CONFIG = YAML.load_file('zendesk.yml')
-  RESOURCE = RestClient::Resource.new CONFIG['host'], :user => CONFIG['user'], :password => CONFIG['password'], :timeout => 20, :open_timeout => 1
+  class ConfigurationNotFound < NameError;
+  end
   
-  # TODO: Make load file as optional
+  
+  ZENDESK_ROOT          = File.expand_path((defined?(Rails) && Rails.root.to_s.length > 0) ? Rails.root : ".") unless defined?(ZENDESK_ROOT)
+  DEFAULT_CONFIG_PATH   = File.join(ZENDESK_ROOT, 'config', 'zendesk.yml')
+
+  def self.load_configuration(config_path)
+    exists = config_path && File.exists?(config_path)
+    raise ConfigurationNotFound, "could not find the \"#{config_path}\" configuration file" unless exists
+    YAML.load_file(config_path)
+  end
+
+  def self.config
+    @configuration ||= load_configuration(DEFAULT_CONFIG_PATH)
+  end
+  
+  def self.resource
+    @resource ||= RestClient::Resource.new config['host'], :user => config['user'], :password => config['password'], :timeout => 20, :open_timeout => 1
+  end
   
   autoload :Resource, File.dirname(__FILE__) + '/zendesk/resource.rb'
   autoload :Comment, File.dirname(__FILE__) + '/zendesk/comment.rb'

data/lib/zendesk/comment.rb

@@ -18,7 +18,7 @@ class Zendesk::Comment < Zendesk::Resource
 
   def save
     begin
-      response = RESOURCE["tickets/#{ticket_id}.xml"].put self.to_xml, :content_type => 'application/xml'
+      response = resource["tickets/#{ticket_id}.xml"].put self.to_xml, :content_type => 'application/xml'
       return (200..300).include?(response.headers[:status].to_i)
     rescue Exception => e
       puts e.message

data/lib/zendesk/lib/rest_object.rb

@@ -23,9 +23,9 @@ module Zendesk::RestObject
     def save
       begin
         response = if self.id
-          Zendesk::RESOURCE["#{path}/#{id}.xml"].put self.to_xml, :content_type => 'application/xml'
+          Zendesk.resource["#{path}/#{id}.xml"].put self.to_xml, :content_type => 'application/xml'
         else  
-          Zendesk::RESOURCE["#{path}.xml"].post self.to_xml, :content_type => 'application/xml'
+          Zendesk.resource["#{path}.xml"].post self.to_xml, :content_type => 'application/xml'
         end
         if (200..300).include?(response.headers[:status].to_i)
           load(id || response.headers[:location].scan(/\d+/).first.to_i)
@@ -51,7 +51,7 @@ module Zendesk::RestObject
     
     def load(id)
       begin
-        data = load_data(Zendesk::RESOURCE["#{path}/#{id}.xml"].get)[path.singularize]
+        data = load_data(Zendesk.resource["#{path}/#{id}.xml"].get)[path.singularize]
         load_attributes(data)
         load_protected_attributes(data)
         load_field_entries(data) if respond_to?(:load_field_entries)

data/lib/zendesk/ticket.rb

@@ -18,10 +18,12 @@ class Zendesk::Ticket < Zendesk::Resource
     super
   end
   
+  # Filling field methods from imported data.
+  # If field is not pointed in config it will be missed
   def load_field_entries(data)
     data['ticket_field_entries'].each do |field_entry|
       method_name = @field_ids.index(field_entry['ticket_field_id'])
-      send("#{method_name}=", field_entry['value'])
+      send("#{method_name}=", field_entry['value']) if method_name
     end
   end
   
@@ -76,7 +78,7 @@ class Zendesk::Ticket < Zendesk::Resource
   end
   
   def load_fields
-    attr_keys = Zendesk::CONFIG['ticket'] || {}
+    attr_keys = Zendesk.config['ticket'] || {}
     @field_ids = {}
     field_names = attr_keys.keys
     unless field_names.blank?
@@ -87,5 +89,4 @@ class Zendesk::Ticket < Zendesk::Resource
       field_names.each{ |field_name| self.class.attributes field_name.to_sym }
     end
   end
-  
 end

data/zendesk.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zendesk}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrey Deryabin"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zendesk
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Andrey Deryabin