y_support 2.0.20 → 2.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b352e0007b5e318e5c95c58725ea49240d283a8d
-  data.tar.gz: e82fac18c9c94700166f7ce1858bb79f671c5c96
+  metadata.gz: 6981d4eb5fdec5cb5eaf09321d4081c39b65c4db
+  data.tar.gz: 472b3008961422d3823f0b5b654ca2ecfadbd4f1
 SHA512:
-  metadata.gz: 6acfc2dee84cf9e609a2ee271ea67161ee70abb0a912735c8e2b3f8fe37b7c32ab1ed2bb8a8879341bb19b9fd30345cc805d9396100e14fb05e0fa64b951d90d
-  data.tar.gz: 69c8f221798a650bc8f33093e9f058555c1a8744d3aeb6c83823121d0fac7ecb59d63a693c6256a57efc252af46b973e0d4a7f33e703a9b62de3669c9bf3c6e1
+  metadata.gz: c0fe48e25cd93a0b8abce16b12b227d408f1f2e99b5f0275abd13a56735ef78e7b303ad22f18fa9ff15e695f02cd050e3ae32cd3d2130786e9c479ffacc2549f
+  data.tar.gz: dbcfa5713ba17cbc1dc64e65f18ad31497faeb82d6943cead57f1504b9e78e1c3ef17bf61d9b18a1684ca8be7e0f224c21b935c16884e3abe2cb0fcc726265a6

data/lib/y_support/core_ext/array/misc.rb

@@ -1,3 +1,5 @@
+require 'matrix'
+
 class Array
   # Converts an array, whose elements are also arrays, to a hash. Head
   # (position 0) of each array is made to point at the rest of the array
@@ -12,7 +14,6 @@ class Array
     }
   end
 
-
   # Zips this array with another collection into a hash. If a block is given,
   # it is applied to each element of the array to get the hash values.
   # 
@@ -79,6 +80,12 @@ class Array
     l = last
     l.delete( key ).tap { pop if l.empty? } if l.is_a? Hash
   end
+
+  # Converts the array to a +Matrix#column_vector+.
+  # 
+  def to_column_vector
+    Matrix.column_vector self
+  end
   
   # TEST ME
   # def pretty_inspect

data/lib/y_support/typing/array/typing.rb

@@ -6,12 +6,19 @@ class Array
   # fails to include the specified element. An optional argument customizes the
   # error message (element description).
   # 
-  def aT_includes element, what_is_element=nil
-    e = what_is_element ? what_is_element.to_s.capitalize :
-      "Element (#{element.class} instance)"
-    m = "#{e} is absent from the array."
-    raise TErr, m unless include? element
-    return self
+  def aT_includes element, what_is_self="array", what_is_element=nil
+    m = "%s is absent from #{what_is_self}!" %
+      if what_is_element then what_is_element.to_s.capitalize else
+        "Element (#{element.class} instance)"
+      end
+    tap { include? element or fail TypeError, m }
   end
   alias :aT_include :aT_includes
+
+  # Fails with TypeError if the array contains duplicates (using +#uniq+).
+  # 
+  def aT_uniq what_is_self="array"
+    m = "#{what_is_self.to_s.capitalize} non-uniq!"
+    tap { self == uniq or fail TypeError, m }
+  end
 end

data/lib/y_support/typing/object/typing.rb

@@ -47,15 +47,13 @@ class Object
   # checked, whether the object is truey.
   # 
   def aT what_is_receiver=nil, how_comply=nil, &b
-    r = what_is_receiver ? what_is_receiver.to_s.capitalize :
-      "#{self.class} instance #{object_id}"
-    if block_given?
-      m = "#{r} fails #{how_comply ? 'to %s' % how_comply : 'its duck type'}!"
-      raise TErr, m unless ( b.arity == 0 ) ? instance_exec( &b ) : b.( self )
-    else
-      raise TErr, m unless self
-    end
-    return self
+    if block_given? then
+      m = "%s fails #{how_comply ? 'to %s' % how_comply : 'its duck type'}!" %
+        if what_is_receiver then what_is_receiver.to_s.capitalize else
+          "#{self.class} instance #{object_id}"
+        end
+      tap { b.( self ) or fail TypeError, m }
+    else self or fail TypeError end
   end
   
   # This method takes a block and fails with TypeError, unless the receiver
@@ -68,28 +66,24 @@ class Object
   # no block is given, it is checked, whether the object is falsey.
   # 
   def aT_not what_is_receiver=nil, how_comply=nil, &b
-    r = what_is_receiver ? what_is_receiver.to_s.capitalize :
-      "#{self.class} instance #{object_id}"
-    if block_given?
-      m = how_comply ? "#{r} must not #{how_comply}!" :
-        "#{r} fails its duck type!"
-      raise TErr, m if ( b.arity == 0 ) ? instance_exec( &b ) : b.( self )
-    else
-      m = "#{r} is not falsey!"
-      raise TErr, m if self
-    end
-    return self
+    if block_given? then
+      m = how_comply ? "%s must not #{how_comply}!" : "%s fails its duck type!"
+      m %= if what_is_receiver then what_is_receiver.to_s.capitalize else
+             "#{self.class} instance #{object_id}"
+           end
+      tap { fail TypeError, m if b.( self ) }
+    else tap { fail TypeError if self } end
   end
 
   # Fails with TypeError unless the receiver is of the prescribed class. Second
   # optional argument customizes the error message (receiver description).
   # 
   def aT_kind_of klass, what_is_receiver=nil
-    r = what_is_receiver ? what_is_receiver.to_s.capitalize :
-      "#{self.class} instance #{object_id}"
-    m = "#{r} is not a kind of #{klass}!"
-    raise TErr, m unless kind_of? klass
-    return self
+    m = "%s is not a kind of #{klass}!" %
+      if what_is_receiver then what_is_receiver.to_s.capitalize else
+        "#{self.class} instance #{object_id}"
+      end
+    tap { kind_of? klass or fail TypeError, m }
   end
   alias :aT_is_a :aT_kind_of
 
@@ -98,11 +92,11 @@ class Object
   # customizes the error message (receiver description).
   # 
   def aT_class_complies klass, what_is_receiver=nil
-    r = what_is_receiver ? what_is_receiver.to_s.capitalize :
-      "#{self.class} instance #{object_id}"
-    m = "#{r} does not comply or declare compliance with #{klass}!"
-    raise TErr, m unless class_complies? klass
-    return self
+    m = "%s does not comply or declare compliance with #{klass}!" %
+      if what_is_receiver then what_is_receiver.to_s.capitalize else
+        "#{self.class} instance #{object_id}"
+      end
+    tap { class_complies? klass or fail TypeError, m }
   end
   
   # Fails with TypeError unless the receiver responds to the given
@@ -110,11 +104,11 @@ class Object
   # description).
   # 
   def aT_respond_to method_name, what_is_receiver=nil
-    r = what_is_receiver ? what_is_receiver.to_s.capitalize :
-      "#{self.class} instance #{object_id}"
-    m = "#{r} does not respond to method '#{method_name}'!"
-    raise TErr, m unless respond_to? method_name
-    return self
+    m = "%s does not respond to method '#{method_name}'!" %
+      if what_is_receiver then what_is_receiver.to_s.capitalize else
+        "#{self.class} instance #{object_id}"
+      end
+    tap { respond_to? method_name or fail TypeError, m }
   end
   alias :aT_responds_to :aT_respond_to
   
@@ -126,9 +120,8 @@ class Object
     r = what_is_receiver ? what_is_receiver.to_s.capitalize :
       "#{self.class} instance #{object_id}"
     o = what_is_other || "the prescribed value (#{other.class})"
-    m = "#{r} is not equal (==) to #{o}!"
-    raise TErr, m unless self == other
-    return self
+    m = "%s is not equal (==) to %s!" % [r, o]
+    tap { self == other or fail TypeError, m }
   end
 
   # Fails with TypeError unless the receiver, according to #== method, differs
@@ -139,31 +132,31 @@ class Object
     r = what_is_receiver ? what_is_receiver.to_s.capitalize :
       "#{self.class} instance #{object_id}"
     o = what_is_other || "the prescribed value (#{other.class})"
-    m = "#{r} fails to differ from #{o}!"
-    raise TErr, m if self == other
-    return self
+    m = "%s fails to differ from %s!" % [r, o]
+    tap { fail TypeError, m if self == other }
   end
 
   # Fails with TypeError unless the ActiveSupport method #blank returns true
   # for the receiver.
   # 
   def aT_blank what_is_receiver=nil
-    r = what_is_receiver ? what_is_receiver.to_s.capitalize :
-      "#{self.class} instance #{object_id}"
-    m = "#{r} fails to be #blank?!"
-    raise TErr, m unless blank?
-    return self
+    r = 
+    m = "#%s fails to be blank!" %
+      if what_is_receiver then what_is_receiver.to_s.capitalize else
+        "#{self.class} instance #{object_id}"
+      end
+    tap { blank? or fail TypeError, m }
   end
 
   # Fails with TypeError unless the ActiveSupport method #present returns true
   # for the receiver.
   # 
   def aT_present what_is_receiver=nil
-    r = what_is_receiver ? what_is_receiver.to_s.capitalize :
-      "#{self.class} instance #{object_id}"
-    m = "#{r} fails to be #present?!"
-    raise TErr, m unless present?
-    return self
+    m = "%s fails to be present!" %
+      if what_is_receiver then what_is_receiver.to_s.capitalize else
+        "#{self.class} instance #{object_id}"
+      end
+    tap { present? or fail TypeError, m }
   end
 
   private

data/lib/y_support/version.rb

@@ -1,3 +1,3 @@
 module YSupport
-  VERSION = "2.0.20"
+  VERSION = "2.0.21"
 end

data/test/misc_test.rb

@@ -92,6 +92,10 @@ describe Array do
     a.pop_named( :foo ).must_equal 3
     a.push_ordered( 42 ).must_equal [1, 2, 42, bar: 4] 
   end
+
+  it "has #to_column_vector" do
+    [1, 2, 3].to_column_vector.must_equal Matrix[[1, 2, 3]]
+  end
 end
 
 describe Hash do

data/test/typing_test.rb

@@ -172,8 +172,8 @@ class TypingTest < Test::Unit::TestCase
       old = a.dup
       assert_nothing_raised do a.may_have :z end
       assert_nothing_raised do a.has? :z end
-      assert_raises TErr do a.may_have( :a, syn!: :b ) end
-      assert_raises TErr do a.has?( :a, syn!: :b ) end
+      assert_raises TypeError do a.may_have( :a, syn!: :b ) end
+      assert_raises TypeError do a.has?( :a, syn!: :b ) end
       assert_equal false, a.has?( :z )
       assert_equal nil, a.may_have( :z )
       assert_equal false, a.has?( :z )
@@ -192,7 +192,7 @@ class TypingTest < Test::Unit::TestCase
       a = { infile: 'a', csv_out_file: 'b', k: 'k', o: 'k', t: 'k' }
       assert_respond_to a, :aT_has
       old = a.dup
-      assert_raises TErr do a.aT_has :z end
+      assert_raises TypeError do a.aT_has :z end
       assert_nothing_raised do a.aT_has :infile end
       assert_nothing_raised do a.aT_has :csv_out_file end
       class TestClass; def initialize( args )
@@ -201,12 +201,12 @@ class TypingTest < Test::Unit::TestCase
                          args.aT_has :k
                        end end
       assert_nothing_raised do TestClass.new a end
-      assert_raises TErr do a.aT_has( :a, syn!: :b ) end
+      assert_raises TypeError do a.aT_has( :a, syn!: :b ) end
       assert_equal "a", a.aT_has( :infile )
       assert_equal "k", a.aT_has( :k, syn!: [:o, :t] )
       assert_equal "b", a.aT_has( :c, syn!: :csv_out_file )
       assert_equal( { infile: 'a', c: 'b', k: 'k' }, a )
-      assert_raises TErr do a.aT_has(:c) {|val| val == 'c'} end
+      assert_raises TypeError do a.aT_has(:c) {|val| val == 'c'} end
       assert_nothing_raised do a.aT_has(:c) {|val| val == 'b'} end
     end
   end # context Hash

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: y_support
 version: !ruby/object:Gem::Version
-  version: 2.0.20
+  version: 2.0.21
 platform: ruby
 authors:
 - boris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2013-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport