diff --git a/app/helpers/upmin/application_helper.rb b/app/helpers/upmin/application_helper.rb index b304c65..99bdaee 100644 --- a/app/helpers/upmin/application_helper.rb +++ b/app/helpers/upmin/application_helper.rb @@ -3,10 +3,10 @@ module ApplicationHelper def body_classes ret = [] - controller = "c-#{params[:controller].gsub(/_/, "-").gsub("upmin/", "")}" + controller = "c-#{params[:controller].tr("_", "-").tr("upmin/", "")}" ret << controller - action = "a-#{params[:action].gsub(/_/, "-")}" + action = "a-#{params[:action].tr("_", "-")}" ret << action if params[:klass] @@ -19,7 +19,7 @@ def body_classes def body_data ret = {} - ret[:controller] = params[:controller].camelize.gsub("Upmin::", "") + ret[:controller] = params[:controller].camelize.tr("Upmin::", "") ret[:action] = params[:action].camelize return ret end diff --git a/app/views/upmin/partials/search_boxes/_ransack_search_box.html.haml b/app/views/upmin/partials/search_boxes/_ransack_search_box.html.haml index a0886a3..28cb42c 100644 --- a/app/views/upmin/partials/search_boxes/_ransack_search_box.html.haml +++ b/app/views/upmin/partials/search_boxes/_ransack_search_box.html.haml @@ -10,12 +10,12 @@ -# TODO(jon): Break these into partials possibly? - if type == :string .form-group - = label(:q, "#{attr_name}_cont", attr_name.to_s.capitalize.gsub("_", " ")) + = label(:q, "#{attr_name}_cont", attr_name.to_s.capitalize.tr("_", " ")) = text_field(:q, "#{attr_name}_cont", class: "form-control") - if type == :integer .form-group - = label(:q, "#{attr_name}_cont", attr_name.to_s.capitalize.gsub("_", " ")) + = label(:q, "#{attr_name}_cont", attr_name.to_s.capitalize.tr("_", " ")) .input-group .input-group-addon From = number_field(:q, "#{attr_name}_gteq", class: "form-control") @@ -25,7 +25,7 @@ - if type == :datetime && Rails::VERSION::MAJOR == 4 -# TODO(jon): Add date fields to search boxes for Rails 3 .form-group - = label(:q, "#{attr_name}_cont", attr_name.to_s.capitalize.gsub("_", " ")) + = label(:q, "#{attr_name}_cont", attr_name.to_s.capitalize.tr("_", " ")) %br From = date_field(:q, "#{attr_name}_gteq", class: "form-control") diff --git a/lib/upmin/attribute.rb b/lib/upmin/attribute.rb index 5d68001..2e54878 100644 --- a/lib/upmin/attribute.rb +++ b/lib/upmin/attribute.rb @@ -51,7 +51,7 @@ def errors? end def label_name - return name.to_s.gsub(/_/, " ").capitalize + return name.to_s.tr("_", " ").capitalize end def form_id diff --git a/lib/upmin/model.rb b/lib/upmin/model.rb index d38ba33..3415388 100644 --- a/lib/upmin/model.rb +++ b/lib/upmin/model.rb @@ -111,7 +111,7 @@ def Model.find_class(model) def Model.find_or_create_class(model_name) ::Rails.application.eager_load! - create_name = model_name.gsub(":", "") + create_name = model_name.tr(":", "") return "Admin#{create_name}".constantize rescue NameError if model_name.match(/::/) @@ -170,7 +170,7 @@ def Model.model_name end def Model.humanized_name(type = :plural) - names = model_class_name.split(/(?=[A-Z])/).map{|n| n.gsub(":", "")} + names = model_class_name.split(/(?=[A-Z])/).map{|n| n.tr(":", "")} if type == :plural names[names.length-1] = names.last.pluralize end diff --git a/lib/upmin/parameter.rb b/lib/upmin/parameter.rb index c5d4dc9..535980d 100644 --- a/lib/upmin/parameter.rb +++ b/lib/upmin/parameter.rb @@ -18,7 +18,7 @@ def title end def label_name - name.to_s.capitalize.gsub("_", " ") + name.to_s.capitalize.tr("_", " ") end def type