astrolabe 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1306bd1680b44a33bad44374f71f0254be88dd30
-  data.tar.gz: f49d728a8cde1724e8c312475bcd8dad607c4eb6
+  metadata.gz: 85dd0cdbc2f8c839e157b64b9115222a2b1b3a44
+  data.tar.gz: e7aeecb9e7db9c47722ba291b594a0e69adc399d
 SHA512:
-  metadata.gz: 47f5e3637d1d87069147a9d1f574ae36d853ce942fa1f3a44330430184519639490aa28c0e6c5c81e8a126ec3dbef1152eb754209c1bc2bbf35c0a2cff69f234
-  data.tar.gz: 10468278e65896eb7d8a641fbe57789823a7a11bb91e89b8b34f976037b0ae3f7e6c9066e1bf583223123c23430f9143c6eb874ba95e01621b1f5e8ab4bc9d18
+  metadata.gz: 504173457388326f8fe074f1fe091ab6db9d92c28d95797a5fff0d6c6a4eb7f7888e760b5417bcd9268aaae2f2714245b0549bc1d0ac49efe50150b63ec02369
+  data.tar.gz: efa3d1e8edc678eb99ba91daa43b139b0398e3aa0ba1a787264a4c34fe39d09dcc8cdd08a0575808e160a29527163eaeb51d1eb581bcec1c9fcaccdfe0749843

data/astrolabe.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^spec\//)
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'parser', '~> 2.1'
+  spec.add_runtime_dependency 'parser', '>= 2.1', '< 3.0'
 
   spec.add_development_dependency 'bundler',       '~> 1.6'
   spec.add_development_dependency 'rake',          '~> 10.3'

data/benchmark/benchmark_helper.rb

@@ -4,10 +4,14 @@ class Benchmarking
   class << self
     attr_accessor :warm_up
     alias_method :warm_up?, :warm_up
-    attr_writer :loop_count
+    attr_writer :trial_count, :loop_count_in_trial
 
-    def loop_count
-      @loop_count ||= 100
+    def trial_count
+      @trial_count ||= 3
+    end
+
+    def loop_count_in_trial
+      @loop_count_in_trial ||= 100
     end
 
     def pretty_time(time)
@@ -22,32 +26,48 @@ class Benchmarking
     @process = block
   end
 
-  def run
-    @process.call
+  def average_time
+    measure if times.empty?
+    times.reduce(:+) / self.class.trial_count
   end
 
-  def time
-    return @time if @time
-
-    self.class.loop_count.times { run } if self.class.warm_up?
-    GC.start # https://github.com/ruby/ruby/blob/v2_1_2/lib/benchmark.rb#L265
-
-    beginning = Time.now
-    self.class.loop_count.times { run }
-    ending = Time.now
-
-    @time = ending - beginning
-  end
+  alias_method :time, :average_time
 
   def pretty_time
     self.class.pretty_time(time)
   end
 
+  def times
+    @times ||= []
+  end
+
   def inspect
     "#{name} (#{pretty_time})"
   end
 
   alias_method :to_s, :inspect
+
+  private
+
+  def measure
+    fail 'Already measured!' unless times.empty?
+
+    self.class.loop_count.times { run } if self.class.warm_up?
+
+    self.class.trial_count.times do
+      GC.start # https://github.com/ruby/ruby/blob/v2_1_2/lib/benchmark.rb#L265
+
+      beginning = Time.now
+      self.class.loop_count_in_trial.times { run }
+      ending = Time.now
+
+      times << (ending - beginning)
+    end
+  end
+
+  def run
+    @process.call
+  end
 end
 
 RSpec::Matchers.define :be_faster_than do |other|
@@ -59,17 +79,12 @@ RSpec::Matchers.define :be_faster_than do |other|
     end
   end
 
-  {
-          twice: 2,
-    three_times: 3,
-     four_times: 4,
-     five_times: 5,
-      six_times: 6,
-    seven_times: 7
-  }.each do |name, value|
-    chain name do
-      @times = value
-    end
+  chain :at_least do |times|
+    @times = times
+  end
+
+  # Just a syntax sugar.
+  chain :times do
   end
 
   failure_message do |subject|

data/benchmark/performance_spec.rb

@@ -6,7 +6,8 @@ require 'parser/current'
 
 describe 'performance' do
   Benchmarking.warm_up = true
-  Benchmarking.loop_count = 1000
+  Benchmarking.trial_count = 3
+  Benchmarking.loop_count_in_trial = 1000
 
   def generate_source(max, current_nest_level = 1)
     <<-END
@@ -113,8 +114,8 @@ describe 'performance' do
         EachDescendantBenchmark.new('proc-pass', ast_with_node_class(node_class))
       end
 
-      specify 'block-pass is obviously (at least 5 times) faster than nested-yield' do
-        expect(block_pass).to be_faster_than(nested_yield).five_times
+      specify 'block-pass is obviously (at least 4 times) faster than nested-yield' do
+        expect(block_pass).to be_faster_than(nested_yield).at_least(4).times
       end
 
       specify 'block-pass is a bit faster than proc-pass' do

data/lib/astrolabe/node.rb

@@ -81,15 +81,15 @@ module Astrolabe
     # @yieldparam [Node] node each ancestor node
     # @return [self] if a block is given
     # @return [Enumerator] if no block is given
-    def each_ancestor(*types)
+    def each_ancestor(*types, &block)
       return to_enum(__method__, *types) unless block_given?
 
       types.flatten!
-      last_node = self
 
-      while (current_node = last_node.parent)
-        yield current_node if types.empty? || types.include?(current_node.type)
-        last_node = current_node
+      if types.empty?
+        visit_ancestors(&block)
+      else
+        visit_ancestors_with_types(types, &block)
       end
 
       self
@@ -149,8 +149,15 @@ module Astrolabe
     # @return [Enumerator] if no block is given
     def each_descendant(*types, &block)
       return to_enum(__method__, *types) unless block_given?
+
       types.flatten!
-      visit_descendants(types, &block)
+
+      if types.empty?
+        visit_descendants(&block)
+      else
+        visit_descendants_with_types(types, &block)
+      end
+
       self
     end
 
@@ -177,19 +184,55 @@ module Astrolabe
     # @return [Enumerator] if no block is given
     def each_node(*types, &block)
       return to_enum(__method__, *types) unless block_given?
+
       types.flatten!
+
       yield self if types.empty? || types.include?(type)
-      visit_descendants(types, &block)
+
+      if types.empty?
+        visit_descendants(&block)
+      else
+        visit_descendants_with_types(types, &block)
+      end
+
       self
     end
 
     protected
 
-    def visit_descendants(types, &block)
+    def visit_descendants(&block)
       children.each do |child|
         next unless child.is_a?(Node)
-        yield child if types.empty? || types.include?(child.type)
-        child.visit_descendants(types, &block)
+        yield child
+        child.visit_descendants(&block)
+      end
+    end
+
+    def visit_descendants_with_types(types, &block)
+      children.each do |child|
+        next unless child.is_a?(Node)
+        yield child if types.include?(child.type)
+        child.visit_descendants_with_types(types, &block)
+      end
+    end
+
+    private
+
+    def visit_ancestors
+      last_node = self
+
+      while (current_node = last_node.parent)
+        yield current_node
+        last_node = current_node
+      end
+    end
+
+    def visit_ancestors_with_types(types)
+      last_node = self
+
+      while (current_node = last_node.parent)
+        yield current_node if types.include?(current_node.type)
+        last_node = current_node
       end
     end
   end

data/lib/astrolabe/version.rb

@@ -6,7 +6,7 @@ module Astrolabe
   module Version
     MAJOR = 0
     MINOR = 5
-    PATCH = 1
+    PATCH = 2
 
     def self.to_s
       [MAJOR, MINOR, PATCH].join('.')

data/spec/spec_helper.rb

@@ -90,6 +90,7 @@ if ENV['TRAVIS']
 
   SimpleCov.start do
     add_filter '/spec/'
+    add_filter '/benchmark/'
     add_filter '/vendor/'
   end
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: astrolabe
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-06 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement