goodbye const_get mess

Author: steved

lib/zendesk_api/association.rb

@@ -35,7 +35,7 @@ def generate_path(*args)
  has_parent = namespace.size > 1 || (options[:with_parent] && @options.parent)
 
  if has_parent
- parent_class = @options.parent ? @options.parent.class : ZendeskAPI.get_class(namespace[0])
+ parent_class = @options.parent ? @options.parent.class : ZendeskAPI.const_get(ZendeskAPI::Helpers.modulize_string(namespace[0]))
  parent_namespace = build_parent_namespace(parent_class, instance, options, original_options)
  namespace[1..1] = parent_namespace if parent_namespace
  namespace[0] = parent_class.resource_name
@@ -176,8 +176,13 @@ def associated_with(name)
  # Represents a parent-to-child association between resources. Options to pass in are: class, path.
  # @param [Symbol] resource_name The underlying resource name
  # @param [Hash] opts The options to pass to the method definition.
- def has(resource_name, class_level_options = {})
- klass = get_class(class_level_options.delete(:class)) || get_class(resource_name)
+ def has(resource_name_or_class, class_level_options = {})
+ if klass = class_level_options.delete(:class)
+ resource_name = resource_name_or_class
+ else
+ klass = resource_name_or_class
+ resource_name = klass.singular_resource_name
+ end
 
  class_level_association = {
  :class => klass,
@@ -231,8 +236,13 @@ def has(resource_name, class_level_options = {})
  # Represents a parent-to-children association between resources. Options to pass in are: class, path.
  # @param [Symbol] resource The underlying resource name
  # @param [Hash] opts The options to pass to the method definition.
- def has_many(resource_name, class_level_opts = {})
- klass = get_class(class_level_opts.delete(:class)) || get_class(Inflection.singular(resource_name.to_s))
+ def has_many(resource_name_or_class, class_level_opts = {})
+ if klass = class_level_opts.delete(:class)
+ resource_name = resource_name_or_class
+ else
+ klass = resource_name_or_class
+ resource_name = klass.resource_name
+ end
 
  class_level_association = {
  :class => klass,
@@ -292,47 +302,6 @@ def has_many(resource_name, class_level_opts = {})
  resource
  end
  end
-
- # Allows using has and has_many without having class defined yet
- # Guesses at Resource, if it's anything else and the class is later
- # reopened under a different superclass, an error will be thrown
- def get_class(resource)
- return false if resource.nil?
- res = ZendeskAPI::Helpers.modulize_string(resource.to_s)
-
- begin
- const_get(res)
- rescue NameError, ArgumentError # ruby raises NameError, rails raises ArgumentError
- ZendeskAPI.get_class(resource)
- end
- end
- end
- end
-
- class << self
- # Make sure Rails' overwriting of const_missing doesn't cause trouble
- def const_missing(*args)
- Object.const_missing(*args)
- end
-
- # Allows using has and has_many without having class defined yet
- # Guesses at Resource, if it's anything else and the class is later
- # reopened under a different superclass, an error will be thrown
- def get_class(resource)
- return false if resource.nil?
- res = ZendeskAPI::Helpers.modulize_string(resource.to_s).split("::")
-
- begin
- res[1..-1].inject(ZendeskAPI.const_get(res[0])) do |iter, k|
- begin
- iter.const_get(k)
- rescue
- iter.const_set(k, Class.new(Resource))
- end
- end
- rescue NameError
- ZendeskAPI.const_set(res[0], Class.new(Resource))
- end
  end
  end
 end

lib/zendesk_api/client.rb

@@ -32,7 +32,7 @@ def method_missing(method, *args, &block)
  method = method.to_s
  options = args.last.is_a?(Hash) ? args.pop : {}
  return instance_variable_get("@#{method}") if !options.delete(:reload) && instance_variable_defined?("@#{method}")
- instance_variable_set("@#{method}", ZendeskAPI::Collection.new(self, ZendeskAPI.get_class(Inflection.singular(method)), options))
+ instance_variable_set("@#{method}", ZendeskAPI::Collection.new(self, ZendeskAPI.const_get(ZendeskAPI::Helpers.modulize_string(Inflection.singular(method))), options))
  end
 
  # Returns the current user (aka me)
@@ -111,7 +111,9 @@ def insert_callback(&block)
 
  # show a nice warning for people using the old style api
  def self.check_deprecated_namespace_usage(attributes, name)
- raise "un-nest '#{name}' from the attributes" if attributes[name].is_a?(Hash)
+ if attributes[name].is_a?(Hash)
+ raise "un-nest '#{name}' from the attributes"
+ end
  end
 
  protected

lib/zendesk_api/collection.rb

@@ -1,7 +1,5 @@
 require 'zendesk_api/resource'
-require 'zendesk_api/resources/misc'
-require 'zendesk_api/resources/ticket'
-require 'zendesk_api/resources/user'
+require 'zendesk_api/resources'
 
 module ZendeskAPI
  # Represents a collection of resources. Lazily loaded, resources aren't

lib/zendesk_api/resource.rb

@@ -50,7 +50,10 @@ def initialize(client, attributes = {})
  @association = attributes.delete(:association) || Association.new(:class => self.class)
  @client = client
  @attributes = ZendeskAPI::Trackie.new(attributes)
- ZendeskAPI::Client.check_deprecated_namespace_usage @attributes, self.class.singular_resource_name
+
+ if self.class.associations.none? {|a| a[:name] == self.class.singular_resource_name}
+ ZendeskAPI::Client.check_deprecated_namespace_usage @attributes, self.class.singular_resource_name
+ end
 
  @attributes.clear_changes unless new_record?
  end