dm-active_model 0.1.0 → 0.2.0

data/dm-active_model.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-active_model}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Gamsjaeger (snusnu)"]
-  s.date = %q{2009-12-29}
+  s.date = %q{2010-01-14}
   s.description = %q{A datamapper plugin for active_model compliance and thus rails 3 compatibility.}
   s.email = %q{gamsnjaga [a] gmail [d] com}
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
      "TODO",
      "dm-active_model.gemspec",
      "lib/dm-active_model.rb",
+     "lib/dm-active_model/extlib.rb",
      "lib/dm-active_model/version.rb",
      "spec/amo_compliance_spec.rb",
      "spec/dm-active_model_spec.rb",

data/lib/dm-active_model/extlib.rb

@@ -0,0 +1,28 @@
+require 'extlib/inflection'
+
+module ActiveSupport
+  Inflector = Extlib::Inflection
+end
+
+module ActiveModel
+
+  # This is mostly copied from active_model and adapted to use extlib under the hood.
+  # see http://github.com/rails/rails/blob/master/activemodel/lib/active_model/naming.rb
+  class Name < String
+
+    attr_reader :singular, :plural, :element, :collection, :partial_path, :human
+    alias_method :cache_key, :collection
+
+    def initialize(klass)
+      super(klass.name)
+      @singular     = Extlib::Inflection.underscore(self).tr('/', '_').freeze
+      @plural       = Extlib::Inflection.pluralize(@singular).freeze
+      @element      = Extlib::Inflection.underscore(Extlib::Inflection.demodulize(self)).freeze
+      @human        = Extlib::Inflection.humanize(@element)
+      @collection   = Extlib::Inflection.pluralize(Extlib::Inflection.underscore(self)).freeze
+      @partial_path = "#{@collection}/#{@element}".freeze
+    end
+
+  end
+
+end

data/lib/dm-active_model/version.rb

@@ -1,7 +1,7 @@
 module DataMapper
   module ActiveModel
 
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.2.0'.freeze
 
   end
 end

data/lib/dm-active_model.rb

@@ -1,31 +1,18 @@
+if Object.const_defined?('Extlib')
+  require 'dm-active_model/extlib'
+else
+  require 'active_model/naming'
+end
+
 module DataMapper
   module ActiveModel
 
-    # This is mostly copied from active_model and adapted to use extlib under the hood.
-    # see http://github.com/rails/rails/blob/master/activemodel/lib/active_model/naming.rb
-    class Name < String
-
-      attr_reader :singular, :plural, :element, :collection, :partial_path, :human
-      alias_method :cache_key, :collection
-
-      def initialize(name)
-        super
-        @singular     = Extlib::Inflection.underscore(self).tr('/', '_').freeze
-        @plural       = Extlib::Inflection.pluralize(@singular).freeze
-        @element      = Extlib::Inflection.underscore(Extlib::Inflection.demodulize(self)).freeze
-        @human        = Extlib::Inflection.humanize(@element)
-        @collection   = Extlib::Inflection.pluralize(Extlib::Inflection.underscore(self)).freeze
-        @partial_path = "#{@collection}/#{@element}".freeze
-      end
-
-    end
-
     module ClassMethods
 
       # Returns an ActiveModel::Name object for module. It can be
       # used to retrieve all kinds of naming-related information.
       def model_name
-        @_model_name ||= DataMapper::ActiveModel::Name.new(name)
+        @_model_name ||= ::ActiveModel::Name.new(self)
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-active_model
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Martin Gamsjaeger (snusnu)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-29 00:00:00 +01:00
+date: 2010-01-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +62,7 @@ files:
 - TODO
 - dm-active_model.gemspec
 - lib/dm-active_model.rb
+- lib/dm-active_model/extlib.rb
 - lib/dm-active_model/version.rb
 - spec/amo_compliance_spec.rb
 - spec/dm-active_model_spec.rb