epitools 0.5.9 → 0.5.10

data/README.rdoc

@@ -8,17 +8,17 @@ Enhanced base classes: {Enumerable}[http://rdoc.info/github/epitron/epitools/mas
 
 Extras:
 
-* {Colored}[http://rdoc.info/github/epitron/epitools/master/Colored] (enhanced version of defunkt's colored -- adds ANSI colouring methods to String, eg: #red, #green, #light_blue, etc.)
 * {Path}[http://rdoc.info/github/epitron/epitools/master/Path] (a better Pathname)
-* {Rash}[http://rdoc.info/github/epitron/epitools/master/Rash] (a hash which can have Regexps as keys, so that many input keys can map to a single value.)
-* {Progressbar}[http://rdoc.info/github/epitron/epitools/master/Progressbar] (better than the progressbar gem)
-* {Browser}[http://rdoc.info/github/epitron/epitools/master/Browser] (a fake browser, using mechanize, Progressbar, and CacheDB)
-* {WM}[http://rdoc.info/github/epitron/epitools/master/WM] (control/query desktop windows in X. Note: `wmctrl` must be installed)
 * {TypedStruct}[http://rdoc.info/github/epitron/epitools/master/TypedStruct] (like Struct, but setters always coerce input to a certain type, eg: boolean, integer, etc.)
-* {MimeMagic}[http://rdoc.info/github/epitron/epitools/master/MimeMagic] (a port of the Unix `file` utility for automatically recognizing files based on their contents; faster than running `file` on every file if you have to process large batches of files)
+* {WM}[http://rdoc.info/github/epitron/epitools/master/WM] (control/query desktop windows in X. Note: `wmctrl` must be installed)
+* {Sys}[http://rdoc.info/github/epitron/epitools/master/Sys] (system tools -- determine operating system, list processes, view network statistics, etc.)
+* {Colored}[http://rdoc.info/github/epitron/epitools/master/Colored] (enhanced version of defunkt's colored -- adds ANSI colouring methods to String, eg: #red, #green, #light_blue, etc.)
 * {Term}[http://rdoc.info/github/epitron/epitools/master/Term] (a toolbox for making terminal-based scripts -- get terminal size, create tables, etc.)
 * {Iter}[http://rdoc.info/github/epitron/epitools/master/Iter] (a "stable iterator" -- lets you write algorithms that modify the array as you're iterating; good for clustering.)
-* {Sys}[http://rdoc.info/github/epitron/epitools/master/Sys] (system tools -- determine operating system, list processes, view network statistics, etc.)
+* {Browser}[http://rdoc.info/github/epitron/epitools/master/Browser] (a fake browser, with a cache, cookies, download progress bars, plus the rest of the mechanize/nokogiri API you know and love)
+* {Rash}[http://rdoc.info/github/epitron/epitools/master/Rash] (a hash which can have Regexps as keys, so that many input keys can map to a single value.)
+* {Progressbar}[http://rdoc.info/github/epitron/epitools/master/Progressbar] (better than the progressbar gem)
+* {MimeMagic}[http://rdoc.info/github/epitron/epitools/master/MimeMagic] (a port of the Unix `file` utility for automatically recognizing files based on their contents; faster than running `file` on every file if you have to process large batches of files)
 
 == Installing
 

data/VERSION

@@ -1 +1 @@
-0.5.9
+0.5.10

data/epitools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "epitools"
-  s.version = "0.5.9"
+  s.version = "0.5.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["epitron"]
-  s.date = "2012-07-09"
+  s.date = "2012-08-26"
   s.description = "Miscellaneous utility libraries to make my life easier."
   s.email = "chris@ill-logic.com"
   s.extra_rdoc_files = [
@@ -89,7 +89,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/epitron/epitools"
   s.licenses = ["WTFPL"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.23"
   s.summary = "NOT UTILS... METILS!"
 
   if s.respond_to? :specification_version then

data/lib/epitools.rb

@@ -12,7 +12,7 @@ require_wrapper = proc do |mod|
 end
 
 #
-# Make all the modules autoload, and require all the monkeypatches
+# Load the things that can't be autoloaded
 #
 %w[
   core_ext 

data/lib/epitools/numwords.rb

@@ -53,6 +53,8 @@ class Numeric
     num_triplets = triplets.size
     
     triplets.each_with_index do |triplet, i|
+      next if triplet.to_i == 0
+      
       result = []
       
       tens, hunds = nil, nil

data/lib/epitools/typed_struct.rb

@@ -1,31 +1,56 @@
 #
-# Like a Stuct, but automatically casts input to specific types.
+# Like a Stuct, but automatically casts assignments to specific types.
 #
 # Example:
 #
-#   class SomeRecord < TypedStruct["some_id:int amount:float x:string a,b,c:bool"]; end
-#   record = SomeRecord.new(69, 12348.871, "stringy", true, 1, "no")
+#   class SomeRecord < TypedStruct["some_id:int amount:float name:string a,b,c:bool untyped_var"]
+#   end
+#
+#   record = SomeRecord.new(69, 12348.871, "stringy", true, 1, "no", Object.new)
+#
+#   another_record = SomeRecord.new :amount=>"1.5", :name=>"Steve", :c=>"true", :a=>"disable", :untyped_var=>Ratio.new(1/2)
+#   record.amount *= 3.141592653589793238462643383279
+#
+# Recognized types, and what they get converted into:
+#
+#   <no type given>              => Don't enforce a type -- any ruby object is allowed.
+#   ["str", "string"]            => String
+#   ["int", "integer"]           => Integer
+#   ["float"]                    => Float
+#   ["bigdecimal"]               => BigDecimal
+#   ["hex"]                      => Integer
+#   ["date", "time", "datetime"] => DateTime (using DateTime.parse)
+#   ["timestamp", "unixtime"]    => Time (using Time.at) 
+#   ["bool", "boolean"]          => Boolean, using the following rules:
+#                                    false when: false, nil, 0, "0", "off", "no", 
+#                                                "false", "disabled", "disable"
+#                                     true when: true, 1, "1", "on",  "yes", 
+#                                                "true", "enabled", "enable"
 #
 class TypedStruct < Struct
 
   ## TODO: Compact syntax: "a,b,c:int x:string y:date"
   ## TODO: Optional commas separating fields: "a, b, c:int, d:bool"
   ## TODO: booleans fields add "field?" methods
+  ## TODO: default values: "a:int(default=50)" or "b:int(50)"
 
   #
   # A perhaps-too-clever table of { "typename" => convert_proc } mappings.
   #
   CONVERTERS = Hash[ *{
-    ["str", "string"]            => :passthru,
+    [:passthru]                  => :passthru,
+    ["str", "string"]            => proc { |me| me.to_s },
     ["int", "integer"]           => proc { |me| me.to_i },
+    ["float"]                    => proc { |me| me.to_f },
+    ["bigdecimal"]               => proc { |me| BigDecimal.new me },
     ["hex"]                      => proc { |me| me.to_i(16) },
     ["date", "time", "datetime"] => proc { |me| DateTime.parse me },
-    ["timestamp"]                => proc { |me| Time.at me },
+    ["timestamp", "unixtime"]    => proc { |me| Time.at me },
     ["bool", "boolean"]          => proc do |me| 
       case me
-      when false, 0, "0", "off", "no",  "false", nil
+      when false, nil, 0, "0", "off", "no",  "false", "disabled", "disable"
         false
-      when true,  1, "1", "on",  "yes", "true"
+      when true,  1, "1", "on",  "yes", "true", "enabled", "enable"
         true
       else
         raise "Invalid boolean type: #{me.inspect}"
@@ -41,7 +66,8 @@ class TypedStruct < Struct
     pairs = specs.split.map do |spec|
       name, type = spec.split(":")
 
-      type ||= "string"
+      type ||= :passthru
+
       unless converter = CONVERTERS[type]
         raise "Unknown type: #{type}"
       end
@@ -49,7 +75,7 @@ class TypedStruct < Struct
       [name.to_sym, converter]
     end
 
-    # initialize the C Struct
+    # initialize the Struct
     struct = new(*pairs.transpose.first)
 
     # overload setter methods to call the proc
@@ -63,8 +89,14 @@ class TypedStruct < Struct
     struct
   end
 
-  def initialize(*args)    
-    members.zip(args).each { |field,value| send "#{field}=", value }
+  def initialize(*args)
+    if args.size == 1 and args.first.is_a? Hash
+      opts = args.first
+    else
+      opts = Hash[members.zip(args)]
+    end
+
+    opts.each { |key,value| send "#{key}=", value }
   end
 
 end

data/lib/epitools/wm.rb

@@ -92,7 +92,7 @@ module WM
     end
 
     def command
-      process.command
+      process && process.command
     end
 
     def inspect

data/spec/numwords_spec.rb

@@ -31,5 +31,9 @@ describe Numeric do
   it "handles 1.thousand.to_words properly" do
     1.thousand.to_words.should == "one thousand"
   end
+
+  it "handles 1.quadrillion.to_words properly" do
+    1.quadrillion.to_words.should == "one quadrillion"
+  end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epitools
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.5.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2012-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: NOT UTILS... METILS!