david-merb_resourceful 0.0.1 → 0.0.2

data/Rakefile

@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "merb_resourceful"
-GEM_VERSION = "0.0.1"
+GEM_VERSION = "0.0.2"
 AUTHOR = "David Leal"
 EMAIL = "dgleal@gmail.com"
 HOMEPAGE = "http://github.com/david/merb_resourceful"
@@ -23,10 +23,9 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency('merb', '>= 1.0')
+  s.add_dependency('merb', '~> 1.0')
   s.require_path = 'lib'
   s.files = %w(LICENSE README.textile Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
-  
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/lib/merb_resourceful.rb

@@ -1,4 +1,7 @@
-require 'english/style_orm'
+require 'rubygems'
+gem 'merb-core'
+gem 'extlib'
+
 require File.join(File.dirname(__FILE__), 'merb_resourceful/builder')
 require File.join(File.dirname(__FILE__), 'merb_resourceful/orms/datamapper_resource')
 

data/lib/merb_resourceful/builder.rb

@@ -1,6 +1,6 @@
+require 'extlib/inflection'
 require File.expand_path(File.join(File.dirname(__FILE__), 'controller'))
 
-
 module Merb
   module Plugins
     module Resourceful
@@ -10,10 +10,9 @@ module Merb
         def initialize(controller_class, options) 
           @controller_class = controller_class
           @options          = options
-          @resource_class   = @controller_class.name.demodulize.singularize
-          @resource_plural  = @controller_class.name.demodulize.underscore
+          @resource_class   = Extlib::Inflection.singularize(Extlib::Inflection.demodulize(@controller_class.name))
+          @resource_plural  = Extlib::Inflection.underscore(Extlib::Inflection.demodulize(@controller_class.name))
           @resource_name    = @resource_plural.singularize
-          
         end
         
         def build(&block)
@@ -111,7 +110,7 @@ module Merb
               if r.save
                 resource_created(r)
               else
-                message[:error] = "#{self.class::RESOURCE_NAME.humanize} failed to be created"
+                message[:error] = "#{Extlib::Inflection.humanize(self.class::RESOURCE_NAME)} failed to be created"
                 render :new, render_options_for_create
               end
             end
@@ -155,7 +154,7 @@ module Merb
               if r.update(params[self.class::RESOURCE_NAME].merge!(resource_params_for_update))
                 resource_updated(r)
               else
-                message[:error] = "#{RESOURCE_NAME.humanize} failed to be updated"
+                message[:error] = "#{Extlib::Inflection.humanize(RESOURCE_NAME)} failed to be updated"
                 render :edit, render_options_for_update
               end
             end
@@ -167,7 +166,7 @@ module Merb
             end
 
             def resource_updated_message(resrc)
-              "#{self.class::RESOURCE_NAME.humanize} updated successfully."
+              "#{Extlib::Inflection.humanize(self.class::RESOURCE_NAME)} updated successfully."
             end
           end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: david-merb_resourceful
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - David Leal
@@ -17,7 +17,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: "1.0"
     version: