smart_hash 0.1.0 → 0.1.1

data/.gitignore

@@ -2,10 +2,10 @@
 .ref-*
 .old*
 *-old*
+/.rvmrc
 
 # Project-specific.
 /*.rb
 /doc/
 /pkg/
-/.rvmrc
 /.yardoc

data/README.md

@@ -2,6 +2,7 @@
 A smarter alternative to OpenStruct
 ===================================
 
+
 Introduction
 ------------
 
@@ -20,7 +21,7 @@ Setup
 $ gem install smart_hash
 ~~~
 
-, or via Bundler's `Gemfile`:
+Or using Bundler's `Gemfile`:
 
 ~~~
 gem "smart_hash"

data/Rakefile

@@ -1 +1,7 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+desc "Run all specs"
+RSpec::Core::RakeTask.new do |t|
+  #t.pattern = "./spec/**/*_spec.rb"    # Should be the default pattern.
+end

data/lib/smart_hash.rb

@@ -1,7 +1,14 @@
 require "set"
 
-# Get us `SmartHash::Loose`. It's usually `Dir[]` in other gems, but we've only got 1 file at the moment.
-require File.expand_path("../smart_hash/loose", __FILE__)
+# Load our stuff.
+# NOTE: Our includes are capable of being loaded in arbitrary order (for spec and stuff), hence the `< Hash` in each of them.
+[
+  "smart_hash/**/*.rb",
+].each do |fmask|
+  Dir[File.expand_path("../#{fmask}", __FILE__)].each do |fn|
+    require fn
+  end
+end
 
 # == A smarter alternative to OpenStruct
 #
@@ -21,9 +28,6 @@ class SmartHash < Hash
   # Forbidden attrs cannot be manupulated as such and are handled as methods only.
   FORBIDDEN_ATTRS = [:default, :default_proc, :strict]
 
-  # Gem version.
-  VERSION = "0.1.0"
-
   # See #declare.
   attr_reader :declared_attrs
 
@@ -67,10 +71,10 @@ class SmartHash < Hash
   #
   # See also #undeclare.
   def declare(*attrs)
-    raise ArgumentError, "No attrs specified" if attrs.empty?
+    raise ArgumentError, "No attributes specified" if attrs.empty?
     attrs.each do |attr|
-      (v = attr).is_a?(klass = Symbol) or raise ArgumentError, "#{klass} expected, #{v.class} (#{v.inspect}) given"
-      attr.to_s.match /\A#{ATTR_REGEXP}\z/ or raise ArgumentError, "Incorrect attribute name '#{attr}'"
+      [attr, Symbol].tap {|v, klass| v.is_a?(klass) or raise ArgumentError, "#{klass} expected, #{v.class} (#{v.inspect}) given"}
+      attr.to_s.match /\A#{ATTR_REGEXP}\z/ or raise ArgumentError, "Incorrect attribute name: #{attr}"
       @declared_attrs << attr   # `Set` is returned.
     end
   end
@@ -85,23 +89,23 @@ class SmartHash < Hash
   #
   # See also #unprotect.
   def protect(*attrs)
-    raise ArgumentError, "No attrs specified" if attrs.empty?
+    raise ArgumentError, "No attributes specified" if attrs.empty?
     attrs.each do |attr|
-      (v = attr).is_a?(klass = Symbol) or raise ArgumentError, "#{klass} expected, #{v.class} (#{v.inspect}) given"
-      attr.to_s.match /\A#{ATTR_REGEXP}\z/ or raise ArgumentError, "Incorrect attribute name '#{attr}'"
+      [attr, Symbol].tap {|v, klass| v.is_a?(klass) or raise ArgumentError, "#{klass} expected, #{v.class} (#{v.inspect}) given"}
+      attr.to_s.match /\A#{ATTR_REGEXP}\z/ or raise ArgumentError, "Incorrect attribute name: #{attr}"
       @protected_attrs << attr
     end
   end
 
   def undeclare(*attrs)
-    raise ArgumentError, "No attrs specified" if attrs.empty?
+    raise ArgumentError, "No attributes specified" if attrs.empty?
     attrs.each do |attr|
       @declared_attrs.delete(attr)    # `Set` is returned.
     end
   end
 
   def unprotect(*attrs)
-    raise ArgumentError, "No attrs specified" if attrs.empty?
+    raise ArgumentError, "No attributes specified" if attrs.empty?
     attrs.each do |attr|
       @protected_attrs.delete(attr)
     end
@@ -110,7 +114,7 @@ class SmartHash < Hash
   private
 
   # Make private copies of methods we need.
-  [:fetch, :instance_eval].each do |method_name|
+  [:fetch].each do |method_name|
     my_method_name = "_smart_hash_#{method_name}".to_sym
     alias_method my_method_name, method_name
     private my_method_name
@@ -118,6 +122,10 @@ class SmartHash < Hash
 
   # Common post-initialize routine.
   def _smart_hash_init      #:nodoc:
+    # At early stages of construction via `[]` half-ready instances might be accessed.
+    # Do determine such situations we need a flag.
+    @is_initialized = true
+
     @declared_attrs = Set[]
     @strict = true
 
@@ -126,45 +134,66 @@ class SmartHash < Hash
     # he'll find a way to do it anyway.
     @protected_attrs = Set[:inspect, :to_s]
 
-    # Suppress warnings.
-    vrb, $VERBOSE = $VERBOSE, nil
-
-    # Insert lookup routine for existing methods, such as <tt>size</tt>.
-    methods.map(&:to_s).each do |method_name|
-      # Install control routine on correct attribute access methods only.
-      # NOTE: Check longer REs first.
-      case method_name
-      when /\A(#{ATTR_REGEXP})=\z/
-        # Case "r.attr=".
-        attr = $1.to_sym
-        next if FORBIDDEN_ATTRS.include? attr
-        _smart_hash_instance_eval <<-EOT
-          def #{method_name}(value)
-            raise ArgumentError, "Attribute '#{attr}' is protected" if @protected_attrs.include? :#{attr}
-            self[:#{attr}] = value
-          end
-        EOT
-      when /\A#{ATTR_REGEXP}\z/
-        # Case "r.attr".
-        next if FORBIDDEN_ATTRS.include? attr
-        _smart_hash_instance_eval <<-EOT
-          def #{method_name}(*args)
-            if @declared_attrs.include?(:#{method_name}) or has_key?(:#{method_name})
-              if @strict
-                _smart_hash_fetch(:#{method_name})
+    # Extend own class with dynamic methods if needed.
+    if not self.class < DynamicMethods
+      method_names = methods.map(&:to_s)
+
+      # Skip methods matching forbidden attrs.
+      method_names -= FORBIDDEN_ATTRS.map(&:to_s) + FORBIDDEN_ATTRS.map {|_| "#{_}="}
+
+      # Collect pieces of code.
+      pcs = []
+
+      method_names.each do |method_name|
+        case method_name
+        when /\A(#{ATTR_REGEXP})=\z/
+          # Assignment.
+          attr = $1.to_sym
+          # NOTE: See `@is_initialized` checks -- our code must take control only when the object is fully initialized.
+          pcs << %{
+            def #{method_name}(value)
+              if @is_initialized
+                if @protected_attrs.include? :#{attr}
+                  raise ArgumentError, "Attribute is protected: #{attr}"
+                else
+                  self[:#{attr}] = value
+                end
+              else
+                super
+              end
+            end
+          } # pcs <<
+        when /\A(#{ATTR_REGEXP})\z/
+          # Access.
+          attr = $1.to_sym
+          pcs << %{
+            def #{method_name}(*args)
+              if @is_initialized and (@declared_attrs.include?(:#{attr}) or has_key?(:#{attr}))
+                if @strict
+                  _smart_hash_fetch(:#{attr})
+                else
+                  self[:#{attr}]
+                end
               else
-                self[:#{method_name}]
+                super
               end
-            else
-              super
             end
-          end
-        EOT
-      end # case
-    end # each
+          } # pcs <<
+        end # case
+      end # method_names.each
 
-    # Restore warnings.
-    $VERBOSE = vrb
+      # Suppress warnings.
+      vrb, $VERBOSE = $VERBOSE, nil
+
+      # Create dynamic methods.
+      DynamicMethods.class_eval pcs.join("\n")
+
+      # Restore warnings.
+      $VERBOSE = vrb
+
+      # Include dynamic methods.
+      self.class.class_eval "include DynamicMethods"
+    end
   end
 
   def method_missing(method_name, *args)
@@ -172,17 +201,17 @@ class SmartHash < Hash
 
     case method_name
     when /\A(.+)=\z/
-      # Case "r.attr=". Attribute assignment. Method name is pre-validated for us by Ruby.
+      # Assignment. Method name is pre-validated for us by Ruby.
       attr = $1.to_sym
-      raise ArgumentError, "Attribute '#{attr}' is protected" if @protected_attrs.include? attr
-
+      raise ArgumentError, "Attribute is protected: #{attr}" if @protected_attrs.include? attr
       self[attr] = args[0]
-    when /\A#{ATTR_REGEXP}\z/
-      # Case "r.attr".
+    when /\A(#{ATTR_REGEXP})\z/
+      # Access.
+      attr = $1.to_sym
       if @strict
-        _smart_hash_fetch(method_name)
+        _smart_hash_fetch(attr)
       else
-        self[method_name]
+        self[attr]
       end
     else
       super

data/lib/smart_hash/dynamic_methods.rb

@@ -0,0 +1,7 @@
+require File.expand_path("../../smart_hash", __FILE__)
+
+class SmartHash < Hash
+  # This module will get dynamically extended with methods which exist in `Hash`.
+  module DynamicMethods
+  end
+end

data/lib/smart_hash/loose.rb

@@ -1,3 +1,5 @@
+require File.expand_path("../../smart_hash", __FILE__)
+
 class SmartHash < Hash
   # Non-strict SmartHash
   #

data/lib/smart_hash/version.rb

@@ -0,0 +1,6 @@
+require File.expand_path("../../smart_hash", __FILE__)
+
+class SmartHash < Hash
+  # Gem version.
+  VERSION = "0.1.1"
+end

data/smart_hash.gemspec

@@ -1,4 +1,4 @@
-require File.expand_path("../lib/smart_hash", __FILE__)
+require File.expand_path("../lib/smart_hash/version", __FILE__)
 
 Gem::Specification.new do |s|
   s.name = "smart_hash"
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables = `git ls-files -- bin/*`.split("\n").map {|f| File.basename(f)}
   s.require_paths = ["lib"]
 
   s.add_development_dependency "rspec"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_hash
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000Z
+date: 2012-03-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &85732360 !ruby/object:Gem::Requirement
+  requirement: &73881490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85732360
+  version_requirements: *73881490
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &85732120 !ruby/object:Gem::Requirement
+  requirement: &73881180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85732120
+  version_requirements: *73881180
 description: A smarter alternative to OpenStruct
 email:
 - alex.r@askit.org
@@ -48,7 +48,9 @@ files:
 - README.md
 - Rakefile
 - lib/smart_hash.rb
+- lib/smart_hash/dynamic_methods.rb
 - lib/smart_hash/loose.rb
+- lib/smart_hash/version.rb
 - smart_hash.gemspec
 - spec/smart_hash_spec.rb
 - spec/spec_helper.rb