renamed ion classes

6 files changed, 13 insertions, 13 deletions

diff --git a/lib/arel/relations.rb b/lib/arel/relations.rb
index b606be3743..364235fb49 100644
--- a/lib/arel/relations.rb
+++ b/lib/arel/relations.rb
@@ -6,14 +6,14 @@ require 'arel/relations/writing'
 require 'arel/relations/table'
 require 'arel/relations/aggregation'
 require 'arel/relations/join'
-require 'arel/relations/grouping'
-require 'arel/relations/projection'
+require 'arel/relations/group'
+require 'arel/relations/project'
 require 'arel/relations/where'
 require 'arel/relations/order'
 require 'arel/relations/take'
 require 'arel/relations/skip'
-require 'arel/relations/deletion'
-require 'arel/relations/insertion'
+require 'arel/relations/delete'
+require 'arel/relations/insert'
 require 'arel/relations/update'
 require 'arel/relations/alias'
 require 'arel/sessions/session'
\ No newline at end of file
diff --git a/lib/arel/relations/deletion.rb b/lib/arel/relations/delete.rb
index 7edc328e4a..7edc328e4a 100644
--- a/lib/arel/relations/deletion.rb
+++ b/lib/arel/relations/delete.rb
diff --git a/lib/arel/relations/grouping.rb b/lib/arel/relations/group.rb
index de8643278b..bc3a7f3437 100644
--- a/lib/arel/relations/grouping.rb
+++ b/lib/arel/relations/group.rb
@@ -1,5 +1,5 @@
 module Arel
-  class Grouping < Compound
+  class Group < Compound
     attr_reader :groupings
 
     def initialize(relation, *groupings)
@@ -7,7 +7,7 @@ module Arel
     end
 
     def ==(other)
-      Grouping    === other          and
+      Group       === other          and
       relation    ==  other.relation and
       groupings   ==  other.groupings
     end
diff --git a/lib/arel/relations/insertion.rb b/lib/arel/relations/insert.rb
index 16eb9b7555..b190ccb211 100644
--- a/lib/arel/relations/insertion.rb
+++ b/lib/arel/relations/insert.rb
@@ -1,5 +1,5 @@
 module Arel
-  class Insertion < Writing
+  class Insert < Writing
     attr_reader :record
 
     def initialize(relation, record)
@@ -20,7 +20,7 @@ module Arel
     end
     
     def ==(other)
-      Insertion   === other         and
+      Insert   === other         and
       relation    == other.relation and
       record      == other.record
     end
diff --git a/lib/arel/relations/projection.rb b/lib/arel/relations/project.rb
index d74f111271..0efc13bdb3 100644
--- a/lib/arel/relations/projection.rb
+++ b/lib/arel/relations/project.rb
@@ -1,5 +1,5 @@
 module Arel
-  class Projection < Compound
+  class Project < Compound
     attr_reader :projections
     
     def initialize(relation, *projections)
@@ -15,7 +15,7 @@ module Arel
     end
     
     def ==(other)
-      Projection  === other          and
+      Project  === other          and
       relation    ==  other.relation and
       projections ==  other.projections
     end
diff --git a/lib/arel/relations/relation.rb b/lib/arel/relations/relation.rb
index 1ef7874f39..4440fb1c1d 100644
--- a/lib/arel/relations/relation.rb
+++ b/lib/arel/relations/relation.rb
@@ -77,7 +77,7 @@ module Arel
       end
 
       def project(*attributes)
-        attributes.all?(&:blank?) ? self : Projection.new(self, *attributes)
+        attributes.all?(&:blank?) ? self : Project.new(self, *attributes)
       end
       
       def alias
@@ -97,12 +97,12 @@ module Arel
       end
   
       def group(*groupings)
-        groupings.all?(&:blank?) ? self : Grouping.new(self, *groupings)
+        groupings.all?(&:blank?) ? self : Group.new(self, *groupings)
       end
       
       module Writable
         def insert(record)
-          session.create Insertion.new(self, record); self
+          session.create Insert.new(self, record); self
         end
 
         def update(assignments)