Skip to content

Commit

Permalink
renamed ActiveSupport::ASC to MonkeySupport::C
Browse files Browse the repository at this point in the history
  • Loading branch information
Burke Libbey committed Sep 4, 2009
1 parent 85aa353 commit 6dd699e
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 200 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -7,3 +7,4 @@ pkg
*.so
*.dll
*.o
Makefile
157 changes: 0 additions & 157 deletions ext/Makefile

This file was deleted.

27 changes: 0 additions & 27 deletions ext/active_support_c.c

This file was deleted.

2 changes: 1 addition & 1 deletion ext/extconf.rb
@@ -1,4 +1,4 @@
require 'mkmf'
extension_name = 'active_support_c'
extension_name = 'monkeysupport_c'
dir_config(extension_name)
create_makefile(extension_name)
27 changes: 27 additions & 0 deletions ext/monkeysupport_c.c
@@ -0,0 +1,27 @@
#include "inflector.h"
#include "core_ext/string/starts_ends_with.h"
#include "core_ext/string/access.h"
#include "core_ext/string/filters.h"

#include "ruby.h"

void
Init_monkeysupport_c()
{
VALUE mMonkeySupport = rb_define_module("MonkeySupport");
VALUE cMSC = rb_define_class_under(mMonkeySupport, "C", rb_cObject);

/* ActiveSupport::ASC.camelize("my_string") */
rb_define_singleton_method(cMSC, "inflector_camelize", inflector_camelize, 2);
rb_define_singleton_method(cMSC, "inflector_demodulize", inflector_demodulize, 1);
rb_define_singleton_method(cMSC, "inflector_dasherize", inflector_dasherize, 1);
rb_define_singleton_method(cMSC, "inflector_foreign_key", inflector_foreign_key, 2);
rb_define_singleton_method(cMSC, "inflector_ordinalize", inflector_ordinalize, 1);
rb_define_singleton_method(cMSC, "inflector_parameterize", inflector_parameterize, 2);
rb_define_singleton_method(cMSC, "inflector_underscore", inflector_underscore, 1);

/* rb_define_singleton_method(cMSC, "core_ext_string_at", core_ext_string_at, 1); */
/* rb_define_singleton_method(cMSC, "core_ext_string_to", core_ext_string_to, 1); */
/* rb_define_singleton_method(cMSC, "core_ext_string_from", core_ext_string_from, 1); */
/* rb_define_singleton_method(cMSC, "core_ext_string_first", core_ext_string_first, 1); */
}
4 changes: 1 addition & 3 deletions lib/monkeysupport.rb
@@ -1,7 +1,5 @@
module MonkeySupport
end
require 'monkeysupport_c'

require 'monkeysupport/type_checks'
require 'monkeysupport/memoizable'
require 'active_support_c'
require 'monkeysupport/inflector'
1 change: 0 additions & 1 deletion lib/monkeysupport/.#util.rb

This file was deleted.

15 changes: 8 additions & 7 deletions lib/monkeysupport/inflector.rb
Expand Up @@ -3,12 +3,13 @@ module Inflector

extend MonkeySupport::Memoizable
extend MonkeySupport::TypeChecks

monkey_memoize :pluralize, :singularize, :humanize

alias_method :__camelize, :camelize
def camelize(lower_case_and_underscored_word, first_letter_in_uppercase = true)
if is_ascii_string?(lower_case_and_underscored_word)
ActiveSupport::ASC.inflector_camelize(lower_case_and_underscored_word.to_s, first_letter_in_uppercase)
MonkeySupport::C.inflector_camelize(lower_case_and_underscored_word.to_s, first_letter_in_uppercase)
else
__camelize(lower_case_and_underscored_word, first_letter_in_uppercase)
end
Expand All @@ -17,7 +18,7 @@ def camelize(lower_case_and_underscored_word, first_letter_in_uppercase = true)
alias_method :__underscore, :underscore
def underscore(camel_cased_word)
if is_ascii_string?(camel_cased_word)
ActiveSupport::ASC.inflector_underscore(camel_cased_word)
MonkeySupport::C.inflector_underscore(camel_cased_word)
else
__underscore(camel_cased_word)
end
Expand All @@ -26,7 +27,7 @@ def underscore(camel_cased_word)
alias_method :__dasherize, :dasherize
def dasherize(underscored_word)
if is_ascii_string?(underscored_word)
ActiveSupport::ASC.inflector_dasherize(underscored_word)
MonkeySupport::C.inflector_dasherize(underscored_word)
else
__dasherize(underscored_word)
end
Expand All @@ -35,7 +36,7 @@ def dasherize(underscored_word)
alias_method :__demodulize, :demodulize
def demodulize(class_name_in_module)
if is_ascii_string?(class_name_in_module)
ActiveSupport::ASC.inflector_demodulize(class_name_in_module)
MonkeySupport::C.inflector_demodulize(class_name_in_module)
else
__demodulize(class_name_in_module)
end
Expand All @@ -45,7 +46,7 @@ def demodulize(class_name_in_module)
def parameterize(string, sep = '-')
parameterized_string = transliterate(string)
if is_ascii_string?(parameterized_string) && is_ascii_string?(sep)
ActiveSupport::ASC.inflector_parameterize(parameterized_string.to_s, sep)
MonkeySupport::C.inflector_parameterize(parameterized_string.to_s, sep)
else
__parameterize(string, sep)
end
Expand All @@ -54,7 +55,7 @@ def parameterize(string, sep = '-')
alias_method :__foreign_key, :foreign_key
def foreign_key(class_name, separate_class_name_and_id_with_underscore = true)
if is_ascii_string?(class_name)
ActiveSupport::ASC.inflector_foreign_key(class_name, separate_class_name_and_id_with_underscore)
MonkeySupport::C.inflector_foreign_key(class_name, separate_class_name_and_id_with_underscore)
else
__foreign_key(class_name, separate_class_name_and_id_with_underscore)
end
Expand All @@ -64,7 +65,7 @@ def foreign_key(class_name, separate_class_name_and_id_with_underscore = true)
def ordinalize(number)
x = number.to_i
if is_fixnum?(x)
ActiveSupport::ASC.inflector_ordinalize(number.to_i)
MonkeySupport::C.inflector_ordinalize(x)
else
__ordinalize(number)
end
Expand Down
5 changes: 1 addition & 4 deletions monkeysupport.gemspec
Expand Up @@ -24,10 +24,6 @@ Gem::Specification.new do |s|
"README.rdoc",
"Rakefile",
"VERSION",
"ext/Makefile",
"ext/Makefile",
"ext/active_support_c.c",
"ext/active_support_c.c",
"ext/core_ext/string/access.c",
"ext/core_ext/string/access.c",
"ext/core_ext/string/access.h",
Expand All @@ -46,6 +42,7 @@ Gem::Specification.new do |s|
"ext/inflector.c",
"ext/inflector.h",
"ext/inflector.h",
"ext/monkeysupport_c.c",
"lib/monkeysupport.rb",
"lib/monkeysupport.rb",
"lib/monkeysupport/inflector.rb",
Expand Down

0 comments on commit 6dd699e

Please sign in to comment.