key_struct 0.4.1 → 0.4.2

data/README.rdoc

@@ -134,6 +134,7 @@ Requires ruby >= 1.9.2.  (Has been tested on MRI 1.9.2 and MRI 1.9.3)
 
 Release Notes:
 
+* 0.4.2 - Bug fix: make class introspection work for derived classes.  Restore metaprogramming: inheritance too fragile.
 * 0.4.1 - Cache anonymous classes to avoid TypeError: superclass mismatch.  Nicer strings for anonymous classes.  Internals change: use base class rather than metaprogramming.
 * 0.4.0 - Introduce class introspection
 * 0.3.1 - Bug fix: to_hash when a value is an array.  Was raising ArgumentError for Hash

data/lib/key_struct/key_struct.rb

@@ -14,51 +14,6 @@ module KeyStruct
 
   private
 
-  class Base
-    include Comparable
-
-    class << self
-      attr_reader :keys, :defaults, :access
-    end
-
-    def initialize(args={})
-      args = self.class.defaults.merge(args)
-      self.class.keys.each do |key|
-        instance_variable_set("@#{key}".to_sym, args.delete(key))
-      end
-      raise ArgumentError, "Invalid argument(s): #{args.keys.map(&:inspect).join(' ')} -- KeyStruct accepts #{self.class.keys.map(&:inspect).join(' ')}" if args.any?
-    end
-
-    def ==(other)
-      self.class.keys.all?{|key| other.respond_to?(key) and self.send(key) == other.send(key)}
-    end
-
-    def <=>(other)
-      self.class.keys.each do |key|
-        cmp = (self.send(key) <=> other.send(key))
-        return cmp unless cmp == 0
-      end
-      0
-    end
-
-    def to_hash
-      Hash[*self.class.keys.map{ |key| [key, self.send(key)]}.flatten(1)]
-    end
-
-    def to_s
-      "[#{self.class.display_name} #{self.class.keys.map{|key| "#{key}:#{self.send(key)}"}.join(' ')}]"
-    end
-
-    def inspect
-      "<#{self.class.display_name}:0x#{self.object_id.to_s(16)} #{self.class.keys.map{|key| "#{key}:#{self.send(key).inspect}"}.join(' ')}>"
-    end
-
-    def self.display_name
-      self.name || "KeyStruct.#{access}"
-    end
-  end
-
-
   # for anonymous superclasses, such as
   #
   #    class Foo < KeyStruct[:a, :b]
@@ -90,12 +45,46 @@ module KeyStruct
     defaults = (Hash === keys.last) ? keys.pop.dup : {}
     keys += defaults.keys
 
-    Class.new(Base).tap{ |klass|
+    Class.new.tap{ |klass|
       klass.class_eval do
-        @keys = keys
-        @defaults = defaults
-        @access = access
+        include Comparable
+
         send "attr_#{access}", *keys
+
+        define_singleton_method(:keys) { keys }
+        define_singleton_method(:defaults) { defaults }
+        define_singleton_method(:access) { access }
+        define_singleton_method(:display_name) { self.name || "KeyStruct.#{access}" }
+
+        define_method(:initialize) do | args={} |
+          args = defaults.merge(args)
+          keys.each do |key|
+            instance_variable_set("@#{key}".to_sym, args.delete(key))
+          end
+          raise ArgumentError, "Invalid argument(s): #{args.keys.map(&:inspect).join(' ')} -- KeyStruct accepts #{keys.map(&:inspect).join(' ')}" if args.any?
+        end
+
+        define_method(:to_s) {
+          "[#{self.class.display_name} #{keys.map{|key| "#{key}:#{self.send(key)}"}.join(' ')}]"
+        }
+        define_method(:inspect) {
+          "<#{self.class.display_name}:0x#{self.object_id.to_s(16)} #{keys.map{|key| "#{key}:#{self.send(key).inspect}"}.join(' ')}>"
+        }
+        define_method(:to_hash) {
+          Hash[*keys.map{ |key| [key, self.send(key)]}.flatten(1)]
+        }
+        define_method(:==) { |other|
+          self.class.keys.all?{|key| other.respond_to?(key) and self.send(key) == other.send(key)}
+        }
+
+        define_method(:<=>) { |other|
+          keys.each do |key|
+            cmp = (self.send(key) <=> other.send(key))
+            return cmp unless cmp == 0
+          end
+          0
+        }
+
       end
     }
   end

data/lib/key_struct/version.rb

@@ -1,3 +1,3 @@
 module KeyStruct
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/spec/key_struct_spec.rb

@@ -12,14 +12,6 @@ shared_examples "a keystruct" do |method|
       Class.should === @klass
     end
 
-    it "should instrospect keys" do
-      @klass.keys.should == [:a, :b, :c]
-    end
-
-    it "should instrospect defaults" do
-      @klass.defaults.should == {:c => 3}
-    end
-
     it "provides getters" do
       @klass.instance_methods.should include :a
       @klass.instance_methods.should include :b
@@ -51,6 +43,41 @@ shared_examples "a keystruct" do |method|
 
   end
 
+  context "introspection"  do
+    context "when anonymous" do
+      before(:each) do
+        @klass = KeyStruct.send(method, :a, :b, :c => 3)
+      end
+
+      it "should instrospect keys" do
+        @klass.keys.should == [:a, :b, :c]
+      end
+
+      it "should instrospect defaults" do
+        @klass.defaults.should == {:c => 3}
+      end
+    end
+
+    context "when inherited" do
+      around(:each) do |example|
+        begin
+          class Inherited < KeyStruct.send(method, :p, :q, :r => 4)
+          end
+          example.run
+        ensure
+          Object.send(:remove_const, :Inherited)
+        end
+      end
+      it "should instrospect keys" do
+        Inherited.keys.should == [:p, :q, :r]
+      end
+
+      it "should instrospect defaults" do
+        Inherited.defaults.should == {:r => 4}
+      end
+    end
+  end
+
   context "definition" do
     it "can handle a default that's an array" do
       expect { KeyStruct.send(method, :a => []) }.should_not raise_error

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: key_struct
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70230512662240 !ruby/object:Gem::Requirement
+  requirement: &70264478987700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70230512662240
+  version_requirements: *70264478987700
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70230512661380 !ruby/object:Gem::Requirement
+  requirement: &70264478986820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70230512661380
+  version_requirements: *70264478986820
 - !ruby/object:Gem::Dependency
   name: simplecov-gem-adapter
-  requirement: &70230512660520 !ruby/object:Gem::Requirement
+  requirement: &70264478985540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70230512660520
+  version_requirements: *70264478985540
 description: Defines KeyStruct analogous to Struct, but constructor takes keyword
   arguments
 email: