Merge branch 'master' into openstreetbugs

[rails.git] / vendor / gems / composite_primary_keys-2.2.2 / lib / composite_primary_keys / composite_arrays.rb

diff --git a/vendor/gems/composite_primary_keys-2.2.2/lib/composite_primary_keys/composite_arrays.rb b/vendor/gems/composite_primary_keys-2.2.2/lib/composite_primary_keys/composite_arrays.rb
index 030c416f3313d408d0d809ce6bf986acd8c3084c..dab39142b909c1822c6adb0673e29ebf19110396 100644 (file)
--- a/vendor/gems/composite_primary_keys-2.2.2/lib/composite_primary_keys/composite_arrays.rb
+++ b/vendor/gems/composite_primary_keys-2.2.2/lib/composite_primary_keys/composite_arrays.rb
@@ -1,30 +1,30 @@
-module CompositePrimaryKeys\r
-  ID_SEP     = ','\r
-  ID_SET_SEP = ';'\r
-\r
-  module ArrayExtension\r
-    def to_composite_keys\r
-      CompositeKeys.new(self)\r
-    end\r
-\r
-    def to_composite_ids\r
-      CompositeIds.new(self)\r
-    end\r
-  end\r
-\r
-  class CompositeArray < Array\r
-    def to_s\r
-      join(ID_SEP)\r
-    end\r
-  end\r
-\r
-  class CompositeKeys < CompositeArray\r
-\r
-  end\r
-\r
-  class CompositeIds < CompositeArray\r
-\r
-  end\r
-end\r
-\r
-Array.send(:include, CompositePrimaryKeys::ArrayExtension)\r
+module CompositePrimaryKeys
+  ID_SEP     = ','
+  ID_SET_SEP = ';'
+
+  module ArrayExtension
+    def to_composite_keys
+      CompositeKeys.new(self)
+    end
+
+    def to_composite_ids
+      CompositeIds.new(self)
+    end
+  end
+
+  class CompositeArray < Array
+    def to_s
+      join(ID_SEP)
+    end
+  end
+
+  class CompositeKeys < CompositeArray
+
+  end
+
+  class CompositeIds < CompositeArray
+
+  end
+end
+
+Array.send(:include, CompositePrimaryKeys::ArrayExtension)