kindah 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmExYmM3NGQ1MTVhOWM3NTI3OWExZjFkYWFiZDBiZDUwMTc0ZmViNA==
+    ZGMzNTYyYmRmMzZiN2I2NjAzZWVjZDJkNTRhMzQwOGUyMjFmZThhZA==
   data.tar.gz: !binary |-
-    ZmRhYjg3MmY4ZWI2NzM3YTdiMTc1MDIxNTExY2Y4MWE3OWY5ODg2NA==
+    MmM4MmM4NjM3NTE1M2I3YTdmYjdlOGQwOTJiNmMyZTAyYzQzNDNkMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODk0ZmQzZGVmYzE2MDk5MjQ4MTIzNDlmNDVlZmNkYjJlMmYyZTJjMWZmNGZi
-    MzIyZThhYTEzMDNhOGZiNGQwYjhkNjkyYWY2OTczMDEwZjExZDMxZTcxODU1
-    YzM2ZGFkODc0MmRlNzQ2YmYyNjY0OWU4MWJiOWViZjFhOTgxNDc=
+    ZTI4NzMxMDZlNDI1OTA2Y2JiMTE2OThmMGY4MTg3NjY3ZTI4YmQ0NzcwYWEx
+    N2FhYzUyNzhiNTlkOWJlZmEzYTE5OWVkMzk0YTY5MTNjMGE1NWVjMTQ1ODdh
+    ZmQ5ZTczNDQ0MTZjMjU4ODY3ODhlY2U3MDc1NDk5ZjY1NTg1ODk=
   data.tar.gz: !binary |-
-    MDQ4NWUxYmEzMTEyNWJiYmI1ZjczZDgwNGU2OTU1N2YyY2E2OTU3YTcwOWM4
-    OGUzZjUyZjZhMGI5NmExZTRkOTI2Y2YwMmM5NzljNDlkYWUwMmNhNDJkMTJi
-    ODdkOTIxMzg1OTYxZTk5MDFmNzNlMmZiZDkwZWVjM2YzYmZiZjY=
+    ZTIwNGY4MjFkMmZkNmM2NWY0YzdhY2FkNmVmOTUxNmZkNjdkYTZkZjUxMTJm
+    MzgxMDQ2MDRjZWNjYjYzZjdmYzhkOTNhZDUyZmNhMDczYWUxMGVkYmQxOTAz
+    NTkzM2JkNmZkZjcxZTNlNTU5YzZmYmJmNmVjYTNkNGFmY2ViZTY=

data/lib/kindah/ast.rb

@@ -1,4 +1,5 @@
 require 'kindah/ast/instance_methods'
 require 'kindah/ast/class_methods'
+require 'kindah/ast/superklass'
 
 require 'kindah/ast/class_template'

data/lib/kindah/ast/class_template.rb

@@ -2,6 +2,7 @@ module Kindah
   class ClassTemplate
     include Katuv::Node
 
+    terminal Superklass
     terminal ClassMethods
     terminal InstanceMethods
   end

data/lib/kindah/ast/superklass.rb

@@ -0,0 +1,11 @@
+module Kindah
+  class Superklass
+    include Katuv::Node
+
+    terminal!
+
+    def self.name
+      'superclass'
+    end
+  end
+end

data/lib/kindah/cache.rb

@@ -11,5 +11,9 @@ module Kindah
     def self.storage
       @storage ||= {}
     end
+
+    def self.clear!
+      @storage = {}
+    end
   end
 end

data/lib/kindah/compiler.rb

@@ -14,6 +14,10 @@ module Kindah
       safe_fetch InstanceMethods
     end
 
+    def superklass
+      safe_fetch(Superklass, proc { Object }).call
+    end
+
     delegate [:arity, :block, :children] => :@ast
     def class_name
       @ast.name
@@ -40,7 +44,7 @@ module Kindah
     def create_klass_with_args(*args)
       compiler = self # this trick carries the outer scope past ruby's stupid block-scoping rules.
 
-      Class.new do
+      Class.new(compiler.superklass) do
         compiler.install_template_arg_methods(self, *args)
         compiler.install_class_methods(self)
         compiler.install_instance_methods(self)
@@ -64,8 +68,8 @@ module Kindah
 
     private
 
-    def safe_fetch(klass)
-      return proc {} unless children.has_key?(klass)
+    def safe_fetch(klass, default = proc {})
+      return default unless children.has_key?(klass)
       children[klass].block
     end
   end

data/lib/kindah/version.rb

@@ -1,3 +1,3 @@
 module Kindah
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/integration/namespaced_parameterized_class_spec.rb

@@ -24,6 +24,12 @@ describe Kindah do
     end
   end
 
+  after :all do
+    TestModule.instance_eval { undef Test }
+    Object.send(:remove_const, :TestModule)
+    Kindah::Cache.clear!
+  end
+
   subject(:test_instance) { TestModule::Test(1).new }
 
   it { should respond_to :bar }

data/spec/integration/parameterized_class_spec.rb

@@ -22,6 +22,10 @@ describe Kindah do
       end
     end
   end
+  after :all do
+    Object.class_eval { undef Test }
+    Kindah::Cache.clear!
+  end
 
   subject(:test_instance) { Test(1).new }
 

data/spec/integration/with_nondefault_superclass_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe Kindah do
+  before :all do
+    module TestModule; end
+
+    Kindah.class_template! :Test, location: TestModule do
+      superclass { Super }
+
+      class_methods do |bar|
+        def foo_class
+          bar + 1
+        end
+      end
+
+      instance_methods do
+        def foo_instance
+          bar + 1
+        end
+
+        def initialize
+          @ivar = 1
+        end
+
+        attr_reader :ivar
+      end
+    end
+
+    class Super
+      def supermethod
+        :super
+      end
+    end
+  end
+
+  after :all do
+    TestModule.instance_eval { undef Test }
+    Object.send(:remove_const, :Super)
+    Object.send(:remove_const, :TestModule)
+    Kindah::Cache.clear!
+  end
+
+  subject(:test_instance) { TestModule::Test(1).new }
+
+  it { should respond_to :bar }
+  it { should respond_to :foo_instance }
+  it { should respond_to :ivar }
+
+  it { should respond_to :supermethod }
+  its(:supermethod) { should == :super }
+
+  its(:ivar) { should == 1 }
+
+  its(:class) { should < Super }
+  its(:class) { should respond_to :bar }
+  its(:class) { should respond_to :foo_class }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kindah
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Joe Fredette
@@ -45,11 +45,13 @@ files:
 - lib/kindah/ast/class_methods.rb
 - lib/kindah/ast/class_template.rb
 - lib/kindah/ast/instance_methods.rb
+- lib/kindah/ast/superklass.rb
 - lib/kindah/cache.rb
 - lib/kindah/compiler.rb
 - lib/kindah/version.rb
 - spec/integration/namespaced_parameterized_class_spec.rb
 - spec/integration/parameterized_class_spec.rb
+- spec/integration/with_nondefault_superclass_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -78,4 +80,5 @@ summary: Kindah is an implementation of Parameterized Classes for Ruby.
 test_files:
 - spec/integration/namespaced_parameterized_class_spec.rb
 - spec/integration/parameterized_class_spec.rb
+- spec/integration/with_nondefault_superclass_spec.rb
 - spec/spec_helper.rb