ctx 2.1.3 → 2.2.0

data/README.md

@@ -1,7 +1,13 @@
 ctx
 ===
 
-Simple utility to limit method redefinition within the bounds of arbitrary logical scopes
+Tired of waiting for refinements in ruby 2.0?
+
+Or something like it?
+
+Me, too.
+
+So, this.
 
 Example
 ===
@@ -67,5 +73,15 @@ There are bugs.  You'll find them.
 Caveats and such
 ===
 
-For whatever goofy reason, this stuff doesn't play well with rspec all the time, particularly if you override stuff the matchers are hoping to also override, like == or =~ on String, or whatnot.  Don't do that right now unless you like stuff to break in inexplicable ways.  Personally, I do like that kind of stuff, makes life interesting (kind of explains my dating choices, when you get right down to it), but anywhoo, honestly, it's your call.
+For whatever reason, this stuff doesn't play well with rspec all the time,
+particularly if you override stuff the matchers are hoping to also override,
+like == or =~ on String, who knew?
+
+*So, don't do that.*
+
+...not unless you like stuff to break in inexplicable ways.
+
+Personally, I *do* like things breaking in inexplicable ways (why else would I write things like this?)
+since makes life interesting (also kind of explains my dating choices, when you get right down to it),
+but, honestly, it's your call.
 

data/lib/ctx.rb

@@ -1,12 +1,6 @@
-module CTX
+require 'mobj'
 
-  class ::Array
-    def return_first(&block)
-      returned = nil
-      each { |item| break if (returned = block.call(item)) }
-      returned
-    end
-  end
+module CTX
 
   class Context < Hash
     attr_reader :name
@@ -17,14 +11,13 @@ module CTX
   end
 
   class ::Object
-    def sym() respond_to?(:to_sym) ? to_sym : to_s.to_sym end
     def ctxputs(*args)
-      ctxs = @@contexts.map(&:name)[1..-1].join(":")
+      ctxs = @@contexts.map(&:name)[1..-1].reverse.join(":")
       ctxs = "[CTX #{ctxs}] " unless ctxs.empty?
       puts "#{ctxs}#{args.map(&:to_s).join(', ')}"
     end
     def ctxp(*args)
-      ctxs = @@contexts.map(&:name)[1..-1].join(":")
+      ctxs = @@contexts.map(&:name)[1..-1].reverse.join(":")
       ctxs = "[CTX #{ctxs.empty? ? "-" : ctxs}]"
       puts "#{ctxs}\n#{args.map(&:inspect).join("\n")}"
     end
@@ -32,53 +25,67 @@ module CTX
     @@contexts ||= [Context.new(nil)]
     def ctx(context = :anonymous, &contextual)
       if contextual.nil?
-        @@contexts.reverse.first
+        @@contexts.first
       else
-        @@contexts.push(Context.new(context))
+        @@contexts.unshift(Context.new(context))
         instance_eval(&contextual)
-        @@contexts.pop()
+        @@contexts.shift()
       end
     end
 
   end
 
-  class ::Class
+  class Template < BasicObject
 
-    def object_methods() self.instance_methods - Object.instance_methods end
-    def class_methods() self.singleton_methods - Object.singleton_methods end
-    def defined_methods() class_methods | object_methods end
+    attr_accessor :added
+    def initialize() @added ||= [] end
+    def singleton_method_added(name) added << name end
+
+  end
+
+  class ::Class
 
     attr_accessor :ctx_methods
 
     def ctx(context = :anonymous, &contextual)
       @ctx_methods ||= {}
 
-      template = Class.new
-      template.class_eval(&contextual)
+      template = Template.new
+      template.instance_exec(self, &contextual)
+
+      matching = template.added
 
-      matching = self.object_methods & template.object_methods
       matching.each do |method_name|
         if ctx_methods[method_name].nil?
           ctx_methods[method_name] = {}
-          ctx_methods[method_name][nil.sym] = instance_method(method_name)
+          if instance_methods(true).includes? method_name
+            ctx_methods[method_name][nil.sym] = instance_method(method_name)
+          elsif singleton_methods(true).include? method_name
+            ctx_methods[method_name][nil.sym] = singleton_class.instance_method(method_name)
+          end
         end
       end
 
       self.class_eval(&contextual)
 
-      template.object_methods.each do |method_name|
-        if ctx_methods[method_name].nil?
-          ctx_methods[method_name] = {}
-        end
-
-        ctx_methods[method_name][context] = instance_method(method_name)
-
-        define_method(method_name) do |*args|
-          methods = self.class.ctx_methods[method_name]
-          matched = @@contexts.reverse.return_first { |currentctx|  methods[currentctx.name] }
-          matched.bind(self).(*args)
+      matching.each do |method_name|
+        if instance_methods(true).includes? method_name
+          ctx_methods[method_name][context] = instance_method(method_name)
+          define_method(method_name) do |*args|
+            methods = self.class.ctx_methods[method_name]
+            matched = @@contexts.return_first { |currentctx|  methods[currentctx.name] }
+            matched.bind(self).(*args)
+          end
+
+        elsif singleton_methods(true).include? method_name
+          ctx_methods[method_name][context] = singleton_class.instance_method(method_name)
+
+          define_singleton_method(method_name) do |*args|
+            methods = self.ctx_methods[method_name]
+            matched = @@contexts.return_first { |currentctx|  methods[currentctx.name] }
+            matched.bind(self).(*args)
+          end
         end
-
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ctx
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-10 00:00:00.000000000 Z
+date: 2012-11-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: mobj
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +75,8 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Contextual method define
+description: Scoped and contextual method definition for use in writing more expressive
+  DSLs without screwing defintions in other pieces of code
 email: ctx@chipped.net
 executables: []
 extensions: []
@@ -90,5 +107,5 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Scoped define and context for use in writing more expressive DSLs
+summary: Contextual method define
 test_files: []