christiank-turntable 0.999.1 → 1.0.0

data/lib/dictionary.rb

@@ -42,45 +42,14 @@ class Dictionary
       end
       hsh
     end
-
-    # Like #new but the block sets the order.
-    def new_by(*args, &blk)
-      new(*args).order_by(&blk)
-    end
-
-    # Alternate to #new which creates a dictionary sorted by key.
-    #
-    #   d = Dictionary.alpha
-    #   d["z"] = 1
-    #   d["y"] = 2
-    #   d["x"] = 3
-    #   d  #=> {"x"=>3,"y"=>2,"z"=>2}
-    #
-    # This is equivalent to:
-    #
-    #   Dictionary.new.order_by { |key,value| key }
-    def alpha(*args, &block)
-      new(*args, &block).order_by_key
-    end
-
-    # Alternate to #new which auto-creates sub-dictionaries as needed.
-    #
-    #   d = Dictionary.auto
-    #   d["a"]["b"]["c"] = "abc"  #=> { "a"=>{"b"=>{"c"=>"abc"}}}
-    #
-    def auto(*args)
-      leet = lambda { |hsh, key| hsh[key] = new(&leet) }
-      new(*args, &leet)
-    end
   end
 
-  # New Dictionary.
   def initialize(*args, &blk)
     @order = []
     @order_by = nil
     if blk
-      dict = self                                  # This ensure autmatic key entry effect the
-      oblk = lambda{ |hsh, key| blk[dict,key] }    # dictionary rather then just the interal hash.
+      dict = self
+      oblk = lambda{ |hsh, key| blk[dict,key] }
       @hash = Hash.new(*args, &oblk)
     else
       @hash = Hash.new(*args)
@@ -92,43 +61,18 @@ class Dictionary
     @order
   end
 
-  # Keep dictionary sorted by a specific sort order.
-  def order_by( &block )
+  def order_by(&block)
     @order_by = block
     order
     self
   end
 
-  # Keep dictionary sorted by key.
-  #
-  #   d = Dictionary.new.order_by_key
-  #   d["z"] = 1
-  #   d["y"] = 2
-  #   d["x"] = 3
-  #   d  #=> {"x"=>3,"y"=>2,"z"=>2}
-  #
-  # This is equivalent to:
-  #
-  #   Dictionary.new.order_by { |key,value| key }
-  #
-  # The initializer Dictionary#alpha also provides this.
   def order_by_key
     @order_by = lambda { |k,v| k }
     order
     self
   end
 
-  # Keep dictionary sorted by value.
-  #
-  #   d = Dictionary.new.order_by_value
-  #   d["z"] = 1
-  #   d["y"] = 2
-  #   d["x"] = 3
-  #   d  #=> {"x"=>3,"y"=>2,"z"=>2}
-  #
-  # This is equivalent to:
-  #
-  #   Dictionary.new.order_by { |key,value| value }
   def order_by_value
     @order_by = lambda { |k,v| v }
     order
@@ -144,7 +88,7 @@ class Dictionary
   end
 
   def ==(hsh2)
-    if hsh2.is_a?( Dictionary )
+    if hsh2.is_a?(Dictionary)
       @order == hsh2.order &&
       @hash  == hsh2.instance_variable_get("@hash")
     else
@@ -152,21 +96,9 @@ class Dictionary
     end
   end
 
-  def [] k
-    @hash[ k ]
-  end
+  def [](k); @hash[k]; end
+  def fetch(k, *a, &b); @hash.fetch(k, *a, &b); end
 
-  def fetch(k, *a, &b)
-    @hash.fetch(k, *a, &b)
-  end
-
-  # Store operator.
-  #
-  #   h[key] = value
-  #
-  # Or with additional index.
-  #
-  #  h[key,index] = value
   def []=(k, i=nil, v=nil)
     if v
       insert(i,k,v)
@@ -175,14 +107,14 @@ class Dictionary
     end
   end
 
-  def insert( i,k,v )
-    @order.insert( i,k )
-    @hash.store( k,v )
+  def insert(i, k, v)
+    @order.insert(i, k)
+    @hash.store(k, v)
   end
 
-  def store( a,b )
-    @order.push( a ) unless @hash.has_key?( a )
-    @hash.store( a,b )
+  def store(a, b)
+    @order.push(a) unless @hash.has_key?(a)
+    @hash.store(a,b)
   end
 
   def clear
@@ -190,23 +122,23 @@ class Dictionary
     @hash.clear
   end
 
-  def delete( key )
-    @order.delete( key )
-    @hash.delete( key )
+  def delete(key)
+    @order.delete(key)
+    @hash.delete(key)
   end
 
   def each_key
-    order.each { |k| yield( k ) }
+    order.each { |k| yield(k) }
     self
   end
 
   def each_value
-    order.each { |k| yield( @hash[k] ) }
+    order.each { |k| yield(@hash[k]) }
     self
   end
 
   def each
-    order.each { |k| yield( k,@hash[k] ) }
+    order.each { |k| yield(k,@hash[k]) }
     self
   end
   alias each_pair each
@@ -222,9 +154,7 @@ class Dictionary
     ary
   end
 
-  def keys
-    order
-  end
+  def keys; order; end
 
   def invert
     hsh2 = self.class.new
@@ -232,11 +162,9 @@ class Dictionary
     hsh2
   end
 
-  def reject(&block)
-    self.dup.delete_if(&block)
-  end
+  def reject(&block); self.dup.delete_if(&block); end
 
-  def reject!( &block )
+  def reject!(&block)
     hsh2 = reject(&block)
     self == hsh2 ? nil : hsh2
   end
@@ -258,7 +186,7 @@ class Dictionary
     key ? [key,delete(key)] : super
   end
 
-  def unshift( k,v )
+  def unshift(k,v)
     unless @hash.include?( k )
       @order.unshift( k )
       @hash.store( k,v )
@@ -268,14 +196,12 @@ class Dictionary
     end
   end
 
-  def <<(kv)
-    push(*kv)
-  end
+  def <<(kv); push(*kv); end
 
-  def push( k,v )
-    unless @hash.include?( k )
-      @order.push( k )
-      @hash.store( k,v )
+  def push(k, v)
+    unless @hash.include?(k)
+      @order.push(k)
+      @hash.store(k, v)
       true
     else
       false
@@ -299,16 +225,14 @@ class Dictionary
     self.class[*a]
   end
 
-  def update( hsh2 )
+  def update(hsh2)
     hsh2.each { |k,v| self[k] = v }
     reorder
     self
   end
   alias :merge! update
 
-  def merge( hsh2 )
-    self.dup.update(hsh2)
-  end
+  def merge(hsh2); self.dup.update(hsh2); end
 
   def select
     ary = []
@@ -321,9 +245,7 @@ class Dictionary
     self
   end
 
-  def reverse
-    dup.reverse!
-  end
+  def reverse; dup.reverse!; end
 
   def first(x=nil)
     return @hash[order.first] unless x
@@ -335,22 +257,11 @@ class Dictionary
     order.last(x).collect { |k| @hash[k] }
   end
 
-  def length
-    @order.length
-  end
+  def length; @order.length; end
   alias :size :length
-
-  def empty?
-    @hash.empty?
-  end
-
-  def has_key?(key)
-    @hash.has_key?(key)
-  end
-
-  def key?(key)
-    @hash.key?(key)
-  end
+  def empty?; @hash.empty?; end
+  def has_key?(key); @hash.has_key?(key); end
+  def key?(key); @hash.key?(key); end
 
   def to_a
     ary = []
@@ -358,15 +269,7 @@ class Dictionary
     ary
   end
 
-  def to_s
-    self.to_a.to_s
-  end
-
-  def to_hash
-    @hash.dup
-  end
-
-  def to_h
-    @hash.dup
-  end
+  def to_s; self.to_a.to_s; end
+  def to_hash; @hash.dup; end
+  alias :to_h :to_hash
 end

data/turntable.rb

@@ -1,5 +1,5 @@
 #
-# Turntable v0.999.1
+# Turntable v1.0.0
 # Christian Koch <ckoch002@student.ucr.edu>
 #
 # Turntable is an alternative relational database for Ruby. A Turntable object
@@ -13,7 +13,7 @@ require 'ostruct'
 
 class Turntable
 
-  VERSION = 'v0.999.1'
+  VERSION = 'v1.0.0'
 
   include Enumerable
   def each
@@ -78,6 +78,8 @@ class Turntable
     @table.each_key { |key| result.push(@table[key]) if key.is_a?(Fixnum) }
     result
   end
+  alias :all :all_numbered_rows
+  alias :*   :all_numbered_rows
 
   # Removes a given row. Returns the new database.
   def delete id
@@ -85,17 +87,25 @@ class Turntable
     self.update
     @table
   end
-  
+
   # A much healthier inspect() makes dealing with Turntable in IRB easier.
   def inspect; self.to_s; end
 
+  # Returns a boolean indicating whether the select statement would return any
+  # data.
+  def include?
+    result = []
+    self.each { |row| result.push row if yield row }
+    result.any?
+  end
+
   # Returns a dictionary of all this Turntable's metadata.
   def metadata
     result = Dictionary.new
     @table.each { |key, value| result[key] = value unless key.is_a?(Fixnum) }
     result
   end
-  
+
   # Pushes self with a new row. Accepts either a list of arguments, or one
   # array which represents the same thing.
   def push *args
@@ -104,7 +114,7 @@ class Turntable
     if args.length != (@table[:columns].length - 1)
       raise ArgumentError, "wrong number of arguments (#{args.length} for #{@table[:columns].length - 1})"
     end
-    
+
     @before_table = @table.dup
 
     row = Row.new
@@ -181,7 +191,7 @@ class Object
 
   # Turn off Object#id warnings.
   undef id
-  
+
   # Just like regular puts(), except putting a Turntable calls
   # Turntable#to_textile.
   def puts obj

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: christiank-turntable
 version: !ruby/object:Gem::Version 
-  version: 0.999.1
+  version: 1.0.0
 platform: ruby
 authors: 
 - Christian Koch