sycl 1.3 → 1.4

data/lib/sycl.rb

@@ -124,11 +124,14 @@ module Sycl
   #   puts a.to_yaml  # outputs '[Alpha, Bravo, Charlie, Delta]'
 
   class Array < ::Array
+
+    @@default_sorting = true
+
     def initialize(*args)  # :nodoc:
       @yaml_preprocessor = nil
       @yaml_postprocessor = nil
       @yaml_style = nil
-      @render_sorted = true
+      @render_sorted = @@default_sorting
       super
     end
 
@@ -153,6 +156,17 @@ module Sycl
       retval
     end
 
+    # Set Default Array Sorting. In some cases we want to instantiate
+    # all sycl objects with sorting defaulted to either true or false.
+    #
+    # Example:
+    #
+    #   Sycl::Array.default_sorting = false
+
+    def self.default_sorting=(sort)
+      @@default_sorting = sort
+    end
+
 
     # Make sure that if we write to this array, we promote any inputs
     # to their Sycl equivalents. This lets dot notation, styled YAML,
@@ -269,7 +283,6 @@ module Sycl
       end
     end
 
-
     # Do not sort this array when it is rendered as YAML. Usually we want
     # elements sorted so that diffs are human-readable, however, there are
     # certain cases where array ordering is significant (for example, a
@@ -279,6 +292,12 @@ module Sycl
       @render_sorted = false
     end
 
+    # Sort this array when it is rendered as YAML. Useful when the default_sorting
+    # has been set to false and arrays should be sorted.
+
+    def render_sorted!
+      @render_sorted = true
+    end
 
     # Set a preprocessor hook which runs before each time YAML is
     # dumped, for example, via to_yaml() or Sycl::dump(). The hook is a
@@ -547,15 +566,30 @@ module Sycl
 
     include Comparable
 
-    def <=>(another)  # :nodoc:
-      self.to_str <=> another.to_str
-    end
-
-    def to_str  # :nodoc:
-      self.keys.sort.first
+    def <=>(other)  # :nodoc:
+      self_keys = self.keys.sort
+      other_keys = other.respond_to?(:keys) ?  other.keys.sort :
+                   other.respond_to?(:sort) ?  other.sort      :
+                   other.respond_to?(:to_s) ? [other.to_s]     :
+                   other                    ? [other]          : []
+
+      while true
+        if self_keys.empty? && other_keys.empty?
+          return 0
+        elsif self_keys.empty?
+          return 1
+        elsif other_keys.empty?
+          return -1
+        else
+          self_key = self_keys.shift
+          other_key = other_keys.shift
+          if self_key != other_key
+            return self_key <=> other_key
+          end
+        end
+      end
     end
 
-
     # Make this hash, and its children, rendered in inline/flow style.
     # The default is to render arrays in block (multi-line) style.
 
@@ -674,3 +708,15 @@ module Sycl
 
   end
 end
+
+class String
+  alias_method :original_comparator, :<=>
+
+  def <=>(other)
+    if other.is_a?(Sycl::Hash)
+      -1 * (other <=> self)
+    else
+      self.__send__(:original_comparator, other)
+    end
+  end
+end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: sycl
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 1
-  - 3
-  version: "1.3"
+  - 4
+  version: "1.4"
 platform: ruby
 authors: 
 - Andrew Ho
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-15 00:00:00 +00:00
+date: 2013-07-17 00:00:00 +00:00
 default_executable: 
 dependencies: []