fancy 0.8.0 → 0.9.0

data/lib/object.fy

@@ -139,6 +139,19 @@ class Object {
     [self]
   }
 
+  @@__to_hash_exclude_slots__ = ['_fancy_documentation]
+  def to_hash {
+    """
+    @return @Hash@ representation of @self based on slot values.
+    """
+
+    h = <[]>
+    slots - @@__to_hash_exclude_slots__ each: |s| {
+      h[s]: $ get_slot: s
+    }
+    h
+  }
+
   def to_i {
     """
     @return @Fixnum@ representation of @self.
@@ -240,7 +253,17 @@ class Object {
           cond_block while_do: body_block
     """
 
-    cond_block while_do: body_block
+    cond_block while_true: body_block
+  }
+
+  def while: condition do: body else: alternative {
+    """
+    @condition @Block@ to be used as condition for while loop.
+    @body @Block@ to be called while @condition yields @true.
+    @alternative @Block@ to be called if @body never got called (@condition never yielded @true).
+    """
+
+    condition while_true: body else: alternative
   }
 
   def until: cond_block do: body_block {
@@ -535,10 +558,13 @@ class Object {
 
     Runs a given @Block@ in a synchronized fashion if called by multiple Threads.
     Uses a @Mutex@ in the background for synchronization (created on demand for each @Object@).
+    Calls @block with @self.
     """
 
     @__mutex__ = @__mutex__ || { Mutex new() }
-    @__mutex__ synchronize(&block)
+    @__mutex__ synchronize() {
+      block call: [self]
+    }
   }
 
   def copy_slots: slots from: object {
@@ -692,18 +718,18 @@ class Object {
 
     { return value } unless: var_name
     unless: block do: {
-      Thread current[var_name]: value
+      Thread current set_dynamic_var: var_name to: value
       return value
     }
 
-    oldval = Thread current[var_name]
+    oldval = Thread current dynamic_var: var_name
     try {
-      Thread current[var_name]: value
+      Thread current set_dynamic_var: var_name to: value
       block call
       return value
     } finally {
       try { ensure_block call } catch {}
-      Thread current[var_name]: oldval
+      Thread current set_dynamic_var: var_name to: oldval
     }
   }
 
@@ -772,7 +798,7 @@ class Object {
     @block @Block@ to be executed while ignoring (catching but not handling) @Exception@s defined in @exception_classes.
 
     Example:
-          ignoring: (IOError, ZeroDivisionError) in: {
+          ignoring: (IOError, ZeroDivisionError) do: {
             # do something
           }
     """

data/lib/option_parser.fy

@@ -50,7 +50,7 @@ class OptionParser {
     { @block call: [self] } if: @block
   }
 
-  def with: option_string doc: doc_string do: block {
+  def with: option_string doc: doc_string do: block ('identity) {
     """
     @option_string Option flag and (optional) argument within \"[]\", e.g. \"--file [filename]\".
     @doc_string Documentation @String@ for @option_string that is used in the standard @--help option.
@@ -100,6 +100,25 @@ class OptionParser {
     }
   }
 
+  def parse_hash: args {
+    """
+    @args @Array@ of arguments to parse options from. Typically you'd pass @ARGV here.
+
+    Parses options as @Hash@ from @args and executes registered option handlers.
+
+    Example:
+          o = OptionParser new: @{
+            with: \"--some-option [option_value]\" doc: \"some docstring\"
+            # ...
+          }
+          opts = o parse_hash: [\"--some-option\", \"some-value\"]
+          opts # => <[\"--some-option\" => \"some-value\"]>
+    """
+
+    parse: args
+    parsed_options
+  }
+
   def print_help_info {
     """
     Displays the @--help information on @*stdout* based on all options that were registered via @OptionParser#with:doc:do:@.

data/lib/package/dependency.fy

@@ -7,6 +7,14 @@ class Fancy Package {
 
     read_slots: ('name, 'version)
     def initialize: @name version: @version ('latest);
+
+    def install {
+      """
+      Installs the Dependency on the System.
+      """
+
+      Fancy Package install: name version: version
+    }
   }
 
   class RubyDependency {

data/lib/package/dependency_installer.fy

@@ -8,15 +8,12 @@ class Fancy {
           return nil
         }
 
-        require: packfile
-
-        spec_name = packfile split: ".fancypack" . first
-        if: (Specification[spec_name]) then: |s| {
-          s dependencies each: |dep| {
+        if: (File eval: packfile) then: |spec| {
+          spec dependencies each: |dep| {
             "Installing dependency: #{dep name} (#{dep version})" println
             Fancy Package install: (dep name) version: (dep version)
           }
-          s ruby_dependencies each: |dep| {
+          spec ruby_dependencies each: |dep| {
             "Installing Ruby dependency: #{dep gem_name} (#{dep version})" println
             dep install
          }

data/lib/package/handler.fy

@@ -34,11 +34,11 @@ class Fancy Package {
       If no @.fancypack file is found, raise an error.
       """
 
-      Dir glob(installed_path ++ "/*.fancypack") first if_true: |fpackfile| {
-        require: fpackfile
+      spec = nil
+      if: (Dir glob(installed_path ++ "/*.fancypack") first) then: |fpackfile| {
+        spec = File eval: fpackfile
       }
-
-      if: (Specification[@repository]) then: success_block else: else_block
+      if: spec then: success_block else: else_block
     }
 
     def installed_path {

data/lib/package/installer.fy

@@ -193,11 +193,8 @@ class Fancy Package {
         File symlink(orig_path, link_path)
       }
 
-      spec dependencies each: |dep| {
-        Fancy Package install: (dep name) version: (dep version)
-      }
-
-      spec ruby_dependencies each: |dep| { dep install }
+      spec dependencies each: @{ install }
+      spec ruby_dependencies each: @{ install }
     }
   }
 }

data/lib/package/list.fy

@@ -5,13 +5,14 @@ class Fancy Package {
     def println {
       packages each: |p| {
         name, version, url = p
-        "#{name} (#{version})" println
+        "#{name} (#{version}) - #{url}" println
       }
     }
 
     def packages {
       packages = []
-      try {
+      # ignore file not found, as no packages might have been installed yet.
+      ignoring: IOError do: {
         File open: @package_list_file modes: ['read] with: |f| {
           f readlines each: |l| {
             match l {
@@ -20,8 +21,6 @@ class Fancy Package {
             }
           }
         }
-      } catch IOError => e {
-        # ignore file not found, as no packages might have been installed yet.
       }
       packages
     }

data/lib/parser/ext/parser.y

@@ -161,6 +161,7 @@ extern char *yytext;
 %%
 
 programm:       /*empty*/
+                | nls
                 | expression_list {
                   rb_funcall(self, rb_intern("body:"), 1, $1);
                 }

data/lib/proxies.fy

@@ -29,8 +29,6 @@ class Proxies {
     }
   }
 
-  Proxy = ProxyReceiver
-
   class RespondsToProxy : Fancy BasicObject {
     """
     A RespondsToProxy is a Proxy that forwards any message sent to it to it's @target instance variable

data/lib/queue.fy

@@ -0,0 +1,7 @@
+class Queue {
+  forwards_unary_ruby_methods
+
+  ruby_aliases: ['<<, 'clear, 'deq, 'empty?, 'length, 'num_waiting, 'pop, 'shift, 'size]
+  alias_method: 'push: for_ruby: 'push
+  alias_method: 'enqueue: for_ruby: 'enq
+}

data/lib/rbx.fy

@@ -38,6 +38,7 @@ require: "rbx/thread"
 require: "rbx/fiber"
 require: "rbx/date"
 require: "rbx/time"
+require: "rbx/date_time"
 require: "rbx/actor"
 require: "rbx/mutex"
 require: "rbx/module"

data/lib/rbx/actor.fy

@@ -1,4 +1,6 @@
-require("actor")
+require("rubygems")
+require("rubinius/actor")
+Actor = Rubinius Actor
 
 class Actor {
   """

data/lib/rbx/alpha.fy

@@ -34,4 +34,28 @@ class Class {
 
 class String {
   alias_method: ":+" for: "+"
+  alias_method: ":to_sym" for: "to_sym"
+}
+
+class Module {
+  def included: module
+
+  def include: modules {
+    modules = modules to_a()
+    modules reverse_each() |mod| {
+      mod append_features: self
+      mod send('included, self)
+    }
+  }
+}
+
+class Class{
+  def include: modules {
+    modules = modules to_a()
+    modules reverse_each() |mod| {
+      mod append_features: self
+      mod send('included, self)
+      mod included: self
+    }
+  }
 }

data/lib/rbx/array.fy

@@ -1,5 +1,7 @@
 class Array {
-  ruby_aliases: [ '==, '<<, 'pop, 'last, 'shift, 'flatten ]
+  ruby_aliases: [ '==, '<<, 'pop, 'last, 'shift, 'flatten, 'flatten! ]
+  alias_method: 'flatten: for_ruby: 'flatten
+  alias_method: 'flatten!: for_ruby: 'flatten!
 
   forwards_unary_ruby_methods
 

data/lib/rbx/class.fy

@@ -114,12 +114,12 @@ class Class {
 
   def nested_classes {
     """
-    @return @Array@ of all nested classes for @self.
+    @return @Set@ of all nested classes for @self.
 
     Returns all the nested classes within a @Class@ as an @Array@.
     """
 
-    "Not Yet Implemented" raise!
+    Set[constants map: |c| { const_get(c) } . select: @{ is_a?: Class }]
   }
 
   def instance_method: name {
@@ -160,8 +160,7 @@ class Class {
     Sets any given method names to public on this @Class@.
     """
 
-    method_names = method_names to_a()
-    method_names = method_names map: |m| { m message_name }
+    method_names = method_names to_a() map() @{ message_name }
     public(*method_names)
   }
 
@@ -172,8 +171,7 @@ class Class {
     Sets any given method names to private on this @Class@.
     """
 
-    method_names = method_names to_a()
-    method_names = method_names map() |m| { m message_name }
+    method_names = method_names to_a() map() @{ message_name }
     private(*method_names)
   }
 
@@ -184,8 +182,7 @@ class Class {
     Sets any given method names to protected on this @Class@.
     """
 
-    method_names = method_names to_a()
-    method_names = method_names map() |m| { m message_name }
+    method_names = method_names to_a() map() @{ message_name }
     protected(*method_names)
   }
 

data/lib/rbx/date_time.fy

@@ -0,0 +1,14 @@
+class DateTime {
+  # """
+  # DateTime class. Used for yet more timely stuff.
+  # """
+
+  forwards_unary_ruby_methods
+
+  metaclass ruby_alias: 'now
+  ruby_aliases: [ '==, '-, '+, '<, '>, '<=, '>= ]
+
+  def != other {
+    self == other not
+  }
+}

data/lib/rbx/file.fy

@@ -8,7 +8,9 @@ class File {
       'truncate => "w+"]>
 
   ruby_aliases: [ 'eof?, 'closed?, 'flush ]
+
   metaclass alias_method: 'expand_path: for_ruby: 'expand_path
+  metaclass alias_method: 'dirname: for_ruby: 'dirname
 
   forwards_unary_ruby_methods
 
@@ -170,6 +172,10 @@ class File {
     File expand_path: filename
   }
 
+  def File join: path_components {
+    File join(*path_components)
+  }
+
   def initialize: path {
     initialize(path)
   }

data/lib/rbx/hash.fy

@@ -7,6 +7,17 @@ class Hash {
   alias_method: 'at: for: '[]
   ruby_alias: '==
 
+  def initialize: default {
+    """
+    @default Default value for @self.
+
+    Initializes a new @Hash@ with @default as a default value.
+    If @default is a @Block@, call it with @self and a given key to get its default value.
+    """
+
+    default: default
+  }
+
   def each: block {
     each(&block)
   }
@@ -51,4 +62,35 @@ class Hash {
 
     include?(key)
   }
+
+  def default: default_value {
+    """
+    @default_value Default value for @self.
+
+    Sets the default value to be returned from @self for keys not in @self.
+    If @default_value is a @Block@, use its return value (called with the @Hash@ and a given key).
+    """
+
+    match default_value {
+      case Block -> @default_proc = true
+    }
+    @default = default_value
+  }
+
+  def default {
+    """
+    @return Default value for @self.
+    """
+
+    @default
+  }
+
+  def default_for: key {
+    """
+    @key Key to be used.
+    @return Default value for @key.
+    """
+
+    default(key)
+  }
 }

data/lib/rbx/thread.fy

@@ -35,15 +35,13 @@ class Thread {
   Thread metaclass ruby_alias: 'main
   Thread metaclass ruby_alias: 'pass
   Thread metaclass ruby_alias: 'stop
-  ruby_alias: 'dynamic_vars
 
-  def [dynamic_var_name] {
-    send('[], dynamic_var_name)
-  }
+  ruby_alias: 'dynamic_vars
+  alias_method: 'dynamic_var: for_ruby: 'get_dynamic_variable
+  alias_method: 'set_dynamic_var:to: for_ruby: 'set_dynamic_variable
 
-  def [dynamic_var_name]: value {
-    send('[]=, dynamic_var_name, value)
-  }
+  alias_method: '[] for_ruby: '[]
+  alias_method: '[]: for_ruby: '[]=
 
   def priority: new_prio {
     priority=(new_prio)