mack 0.0.7.0 → 0.1.0

data/CHANGELOG

@@ -1,3 +1,11 @@
+===0.1.0
+* Added an inflections system. The default inflections are from Jeremy McAnally's great Rails plugin, acts_as_good_speeler. Thanks Jeremy! http://www.jeremymcanally.com/
+* Added a to_params method to Hash to help with testing.
+* Added rake generate:scaffold task.
+
+===0.0.7.0
+* Fixed [#18488] Recommend moving files under lib/
+
 ===0.0.6.2
 * gem: thin 0.7.0
 * gem: cachetastic 1.3.1

data/bin/templates/config/app_config/default.yml.template

@@ -2,6 +2,6 @@ whiny_config_missing: false
 
 mack::session_id: _<%= app.downcase %>_session_id
 
-# mack::log_level: error
+# log::level: error
 
-<%= options.orm ? "mack::orm: #{options.orm}" : "" %>
+<%= options.orm ? "orm: #{options.orm}" : "" %>

data/bin/templates/config/database.yml.template

@@ -14,7 +14,7 @@ test:
 
 production:
   adapter: mysql
-  database: <%= app.downcase %>_development
+  database: <%= app.downcase %>_production
   host: localhost
   username: root
   password:

data/lib/core_extensions/hash.rb

@@ -6,4 +6,34 @@ class Hash
     self
   end
   
+  # Converts a hash to query string parameters. 
+  # An optional boolean escapes the values if true, which is the default.
+  def to_params(escape = true)
+    params = ''
+    stack = []
+    
+    each do |k, v|
+      if v.is_a?(Hash)
+        stack << [k,v]
+      else
+        v = Rack::Utils.escape(v) if escape
+        params << "#{k}=#{v}&"
+      end
+    end
+    
+    stack.each do |parent, hash|
+      hash.each do |k, v|
+        if v.is_a?(Hash)
+          stack << ["#{parent}[#{k}]", v]
+        else
+          v = Rack::Utils.escape(v) if escape
+          params << "#{parent}[#{k}]=#{v}&"
+        end
+      end
+    end
+    
+    params.chop! # trailing &
+    params
+  end
+  
 end

data/lib/core_extensions/string.rb

@@ -25,4 +25,14 @@ class String
     self == ""
   end
   
+  # Maps to Mack::Utils::Inflector.instance.pluralize
+  def plural
+    Mack::Utils::Inflector.instance.pluralize(self)
+  end
+  
+  # Maps to Mack::Utils::Inflector.instance.singularize
+  def singular
+    Mack::Utils::Inflector.instance.singularize(self)
+  end
+  
 end

data/lib/generators/scaffold_generator/scaffold_generator.rb

@@ -0,0 +1,72 @@
+# Generates scaffold for Mack applications.
+# 
+# Example:
+#   rake generate:scaffold name=post
+# This will generate the following in your mack application:
+#   vendor/plugins/my_cool_plugin
+#   vendor/plugins/my_cool_plugin/init.rb
+#   vendor/plugins/my_cool_plugin/lib
+#   vendor/plugins/my_cool_plugin/lib/my_cool_plugin.rb
+class ScaffoldGenerator < Mack::Generator::Base
+  
+  require_param :name
+  
+  def generate
+    @name_singular = param(:name).singular
+    @name_plural = param(:name).plural
+    @name_singular_camel = @name_singular.camelcase
+    @name_plural_camel = @name_plural.camelcase
+    
+    # update routes.rb
+    routes = File.join(MACK_CONFIG, "routes.rb")
+    rf = File.open(routes).read
+    unless rf.match(".resource :#{@name_plural}")
+      puts "Updating routes.rb"
+      nrf = ""
+      rf.each do |line|
+        if line.match("Mack::Routes.build")
+          x = line.match(/\|(.+)\|/).captures
+          line << "\n  #{x}.resource :#{@name_plural} # Added by rake generate:scaffold name=#{param(:name)}\n"
+        end
+        nrf << line
+      end
+      File.open(routes, "w") do |f|
+        f.puts nrf
+      end
+    end 
+    
+    app_cont_dir = File.join(MACK_APP, "controllers")
+    directory(app_cont_dir)
+    
+    app_model_dir = File.join(MACK_APP, "models")
+    directory(app_model_dir)
+    
+    app_views_dir = File.join(MACK_APP, "views", @name_plural)
+    directory(app_views_dir)
+    
+    temp_dir = File.join(File.dirname(__FILE__), "templates")
+
+    case app_config.orm
+    when "activerecord"
+      template(File.join(temp_dir, "generic", "app", "controllers", "controller.rb.template"), File.join(app_cont_dir, "#{@name_plural}_controller.rb"), :force => param(:force))
+      template(File.join(temp_dir, "activerecord", "app", "models", "model.rb.template"), File.join(app_model_dir, "#{@name_singular}.rb"), :force => param(:force))
+      
+      template(File.join(temp_dir, "generic", "app", "views", "index.html.erb.template"), File.join(app_views_dir, "index.html.erb"), :force => param(:force))
+      template(File.join(temp_dir, "generic", "app", "views", "edit.html.erb.template"), File.join(app_views_dir, "edit.html.erb"), :force => param(:force))
+      template(File.join(temp_dir, "generic", "app", "views", "new.html.erb.template"), File.join(app_views_dir, "new.html.erb"), :force => param(:force))
+      template(File.join(temp_dir, "generic", "app", "views", "show.html.erb.template"), File.join(app_views_dir, "show.html.erb"), :force => param(:force))
+    when "data_mapper"
+      template(File.join(temp_dir, "data_mapper", "app", "controllers", "controller.rb.template"), File.join(app_cont_dir, "#{@name_plural}_controller.rb"), :force => param(:force))
+      template(File.join(temp_dir, "data_mapper", "app", "models", "model.rb.template"), File.join(app_model_dir, "#{@name_singular}.rb"), :force => param(:force))
+      
+      template(File.join(temp_dir, "generic", "app", "views", "index.html.erb.template"), File.join(app_views_dir, "index.html.erb"), :force => param(:force))
+      template(File.join(temp_dir, "generic", "app", "views", "edit.html.erb.template"), File.join(app_views_dir, "edit.html.erb"), :force => param(:force))
+      template(File.join(temp_dir, "generic", "app", "views", "new.html.erb.template"), File.join(app_views_dir, "new.html.erb"), :force => param(:force))
+      template(File.join(temp_dir, "generic", "app", "views", "show.html.erb.template"), File.join(app_views_dir, "show.html.erb"), :force => param(:force))
+    else
+      template(File.join(temp_dir, "no_orm", "app", "controllers", "controller.rb.template"), File.join(app_cont_dir, "#{@name_plural}_controller.rb"), :force => param(:force))
+    end
+
+  end
+  
+end

data/lib/generators/scaffold_generator/templates/activerecord/app/models/model.rb.template

@@ -0,0 +1,2 @@
+class <%= @name_singular_camel %> < ActiveRecord::Base
+end

data/lib/generators/scaffold_generator/templates/data_mapper/app/controllers/controller.rb.template

@@ -0,0 +1,50 @@
+class <%= @name_plural_camel %>Controller < Mack::Controller::Base
+  
+  # GET /<%= @name_plural %>
+  def index
+    @<%= @name_plural %> = <%= @name_singular_camel %>.find(:all)
+  end
+  
+  # GET /<%= @name_plural %>/1
+  def show
+    @<%= @name_singular %> = <%= @name_singular_camel %>.find(params(:id))
+  end
+  
+  # GET /<%= @name_plural %>/new
+  def new
+    @<%= @name_singular %> = <%= @name_singular_camel %>.new
+  end
+  
+  # GET /<%= @name_plural %>/1/edit
+  def edit
+    @<%= @name_singular %> = <%= @name_singular_camel %>.find(params(:id))
+  end
+  
+  # POST /<%= @name_plural %>
+  def create
+    @<%= @name_singular %> = <%= @name_singular_camel %>.new(params(:<%= @name_singular %>))
+    if @<%= @name_singular %>.save
+      redirect_to(<%= @name_plural %>_show_url(:id => @<%= @name_singular %>.id))
+    else
+      render(:action => "new")
+    end
+  end
+  
+  # PUT /<%= @name_plural %>/1
+  def update
+    @<%= @name_singular %> = <%= @name_singular_camel %>.find(params(:id))
+    if @<%= @name_singular %>.update_attributes(params(:<%= @name_singular %>))
+      redirect_to(<%= @name_plural %>_show_url(:id => @<%= @name_singular %>.id))
+    else
+      render(:action => "edit")
+    end
+  end
+
+  # DELETE /<%= @name_plural %>/1
+  def delete
+    @<%= @name_singular %> = <%= @name_singular_camel %>.find(params(:id))
+    @<%= @name_singular %>.destroy!
+    redirect_to(<%= @name_plural %>_index_url)
+  end
+  
+end

data/lib/generators/scaffold_generator/templates/data_mapper/app/models/model.rb.template

@@ -0,0 +1,2 @@
+class <%= @name_singular_camel %> < DataMapper::Base
+end

data/lib/generators/scaffold_generator/templates/generic/app/controllers/controller.rb.template

@@ -0,0 +1,50 @@
+class <%= @name_plural_camel %>Controller < Mack::Controller::Base
+  
+  # GET /<%= @name_plural %>
+  def index
+    @<%= @name_plural %> = <%= @name_singular_camel %>.find(:all)
+  end
+  
+  # GET /<%= @name_plural %>/1
+  def show
+    @<%= @name_singular %> = <%= @name_singular_camel %>.find(params(:id))
+  end
+  
+  # GET /<%= @name_plural %>/new
+  def new
+    @<%= @name_singular %> = <%= @name_singular_camel %>.new
+  end
+  
+  # GET /<%= @name_plural %>/1/edit
+  def edit
+    @<%= @name_singular %> = <%= @name_singular_camel %>.find(params(:id))
+  end
+  
+  # POST /<%= @name_plural %>
+  def create
+    @<%= @name_singular %> = <%= @name_singular_camel %>.new(params(:<%= @name_singular %>))
+    if @<%= @name_singular %>.save
+      redirect_to(<%= @name_plural %>_show_url(:id => @<%= @name_singular %>))
+    else
+      render(:action => "new")
+    end
+  end
+  
+  # PUT /<%= @name_plural %>/1
+  def update
+    @<%= @name_singular %> = <%= @name_singular_camel %>.find(params(:id))
+    if @<%= @name_singular %>.update_attributes(params(:<%= @name_singular %>))
+      redirect_to(<%= @name_plural %>_show_url(:id => @<%= @name_singular %>))
+    else
+      render(:action => "edit")
+    end
+  end
+
+  # DELETE /<%= @name_plural %>/1
+  def delete
+    @<%= @name_singular %> = <%= @name_singular_camel %>.find(params(:id))
+    @<%= @name_singular %>.destroy
+    redirect_to(<%= @name_plural %>_index_url)
+  end
+  
+end

data/lib/generators/scaffold_generator/templates/generic/app/views/edit.html.erb.template

@@ -0,0 +1,13 @@
+<h1>Edit <%= @name_singular %></h1>
+
+<%%= error_messages_for :<%= @name_singular %> %>
+
+<form action="<%%= <%= @name_singular %>s_update_url(:id => @<%= @name_singular %>.id) %>" class="edit_<%= @name_singular %>" id="edit_<%= @name_singular %>" method="<%= @name_singular %>">
+  <input type="hidden" name="_method" value="put">
+
+  <p>
+    <input id="<%= @name_singular %>_submit" name="commit" type="submit" value="Create" />
+  </p>
+</form>
+
+<%%= link_to("Back", <%= @name_singular %>s_index_url) %>

data/lib/generators/scaffold_generator/templates/generic/app/views/index.html.erb.template

@@ -0,0 +1,20 @@
+<h1>Listing <%= @name_plural %></h1>
+
+<table>
+  <tr>
+    <th>&nbsp;</th>
+  </tr>
+
+<%% for <%= @name_singular %> in @<%= @name_plural %> %>
+  <tr>
+    <td>&nbsp;</td>
+    <td><%%= link_to("Show", <%= @name_plural %>_show_url(:id => <%= @name_singular %>.id)) %></td>
+    <td><%%= link_to("Edit", <%= @name_plural %>_edit_url(:id => <%= @name_singular %>.id)) %></td>
+    <td><%%= link_to("Delete", <%= @name_plural %>_delete_url(:id => <%= @name_singular %>.id), :method => :delete, :confirm => "Are you sure?") %></td>
+  </tr>
+<%% end %>
+</table>
+
+<br />
+
+<%%= link_to("New <%= @name_singular_camel %>", <%= @name_plural %>_new_url) %>

data/lib/generators/scaffold_generator/templates/generic/app/views/new.html.erb.template

@@ -0,0 +1,12 @@
+<h1>New <%= @name_singular %></h1>
+
+<%%= error_messages_for :<%= @name_singular %> %>
+
+<form action="<%%= <%= @name_singular %>s_create_url %>" class="new_<%= @name_singular %>" id="new_<%= @name_singular %>" method="<%= @name_singular %>">
+
+  <p>
+    <input id="<%= @name_singular %>_submit" name="commit" type="submit" value="Create" />
+  </p>
+</form>
+
+<%%= link_to("Back", <%= @name_singular %>s_index_url) %>

data/lib/generators/scaffold_generator/templates/generic/app/views/show.html.erb.template

@@ -0,0 +1,7 @@
+<p>
+  <%%= @<%= @name_singular %>.inspect %>
+</p>
+
+
+<%%= link_to("Edit", <%= @name_plural %>_edit_url(:id => @<%= @name_singular %>.id)) %> |
+<%%= link_to("Back", <%= @name_plural %>_index_url) %>

data/lib/generators/scaffold_generator/templates/no_orm/app/controllers/controller.rb.template

@@ -0,0 +1,38 @@
+class <%= @name_plural_camel %>Controller < Mack::Controller::Base
+  
+  # GET /<%= @name_plural %>
+  def index
+    "<%= @name_plural_camel %>#index"
+  end
+  
+  # POST /<%= @name_plural %>
+  def create
+    "<%= @name_plural_camel %>#create"
+  end
+  
+  # GET /<%= @name_plural %>/new
+  def new
+    "<%= @name_plural_camel %>#new"
+  end
+  
+  # GET /<%= @name_plural %>/1
+  def show
+    "<%= @name_plural_camel %>#show id: #{params(:id)}"
+  end
+  
+  # GET /<%= @name_plural %>/1/edit
+  def edit
+    "<%= @name_plural_camel %>#edit id: #{params(:id)}"
+  end
+  
+  # PUT /<%= @name_plural %>/1
+  def update
+    "<%= @name_plural_camel %>#update id: #{params(:id)}"
+  end
+  
+  # DELETE /<%= @name_plural %>/1
+  def delete
+    "<%= @name_plural_camel %>#delete"
+  end
+  
+end

data/lib/initialization/initializer.rb

@@ -40,7 +40,7 @@ unless Object.const_defined?("MACK_INITIALIZED")
   fl = File.join(File.dirname(__FILE__), "..")
 
   # Require all the necessary files to make Mack actually work!
-  ["errors", "core_extensions", "utils", "test_extensions", "routing", "sea_level", "tasks", "initialization/server"].each do |dir|
+  ["errors", "core_extensions", "utils", "test_extensions", "routing", "sea_level", "tasks", "initialization/server", "generators"].each do |dir|
     dir_globs = Dir.glob(File.join(fl, dir, "**/*.rb"))
     dir_globs.each do |d|
       require d

data/lib/initialization/initializers/orm_support.rb

@@ -4,9 +4,9 @@
   eval("def using_#{orm}?; false; end")
 end
 
-unless app_config.mack.orm.nil?
+unless app_config.orm.nil?
   dbs = YAML::load(ERB.new(IO.read(File.join(MACK_CONFIG, "database.yml"))).result)
-  case app_config.mack.orm
+  case app_config.orm
   when 'activerecord'
     require 'activerecord'
     ActiveRecord::Base.establish_connection(dbs[MACK_ENV])
@@ -16,7 +16,7 @@ unless app_config.mack.orm.nil?
     DataMapper::Database.setup(dbs[MACK_ENV])
     eval("def using_data_mapper?; true; end")
   else
-    MACK_DEFAULT_LOGGER.warn("Attempted to configure an unknown ORM: #{app_config.mack.orm}")
+    MACK_DEFAULT_LOGGER.warn("Attempted to configure an unknown ORM: #{app_config.orm}")
   end
 else
   MACK_DEFAULT_LOGGER.warn("No ORM has been configured!")

data/lib/mack.rb

@@ -55,15 +55,21 @@ module Mack
     # Setup the request, response, cookies, session, etc...
     # yield up, and then clean things up afterwards.
     def setup(env)
+      exception = nil
       log_request do
         @request = Mack::Request.new(env) 
         @response = Mack::Response.new
         @cookies = Mack::CookieJar.new(self.request, self.response)
         session do
-          yield
+          begin
+            yield
+          rescue Exception => e
+            exception = e
+          end
         end
-        self.response.finish
+        return self.response.finish unless exception
       end
+      raise exception if exception
     end
     
     def session

data/lib/routing/route_map.rb

@@ -60,7 +60,7 @@ module Mack
     #     #   '/users/:id/:edit # => {:controller => 'users', :action => :edit, :method => :get} 
     #     #                     # => users_edit_url
     #     #                     # => users_edit_full_url
-    #     #   '/users/:id/update # => {:controller => 'users', :action => :update, :method => :post} 
+    #     #   '/users/:id # => {:controller => 'users', :action => :update, :method => :put} 
     #     #                      # => users_update_url
     #     #                      # => users_update_full_url
     #     #   '/users/:id # => {:controller => 'users', :action => :delete, :method => :delete} 
@@ -158,7 +158,7 @@ module Mack
         connect_with_named_route("#{controller}_new", "/#{controller}/new", {:controller => controller, :action => :new, :method => :get})
         connect_with_named_route("#{controller}_show", "/#{controller}/:id", {:controller => controller, :action => :show, :method => :get})
         connect_with_named_route("#{controller}_edit", "/#{controller}/:id/edit", {:controller => controller, :action => :edit, :method => :get})
-        connect_with_named_route("#{controller}_update", "/#{controller}/:id/update", {:controller => controller, :action => :update, :method => :post})
+        connect_with_named_route("#{controller}_update", "/#{controller}/:id", {:controller => controller, :action => :update, :method => :put})
         connect_with_named_route("#{controller}_delete", "/#{controller}/:id", {:controller => controller, :action => :delete, :method => :delete})
       end
       

data/lib/sea_level/helpers/view_helpers/orm_helpers.rb

@@ -38,13 +38,28 @@ module Mack
           object = instance_variable_get("@#{name}")
           if object
             object.errors.each do |key, value|
-              if value.match(/^\^/)
-                app_errors << value[1..value.length]
+              key = key.to_s
+              if value.is_a?(Array)
+                value.each do |v|
+                  if v.match(/^\^/)
+                    app_errors << v[1..v.length]
+                  else
+                    if key.class == String and key == "base"
+                      app_errors << "#{v}"
+                    else
+                      app_errors << "#{object.business_display_name} #{key.underscore.split('_').join(' ')} #{v}"
+                    end
+                  end
+                end
               else
-                if key.class == String and key == "base"
-                  app_errors << "#{value}"
+                if value.match(/^\^/)
+                  app_errors << value[1..value.length]
                 else
-                  app_errors << "#{object.business_display_name} #{key.underscore.split('_').join(' ').humanize} #{value}"
+                  if key.class == String and key == "base"
+                    app_errors << "#{value}"
+                  else
+                    app_errors << "#{object.business_display_name} #{key.underscore.split('_').join(' ')} #{value}"
+                  end
                 end
               end
             end

data/lib/test_extensions/test_helpers.rb

@@ -11,24 +11,12 @@ module Mack
     
     # Performs a 'put' request for the specified uri.
     def put(uri, options = {})
-      build_response(request.put(uri, options))
+      build_response(request.put(uri, :input => options.to_params))
     end
     
     # Performs a 'post' request for the specified uri.
     def post(uri, options = {})
-      opts = {}
-      options.each_pair do |k,v|
-        if v.is_a?(String)
-          opts[k] = Rack::Utils.escape(v)
-        elsif v.is_a?(Hash)
-          v.each_pair do |sk, sv|
-            opts["#{k}[#{sk}]"] = Rack::Utils.escape(sv)
-          end
-        else
-          opts[k] = v
-        end
-      end
-      build_response(request.post(uri, :input => opts.join("%s=%s", "&")))
+      build_response(request.post(uri, :input => options.to_params))
     end
     
     # Performs a 'delete' request for the specified uri.

data/lib/utils/inflections.rb

@@ -0,0 +1,62 @@
+require File.join(File.dirname(__FILE__), "inflector")
+# Default inflections. This is taken from Jeremy McAnally's great Rails plugin, acts_as_good_speeler. Thanks Jeremy! http://www.jeremymcanally.com/
+Mack::Utils::Inflector.inflections do |inflect|
+  inflect.plural(/$/, 's')
+  inflect.plural(/s$/i, 's')
+  inflect.plural(/(bu)s$/i, '\1ses')
+  inflect.plural(/(stimul|hippopotam|octop|vir|syllab|foc|alumn|fung|radi)us$/i, '\1i')
+  inflect.plural(/(ax|test)is$/i, '\1es')
+  inflect.plural(/(alias|status)$/i, '\1es')
+  inflect.plural(/(buffal|tomat|torped)o$/i, '\1oes')
+  inflect.plural(/([dti])um$/i, '\1a')
+  inflect.plural(/sis$/i, 'ses')
+  inflect.plural(/(?:([^f])fe|([lr])f)$/i, '\1\2ves')
+  inflect.plural(/(hive)$/i, '\1s')
+  inflect.plural(/([^aeiouy]|qu)y$/i, '\1ies')
+  inflect.plural(/(x|ch|ss|sh)$/i, '\1es')
+  inflect.plural(/(matr|append|vert|ind)ix|ex$/i, '\1ices')
+  inflect.plural(/([m|l])ouse$/i, '\1ice')
+  inflect.plural(/^(ox)$/i, '\1en')
+  inflect.plural(/(quiz)$/i, '\1zes')
+  inflect.plural(/(phenomen|criteri)on$/i, '\1a')
+  inflect.plural(/^(?!(.*hu|.*ger|.*sha))(.*)(wom|m)an$/i, '\2\3en')
+  inflect.plural(/(curricul|bacteri|medi)um$/i, '\1a')
+  inflect.plural(/(nebul|formul|vit|vertebr|alg|alumn)a$/i, '\1ae')
+
+  inflect.singular(/s$/i, '')
+  inflect.singular(/(n)ews$/i, '\1ews')
+  inflect.singular(/([dti])a$/i, '\1um')
+  inflect.singular(/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i, '\1\2sis')
+  inflect.singular(/(^analy|cri|empha)ses$/i, '\1sis')
+  inflect.singular(/([^f])ves$/i, '\1fe')
+  inflect.singular(/(hive)s$/i, '\1')
+  inflect.singular(/(tive)s$/i, '\1')
+  inflect.singular(/(bus)es$/i, '\1')
+  inflect.singular(/(o)es$/i, '\1')
+  inflect.singular(/(shoe)s$/i, '\1')
+  inflect.singular(/(test|ax)es$/i, '\1is')
+  inflect.singular(/(stimul|hippopotam|octop|vir|syllab|foc|alumn|fung|radi)i$/i, '\1us')
+  inflect.singular(/(alias|status)es$/i, '\1')
+  inflect.singular(/^(ox)en$/i, '\1')
+  inflect.singular(/(vert|ind)ices$/i, '\1ex')
+  inflect.singular(/(matr|append)ices$/i, '\1ix')
+  inflect.singular(/(quiz)zes$/i, '\1')
+  inflect.singular(/(phenomen|criteri)a$/i, '\1on')
+  inflect.singular(/(.*)(wo|m)en$/i, '\1\2an')
+  inflect.singular(/(medi|curricul|bacteri)a$/i, '\1um')
+  inflect.singular(/(nebula|formula|vita|vertebra|alga|alumna)e$/i, '\1')
+  inflect.singular(/^(.*)ookies$/, '\1ookie')
+  inflect.singular(/(.*)ss$/, '\1ss')
+  inflect.singular(/(.*)ies$/, '\1y')
+  
+  inflect.irregular('person', 'people')
+  inflect.irregular('child', 'children')
+  inflect.irregular('sex', 'sexes')
+  inflect.irregular('move', 'moves')
+  inflect.irregular('tooth', 'teeth')
+  inflect.irregular('die', 'dice')
+  inflect.irregular('talisman', 'talismans')
+  inflect.irregular('penis', 'penises')
+  
+  inflect.uncountable(%w(pokemon pokémon equipment information rice money species series fish sheep deer offspring))
+end

data/lib/utils/inflector.rb

@@ -0,0 +1,129 @@
+require 'singleton'
+module Mack
+  module Utils
+    # This class is used to deal with inflection strings. This means taken a string and make it plural, or singular, etc...
+    # Inflection rules can be added very easy, and are checked from the bottom up. This means that the last rule is the first
+    # rule to be matched. The exception to this, kind of, is 'irregular' and 'uncountable' rules. The 'uncountable' rules are
+    # always checked first, then the 'irregular' rules, and finally either the 'singular' or 'plural' rules, depending on what
+    # you're trying to do. Within each of these sets of rules, the last rule in is the first rule matched.
+    # 
+    # Example:
+    #   Mack::Utils::Inflector.inflections do |inflect|
+    #     inflect.plural(/$/, 's')
+    #     inflect.plural(/^(ox)$/i, '\1en')
+    #     inflect.plural(/(phenomen|criteri)on$/i, '\1a')
+    #   
+    #     inflect.singular(/s$/i, '')
+    #     inflect.singular(/(n)ews$/i, '\1ews')
+    #     inflect.singular(/^(.*)ookies$/, '\1ookie')
+    #   
+    #     inflect.irregular('person', 'people')
+    #     inflect.irregular('child', 'children')
+    #   
+    #     inflect.uncountable(%w(fish sheep deer offspring))
+    #   end
+    class Inflector
+      include Singleton
+      
+      def initialize # :nodoc:
+        @plural_rules = []
+        @singular_rules = []
+        @irregular_rules = []
+        @uncountable_rules = []
+      end
+      
+      # Adds a plural rule to the system.
+      # 
+      # Example:
+      #   Mack::Utils::Inflector.inflections do |inflect|
+      #     inflect.plural(/$/, 's')
+      #     inflect.plural(/^(ox)$/i, '\1en')
+      #     inflect.plural(/(phenomen|criteri)on$/i, '\1a')
+      #   end
+      def plural(rule, replacement)
+        @plural_rules << {:rule => rule, :replacement => replacement}
+      end
+      
+      # Adds a singular rule to the system.
+      # 
+      # Example:
+      #   Mack::Utils::Inflector.inflections do |inflect|
+      #     inflect.singular(/s$/i, '')
+      #     inflect.singular(/(n)ews$/i, '\1ews')
+      #     inflect.singular(/^(.*)ookies$/, '\1ookie')
+      #   end
+      def singular(rule, replacement)
+        @singular_rules << {:rule => rule, :replacement => replacement}
+      end
+      
+      # Adds a irregular rule to the system.
+      # 
+      # Example:
+      #   Mack::Utils::Inflector.inflections do |inflect|
+      #     inflect.irregular('person', 'people')
+      #     inflect.irregular('child', 'children')
+      #   end
+      def irregular(rule, replacement)
+        @irregular_rules << {:rule => rule, :replacement => replacement}
+        # do the reverse so you get:
+        # person => people
+        # people => person
+        @irregular_rules << {:rule => replacement, :replacement => rule}
+      end
+      
+      # Adds a uncountable word, or words, to the system.
+      # 
+      # Example:
+      #   Mack::Utils::Inflector.inflections do |inflect|
+      #     inflect.uncountable(%w(fish sheep deer offspring))
+      #   end
+      def uncountable(*args)
+        [args].flatten.each do |word|
+          @uncountable_rules << word.downcase
+        end
+      end
+      
+      # Returns the singular version of the word, if possible.
+      # 
+      # Examples:
+      #   Mack::Utils::Inflector.instance.singularize("armies") # => "army"
+      #   Mack::Utils::Inflector.instance.singularize("people") # => "person"
+      #   Mack::Utils::Inflector.instance.singularize("boats") # => "boat"
+      def singularize(word)
+        do_work(word, @singular_rules)
+      end
+      
+      # Returns the singular version of the word, if possible.
+      # 
+      # Examples:
+      #   Mack::Utils::Inflector.instance.pluralize("army") # => "armies"
+      #   Mack::Utils::Inflector.instance.pluralize("person") # => "people"
+      #   Mack::Utils::Inflector.instance.pluralize("boat") # => "boats"
+      def pluralize(word)
+        do_work(word, @plural_rules)
+      end
+      
+      private
+      def do_work(word, specific_rules)
+        return word if @uncountable_rules.include?(word.downcase)
+        w = word.dup
+        [specific_rules, @irregular_rules].flatten.reverse.each do |rule_hash|
+          return w if w.gsub!(rule_hash[:rule], rule_hash[:replacement])
+        end
+        # if all else fails, return the word:
+        return word
+      end
+      
+      public
+      class << self
+        
+        # Yields up Mack::Utils::Inflector.instance
+        def inflections
+          yield Mack::Utils::Inflector.instance
+        end
+        
+      end
+      
+    end # Inflection
+  end # Utils
+end # Mack

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack
 version: !ruby/object:Gem::Version 
-  version: 0.0.7.0
+  version: 0.1.0
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-03 00:00:00 -05:00
+date: 2008-03-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -103,6 +103,16 @@ files:
 - lib/generators/plugin_generator/plugin_generator.rb
 - lib/generators/plugin_generator/templates/init.rb.template
 - lib/generators/plugin_generator/templates/lib/plugin.rb.template
+- lib/generators/scaffold_generator/scaffold_generator.rb
+- lib/generators/scaffold_generator/templates/activerecord/app/models/model.rb.template
+- lib/generators/scaffold_generator/templates/data_mapper/app/controllers/controller.rb.template
+- lib/generators/scaffold_generator/templates/data_mapper/app/models/model.rb.template
+- lib/generators/scaffold_generator/templates/generic/app/controllers/controller.rb.template
+- lib/generators/scaffold_generator/templates/generic/app/views/edit.html.erb.template
+- lib/generators/scaffold_generator/templates/generic/app/views/index.html.erb.template
+- lib/generators/scaffold_generator/templates/generic/app/views/new.html.erb.template
+- lib/generators/scaffold_generator/templates/generic/app/views/show.html.erb.template
+- lib/generators/scaffold_generator/templates/no_orm/app/controllers/controller.rb.template
 - lib/initialization/configuration.rb
 - lib/initialization/console.rb
 - lib/initialization/initializer.rb
@@ -133,6 +143,8 @@ files:
 - lib/test_extensions/test_assertions.rb
 - lib/test_extensions/test_helpers.rb
 - lib/utils/html.rb
+- lib/utils/inflections.rb
+- lib/utils/inflector.rb
 - lib/utils/server.rb
 - CHANGELOG
 has_rdoc: true