aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2013-04-14 20:45:31 +0200
committerXavier Noria <fxn@hashref.com>2013-04-14 20:46:58 +0200
commit8c21663f655b9a67069c03094e5da2dc8a674eb3 (patch)
treeffeaeb0855328c24e2175f80ad5a67066f17effa
parent6b3bc33e1cb85cb55d1d15c6aa9cf241bd8c2ee2 (diff)
downloadrails-8c21663f655b9a67069c03094e5da2dc8a674eb3.tar.gz
rails-8c21663f655b9a67069c03094e5da2dc8a674eb3.tar.bz2
rails-8c21663f655b9a67069c03094e5da2dc8a674eb3.zip
ARel -> Arel
The project uses "Arel" most of the time, but there were a few "ARel" here and there. I checked with @brynary back in 2010 to pick one for the Rails documentation guidelines and "Arel" was chosen and documented. This patch chooses "Arel" vs "ARel" based on that.
-rw-r--r--History.txt2
-rw-r--r--README.markdown4
-rw-r--r--lib/arel/crud.rb6
-rw-r--r--lib/arel/select_manager.rb4
-rw-r--r--lib/arel/table.rb2
-rw-r--r--lib/arel/visitors/dot.rb2
-rw-r--r--lib/arel/visitors/to_sql.rb2
7 files changed, 11 insertions, 11 deletions
diff --git a/History.txt b/History.txt
index 88cfecd5ea..b24faf3267 100644
--- a/History.txt
+++ b/History.txt
@@ -144,7 +144,7 @@
* Deprecations
- * Support for Subclasses of core classes will be removed in ARel version
+ * Support for Subclasses of core classes will be removed in Arel version
2.2.0
== 2.0.4
diff --git a/README.markdown b/README.markdown
index d7ed9004fd..384cc74451 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,4 +1,4 @@
-# ARel [![Build Status](https://secure.travis-ci.org/rails/arel.png)](http://travis-ci.org/rails/arel) [![Dependency Status](https://gemnasium.com/rails/arel.png)](https://gemnasium.com/rails/arel)
+# Arel [![Build Status](https://secure.travis-ci.org/rails/arel.png)](http://travis-ci.org/rails/arel) [![Dependency Status](https://gemnasium.com/rails/arel.png)](https://gemnasium.com/rails/arel)
* http://github.com/rails/arel
@@ -19,7 +19,7 @@ For the moment, Arel uses Active Record's connection adapters to connect to the
## A Gentle Introduction
-Generating a query with ARel is simple. For example, in order to produce
+Generating a query with Arel is simple. For example, in order to produce
SELECT * FROM users
diff --git a/lib/arel/crud.rb b/lib/arel/crud.rb
index 6c29d5fee4..e8e78a381c 100644
--- a/lib/arel/crud.rb
+++ b/lib/arel/crud.rb
@@ -22,7 +22,7 @@ module Arel
def update values
if $VERBOSE
warn <<-eowarn
-update (#{caller.first}) is deprecated and will be removed in ARel 4.0.0. Please
+update (#{caller.first}) is deprecated and will be removed in Arel 4.0.0. Please
switch to `compile_update`
eowarn
end
@@ -45,7 +45,7 @@ switch to `compile_update`
def insert values
if $VERBOSE
warn <<-eowarn
-insert (#{caller.first}) is deprecated and will be removed in ARel 4.0.0. Please
+insert (#{caller.first}) is deprecated and will be removed in Arel 4.0.0. Please
switch to `compile_insert`
eowarn
end
@@ -62,7 +62,7 @@ switch to `compile_insert`
def delete
if $VERBOSE
warn <<-eowarn
-delete (#{caller.first}) is deprecated and will be removed in ARel 4.0.0. Please
+delete (#{caller.first}) is deprecated and will be removed in Arel 4.0.0. Please
switch to `compile_delete`
eowarn
end
diff --git a/lib/arel/select_manager.rb b/lib/arel/select_manager.rb
index b5c5834a51..ee9d34a514 100644
--- a/lib/arel/select_manager.rb
+++ b/lib/arel/select_manager.rb
@@ -170,7 +170,7 @@ module Arel
end
def wheres
- warn "#{caller[0]}: SelectManager#wheres is deprecated and will be removed in ARel 4.0.0 with no replacement"
+ warn "#{caller[0]}: SelectManager#wheres is deprecated and will be removed in Arel 4.0.0 with no replacement"
Compatibility::Wheres.new @engine.connection, @ctx.wheres
end
@@ -276,7 +276,7 @@ module Arel
def insert values
if $VERBOSE
warn <<-eowarn
-insert (#{caller.first}) is deprecated and will be removed in ARel 4.0.0. Please
+insert (#{caller.first}) is deprecated and will be removed in Arel 4.0.0. Please
switch to `compile_insert`
eowarn
end
diff --git a/lib/arel/table.rb b/lib/arel/table.rb
index 6f1ab7e90f..5fb1254d17 100644
--- a/lib/arel/table.rb
+++ b/lib/arel/table.rb
@@ -32,7 +32,7 @@ module Arel
def primary_key
if $VERBOSE
warn <<-eowarn
-primary_key (#{caller.first}) is deprecated and will be removed in ARel 4.0.0
+primary_key (#{caller.first}) is deprecated and will be removed in Arel 4.0.0
eowarn
end
@primary_key ||= begin
diff --git a/lib/arel/visitors/dot.rb b/lib/arel/visitors/dot.rb
index e309bd6f12..843266f85a 100644
--- a/lib/arel/visitors/dot.rb
+++ b/lib/arel/visitors/dot.rb
@@ -254,7 +254,7 @@ module Arel
end
def to_dot
- "digraph \"ARel\" {\nnode [width=0.375,height=0.25,shape=record];\n" +
+ "digraph \"Arel\" {\nnode [width=0.375,height=0.25,shape=record];\n" +
@nodes.map { |node|
label = "<f0>#{node.name}"
diff --git a/lib/arel/visitors/to_sql.rb b/lib/arel/visitors/to_sql.rb
index d0a05fac7e..1a4826bcd2 100644
--- a/lib/arel/visitors/to_sql.rb
+++ b/lib/arel/visitors/to_sql.rb
@@ -96,7 +96,7 @@ module Arel
unless key
warn(<<-eowarn) if $VERBOSE
(#{caller.first}) Using UpdateManager without setting UpdateManager#key is
-deprecated and support will be removed in ARel 4.0.0. Please set the primary
+deprecated and support will be removed in Arel 4.0.0. Please set the primary
key on UpdateManager using UpdateManager#key=
eowarn
key = o.relation.primary_key