fancy 0.3.2 → 0.3.3

data/lib/rbx/exception.fy

@@ -1,5 +1,6 @@
 class StandardError {
   ruby_alias: 'message
+  ruby_alias: 'backtrace
 
   def initialize {
     "Creates a new Exception with an empty message."

data/lib/rbx/fiber.fy

@@ -4,6 +4,7 @@ Fiber = Rubinius Fiber
 
 class Fiber {
    metaclass ruby_alias: 'yield
+   metaclass ruby_alias: 'current
    ruby_alias: 'resume
    ruby_alias: 'alive?
 

data/lib/rbx/file.fy

@@ -174,6 +174,14 @@ class File {
     print(str)
   }
 
+  def read: bytes {
+    """
+    @bytes Integer the amount of bytes to read from a @File@.
+    """
+
+    read(bytes)
+  }
+
   def newline {
     "Writes a newline character to the @File@."
 

data/lib/rbx/integer.fy

@@ -4,12 +4,4 @@ class Integer {
   def times: block {
     times(&block)
   }
-
-  def upto: num do_each: block {
-    upto(num, &block)
-  }
-
-  def downto: num do_each: block {
-    downto(num, &block)
-  }
 }

data/lib/rbx/method.fy

@@ -1,4 +1,4 @@
-class Method {
+class MethodMixin {
   def documentation {
     Fancy Documentation for: (executable())
   }
@@ -6,17 +6,44 @@ class Method {
   def documentation: str {
     Fancy Documentation for: (executable()) is: str
   }
-}
 
-class UnboundMethod {
+  def visibility {
+    """
+    Returns the visibility ('private, 'protected, 'public) of a @Method@ in its defined context, if any.
+    """
+    entry = @defined_in method_table() lookup(@name)
+    { entry visibility() } if: entry
+  }
 
-  def documentation {
-    Fancy Documentation for: (executable())
+  def public? {
+    """
+    Returns true, if the @Method@ is public in its defined context.
+    """
+    visibility == 'public
   }
 
-  def documentation: str {
-    Fancy Documentation for: (executable()) is: str
+  def protected? {
+    """
+    Returns true, if the @Method@ is protected in its defined context.
+    """
+    visibility == 'protected
   }
 
+  def private? {
+    """
+    Returns true, if the @Method@ is private in its defined context.
+    """
+    visibility == 'private
+  }
+}
+
+class Method {
+  ruby_alias: 'arity
+  include: MethodMixin
+}
+
+class UnboundMethod {
+  ruby_alias: 'arity
+  include: MethodMixin
 }
 

data/lib/rbx/no_method_error.fy

@@ -10,6 +10,13 @@ class NoMethodError {
     Returns the name of the method that was not found as a @String@.
     """
 
-    name to_s from: 1 to: -1
+    match name to_s {
+      case /^:/ -> name to_s from: 1 to: -1 . to_sym
+      case _ -> name
+    }
+  }
+
+  def self inspect {
+    "NoMethodError"
   }
 }

data/lib/rbx/object.fy

@@ -40,35 +40,6 @@ class Object {
     instance_variable_get("@" ++ slotname)
   }
 
-  def and: other {
-    """
-    Boolean conjunction.
-    Returns true if self and other are true, otherwise nil.
-    """
-
-    self if_do: {
-      other if_do: {
-        return true
-      }
-    }
-    return false
-  }
-
-  def or: other {
-    """
-    Boolean disjunction.
-    Returns true if either self or other is true, otherwise nil.
-    """
-    self if_do: {
-      return true
-    } else: {
-      other if_do: {
-        return true
-      }
-    }
-    return false
-  }
-
   def define_singleton_method: name with: block {
     metaclass define_method: name with: block
   }
@@ -87,17 +58,17 @@ class Object {
     kind_of?(class)
   }
 
-  def send: message {
+  def send_message: message {
     send(message_name: message)
   }
 
-  def send: message params: params {
+  def send_message: message with_params: params {
     ruby: (message_name: message) args: params
   }
 
   def message_name: symbol {
     symbol = symbol to_s
-    if: (symbol includes?: ":") then: {
+    if: (symbol =~ /:/) then: {
       symbol
     } else: {
       ":" ++ symbol

data/lib/rbx/range.fy

@@ -10,6 +10,18 @@ class Range {
   }
 
   def each: block {
-    each(&block)
+    try {
+      val = nil
+      each() |x| {
+        try {
+          val = block call: [x]
+        } catch (Fancy NextIteration) => ex {
+          val = ex return_value
+        }
+      }
+      val
+    } catch (Fancy BreakIteration) => ex {
+      ex return_value
+    }
   }
 }

data/lib/rbx/regexp.fy

@@ -1,4 +1,7 @@
 class Regexp {
+  ruby_alias: 'inspect
+  ruby_alias: 'to_s
+
   def === string {
     ruby: 'match args: [string]
   }

data/lib/rbx/string.fy

@@ -9,6 +9,7 @@ class String {
   ruby_alias: 'to_f
   ruby_alias: 'chomp
   ruby_alias: 'inspect
+  ruby_alias: 'to_sym
 
   def [] index {
     """Given an Array of 2 Numbers, it returns the substring between the given indices.
@@ -39,7 +40,7 @@ class String {
 
     Calls a given @Block with each character in a @String.
     """
-    split("") each(&block)
+    split("") each: block
   }
 
   def at: idx {
@@ -98,4 +99,8 @@ class String {
   def % values {
     ruby: '% args: [values to_a]
   }
+
+  def unpack: format {
+    unpack(format)
+  }
 }

data/lib/rbx/system.fy

@@ -1,3 +1,5 @@
+require("open3")
+
 class System {
   def System exit {
     "Exit the running Fancy process."
@@ -22,10 +24,26 @@ class System {
 
   def System pipe: command_str {
     """
-    Runs the given string as a popen() call and returns a IO handle
+    @command_str String to run as a command via popen3()
+    @return @IO@ object representing the command's @STDOUT IO stream.
+
+    Runs the given string as a popen3() call and returns a IO handle
     that can be read from
     """
 
-    IO popen(command_str)
+    in, out, err = Open3 popen3(command_str)
+    return out
+  }
+
+  def System pipe: command_str do: block {
+    """
+    @command_str String to run as a command via popen3()
+    @block @Block@ to be called with @STDIN, @STDOUT and @STDERR.
+
+    Runs the given string as a popen3() call, passing in a given @Block@.
+    The @Block@ is expected to take 3 arguments for @STDIN, @STDOUT and @STDERR.
+    """
+
+    Open3 popen3(command_str, &block)
   }
 }

data/lib/set.fy

@@ -43,9 +43,9 @@ class Set {
 
   def unknown_message: msg with_params: params {
     if: (params empty?) then: {
-      @values send: msg
+      @values send_message: msg
     } else: {
-      @values send: msg params: params
+      @values send_message: msg with_params: params
     }
   }
 

data/lib/string.fy

@@ -25,7 +25,7 @@ class String {
   def blank? {
     "Indicates, if a String consists only of whitespace."
 
-    self =~ /^\s*$/ if_do: {
+    self =~ /^\s*$/ if_true: {
       true
     } else: {
       false

data/lib/struct.fy

@@ -1,13 +1,16 @@
 class Struct {
-   def Struct new: fields {
-      struct = ruby: "new" args: fields
-      struct read_write_slots: fields
-      struct define_method: "new:" with: |values| {
-        instance = struct new()
-        fields each_with_index: |f i| {
-          instance send: f params: [values at: i]
-        }
-      }
-      struct
-   }
-}
+  def Struct new: fields {
+    struct = new(*fields)
+    struct read_write_slots: fields
+
+    def struct new: values {
+      new(*values)
+    }
+
+    def struct new {
+      new()
+    }
+
+    struct
+  }
+}

data/lib/symbol.fy

@@ -14,9 +14,9 @@ class Symbol {
     """
 
     if: (arg is_a?: Array) then: {
-      arg first send: self params: $ arg rest
+      arg first send_message: self with_params: $ arg rest
     } else: {
-      arg send: self
+      arg send_message: self
     }
   }
 

data/lib/true_class.fy

@@ -1,5 +1,5 @@
 class TrueClass {
-  "TrueClass. The class of the singleton true value."
+  "TrueClass. The class of the singleton @true value."
 
   def TrueClass new {
     # always return true singleton object when trying to create a new
@@ -7,37 +7,33 @@ class TrueClass {
     true
   }
 
-  def if_true: then_block else: else_block {
-    "Calls the then_block."
-    then_block call
-  }
-
   def if_true: block {
-    "Calls the block."
-    block call
+    "Calls @block."
+    block call: [self]
   }
 
-  def if_false: block {
-    "Returns nil."
-    nil
+  def if_true: then_block else: else_block {
+    "Calls @then_block."
+    then_block call: [self]
   }
 
-  def nil? {
-    "Returns nil."
-    false
+  def true? {
+    "Returns @true."
+    true
   }
 
-  def false? {
-    "Returns nil."
-    false
+  def to_s {
+    "Returns @true as a @String@."
+    "true"
   }
 
-  def true? {
-    "Returns true."
-    true
+  def to_a {
+    "Returns an empty @Array@."
+    []
   }
 
   def not {
+    "Returns @false."
     false
   }
 }

data/lib/version.fy

@@ -1,6 +1,6 @@
 VERSION_MAJOR = 0
 VERSION_MINOR = 3
-VERSION_PATCH = 0
+VERSION_PATCH = 3
 VERSION_SUFFIX = "alpha"
 
 FANCY_VERSION = [VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH] join: "." ++ " " ++ VERSION_SUFFIX

data/tests/argv.fy

@@ -5,6 +5,7 @@ FancySpec describe: "ARGV & predefined values" with: {
 
   it: "should have a __FILE__ variable defined" when: {
     __FILE__ should_not == nil
+    __FILE__ should =~ /\/argv.fy$/
   }
 
   it: "should have the __FILE__ value be an element in ARGV" when: {

data/tests/array.fy

@@ -10,8 +10,7 @@ FancySpec describe: Array with: {
 
   it: "should iterate over all elements, calling a block" for: 'each: when: {
     sum = 0
-    retval = [1,2,3,4,5] each: |x| { sum = sum + x }
-    retval should == sum
+    [1,2,3,4,5] each: |x| { sum = sum + x }
     sum should == ([1,2,3,4,5] sum)
   }
 
@@ -43,6 +42,18 @@ FancySpec describe: Array with: {
     arr at: 0 . should == 'a
   }
 
+  it: "should set the value for a given index" for: 'at:put: when: {
+    arr = [1,2,3]
+    arr at: 0 put: 10
+    arr should == [10, 2, 3]
+    arr at: -1 put: 30
+    arr should == [10, 2, 30]
+    arr at: 1 put: 20
+    arr should == [10,20,30]
+    arr at: 3 put: 40
+    arr should == [10,20,30,40]
+  }
+
   it: "should NOT include the items" for: "includes?:" when: {
     arr = ['a, 10, "hello, world"]
     arr includes?: "hello" . should == false
@@ -340,4 +351,24 @@ FancySpec describe: Array with: {
     arr partition_by: 'identity . should == [[1], [2,2], [3,3,3], [4,4,4,4], [5]]
     arr partition_by: @{== 2} . should == [[1], [2,2], [3,3,3,4,4,4,4,5]]
   }
+
+  it: "should remove the first value" for: 'shift when: {
+    a = [1,2,3]
+    a shift should == 1
+    a should == [2,3]
+
+    a = []
+    a shift should == nil
+    a should == []
+  }
+
+  it: "should append a value at the front" for: 'unshift: when: {
+    a = []
+    a unshift: 1 . should == a # should return self
+    a should == [1]
+
+    a = [1,2,3]
+    a unshift: (a shift) . should == a
+    a should == [1,2,3]
+  }
 }