power_assert 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7444d3904ad2148eb3fc1f836d721d28f1c59fe4
-  data.tar.gz: 6aade4c736ebba939973db85fc33f9e276daf010
+  metadata.gz: 99b3895797c266648105fc96abdc122df93537d1
+  data.tar.gz: a9af7c357642b19eadeace43da8ba2f1ee17d9fe
 SHA512:
-  metadata.gz: 948cfe90a83135a15de3b7ac7d4dbdec085c352a2b04857b1e3e22e878a69eac63f54ca16d389aa6134037387b667e6ff8f7f3db3a94aeb3513f91c60d6e7f41
-  data.tar.gz: 666404c70ed0c62857490819241e169b994163d23972a62ff6f22b89372c47932aaec1647018d39f1824b823c1ea47a08a4db843816ad379499c41979d22c09b
+  metadata.gz: ae79bba8eb3a079bcf30df88ef0109be3de8848a2d5dcd4f7d1d5fdee731dcc20150a21e272ec54c7c19f70200c684df6972c23ee0c835113be6985c143f6f63
+  data.tar.gz: 4f0f959d1a16f3ba502adfe0c73f92909d2c78a3383a2bbb9044e886d6c3e0c06a41dbf2b9a572b5bd6e8a411e5c060bd3e3e305d682428d0645dd321cd4b662

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
   - 2.0.0
-  - 2.1.1
+  - 2.1.2
   - ruby-head

data/lib/power_assert.rb

@@ -3,9 +3,9 @@
 # Copyright (C) 2014 Kazuki Tsujimoto, All rights reserved.
 
 require 'power_assert/version'
+require 'power_assert/pattern_match'
 
 require 'ripper'
-require 'pattern-match'
 
 # NB: API is not fixed
 
@@ -31,9 +31,9 @@ module PowerAssert
       @assertion_proc = assertion_proc
       @message_proc = -> {
         @assertion_message ||=
-          @base_caller_length > 0 ? assertion_message(line, methods, return_values, refs, @assertion_proc.binding).freeze : nil
+          @base_caller_length > 0 ? assertion_message(line || '', methods || [], return_values, refs || [], assertion_proc.binding).freeze : nil
       }
-      @proc_local_variables = assertion_proc ? assertion_proc.binding.eval('local_variables').map(&:to_s) : []
+      @proc_local_variables = assertion_proc.binding.eval('local_variables').map(&:to_s)
       @trace = TracePoint.new(:return, :c_return) do |tp|
         next if method_ids and ! method_ids.include?(tp.method_id)
         locs = tp.binding.eval('caller_locations')
@@ -46,7 +46,7 @@ module PowerAssert
             idents = extract_idents(Ripper.sexp(line), assertion_method)
             methods, refs = idents.partition {|i| i.type == :method }
           end
-          method_ids = methods.map(&:name).map(&:to_sym).uniq
+          method_ids ||= methods.map(&:name).map(&:to_sym).uniq
           if path == locs[idx].path and lineno == locs[idx].lineno
             return_values << Value[tp.method_id.to_s, tp.return_value, nil]
           end
@@ -69,10 +69,10 @@ module PowerAssert
 
     def assertion_message(line, methods, return_values, refs, proc_binding)
       set_column(line, methods, return_values)
-      ref_values = refs ? refs.map {|i| Value[i.name, proc_binding.eval(i.name), i.column] } : []
+      ref_values = refs.map {|i| Value[i.name, proc_binding.eval(i.name), i.column] }
       vals = (return_values + ref_values).find_all(&:column).sort_by(&:column).reverse
       if vals.empty?
-        return line || ''
+        return line
       end
       fmt = (vals[0].column + 1).times.map {|i| vals.find {|v| v.column == i } ? "%<#{i}>s" : ' '  }.join
       ret = []
@@ -88,7 +88,7 @@ module PowerAssert
     end
 
     def set_column(line, methods, return_values)
-      methods &&= methods.dup
+      methods = methods.dup
       return_values.each do |val|
         idx = methods.index {|method| method.name == val.name }
         if idx and (m = methods.delete_at(idx)).column
@@ -118,8 +118,8 @@ module PowerAssert
           extract_idents(s)
         end
         with(_[:method_add_arg, s0, s1]) do
-          s0_methods = extract_idents(s0)
-          s0_methods[0..-2] + extract_idents(s1) + [s0_methods[-1]]
+          s0_idents = extract_idents(s0)
+          s0_idents[0..-2] + extract_idents(s1) + [s0_idents[-1]]
         end
         with(_[:arg_paren, s]) do
           extract_idents(s)

data/lib/power_assert/pattern_match.rb

@@ -0,0 +1,16 @@
+require 'pattern-match/core'
+
+class << Array
+  include PatternMatch::Deconstructable
+
+  def deconstruct(val)
+    accept_self_instance_only(val)
+    val
+  end
+
+  private
+
+  def accept_self_instance_only(val)
+    raise PatternMatch::PatternNotMatch unless val.kind_of?(self)
+  end
+end

data/lib/power_assert/version.rb

@@ -1,3 +1,3 @@
 module PowerAssert
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/power_assert.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables      = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f) }
   s.require_paths    = ['lib']
-  s.add_runtime_dependency 'pattern-match'
+  s.add_runtime_dependency 'pattern-match', '>= 0.5.1'
   s.add_development_dependency 'test-unit'
   s.add_development_dependency 'rake'
   s.extra_rdoc_files = ['README.rdoc']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: power_assert
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kazuki Tsujimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-31 00:00:00.000000000 Z
+date: 2014-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pattern-match
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -68,6 +68,7 @@ files:
 - README.rdoc
 - Rakefile
 - lib/power_assert.rb
+- lib/power_assert/pattern_match.rb
 - lib/power_assert/version.rb
 - power_assert.gemspec
 - test/test_power_assert.rb
@@ -92,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Power Assert for Ruby