tins 1.3.0 → 1.3.1

data/lib/tins/dslkit.rb

@@ -12,14 +12,10 @@ module Tins
   #
   # The module can be included into other modules/classes to make the methods available.
   module Eigenclass
-    if Object.respond_to?(:singleton_class)
-      alias eigenclass singleton_class
-    else
-      # Returns the eigenclass of this object.
-      def eigenclass
-        class << self; self; end
-      end
+    # Returns the eigenclass of this object.
+    def eigenclass
     end
+    alias eigenclass singleton_class
 
     # Evaluates the _block_ in context of the eigenclass of this object.
     def eigenclass_eval(&block)
@@ -30,8 +26,7 @@ module Tins
   module ClassMethod
     include Eigenclass
 
-    # Define a class method named _name_ using _block_. To be able to take
-    # blocks as arguments in the given _block_ Ruby 1.9 is required.
+    # Define a class method named _name_ using _block_.
     def class_define_method(name, &block)
       eigenclass_eval { define_method(name, &block) }
     end
@@ -92,55 +87,13 @@ module Tins
   end
 
   module InstanceExec
-    unless (Object.instance_method(:instance_exec) rescue nil)
-      class << self
-        attr_accessor :pool
-        attr_accessor :count
-      end
-      self.count = 0
-      self.pool = []
-
-      # This is a pure ruby implementation of Ruby 1.9's instance_exec method. It
-      # executes _block_ in the context of this object while parsing <i>*args</i> into
-      # the block.
-      def instance_exec(*args, &block)
-        instance = self
-        id = instance_exec_fetch_symbol
-        InstanceExec.module_eval do
-          begin
-            define_method id, block
-            instance.__send__ id, *args
-          ensure
-            remove_method id if method_defined?(id)
-          end
-        end
-      ensure
-        InstanceExec.pool << id
-      end
-
-      private
-
-      @@mutex = Mutex.new
-
-      # Fetch a symbol from a pool in thread save way. If no more symbols are
-      # available create a new one, that will be pushed into the pool later.
-      def instance_exec_fetch_symbol
-        @@mutex.synchronize do
-          if InstanceExec.pool.empty?
-            InstanceExec.count += 1
-            symbol = :"__instance_exec_#{InstanceExec.count}__"
-          else
-            symbol = InstanceExec.pool.shift
-          end
-          return symbol
-        end
-      end
+    def self.included(*)
+      super
+      warn "#{self} is deprecated, but included at #{caller.first[/(.*):/, 1]}"
     end
   end
 
   module Interpreter
-    include InstanceExec
-
     # Interpret the string _source_ as a body of a block, while passing
     # <i>*args</i> into the block.
     #

data/lib/tins/file_binary.rb

@@ -1,5 +1,3 @@
-require 'tins/xt/hash_union'
-
 module Tins
   module FileBinary
     module Constants
@@ -35,7 +33,7 @@ module Tins
     # from offset <tt>options[:offset]</tt>). If an option isn't given the one
     # from FileBinary.default_options is used instead.
     def binary?(options = {})
-      options |= FileBinary.default_options
+      options = FileBinary.default_options.merge(options)
       old_pos = tell
       seek options[:offset], Constants::SEEK_SET
       data = read options[:buffer_size]

data/lib/tins/method_description.rb

@@ -3,7 +3,7 @@ module Tins
     def description
       result = ''
       if owner <= Module
-        result << receiver.to_s << '.'
+        result << receiver.to_s << '.' # XXX Better to use owner here as well?
       else
         result << owner.name.to_s << '#'
       end
@@ -22,8 +22,10 @@ module Tins
           when :req
             p_name
           when :opt
-            "#{p_name}="
+            "#{p_name}=?"
           when :key
+            "#{p_name}:?"
+          when :keyreq
             "#{p_name}:"
           else
             [ p_name, p_type ] * ':'

data/lib/tins/null.rb

@@ -87,7 +87,7 @@ module Tins
     include Tins::Null
 
     def initialize(opts = {})
-      class << self; self; end.class_eval do
+      singleton_class.class_eval do
         opts.each do |name, value|
           define_method(name) { value }
         end

data/lib/tins/string_version.rb

@@ -1,5 +1,3 @@
-require 'tins/xt/symbol_to_proc'
-
 module Tins
   module StringVersion
     class Version
@@ -76,7 +74,7 @@ module Tins
       end
 
       def array
-         @version.split('.').map(&:to_i)
+        @version.split('.').map { |x| x.to_i }
       end
 
       alias to_a array

data/lib/tins/terminal.rb

@@ -1,5 +1,3 @@
-require 'tins/xt/ask_and_send'
-
 begin
   require 'io/console'
 rescue LoadError
@@ -10,11 +8,23 @@ module Tins
 
     module_function
 
+    def winsize
+      if IO.respond_to?(:console)
+        console = IO.console
+        if console.respond_to?(:winsize)
+          console.winsize
+        else
+          []
+        end
+      else
+        []
+      end
+    end
+
+
     def rows
-      IO.ask_and_send(:console).ask_and_send(:winsize).ask_and_send(:[], 0) ||
-        `stty size 2>/dev/null`.split[0].to_i.nonzero? ||
-        `tput lines 2>/dev/null`.to_i.nonzero? ||
-        25
+      winsize[0] || `stty size 2>/dev/null`.split[0].to_i.nonzero? ||
+        `tput lines 2>/dev/null`.to_i.nonzero? || 25
     end
 
     def lines
@@ -22,10 +32,8 @@ module Tins
     end
 
     def columns
-      IO.ask_and_send(:console).ask_and_send(:winsize).ask_and_send(:[], 1) ||
-        `stty size 2>/dev/null`.split[1].to_i.nonzero? ||
-        `tput cols 2>/dev/null`.to_i.nonzero? ||
-        80
+      winsize[1] || `stty size 2>/dev/null`.split[1].to_i.nonzero? ||
+        `tput cols 2>/dev/null`.to_i.nonzero? || 80
     end
 
     def cols

data/lib/tins/thread_local.rb

@@ -41,11 +41,10 @@ module Tins
     # Define a thread local variable for the current instance with name _name_.
     # If the value _value_ is given, it is used to initialize the variable.
     def instance_thread_local(name, value = nil)
-      sc = class << self
+      class << self
         extend Tins::ThreadLocal
         self
-      end
-      sc.thread_local name, value
+      end.thread_local name, value
       self
     end
   end

data/lib/tins/token.rb

@@ -1,3 +1,5 @@
+require 'securerandom'
+
 module Tins
   class Token < String
     DEFAULT_ALPHABET = ((?0..?9).to_a + (?a..?z).to_a + (?A..?Z).to_a).freeze
@@ -7,6 +9,7 @@ module Tins
       bits     = options[:bits] || 128
       length   = options[:length]
       alphabet = options[:alphabet] || DEFAULT_ALPHABET
+      random   = options[:random] || SecureRandom
       alphabet.size > 1 or raise ArgumentError, 'need at least 2 symbols in alphabet'
       if length
         length > 0 or raise ArgumentError, 'length has to be positive'
@@ -16,7 +19,7 @@ module Tins
       end
       self.bits = (Math.log(alphabet.size ** length) / Math.log(2)).floor
       token = ''
-      length.times { token << alphabet[rand(alphabet.size)] }
+      length.times { token << alphabet[random.random_number(alphabet.size)] }
       super token
     end
 

data/lib/tins/version.rb

@@ -1,6 +1,6 @@
 module Tins
   # Tins version
-  VERSION         = '1.3.0'
+  VERSION         = '1.3.1'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/lib/tins/xt.rb

@@ -16,7 +16,6 @@ module Tins
   require 'tins/xt/partial_application'
   require 'tins/xt/range_plus'
   require 'tins/xt/require_maybe'
-  require 'tins/xt/round'
   require 'tins/xt/secure_write'
   require 'tins/xt/string'
   require 'tins/xt/subhash'
@@ -40,4 +39,6 @@ module Tins
   require 'tins/xt/annotate'
   require 'tins/xt/concern'
   require 'tins/xt/dslkit'
+  require 'tins/xt/time_freezer'
+  require 'tins/xt/case_predicate'
 end

data/lib/tins/xt/case_predicate.rb

@@ -0,0 +1,8 @@
+require 'tins/case_predicate'
+
+module Tins
+  class ::Object
+    include Tins::CasePredicate
+  end
+end
+

data/lib/tins/xt/dslkit.rb

@@ -13,7 +13,6 @@ module Tins
   class ::Object
     include Tins::ThreadLocal
     include Tins::ThreadGlobal
-    include Tins::InstanceExec
     include Tins::Interpreter
     include Tins::Deflect
     include Tins::ThreadLocal

data/lib/tins/xt/named.rb

@@ -1,35 +1,23 @@
 require 'tins/xt/string_version'
 
 class Object
-  if RUBY_VERSION.version >= '1.9'.version
-    def named(name, method, *args, &named_block)
-      extend Module.new {
-        define_method(name) do |*rest, &block|
-          block = named_block if named_block
-          __send__(method, *(args + rest), &block)
-        end
-      }
-    end
-  else
-    def named(name, method, *args, &block)
-      extend Module.new { define_method(name) { |*rest| __send__(method, *(args + rest), &block) } }
-    end
+  def named(name, method, *args, &named_block)
+    extend Module.new {
+      define_method(name) do |*rest, &block|
+        block = named_block if named_block
+        __send__(method, *(args + rest), &block)
+      end
+    }
   end
 end
 
 class Module
-  if RUBY_VERSION.version >= '1.9'.version
-    def named(name, method, *args, &named_block)
-      include Module.new {
-        define_method(name) do |*rest, &block|
-          block = named_block if named_block
-          __send__(method, *(args + rest), &block)
-        end
-      }
-    end
-  else
-    def named(name, method, *args, &block)
-      include Module.new { define_method(name) { |*rest| __send__(method, *(args + rest), &block) } }
-    end
+  def named(name, method, *args, &named_block)
+    include Module.new {
+      define_method(name) do |*rest, &block|
+        block = named_block if named_block
+        __send__(method, *(args + rest), &block)
+      end
+    }
   end
 end

data/tests/ask_and_send_test.rb

@@ -28,5 +28,19 @@ module Tins
       assert_equal :bar, A.new.ask_and_send!(:bar)
       assert_nil A.new.ask_and_send(:baz)
     end
+
+    def test_asking_selfy_publicly
+      a = A.new
+      assert_equal :foo, a.ask_and_send_or_self(:foo)
+      assert_equal a, a.ask_and_send_or_self(:bar)
+      assert_equal a, a.ask_and_send_or_self(:baz)
+    end
+
+    def test_asking_selfy_privately
+      a = A.new
+      assert_equal :foo, a.ask_and_send_or_self!(:foo)
+      assert_equal :bar, a.ask_and_send_or_self!(:bar)
+      assert_equal a, a.ask_and_send_or_self(:baz)
+    end
   end
 end

data/tests/attempt_test.rb

@@ -81,11 +81,5 @@ module Tins
         method_defined?(:sleep_duration) and remove_method :sleep_duration
       end
     end
-
-    private
-
-    def singleton_class
-      class << self; self; end
-    end unless method_defined?(:singleton_class)
   end
 end

data/tests/case_predicate_test.rb

@@ -0,0 +1,29 @@
+require 'test_helper'
+require 'tins/xt/case_predicate'
+
+module Tins
+  class CasePredicateTest < Test::Unit::TestCase
+    def test_case_predicate_failure
+      assert_nil 4.case?(1, 2..3, 5...7)
+    end
+
+    def test_case_predicate_failure_is_a
+      s = 'foo'
+      assert_nil s.case?(Array, Hash)
+      s = Class.new(String).new
+      assert_nil s.case?(Array, Hash)
+    end
+
+    def test_case_predicate_success
+      assert_equal 2..3, 3.case?(1, 2..3, 5...7)
+    end
+
+    def test_case_predicate_success_is_a
+      s = 'foo'
+      assert_equal String, s.case?(Array, Hash, String)
+      s = Class.new(String).new
+      assert_equal String, s.case?(Array, Hash, String)
+    end
+  end
+end
+

data/tests/dslkit_test.rb

@@ -19,7 +19,6 @@ class TL
 end
 
 class IE
-  include Tins::InstanceExec
 
   def initialize(&block)
     @block = block
@@ -77,7 +76,6 @@ class I
 end
 
 class S
-  include Tins::InstanceExec
   include Tins::SymbolMaker
 end
 

data/tests/if_predicate_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 require 'tins/xt'
 
 module Tins
-  class IfPredicateTest
+  class IfPredicateTest < Test::Unit::TestCase
     def test_if_predicate
       assert_equal :foo, true.if? && :foo
       assert_nil false.if? && :foo

data/tests/method_description_test.rb

@@ -25,7 +25,7 @@ if RUBY_VERSION >= "1.9"
       end
 
       def test_standard_parameters
-        assert_equal 'Tins::MethodDescriptionTest::B#foo(x,y=,*r,&b)', B.instance_method(:foo).to_s
+        assert_equal 'Tins::MethodDescriptionTest::B#foo(x,y=?,*r,&b)', B.instance_method(:foo).to_s
       end
 
       if RUBY_VERSION >= "2.0"
@@ -39,11 +39,24 @@ if RUBY_VERSION >= "1.9"
           end
 
           def test_keyword_parameters
-            assert_equal 'Tins::MethodDescriptionTest::C#foo(x,k:,&b)', C.instance_method(:foo).to_s
+            assert_equal 'Tins::MethodDescriptionTest::C#foo(x,k:?,&b)', C.instance_method(:foo).to_s
             assert_equal 'Tins::MethodDescriptionTest::C#bar(x,**k,&b)', C.instance_method(:bar).to_s
           end
         }
       end
+
+      if RUBY_VERSION >= "2.1"
+        eval %{
+          class D
+            def foo(x, k:, &b)
+            end
+          end
+
+          def test_keyword_parameters_required
+            assert_equal 'Tins::MethodDescriptionTest::D#foo(x,k:,&b)', D.instance_method(:foo).to_s
+          end
+        }
+      end
     end
   end
 end