sycamore 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9ca22a9fa8a7caafbbce1f4a166ff6a43780493
-  data.tar.gz: ed6fa35d1e3bdef4d41d3642153437755dc0d708
+  metadata.gz: 3400b36a441f2a76477f4d0de2e6ffca2daefe49
+  data.tar.gz: cf08112b5fbe999cb12e09736a6828912c7cc41a
 SHA512:
-  metadata.gz: 55180ebbfd457ba351a0ad933bcf5064e3de0efa9bb032bcc0c8bf4e9493abe108ad2a40d2de82a584beadc57973b92ffb9027aabbb84bd8a6a070de55cab77d
-  data.tar.gz: ac5e395633685242d42b6b3710441274425266ecaa2246298c6434146b65df1e2993bc5ad9de266f1d9e94dd9c193fa8be12dfe416b079192932cb4efe5f5ac4
+  metadata.gz: b4675895dca790b7a8968fba0363ca713d592b1be4454fc23446e26f607f7b5dc75bfca6bd572a35bd477a989df265a19ba692fb2a09dfe078d44c625e509fe3
+  data.tar.gz: 5ee07612195732f7c15234c9f8f8555e60ba3cb557de10d44c104c89f7819c15ba41606cebed3783e42d965841ccc25abbaa7e58b0a49a0279b9cecd4f41a899

data/.gitignore

@@ -1,6 +1,7 @@
 /.bundle/
 /.yardoc
 /Gemfile.lock
+/.ruby-version
 /_yardoc/
 /coverage/
 /doc

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
+bundler_args: --without debug
 rvm:
-  - 2.1
   - 2.2.4
-  - 2.3.0
-  - jruby-9.0.4.0
-  - rbx-2
+  - 2.3.1
+  - jruby-9.0.5.0
+  - rbx
 cache: bundler
 before_install:
   - gem update bundler

data/CHANGELOG.md

@@ -5,6 +5,22 @@ This project adheres to [Semantic Versioning](http://semver.org/) and
 [Keep a CHANGELOG](http://keepachangelog.com).
 
 
+## 0.3.1 - 2016-05-07
+
+### Added
+
+- array-access operator and `fetch` on `Path` for random access
+
+### Changed
+
+- Lazy initialization of the internal hash. This improves extensibility, eg. by  
+  not requiring a `super` call in the constructors of `Tree` subclasses.
+
+
+[Compare v0.3.0...v0.3.1](https://github.com/marcelotto/sycamore/compare/v0.3.0...v0.3.1)
+
+
+
 ## 0.3.0 - 2016-04-23
 
 ### Added
@@ -32,6 +48,7 @@ This project adheres to [Semantic Versioning](http://semver.org/) and
 - `Tree#delete` deleted paths, when they matched a given input path partially,
   e.g. `Tree[a: 1] >> a: {1 => 2}` deleted successfully.
 
+
 [Compare v0.2.1...v0.3.0](https://github.com/marcelotto/sycamore/compare/v0.2.1...v0.3.0)
 
 
@@ -47,6 +64,7 @@ This project adheres to [Semantic Versioning](http://semver.org/) and
 
 - [#2](https://github.com/marcelotto/sycamore/issues/2): Rubinius support
 
+
 [Compare v0.2.0...v0.2.1](https://github.com/marcelotto/sycamore/compare/v0.2.0...v0.2.1)
 
 
@@ -60,6 +78,7 @@ This project adheres to [Semantic Versioning](http://semver.org/) and
 - `Tree#node!` as a more strict variant of `Tree#node`, which raises an error 
   when no node present
 
+
 [Compare v0.1.0...v0.2.0](https://github.com/marcelotto/sycamore/compare/v0.1.0...v0.2.0)
 
 

data/Gemfile

@@ -2,9 +2,8 @@ source 'https://rubygems.org'
 
 gemspec
 
-group :development do
+group :debug do
   gem 'guard-rspec'
-  gem 'listen', '< 3.1' # to circumvent the fail for Ruby 2.1 and Rubinius
   gem 'pry'
 end
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/sycamore/path.rb

@@ -1,3 +1,5 @@
+require 'forwardable'
+
 module Sycamore
 
   ##
@@ -21,6 +23,7 @@ module Sycamore
   #
   class Path
     include Enumerable
+    extend Forwardable
 
     attr_reader :node, :parent
 
@@ -75,6 +78,8 @@ module Sycamore
     # @group Elements
     ########################################################################
 
+    def_delegators :to_a, :[], :fetch
+
     ##
     # Returns a new path based on this path, but with the given nodes extended.
     #

data/lib/sycamore/tree.rb

@@ -65,7 +65,14 @@ module Sycamore
     # Creates a new empty Tree.
     #
     def initialize
-      @data = Hash.new
+    end
+
+    protected def data
+      @data ||= Hash.new
+    end
+
+    protected def clear_data
+      @data = nil
     end
 
     ##
@@ -218,7 +225,7 @@ module Sycamore
     alias << add
 
     protected def add_node(node)
-      @data[node] ||= Nothing
+      data[node] ||= Nothing
 
       self
     end
@@ -227,7 +234,7 @@ module Sycamore
     # @api private
     #
     def clear_child_of_node(node)
-      @data[valid_node! node] = Nothing
+      data[valid_node! node] = Nothing
 
       self
     end
@@ -238,8 +245,8 @@ module Sycamore
     def add_node_with_empty_child(node)
       valid_node! node
 
-      if @data.fetch(node, Nothing).nothing?
-        @data[node] = new_child(node)
+      if data.fetch(node, Nothing).nothing?
+        data[node] = new_child(node)
       end
 
       self
@@ -249,7 +256,7 @@ module Sycamore
       return add_node(node) if Nothing.like?(children)
 
       add_node_with_empty_child(node)
-      @data[node] << children
+      data[node] << children
 
       self
     end
@@ -329,7 +336,7 @@ module Sycamore
     alias >> delete
 
     protected def delete_node(node)
-      @data.delete(node)
+      data.delete(node)
 
       self
     end
@@ -491,7 +498,7 @@ module Sycamore
     #   tree.size  # => 0
     #
     def clear
-      @data.clear
+      data.clear
 
       self
     end
@@ -509,7 +516,7 @@ module Sycamore
     #   tree.to_h  # => {foo: :bar}
     #
     def compact
-      @data.each do |node, child| case
+      data.each do |node, child| case
           when child.nothing? then next
           when child.empty?   then clear_child_of_node(node)
           else child.compact
@@ -535,7 +542,7 @@ module Sycamore
     #   tree[:foo].nodes  # => [:bar, :baz]
     #
     def nodes
-      @data.keys
+      data.keys
     end
 
     alias keys nodes  # Hash compatibility
@@ -605,7 +612,7 @@ module Sycamore
     def child_of(node)
       valid_node! node
 
-      Nothing.like?(child = @data[node]) ? Absence.at(self, node) : child
+      Nothing.like?(child = data[node]) ? Absence.at(self, node) : child
     end
 
     ##
@@ -684,7 +691,7 @@ module Sycamore
       return fetch_path(node, *default, &block) if node.is_a? Path
       valid_node! node
 
-      child = @data.fetch(node, *default, &block)
+      child = data.fetch(node, *default, &block)
       if child.equal? Nothing
         child = case
           when block_given?    then yield
@@ -754,7 +761,7 @@ module Sycamore
     def each_node(&block)
       return enum_for(__callee__) unless block_given?
 
-      @data.each_key(&block)
+      data.each_key(&block)
 
       self
     end
@@ -783,7 +790,7 @@ module Sycamore
     def each_pair(&block)
       return enum_for(__callee__) unless block_given?
 
-      @data.each_pair(&block)
+      data.each_pair(&block)
 
       self
     end
@@ -870,7 +877,7 @@ module Sycamore
     def include_node?(node)
       return include_path?(node) if node.is_a? Path
 
-      @data.include?(node)
+      data.include?(node)
     end
 
     alias member?  include_node?  # Hash compatibility
@@ -954,7 +961,7 @@ module Sycamore
     #   tree["e"].size  # => 2
     #
     def size
-      @data.size
+      data.size
     end
 
     ##
@@ -971,7 +978,7 @@ module Sycamore
     #
     def total_size
       total = size
-      @data.each { |_, child| total += child.total_size }
+      data.each { |_, child| total += child.total_size }
       total
     end
 
@@ -1001,7 +1008,7 @@ module Sycamore
     #   Tree[a: 1].empty?  # => false
     #
     def empty?
-      @data.empty?
+      data.empty?
     end
 
     alias blank? empty?
@@ -1146,7 +1153,7 @@ module Sycamore
     # @return [Fixnum]
     #
     def hash
-      @data.hash ^ self.class.hash
+      data.hash ^ self.class.hash
     end
 
     ##
@@ -1165,7 +1172,7 @@ module Sycamore
     #   tree1.eql? tree4  # => false
     #
     def eql?(other)
-      (other.instance_of?(self.class) and @data.eql?(other.data)) or
+      (other.instance_of?(self.class) and data.eql?(other.data)) or
         (other.instance_of?(Absence) and other.eql?(self))
     end
 
@@ -1339,7 +1346,7 @@ module Sycamore
       # not the nicest, but fastest way to inject on hashes, as noted here:
       # http://stackoverflow.com/questions/3230863/ruby-rails-inject-on-hashes-good-style
       hash = {}
-      @data.each do |node, child|
+      data.each do |node, child|
         hash[node] = child.to_native_object(*args)
       end
 
@@ -1444,7 +1451,7 @@ module Sycamore
     #
     def initialize_clone(other)
       super
-      @data = Hash.new
+      clear_data
       add other
     end
 
@@ -1454,7 +1461,7 @@ module Sycamore
     # @see http://ruby-doc.org/core/Object.html#method-i-freeze
     #
     def freeze
-      @data.freeze
+      data.freeze
       each { |_, child| child.freeze }
       super
     end

data/sycamore.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.1'
 
-  spec.add_development_dependency 'bundler', '~> 1.9'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '~> 1.11'
+  spec.add_development_dependency 'rake', '~> 11.0'
   spec.add_development_dependency 'rspec', '~> 3.4.0'
   spec.add_development_dependency 'yard', '~> 0.8'
   spec.add_development_dependency 'yard-doctest'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sycamore
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Marcel Otto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-23 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -90,7 +90,6 @@ files:
 - ".editorconfig"
 - ".gitignore"
 - ".rspec"
-- ".ruby-version"
 - ".travis.yml"
 - ".yardopts"
 - AUTHORS

data/.ruby-version

@@ -1 +0,0 @@
-2.3.0