metahash-rb 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dd0495140177117ee39d5dfab630bd2b2883b81
-  data.tar.gz: cece44198668cd884390321748306ca80b9e4764
+  metadata.gz: ed909cd2a13513e1c8e01ba8acfe0da1e50032c8
+  data.tar.gz: 6949a93b1f88c044f1fac9c6337aec8e7a0a1c41
 SHA512:
-  metadata.gz: 19fdb4d1e1ca9ee1a2201bf8ca810f34268217ce5502053aa14958225299911c16855296b5641fdd96025b41e880d624044c223dd584c4c381f7e6e51dd5267a
-  data.tar.gz: 68bd91fbb923d0af5d4374cefab6b046b6db2d0e2168d3ef4fe9c8e6c3694061c56fd2655652926e10d74d6fd29972e4be174a67eea74566d1d6735c754ddec7
+  metadata.gz: 385f4ac6de7ee6a9403fb1727257fa46fad234922abf3a7658f5334ee5fe6c023a95cb9468266ccfbe9fbee50e0e7cd56de46b2dd7f3417658cc2021481ed9da
+  data.tar.gz: e5c52277e77242e0ed97e2a921e436894b928a56ab5a4b88b091b080268474d77b7adb047b86cd22d76dc40776114f2be143013c66b94f2c40fe05ad27a911b2

data/README.md

@@ -31,7 +31,7 @@ Provides a subclass of Hash and a wrapper around Rails' serialize attribute for
 
 #### In your Gemfile
 
-    gem "metahash-rb"
+    gem "metahash-rb", require: "metahash"
 
 #### in your ActiveRecord model
 

data/lib/metahash.rb

@@ -1,3 +1,4 @@
+require "metahash/metaclass"
 require "metahash/metadata"
 require "metahash/version"
 require 'active_record'

data/lib/metahash/metaclass.rb

@@ -0,0 +1,19 @@
+# http://reference.jumpingmonkey.org/programming_languages/ruby/ruby-metaprogramming.html
+# allows the adding of methods to instances,
+# but not the entire set of instances for a
+# particular class
+module Metaclass
+  # The hidden singleton lurks behind everyone
+  def metaclass; class << self; self; end; end
+  def meta_eval &blk; metaclass.instance_eval &blk; end
+
+  # Adds methods to a metaclass
+  def meta_def( name, &blk )
+    meta_eval { define_method name, &blk }
+  end
+
+  # Defines an instance method within a class
+  def class_def( name, &blk )
+    class_eval { define_method name, &blk }
+  end
+end

data/lib/metahash/metadata.rb

@@ -20,6 +20,10 @@
 #     h[:inner][:key] == "value"
 #
 class Metadata < Hash
+  include Metaclass
+  # in the event we are overriding a method, have a way to
+  # get back to the original
+  METHOD_BACKUP_KEY = "metadata_original_"
 
   # the hash being passed in will have all its subhashes converted to
   # metadata hashes.
@@ -39,9 +43,6 @@ class Metadata < Hash
     elsif hash.is_a?(Hash)
       # recursively create nested metadata objects
       hash.each do |key, value|
-        if not valid_key?(key)
-          raise ArgumentError.new("Not Allowed. '#{key}' is a reserved method.")
-        end
 
         self[key] = (
           if value.is_a?(Hash)
@@ -68,18 +69,21 @@ class Metadata < Hash
     # check for assignment
     if (key = method_name.to_s).include?("=")
       key = key.chop.to_sym
-      if not self.valid_key?(key)
-        raise ArgumentError.new("Not Allowed. '#{key}' is a reserved method.")
-      end
 
+      deepest_metadata = self
       if not @empty_nested_hashes.empty?
-        deepest_metadata = self
         @empty_nested_hashes.each do |key|
           deepest_metadata = deepest_metadata[key] = Metadata.new
         end
         @empty_nested_hashes = []
         deepest_metadata[key] = args[0]
-     end
+        # override any existing method with the key
+        deepest_metadata.meta_def(key){ self[key]}
+      else
+        self[key] = args[0]
+        # override any existing method with the key
+        self.meta_def(key){ args[0] }
+      end
     else
       value = self[method_name]
       if not value
@@ -106,9 +110,7 @@ class Metadata < Hash
   # @param [Symbol] key
   # @return [Boolean] whether or not this can be used as a hash key
   def valid_key?(key)
-    # second parameter says that we are
-    #  looking at private methods as well
-    not self.respond_to?(key, true)
+    not self.respond_to?(key)
   end
 
   # convert to regular hash, recursively

data/lib/metahash/version.rb

@@ -1,3 +1,3 @@
 module MetaHash
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/metahash.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "bundler"
   s.add_development_dependency "rspec"
   s.add_development_dependency "sqlite3"
+  s.add_development_dependency "awesome_print"
   s.add_development_dependency "pry-byebug"
   s.add_development_dependency "codeclimate-test-reporter"
 

data/spec/metadata_spec.rb

@@ -11,12 +11,17 @@ describe Metadata do
 
     it "removes empty hashes" do
       m.a.b.c
-      expect(m.send :prune).to eq Metadata.new
+      expect(m.a.b.c).to eq Metadata.new
     end
 
     it "does not remove valid hashes" do
       m.a.b = 2
-      expect(m.send :prune).to_not eq Metadata.new
+      expect(m.a.b).to_not eq Metadata.new
+    end
+
+    it "does not remove valid hashes of long chains" do
+      m.a.b.c.d.e = 2
+      expect(m.a.b.c.d.e).to eq 2
     end
 
     it "does not pollute itself with empty hashes" do
@@ -25,13 +30,36 @@ describe Metadata do
     end
   end
 
+  context "assigns values" do
+    let(:m){Metadata.new}
+
+    it "sets a non-exsiting deep value" do
+      m.a.b = 2
+      expect(m.a.b).to eq 2
+    end
+
+    it "sets with specific keys" do
+      m.a.min = 2
+      m.a.max = 3
+      expect(m.a.min).to eq 2
+      expect(m.a.max).to eq 3
+    end
+
+    it "overrides existing methods if set" do
+      m.keys = 2
+      expect(m.keys).to eq 2
+    end
+
+    it "overrides existing methods if set to non-simple objects" do
+      m.a.b = 2
+      m.a.keys = 3
+      expect(m.a.keys).to eq 3
+    end
 
-  it "sets a non-exsiting deep value" do
-    m = Metadata.new
-    m.a.b = 2
-    expect(m.a.b).to eq 2
   end
 
+
+
   it "has indifferent access" do
     m = Metadata.new(a: 2)
     expect(m.a).to eq 2
@@ -49,10 +77,4 @@ describe Metadata do
     expect(m[:outer][:inner][:k]).to eq h[:outer][:inner][:k]
   end
 
-  it "does not allow hash keys to conflict with the name of a method of the Hash object" do
-    expect{
-      Metadata.new( outer: { key: "value" } )
-    }.to raise_error
-  end
-
 end

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require "bundler/setup"
 require "metahash"
 require "pry-byebug" # binding.pry to debug!
 require "codeclimate-test-reporter"
+require "awesome_print"
 CodeClimate::TestReporter.start
 
 ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metahash-rb
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - L. Preston Sego III
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  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-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,7 @@ files:
 - README.md
 - Rakefile
 - lib/metahash.rb
+- lib/metahash/metaclass.rb
 - lib/metahash/metadata.rb
 - lib/metahash/version.rb
 - metahash.gemspec
@@ -141,7 +156,7 @@ rubyforge_project:
 rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
-summary: MetaHash-1.0.2
+summary: MetaHash-1.0.3
 test_files:
 - spec/metadata_spec.rb
 - spec/metahash_spec.rb