ramaze 2011.07.25 → 2011.10.23

data/lib/ramaze/setup.rb

@@ -117,14 +117,11 @@ module Ramaze
 
       log "Activating gem #{name}"
 
-      Gem.activate(name, *version)
-      require(lib_name)
-
+      activate(name, lib_name, *version)
     # Gem not installed yet
-    rescue LoadError
+    rescue Gem::LoadError
       install_gem(name, options)
-      Gem.activate(name, *version)
-      require(lib_name)
+      activate(name, lib_name, *version)
     end
 
     ##
@@ -165,6 +162,26 @@ module Ramaze
 
     private
 
+    ##
+    # Activates a gem and requires it.
+    #
+    # @author Yorick Peterse
+    # @author Lee Jarvis
+    # @since  20-08-2011
+    # @param  [String] name The name of the gem to activate.
+    # @param  [String] lib_name The name of the gem as it should be required.
+    # @param  [Array] requirements An array with additional requirements.
+    #
+    def activate(name, lib_name, *requirements)
+      if Gem::Specification.respond_to?(:find_by_name)
+        Gem::Specification.find_by_name(name, *requirements).activate
+      else
+        Gem.activate(name, *requirements)
+      end
+
+      require(lib_name)
+    end
+
     ##
     # Writes the message to the logger.
     #

data/lib/ramaze/snippets/array/put_within.rb

@@ -3,15 +3,11 @@
 
 module Ramaze
   module CoreExtensions
-
     # Extensions for Array
-
     module Array
-
       #   a = [1, 2, 3]
       #   a.put_within(4, :after => 2, :before => 3)
       #   a # => [1, 2, 4, 3]
-
       def put_within(object, constrain)
         pre, post = constrain.values_at(:after, :before)
 
@@ -23,7 +19,6 @@ module Ramaze
       #   a = [1, 2, 3]
       #   a.put_after(2, 4)
       #   a # => [1, 2, 4, 3]
-
       def put_after(element, object)
         return self[index(element) + 1, 0] = object if include?(element)
 
@@ -33,12 +28,11 @@ module Ramaze
       #   a = [1, 2, 3]
       #   a.put_before(2, 4)
       #   a # => [1, 4, 2, 3]
-
       def put_before(element, object)
         return self[rindex(element), 0] = object if include?(element)
 
         raise ArgumentError, "The given element doesn't exist"
       end
-    end
-  end
-end
+    end # Array
+  end # CoreExtensions
+end # Ramaze

data/lib/ramaze/snippets/binding/locals.rb

@@ -1,17 +1,13 @@
 module Ramaze
   module CoreExtensions
-
     # Extensions for Binding
-
     module Binding
-
       # Returns a hash of localvar/localvar-values from binding, useful for
       # template engines that do not accept bindings and force passing locals
       # via hash
       #
-      # Usage:
-      #   x = 42; p binding.locals #=> {'x'=> 42}
-
+      # @example
+      #  x = 42; p binding.locals #=> {'x'=> 42}
       def locals
         ::Kernel::eval '
         local_variables.inject({}){|h,v|
@@ -19,7 +15,6 @@ module Ramaze
           h.merge!(k => eval(k))
         }', self
       end
-
-    end
-  end
-end
+    end # Binding
+  end # CoreExtensions
+end # Ramaze

data/lib/ramaze/snippets/fiber.rb

@@ -26,7 +26,7 @@ unless defined? Fiber
     def wait
       @resume.pop
     end
-    
+
     def self.yield *args
       raise FiberError, "can't yield from root fiber" unless fiber = Thread.current[:fiber]
       fiber.yield.push(args)
@@ -39,25 +39,3 @@ unless defined? Fiber
     end
   end
 end
-
-if __FILE__ == $0
-  f = Fiber.new{ puts 'hi'; p Fiber.yield(1); puts 'bye'; :done }
-  p f.resume
-  p f.resume(2)
-end
-
-__END__
-
-$ ruby fbr.rb 
-hi
-1
-2
-bye
-:done
-
-$ ruby1.9 fbr.rb 
-hi
-1
-2
-bye
-:done

data/lib/ramaze/snippets/kernel/pretty_inspect.rb

@@ -5,9 +5,7 @@ require 'pp'
 
 module Ramaze
   module CoreExtensions
-
     # Extensions for Kernel
-
     module Kernel
       unless defined?(pretty_inspect)
         # returns a pretty printed object as a string.
@@ -15,7 +13,6 @@ module Ramaze
           PP.pp(self, '')
         end
       end
-    end
-
-  end
-end
+    end # Kernel
+  end # CoreExtensions
+end # Ramaze

data/lib/ramaze/snippets/numeric/filesize_format.rb

@@ -3,7 +3,6 @@
 
 module Ramaze
   module CoreExtensions
-
     # Extensions for Numeric
     module Numeric
       FILESIZE_FORMAT = [
@@ -26,7 +25,6 @@ module Ramaze
 
         self.to_s
       end
-    end
-
-  end
-end
+    end # Numeric
+  end # CoreExtensions
+end # Ramaze

data/lib/ramaze/snippets/numeric/time.rb

@@ -1,8 +1,6 @@
 module Ramaze
   module CoreExtensions
-
     # Extensions for Numeric
-
     module Numeric
       def seconds
         self
@@ -56,8 +54,6 @@ module Ramaze
         t + self
       end
       alias since from_now
-
-    end
-
-  end
-end
+    end # Numeric
+  end # CoreExtensions
+end # Ramaze

data/lib/ramaze/snippets/object/__dir__.rb

@@ -3,9 +3,7 @@
 
 module Ramaze
   module CoreExtensions
-
     # Extensions for Object
-
     module Object
       unless defined?(__DIR__)
 
@@ -16,14 +14,12 @@ module Ramaze
         # This method is convenience for the
         #  File.expand_path(File.dirname(__FILE__))
         # idiom.
-
         def __DIR__(*args)
           filename = caller[0][/^(.*):/, 1]
           dir = File.expand_path(File.dirname(filename))
           ::File.expand_path(::File.join(dir, *args.map{|a| a.to_s}))
         end
       end
-    end
-
-  end
-end
+    end # Object
+  end # CoreExtensions
+end # Ramaze

data/lib/ramaze/snippets/object/instance_variable_defined.rb

@@ -3,17 +3,14 @@
 
 module Ramaze
   module CoreExtensions
-
     # Extensions for Object
     module Object
       # Available in 1.8.6 and later.
-
       unless ::Object.method_defined?(:instance_variable_defined?)
         def instance_variable_defined?(variable)
           instance_variables.include?(variable.to_s)
         end
       end
-    end
-
-  end
-end
+    end # Object
+  end # CoreExtensions
+end # Ramaze

data/lib/ramaze/snippets/object/pretty.rb

@@ -1,16 +1,12 @@
 module Ramaze
   module CoreExtensions
-
     # Extensions for Object
     module Object
-
       # Returns the string that #pretty_inspect would yield
-
       def pretty s = ''
         PP.pp(self, s)
         s
       end
-    end
-
-  end
-end
+    end # Object
+  end # CoreExtensions
+end # Ramaze

data/lib/ramaze/snippets/object/scope.rb

@@ -1,18 +1,16 @@
 module Ramaze
   module CoreExtensions
-
     # Extensions for Object
     module Object
-
       # returns a new clean binding for this object
-      #   usage: eval 'self', object.scope  #=> returns object
       #
-
+      # Usage:
+      #
+      #     eval 'self', object.scope  #=> returns object
+      #
       def scope
         lambda{}
       end
-
-    end
-
-  end
-end
+    end # Object
+  end # CoreExtensions
+end # Ramaze

data/lib/ramaze/snippets/proc/locals.rb

@@ -1,19 +1,19 @@
 module Ramaze
   module CoreExtensions
-
     # Extensions for Proc
-
     module Proc
-
-      # returns a hash of localvar/localvar-values from proc, useful for template
-      # engines that do not accept bindings/proc and force passing locals via
-      # hash
-      #   usage: x = 42; p Proc.new.locals #=> {'x'=> 42}
-
+      ##
+      # Returns a hash of localvar/localvar-values from proc, useful for
+      # template engines that do not accept bindings/proc and force passing
+      # locals via hash
+      #
+      # Usage:
+      #
+      #     x = 42; p Proc.new.locals #=> {'x'=> 42}
+      #
       def locals
         instance_eval('binding').locals
       end
-
-    end
-  end
-end
+    end # Proc
+  end # CoreExtensions
+end # Ramaze

data/lib/ramaze/snippets/ramaze/acquire.rb

@@ -5,22 +5,23 @@ module Ramaze
   # Require all .rb and .so files on the given globs, utilizes Dir::[].
   #
   # Examples:
-  #   # Given following directory structure:
-  #   # src/foo.rb
-  #   # src/bar.so
-  #   # src/foo.yaml
-  #   # src/foobar/baz.rb
-  #   # src/foobar/README
   #
-  #   # requires all files in 'src':
-  #   Ramaze.acquire 'src/*'
+  #     # Given following directory structure:
+  #     # src/foo.rb
+  #     # src/bar.so
+  #     # src/foo.yaml
+  #     # src/foobar/baz.rb
+  #     # src/foobar/README
   #
-  #   # requires all files in 'src' recursive:
-  #   Ramaze.acquire 'src/**/*'
+  #     # requires all files in 'src':
+  #     Ramaze.acquire 'src/*'
+  #
+  #     # requires all files in 'src' recursive:
+  #     Ramaze.acquire 'src/**/*'
+  #
+  #     # require 'src/foo.rb' and 'src/bar.so' and 'src/foobar/baz.rb'
+  #     Ramaze.acquire 'src/*', 'src/foobar/*'
   #
-  #   # require 'src/foo.rb' and 'src/bar.so' and 'src/foobar/baz.rb'
-  #   Ramaze.acquire 'src/*', 'src/foobar/*'
-
   def self.acquire(*globs)
     globs.flatten.each do |glob|
       Dir[glob].each do |file|
@@ -28,4 +29,4 @@ module Ramaze
       end
     end
   end
-end
+end # Ramaze

data/lib/ramaze/snippets/ramaze/deprecated.rb

@@ -20,4 +20,4 @@ module Ramaze
       super
     end
   end
-end
+end # Ramaze

data/lib/ramaze/snippets/ramaze/fiber.rb

@@ -21,4 +21,4 @@ module Ramaze
       @state.key?(key)
     end
   end if defined?(::Fiber)
-end
+end # Ramaze

data/lib/ramaze/snippets/ramaze/lru_hash.rb

@@ -21,7 +21,6 @@ module Ramaze
   # Copyright (c) 2009  Michael Fellinger  <manveru@rubyists.com>
   #
   # You may redistribute it and/or modify it under the same terms as Ruby.
-
   class LRUHash < Struct.new(:max_total, :max_value, :max_count, :expiration,
                               :hook, :objs, :total_size, :list, :hits, :misses)
     CacheObject = Struct.new(:content, :size, :atime)
@@ -244,5 +243,5 @@ module Ramaze
         raise ArgumentError, "invalid expiration `#{expiration}'"
       end
     end
-  end
-end
+  end # LRUHash
+end # Ramaze

data/lib/ramaze/snippets/ramaze/struct.rb

@@ -4,7 +4,6 @@
 
 module Ramaze
   class Struct < ::Struct
-
     # Makes it possible to access the keys directly by their name, not only
     # their index. The original Struct#values_at tries to call #to_int on the
     # arguments.
@@ -30,7 +29,6 @@ module Ramaze
     #  # Added new behaviour:
     #  point.values_at(:y, :x)
     #  # => [10, 15]
-
     def values_at(*keys)
       keys.map do |key|
         case key
@@ -41,5 +39,5 @@ module Ramaze
         end
       end
     end
-  end
-end
+  end # Struct
+end # Ramaze

data/lib/ramaze/snippets/string/camel_case.rb

@@ -3,19 +3,17 @@
 
 module Ramaze
   module CoreExtensions
-
     # Extensions for String
-
     module String
-
-      # simple transformation to CamelCase from snake_case
+      ##
+      # Simple transformation to CamelCase from snake_case
+      #
+      # @example
+      #  'foo_bar'.camel_case # => 'FooBar'
       #
-      #   'foo_bar'.camel_case # => 'FooBar'
-
       def camel_case
         split('_').map{|e| e.capitalize}.join
       end
-    end
-
-  end
-end
+    end # String
+  end # CoreExtensions
+end # Ramaze