octothorpe 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc534ef4336a77b76543f3516e116638fa32689c
-  data.tar.gz: bea9afa7dbf04641ad087876739b196bb144eae5
+  metadata.gz: 04716672658edfc3209de1cf393dd97f6bc8704a
+  data.tar.gz: 87efb8325fbe599b1ee0c17ac3dd854a2190a601
 SHA512:
-  metadata.gz: f0aefe4fe287dde92571b523f81d556c66140e44cab5c0b5287d789400c08eec22d01eff403f858692a20fcd40dbc1ddec8ea7f5de5c44018b3c7c10bb23500f
-  data.tar.gz: e873feb328edecb076cd126c92861d0f7032d2fc4bca4b21ef732c8a7c75d3c8be1a46a84e37008559a8b9f2069721e4da01309bcc1b43eeccef1525f5521d25
+  metadata.gz: 95250990bf652fef1126436b8f86cfebc049cac2074f59355a819847b9f5fde15d85cf151930df174d48fb095be3b8fd8293c8cf6f6f60329fd40f5ca286a35f
+  data.tar.gz: 931b5b36ee0e1976831ee8f9d6ee8a7d3df86a7557407229c0010fc9ab3469700089496ddd505b6a42a243db1d4cc1945eedab7bcc5ce82bbdcfcd986d668712

data/.hgignore

@@ -10,4 +10,5 @@ tmp/
 *.o
 *.a
 mkmf.log
-.rbenv-gemsets
+.ruby*
+.rbenv*

data/lib/octothorpe.rb

@@ -14,7 +14,7 @@ require 'forwardable'
 # Meant to facilitate message-passing between classes.
 #
 # Simple example:
-#     ot = Octotghorpe.new(one: 1, "two" => 2, "weird key" => 3)
+#     ot = Octothorpe.new(one: 1, "two" => 2, "weird key" => 3)
 #     ot.>>.one            # -> 1
 #     ot.>>.two            # -> 2
 #     ot.get("weird key")  # -> 3
@@ -41,7 +41,7 @@ class Octothorpe
   def_delegators :@inner_hash, :select, :map, :reject, :inject
 
   # Gem version number
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 
 
   # Generic Octothorpe error class
@@ -59,15 +59,15 @@ class Octothorpe
   # names.  Not exposed to Octothorpe's caller.
   #
   class Storage
-    attr_reader :store
+    attr_reader :octothorpe_store
 
     def initialize(hash)
-      @store = hash
+      @octothorpe_store = hash
     end
 
     def method_missing(method, *attrs)
       super if (block_given? || !attrs.empty?)
-      @store[method.to_sym]
+      @octothorpe_store[method.to_sym]
     end
 
   end
@@ -88,7 +88,7 @@ class Octothorpe
   #
   def initialize(hash=nil)
     @store = Storage.new( symbol_hash(hash || {}) )
-    @inner_hash = @store.store
+    @inner_hash = @store.octothorpe_store
   end
 
 
@@ -112,13 +112,14 @@ class Octothorpe
   # :call-seq:
   #   ot.get(key)
   #   ot.send(key)
+  #   ot[key]
   #
   # You can use get to access member object values instead of the >> syntax.
   #
   # Unlike >>, this works for keys with spaces, or keys that have the same name
   # as methods on Object.
   #
-  def get(key); @store.store[key.to_sym]; end
+  def get(key); @store.octothorpe_store[key.to_sym]; end
 
   alias send get
   alias [] get
@@ -127,7 +128,7 @@ class Octothorpe
   ##
   # Returns a hash of the object.
   #
-  def to_h; @store.store; end
+  def to_h; @store.octothorpe_store; end
 
 
   ##
@@ -146,7 +147,7 @@ class Octothorpe
   #
   def guard(klass, *keys)
     raise Frozen if self.frozen?
-    keys.map(&:to_sym).each{|k| @store.store[k] ||= klass.new }
+    keys.map(&:to_sym).each{|k| @store.octothorpe_store[k] ||= klass.new }
     self
   end
 
@@ -156,22 +157,23 @@ class Octothorpe
   #   ot.merge(other)                              -> new_ot
   #   ot.merge(other){|key, oldval, newval| block} -> new_ot
   #
-  # Exactly has _Hash.merge_, but returns a new Octothorpe object.
+  # Exactly as _Hash.merge_, but returns a new Octothorpe object.
   #
   # You may pass a hash or an octothorpe. Raises Octothorpe::BadHash
   # if it is anything else.
   #
   def merge(other)
+    thisHash  = @store.octothorpe_store
     otherHash = symbol_hash(other)
 
     merged = 
       if block_given?
-        @store.store.merge(otherHash) {|key,old,new| yield key, old, new }
+        thisHash.merge(otherHash) {|key,old,new| yield key, old, new }
       else
-        @store.store.merge(otherHash)
+        thisHash.merge(otherHash)
       end
 
-    return Octothorpe.new(merged)
+    Octothorpe.new(merged)
   end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octothorpe
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Andy Jones
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,7 +95,6 @@ extra_rdoc_files: []
 files:
 - ".hgignore"
 - ".rspec"
-- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -125,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Like a Hash. Better for message passing between classes, I hope.

data/.ruby-version

@@ -1 +0,0 @@
-2.2.2