common_name 0.1.6 → 0.1.7

data/.gitignore

@@ -3,3 +3,4 @@
 coverage
 rdoc
 pkg
+Gemfile.lock

data/lib/common_name.rb

@@ -1,13 +1,8 @@
 require 'active_support'
 require 'active_support/version'
-%w{
-  active_support/inflector
-}.each do |active_support_3_requirement|
-  require active_support_3_requirement
-end if ::ActiveSupport::VERSION::MAJOR == 3
-
-if defined?(::Rails)
-  require 'common_name/railtie'
+if ::ActiveSupport::VERSION::MAJOR >= 3
+  require 'active_support/core_ext/string'
+  require 'active_support/inflector'
 end
 
 # This library comes out of my frustration with seeing lines like
@@ -32,7 +27,9 @@ module CommonName
   
   # delegate instance methods to class methods
   METHODS.each do |m|
-    eval %{ def common_#{m}; self.class.common_#{m}; end }
+    define_method "common_#{m}" do
+      self.class.send("common_#{m}")
+    end
   end
   
   module ClassMethods
@@ -92,3 +89,20 @@ module CommonName
     def common_plural_camel;      _COMMON_PLURAL_CAMEL    ||= common_plural.camelcase;                                                  end
   end
 end
+
+if defined?(::ActiveRecord)
+  ::ActiveRecord::Base.class_eval do
+    def self._common_name
+      name.underscore
+    end
+    include ::CommonName
+  end
+end
+if defined?(::ActionController)
+  ::ActionController::Base.class_eval do
+    def self._common_name
+      controller_name.singularize
+    end
+    include ::CommonName
+  end
+end

data/lib/common_name/version.rb

@@ -1,3 +1,3 @@
 module CommonName
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

data/test/common_name_test.rb

@@ -11,7 +11,7 @@ end
 # a class where you always want to chop off the _component part and singularize
 class Component
   def self._common_name
-    name.underscore.gsub('_component', '').singularize
+    name.underscore.sub(/_component$/, '').singularize
   end
   include CommonName
 end

metadata

@@ -1,78 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: common_name
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 6
-  version: 0.1.6
+version: !ruby/object:Gem::Version
+  version: 0.1.7
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Seamus Abshere
 - Derek Kastner
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-02 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2154157800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2154157800
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &2154157280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2154157280
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &2154156640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 3
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.4
   type: :runtime
-  version_requirements: *id003
-description: Provides methods like User.common_name (#=> "user") and User.common_plural_symbol (#=> :users) so that you don't have to chain humanize/downcase/etc. etc.'
-email: 
+  prerelease: false
+  version_requirements: *2154156640
+description: Provides methods like User.common_name (#=> "user") and User.common_plural_symbol
+  (#=> :users) so that you don't have to chain humanize/downcase/etc. etc.'
+email:
 - seamus@abshere.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gitignore
 - Gemfile
@@ -81,44 +61,35 @@ files:
 - Rakefile
 - common_name.gemspec
 - lib/common_name.rb
-- lib/common_name/railtie.rb
 - lib/common_name/version.rb
 - test/common_name_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/seamusabshere/common_name
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: commonname
-rubygems_version: 1.3.7
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: Provides methods like User.common_name (#=> "user") and User.common_plural_symbol (#=> :users)
-test_files: 
+summary: Provides methods like User.common_name (#=> "user") and User.common_plural_symbol
+  (#=> :users)
+test_files:
 - test/common_name_test.rb
 - test/test_helper.rb
+has_rdoc: 

data/lib/common_name/railtie.rb

@@ -1,21 +0,0 @@
-module CommonName
-  class Railtie < ::Rails::Railtie
-    initializer 'ActiveRecord' do
-      ::ActiveRecord::Base.class_eval do
-        def self._common_name
-          name.underscore
-        end
-        include ::CommonName
-      end
-    end
-
-    initializer 'ActionController' do
-      ::ActionController::Base.class_eval do
-        def self._common_name
-          controller_name.singularize
-        end
-        include ::CommonName
-      end
-    end
-  end
-end