adt 0.0.3 → 0.0.4

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.0.4
+=====
+
+* BUG: Methods defined using the 'operation' DSL could not access other methods in the class.
+
 0.0.3
 =====
 

data/lib/adt.rb

@@ -220,16 +220,23 @@ module ADT
   # @param [Proc] The definitions of the implementations for each case.
   def operation(sym, &definitions)
     define_method(sym) do |*args|
+      the_instance = self
       dsl = CaseRecorder.new
-      dsl_cls = class <<dsl; self; end
-      # This is hax so that we can 'instance_eval' the definitions block on a recorder,
-      # but in this case the definitions block could have arguments (which are arguments
-      # to the operation)
-      dsl_cls.send(:define_method, :_defs, &definitions)
-      dsl._defs(*args)
+      # The definitions block needs to be executed in the context of the recorder, to
+      # read the impls.
+      dsl.__instance_exec(*args, &definitions)
       # Now we just turn the [(case_name, impl)] structure into an argument for fold and
       # are done. Fold with a hash will check that all keys are defined.
-      fold(dsl._implementations.inject({}) { |memo, (c, impl)| memo[c] = impl; memo })
+      fold(dsl._implementations.inject({}) { |memo, (c, impl)| 
+        # Fucker. if 'impl' is used directly, because of the 'define_method' from earlier,
+        # it is evaluated in the context of the recorder, which is bad. So instead. We
+        # instance_exec it back on the instance.
+        # TODO: use the proc builder like in the `cases` method, which will let us tie 
+        # down the arity
+        some_impl = proc { |*args| the_instance.instance_exec(*args, &impl) }
+        memo[c] = some_impl
+        memo 
+      })
     end
   end
 end

data/lib/adt/case_recorder.rb

@@ -2,6 +2,7 @@ module ADT
   # @private
   class CaseRecorder
     alias :__instance_eval :instance_eval
+    alias :__instance_exec :instance_exec
     instance_methods.each { |m| undef_method m unless m =~ /(^__|object_id)/ }
 
     def initialize

metadata

@@ -1,8 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: adt
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.0.3
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Nick Partridge
@@ -10,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-10 00:00:00 +10:00
+date: 2011-09-06 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -37,21 +41,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Algebraic data type DSL