rns 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rns (0.0.2)
+    rns (0.0.3)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -24,10 +24,8 @@ module Statistics
 end
 
 class Main
-  include Rns
-  
-  extend_specified Arithmetic => [:inc]
-  include_specified Statistics => [:avg]
+  extend Rns.module_with(Arithmetic => [:inc])
+  include Rns.module_with(Statistics => [:avg])
 
   def main
     puts "1+1 is #{self.class.inc 1} and the average of [1,2,3] is #{avg [1,2,3]}"

data/lib/rns/version.rb

@@ -1,3 +1,3 @@
 module Rns
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/rns.rb

@@ -1,41 +1,47 @@
 module Rns
-  def self.included(base)
-    base.extend(ClassMethods)
-  end
+  class << self
+    def constant_for(module_names)
+      (m, *more) = module_names.map{|n| n.split("::")}.flatten
+      more.reduce(Kernel.const_get(m)){|m, s| m.const_get(s)}
+    end
 
-  def self.add_methods(to, use_spec)
-    use_spec.to_a.each do |from, method_names|
-      if (method_names.is_a? Hash)
-        add_methods(to, method_names.map do |k,v|
-                      #TODO: is there a better way to construct modules?
-                      {eval(from.to_s + "::" + k.to_s) => v}
-                    end.reduce({}){|l,r| l.merge(r)})
-      else
-        method_names.each do |name|
-          if (name.is_a? Hash)
-            add_methods(to, {from => name})
-          else
-            to.send(:define_method, name) do |*args|
-              from.method(name).call(*args)
-            end
-          end
+    def module_with(use_spec)
+      Module.new.tap {|m| add_methods(m, use_spec) }
+    end
+
+    def process_spec_entry(entry)
+      (k,v) = entry
+      if (v.is_a? Array)
+        v.map{|x| process_spec_entry([k,x])}
+      elsif (v.is_a? Hash)
+        v.map do |x,y|
+          process_spec_entry([constant_for([k, x].map(&:to_s)), y])
         end
+      else
+        [k,v]
       end
     end
-  end
 
-  module ClassMethods
-    def include_specified(use_spec)
-      Rns::add_methods(self, use_spec)
+    def process_spec(use_spec)
+      use_spec.map(&method(:process_spec_entry)).
+        flatten.
+        each_slice(2).
+        to_a
     end
 
-    def extend_specified(use_spec)
-      singleton_class = class << self; self; end
-      Rns::add_methods(singleton_class, use_spec)
+    def add_methods(to, use_spec)
+      process_spec(use_spec).each do |from, method|
+        to.send(:define_method, method) do |*args|
+          from.method(method).call(*args)
+        end
+        to.send(:private, method)
+      end
     end
-  end
 
-  def self.using(use_spec, &blk)
-    blk[Object.new.tap{|o| Rns::add_methods(o.class, use_spec)}]
+    def using(use_spec, &blk)
+      klass = Class.new
+      add_methods(klass, use_spec)
+      klass.new.instance_eval(&blk)
+    end
   end
 end

data/spec/rns/rns_spec.rb

@@ -8,6 +8,7 @@ module Math
     class << self
       def dec(n) n - one end
       def inc(n) n + one end
+      def add(x,y) x + y end
       private
       def one() 1 end
     end
@@ -15,17 +16,40 @@ module Math
 
   module Statistics
     def self.avg(arr); arr.reduce(:+).to_f / arr.count end
+    module Foo
+      def self.blah; :quux end
+    end
   end
 end
 
-class Thing
-  include Rns
+module Util
+  class << self
+    def assoc!(h, k, v)
+      h.tap{|o| o[k] = v}
+    end
 
-  extend_specified Math::Arithmetic => [:inc]
-  include_specified Math::Statistics => [:avg]
+    def merge_with(f, *hshs)
+      merge_entry = lambda do |h, (k,v)|
+        if (h.has_key?(k))
+          assoc!(h, k, f[h[k], v])
+        else
+          assoc!(h, k, v)
+        end
+      end
+      merge2 = lambda do |h1,h2|
+        h2.to_a.reduce(h1, &merge_entry)
+      end
+      ([{}] + hshs).reduce(&merge2)
+    end
+  end
+end
 
-  def inced_one
-    self.class.inc 1
+class Thing
+  extend Rns.module_with(Math::Arithmetic => [:inc])
+  include Rns.module_with(Math::Statistics => [:avg])
+
+  def self.inced_one
+    inc 1
   end
 
   def average
@@ -40,11 +64,33 @@ describe Rns do
     end
 
     it "works with private module methods" do
-      Thing.new.inced_one.should == 2
+      Thing.inced_one.should == 2
+    end
+
+    it "should add methods privately" do
+      lambda { Thing.new.avg [11, 42, 7] }.should raise_error(NoMethodError)
     end
   end
 
   context 'adding methods to blocks' do
+
+    it 'computes' do
+      Rns::using(Util => [:merge_with],
+                 Math::Arithmetic => [:inc, :add]) do
+
+        sum = lambda{|*xs| xs.reduce(:+)}
+
+        merge_with(sum, *(1..10).map{|n| {x: n}})[:x].should == 55
+        merge_with(sum,
+                   {x: 10, y: 20},
+                   {x: 3, z: 30}).should == {x: 13, y: 20, z: 30}
+
+        merge_with(lambda{|l,r| l.send(:+, r)},
+                   {:x => [:something]},
+                   {:x => [:else]}).should == {:x => [:something, :else]}
+      end
+    end
+
     it "works with individual modules" do
       Rns::using(Math::Arithmetic => [:inc],
                  Math::Statistics => [:avg]) do
@@ -68,5 +114,38 @@ describe Rns do
         avg((1..10).to_a.map(&method(:inc))).should == 6.5
       end
     end
+
+    it "does not modify Object" do
+      Rns::using(Math::Arithmetic => [:inc]) do
+        # do nothing
+      end
+      lambda { Object.new.inc 1 }.should raise_error(NoMethodError)
+    end
+
+    it "does not modify Class" do
+      Rns::using(Math::Arithmetic => [:inc]) do
+        # do nothing
+      end
+      lambda { Class.new.inc 1 }.should raise_error(NoMethodError)
+    end
+
+    it 'processes specs correctly' do
+      Rns::using(Rns => [:process_spec]) do
+        process_spec({Math => [:inc, :dec]}).
+          should == [[Math, :inc], [Math, :dec]]
+      end
+
+      Rns::using(Rns => [:process_spec]) do
+        spec = {Math::Arithmetic => [:inc],
+                Math => [:identity,
+                         {:Statistics => [:avg,
+                                          {:Foo => [:blah, :quux]}]}]}
+        process_spec(spec).should == [[Math::Arithmetic, :inc],
+                                      [Math, :identity],
+                                      [Math::Statistics, :avg],
+                                      [Math::Statistics::Foo, :blah],
+                                      [Math::Statistics::Foo, :quux]]
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rns
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-06 00:00:00.000000000 Z
+date: 2012-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec