octothorpe 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75ff578c9887b8a62a0effcc8e51233eefb7743e
-  data.tar.gz: c449257f2bed3d03ee82b53653771e22711d312e
+  metadata.gz: 1dc7649e0f220470c6ec828bdeb73cd870f0e1b6
+  data.tar.gz: b1828f26f8d683bdc0347eec4ede391320874cca
 SHA512:
-  metadata.gz: 3cb263ec2df833ac54a34cc838b267bd198062cb93c3db6c6ee383fdce4943eb06c9b34f0e0703d79f53aa8c056c8899172fb32339c029fc61b4ad94685911d9
-  data.tar.gz: 34b01fb89862be06e9c92e2e801c11247b14f4a6cb61b29027d9cec421610225aa4ccde24fbbc55e400de67397c0f6087b3d755bf04db5b3570bebb5772494ab
+  metadata.gz: 13788c201cf67ca740757ef58fd693d6b43bef1580b2ff25e3ee7fcc75c9ad642710a0d04b93f98dcdb03836bb826df8f75be8dbc3bef65442004ae1e5ffdf77
+  data.tar.gz: d8197ac01d73730e3a6a9c3066a48fb8057eca3284c8e4196358b5b9a0d70f8dc6ed349fecf342cdaacbce832219f14c99f446ccea1d6dc1fab7e2e422ec12c5

data/README.md

@@ -74,8 +74,8 @@ hash && (hash[:key] || {})[4]
 ... and for some reason Ruby's new lonely operator is a problem, then this might just possibly be
 of use. 
 
-Alternatively you might try an OpenStruct, Rails' HashWithIndifferentAccess, the Hashie gem or the
-AndAnd gem.
+Alternatively you might try a Struct. (Really, if you can use a Struct, then that would be better).
+Or an OpenStruct, Rails' HashWithIndifferentAccess, or the Hashie gem.
 
 ### Why Read-Only?
 

data/lib/octothorpe.rb

@@ -41,7 +41,7 @@ class Octothorpe
   def_delegators :@inner_hash, :select, :map, :reject, :inject
 
   # Gem version number
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 
 
   # Generic Octothorpe error class
@@ -67,7 +67,7 @@ class Octothorpe
 
     def method_missing(method, *attrs)
       super if (::Kernel.block_given? || !attrs.empty?)
-      @octothorpe_store[method.to_sym]
+      @octothorpe_store[method]
     end
 
   end
@@ -98,11 +98,11 @@ class Octothorpe
   #
   # You can use >> to access member objects in somewhat the same way as an OpenStruct.
   #
-  #   ot = Octotghorpe.new(one: 1, "two" => 2)
+  #   ot = Octothorpe.new(one: 1, "two" => 2)
   #   ot.>>.one  # -> 1
   #
-  # This will not work for members that have keys with spaces in, or keys which have the same name
-  # as methods on Object. Use _get_ for those.
+  # This will not work for members that have keys with spaces in, keys which have the same name as
+  # methods on Object, or keys that aren't String or Symbol. Use _get_ for those.
   #
   def >>; @store; end
 
@@ -118,7 +118,7 @@ class Octothorpe
   # Unlike >>, this works for keys with spaces, or keys that have the same name as methods on
   # Object.
   #
-  def get(key); @store.octothorpe_store[key.to_sym]; end
+  def get(key); @store.octothorpe_store[octokey key]; end
 
   alias send get
   alias [] get
@@ -150,7 +150,7 @@ class Octothorpe
     raise Frozen if self.frozen?
 
     klass = args.shift unless block_given?
-    keys  = args.map(&:to_sym)
+    keys  = args.map{|k| octokey k}
 
     if block_given?
       keys.each{|k| @store.octothorpe_store[k] ||= yield k }
@@ -229,10 +229,10 @@ class Octothorpe
     if thing.kind_of?(Octothorpe)
       thing.to_h
     else
-      thing.each_with_object({}) {|(k,v),m| m[k.to_sym] = v }
+      thing.each_with_object({}) {|(k,v),m| m[octokey k] = v }
     end
   rescue
-    raise BadHash
+    raise BadHash, $!
   end
 
 
@@ -246,5 +246,13 @@ class Octothorpe
     thisHash.send(method, otherHash)
   end
 
+  
+  ##
+  # Munge a potential key so we can use it
+  #
+  def octokey(thing)
+    thing.is_a?(String) ? thing.to_sym : thing
+  end
+
 end
 

data/spec/octothorpe_spec.rb

@@ -1,4 +1,5 @@
 require 'octothorpe'
+require 'date'
 
 describe Octothorpe do
 
@@ -28,6 +29,13 @@ describe Octothorpe do
       expect{ Octothorpe.new(14)      }.to raise_exception Octothorpe::BadHash
     end
 
+    it "accepts a hash with a nil or non-string key" do
+      expect{ Octothorpe.new( {nil=>"foo"} ) }.not_to raise_exception
+      expect{ Octothorpe.new( {1=>"foo"}              ) }.not_to raise_exception
+      expect{ Octothorpe.new( {Date.new=>"foo"}       ) }.not_to raise_exception
+      expect{ Octothorpe.new( {Octothorpe.new=>"foo"} ) }.not_to raise_exception
+    end
+
   end
 
 
@@ -66,6 +74,15 @@ describe Octothorpe do
       expect( @ot.get('weird key') ).to eq @hash2[:'weird key']
     end
 
+    it "will accept nil or non-string keys" do
+      hash = { nil => "nil", Date.new => "date", Octothorpe.new => "ot" }
+      ot   = Octothorpe.new(hash)
+
+      hash.each do |k,v|
+        expect( ot.get(k) ).to eq v
+      end
+    end
+
   end
 
 
@@ -99,6 +116,13 @@ describe Octothorpe do
       expect( @ot.guard(Array, :foo) ).to eq @ot
     end
 
+    it "will accept nil or non-string keys" do
+      hash = { nil => "nil", Date.new => "date", Octothorpe.new => "ot" }
+      ot   = Octothorpe.new(hash)
+
+      expect{ ot.guard(Hash, *hash.keys) }.not_to raise_exception
+    end
+
     context "when given a class" do
 
       it "accepts a class and list of keys" do
@@ -148,7 +172,6 @@ describe Octothorpe do
 
     end
 
-
   end
 
 

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: octothorpe
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Andy Jones
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-doc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |
@@ -93,9 +93,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .hgignore
-- .hgtags
-- .rspec
+- ".hgignore"
+- ".hgtags"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -115,17 +115,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Like a Hash. Better for message passing between classes, I hope.
@@ -133,4 +133,3 @@ test_files:
 - spec/doc_no_pending.rb
 - spec/octothorpe_spec.rb
 - spec/spec_helper.rb
-has_rdoc: