typerb 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19f90a93082e4acdb25f5750c9de2880bf0c613cb414800a7ce8beb275d2ee54
-  data.tar.gz: 10e47702b997c0f4b54b416c7f77c800ee50343b391a0f41b33ff6bd4b379dc2
+  metadata.gz: 1ce9f42a58f215a179f850016e0f647a4e16b4f23b3021d7cd17a43960857439
+  data.tar.gz: 9bb4dc2cb1f2396c7ccfd773d27a2d85e0d11f3a66ef54537e9c809594795d5a
 SHA512:
-  metadata.gz: 4c3a3d1dbc81a742d08c3e68413a70a7aa8858e473bf46a78dcdec452e862421bf85b02354ad70d203600ea1031ac85dbfc08758ea1bc79145ce03542bc92b6c
-  data.tar.gz: 55ffd3b8d1ed4fc33141a9345baaf3f7380336bfa7a4135630e24009607d7d3554b8d5892a887676a24a38a70ca7acfa351293b31f8d3f77e13ba31558cdcf5a
+  metadata.gz: a35899b9f7f7cc045725241d6eef0d312470016e2945edea86c67696c67f3ba69bbc52743fd51cb0253b6b7bc4f3be30ac9567784269a6f382d46484b9bc2476
+  data.tar.gz: 58c8a8839809ff2c87801388cca35dca300a565616645a01d9bd59fdea6e6986c74763250093400aaca8d2b91a47cfad8b24b0060b24ae0215a3bdb846617568

data/.rubocop.yml

@@ -1,7 +1,12 @@
 AllCops:
+  TargetRubyVersion: 2.4
   Exclude:
     - 'bin/**/*'
 
+inherit_mode:
+  merge:
+    - Exclude
+
 Style/CommentedKeyword:
   Enabled: false
 

data/.travis.yml

@@ -4,6 +4,11 @@ language: ruby
 cache: bundler
 before_install: gem install bundler
 
+rvm:
+  - 2.4.0
+  - 2.5.3
+#  - 2.6.0-preview3 travis does not support it yet
+
 script:
   - bundle exec rubocop -DP
   - bundle exec rspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    typerb (0.1.3)
+    typerb (0.1.6)
 
 GEM
   remote: https://rubygems.org/

data/lib/typerb/exceptional.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Typerb
+  class Exceptional # NOTE: don't want to collide with 'Exception' class name
+    class << self
+      def klasses_text(klasses)
+        klasses.size > 1 ? klasses.map(&:name).join(' or ') : klasses.first.name
+      end
+    end
+
+    def raise_with(backtrace, exception_text)
+      exception = TypeError.new(exception_text)
+      exception.set_backtrace(backtrace)
+      raise exception
+    end
+  end
+end

data/lib/typerb/variable_name.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Typerb
+  class VariableName
+    attr_reader :file, :line
+
+    def initialize(caller_loc)
+      @file = caller_loc[0].path
+      @line = caller_loc[0].lineno
+    end
+
+    def get
+      return if RUBY_VERSION < '2.6.0'
+      return unless File.exist?(file)
+
+      caller_method = caller_locations(1, 1)[0].label.to_sym
+      from_ast(caller_method)
+    end
+
+    private
+
+    def from_ast(caller_method) # rubocop: disable Metrics/AbcSize not worth fixing
+      code = File.read(file).lines[line - 1].strip
+      node = RubyVM::AST.parse(code)
+      if node.children.last.children.size == 3 && node.children.last.children[1] == caller_method # rubocop: disable Style/IfUnlessModifier, Style/GuardClause
+        node.children.last.children.first.children.first
+      end
+    end
+  end
+end

data/lib/typerb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Typerb
-  VERSION = '0.1.4'
+  VERSION = '0.1.6'
 end

data/lib/typerb.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require 'typerb/version'
+require 'typerb/variable_name'
+require 'typerb/exceptional'
 
 module Typerb
   refine Object do
@@ -8,50 +10,26 @@ module Typerb
       raise ArgumentError, 'provide at least one class' if klasses.empty?
       return self if klasses.any? { |kls| is_a?(kls) }
 
-      exception_text = if (var_name = VariableNameUtil.get(caller_locations(1, 1)))
-                         "`#{var_name}` should be #{VariableNameUtil.klasses_text(klasses)}, not #{self.class} (#{self})"
+      klasses_text = Typerb::Exceptional.klasses_text(klasses)
+      exception_text = if (var_name = Typerb::VariableName.new(caller_locations(1, 1)).get)
+                         "`#{var_name}` should be #{klasses_text}, not #{self.class} (#{self})"
                        else
-                         "expected #{VariableNameUtil.klasses_text(klasses)}, got #{self.class} (#{self})"
+                         "expected #{klasses_text}, got #{self.class} (#{self})"
                        end
 
-      exception = TypeError.new(exception_text)
-      exception.set_backtrace(caller)
-      raise exception
+      Typerb::Exceptional.new.raise_with(caller, exception_text)
     end
 
     def not_nil!
-      return self unless self.nil? # rubocop: disable Style/RedundantSelf
+      return self unless self.nil? # rubocop: disable Style/RedundantSelf rubocop breaks without reundant self
 
-      exception_text = if (var_name = VariableNameUtil.get(caller_locations(1, 1)))
+      exception_text = if (var_name = Typerb::VariableName.new(caller_locations(1, 1)).get)
                          "`#{var_name}` should not be nil"
                        else
-                         'expected not nil, but got nil'
+                         'expected not nil, got nil'
                        end
 
-      exception = TypeError.new(exception_text)
-      exception.set_backtrace(caller)
-      raise exception
-    end
-  end
-
-  module VariableNameUtil
-    module_function
-
-    def get(c_loc) # rubocop: disable Metrics/AbcSize screw this
-      where = c_loc[0]
-      file = where.path
-      line = where.lineno
-      return unless File.exist?(file)
-
-      code = File.read(file).lines[line - 1].strip
-      node = RubyVM::AST.parse(code)
-      if node.children.last.children.size == 3 && %i[type! not_nil!].include?(node.children.last.children[1]) # rubocop: disable Style/IfUnlessModifier, Style/GuardClause
-        node.children.last.children.first.children.first
-      end
-    end
-
-    def klasses_text(klasses)
-      klasses.size > 1 ? klasses.map(&:name).join(' or ') : klasses.first.name
+      Typerb::Exceptional.new.raise_with(caller, exception_text)
     end
   end
 end

data/typerb.gemspec

@@ -31,5 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'super_awesome_print'
 
-  spec.required_ruby_version = '>= 2.6.0-preview3'
+  spec.required_ruby_version = '>= 2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typerb
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Oleg Antonyan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-12 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,6 +115,8 @@ files:
 - bin/console
 - bin/setup
 - lib/typerb.rb
+- lib/typerb/exceptional.rb
+- lib/typerb/variable_name.rb
 - lib/typerb/version.rb
 - typerb.gemspec
 homepage: https://github.com/olegantonyan/typerb
@@ -129,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0.pre.preview3
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="