Merge pull request zendesk#51 from zendesk/grosser/core_ext

core ext are bad :)

Author: steved

lib/zendesk_api.rb

@@ -1,6 +1,3 @@
-
-require 'zendesk_api/core_ext/modulize'
-require 'zendesk_api/core_ext/snakecase'
 require 'zendesk_api/core_ext/inflection'
 require 'zendesk_api/client'
 

lib/zendesk_api/association.rb

@@ -1,3 +1,5 @@
+require 'zendesk_api/helpers'
+
 module ZendeskAPI
  # Represents an association between two resources 
  class Association
@@ -50,7 +52,7 @@ def generate_path(*args)
 
  def side_load(resources, side_loads)
  key = "#{options.name}_id"
- plural_key = "#{options.name.to_s.singular}_ids"
+ plural_key = "#{Inflection.singular options.name.to_s}_ids"
 
  resources.each do |resource|
  if resource.key?(plural_key) # Grab associations from child_ids field on resource
@@ -230,7 +232,7 @@ def has(resource_name, class_level_options = {})
  # @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(resource_name.to_s.singular)
+ klass = get_class(class_level_opts.delete(:class)) || get_class(Inflection.singular(resource_name.to_s))
 
  class_level_association = {
  :class => klass,
@@ -259,7 +261,7 @@ def has_many(resource_name, class_level_opts = {})
 
  # find and cache association
  instance_association = Association.new(class_level_association.merge(:parent => self))
- singular_resource_name = resource_name.to_s.singular
+ singular_resource_name = Inflection.singular(resource_name.to_s)
 
  resources = if (ids = method_missing("#{singular_resource_name}_ids")) && ids.any?
  ids.map do |id|
@@ -296,7 +298,7 @@ def has_many(resource_name, class_level_opts = {})
  # reopened under a different superclass, an error will be thrown
  def get_class(resource)
  return false if resource.nil?
- res = resource.to_s.modulize
+ res = ZendeskAPI::Helpers.modulize_string(resource.to_s)
 
  begin
  const_get(res)
@@ -318,7 +320,7 @@ def const_missing(*args)
  # reopened under a different superclass, an error will be thrown
  def get_class(resource)
  return false if resource.nil?
- res = resource.to_s.modulize.split("::")
+ res = ZendeskAPI::Helpers.modulize_string(resource.to_s).split("::")
 
  begin
  res[1..-1].inject(ZendeskAPI.const_get(res[0])) do |iter, k|

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(method.singular), options))
+ instance_variable_set("@#{method}", ZendeskAPI::Collection.new(self, ZendeskAPI.get_class(Inflection.singular(method)), options))
  end
 
  # Plays a view playlist.

lib/zendesk_api/core_ext/inflection.rb

@@ -1,13 +1,3 @@
 require 'inflection'
 
 Inflection.plural_rule 'forum', 'forums'
-
-class String
- def singular
- Inflection.singular(self)
- end
- 
- def plural
- Inflection.plural(self)
- end
-end

lib/zendesk_api/core_ext/modulize.rb

@@ -0,0 +1,23 @@
+module ZendeskAPI
+ module Helpers
+ # From https://github.com/rubyworks/facets/blob/master/lib/core/facets/string/modulize.rb
+ def self.modulize_string(string)
+ #gsub('__','/'). # why was this ever here?
+ string.gsub(/__(.?)/){ "::#{$1.upcase}" }.
+ gsub(/\/(.?)/){ "::#{$1.upcase}" }.
+ gsub(/(?:_+|-+)([a-z])/){ $1.upcase }.
+ gsub(/(\A|\s)([a-z])/){ $1 + $2.upcase }
+ end
+
+ # From https://github.com/rubyworks/facets/blob/master/lib/core/facets/string/snakecase.rb
+ def self.snakecase_string(string)
+ #gsub(/::/, '/').
+ string.gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+ gsub(/([a-z\d])([A-Z])/,'\1_\2').
+ tr('-', '_').
+ gsub(/\s/, '_').
+ gsub(/__+/, '_').
+ downcase
+ end
+ end
+end

lib/zendesk_api/core_ext/snakecase.rb

@@ -1,3 +1,4 @@
+require 'zendesk_api/helpers'
 require 'zendesk_api/trackie'
 require 'zendesk_api/actions'
 require 'zendesk_api/association'
@@ -12,12 +13,12 @@ class Data
  class << self
  # The singular resource name taken from the class name (e.g. ZendeskAPI::Ticket -> ticket)
  def singular_resource_name
- @singular_resource_name ||= to_s.split("::").last.snakecase
+ @singular_resource_name ||= ZendeskAPI::Helpers.snakecase_string(to_s.split("::").last)
  end
 
  # The resource name taken from the class name (e.g. ZendeskAPI::Ticket -> tickets)
  def resource_name
- @resource_name ||= singular_resource_name.plural
+ @resource_name ||= Inflection.plural(singular_resource_name)
  end
 
  alias :model_key :resource_name

lib/zendesk_api/helpers.rb

@@ -2,6 +2,6 @@
 
 describe String do
  specify "the plural of forum if forums" do
- "forum".plural.should == "forums"
+ Inflection.plural("forum").should == "forums"
  end
 end

lib/zendesk_api/resource.rb

@@ -1,4 +1,3 @@
-$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 $:.unshift(File.join(File.dirname(__FILE__), "macros"))
 
 ENV['TZ'] = 'CET' # something that is not local and not utc so we find all the bugs