rns 0.0.1 → 0.0.2

data/Gemfile.lock

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

data/README.md

@@ -13,22 +13,24 @@ functional programming in Ruby.  It is inspired by
 require 'rns'
 
 module Arithmetic
-  def self.dec(n) n - 1; end
-  def self.inc(n) n + 1; end
+  class << self
+    def dec(n) n - 1 end
+    def inc(n) n + 1 end
+  end
 end
 
 module Statistics
-  def self.avg(arr); arr.reduce(:+) / arr.count; end
+  def self.avg(arr); arr.reduce(:+).to_f / arr.count end
 end
 
-class Main < Rns
-  def use
-    {Math       => [:inc],
-     Statistics => [:avg]}
-  end
+class Main
+  include Rns
+  
+  extend_specified Arithmetic => [:inc]
+  include_specified Statistics => [:avg]
 
   def main
-    puts "1+1 is #{inc 1} and the average of [1,2,3] is #{avg [1,2,3]}"
+    puts "1+1 is #{self.class.inc 1} and the average of [1,2,3] is #{avg [1,2,3]}"
   end
 end
 
@@ -38,7 +40,7 @@ Main.new.main
 ## Importing Methods into Blocks
 
 ```ruby
-Rns::using [Math, [:inc], Statistics, [:avg]] do
+Rns::using(Arithmetic => [:inc], Statistics => [:avg]) do
   puts avg((1..10).to_a.map(&method(:inc)))
 end
 ```

data/lib/rns/version.rb

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

data/lib/rns.rb

@@ -1,30 +1,41 @@
-class Rns
-  def self.to_pairs(use_spec)
-    case use_spec
-    when Array then use_spec.each_slice(2).reduce([]){|xs,y| xs + [y]}
-    when Hash then use_spec.to_a
-    else
-      raise "Don't know how to make module/class:methods pairs out of #{use_spec.class}"
-    end
+module Rns
+  def self.included(base)
+    base.extend(ClassMethods)
   end
 
-  def self.populate(obj, use_spec)
-    obj.tap do |o|
-      to_pairs(use_spec).each do |pkg, method_names|
+  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|
-          o.class.send(:define_method, name) do |*args|
-            pkg.method(name).call(*args)
+          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
         end
       end
     end
   end
 
-  def initialize
-    Rns::populate(self, use)
+  module ClassMethods
+    def include_specified(use_spec)
+      Rns::add_methods(self, use_spec)
+    end
+
+    def extend_specified(use_spec)
+      singleton_class = class << self; self; end
+      Rns::add_methods(singleton_class, use_spec)
+    end
   end
 
   def self.using(use_spec, &blk)
-    blk[Rns::populate(Object.new, use_spec)]
+    blk[Object.new.tap{|o| Rns::add_methods(o.class, use_spec)}]
   end
 end

data/spec/rns/rns_spec.rb

@@ -1,15 +1,72 @@
 require File.join(File.dirname(__FILE__), *%w[.. spec_helper.rb])
 require 'rns'
 
+module Math
+  def self.identity(x); x end
+
+  module Arithmetic
+    class << self
+      def dec(n) n - one end
+      def inc(n) n + one end
+      private
+      def one() 1 end
+    end
+  end
+
+  module Statistics
+    def self.avg(arr); arr.reduce(:+).to_f / arr.count end
+  end
+end
+
+class Thing
+  include Rns
+
+  extend_specified Math::Arithmetic => [:inc]
+  include_specified Math::Statistics => [:avg]
+
+  def inced_one
+    self.class.inc 1
+  end
+
+  def average
+    avg [11, 42, 7]
+  end
+end
+
 describe Rns do
   context 'adding methods to classes' do
     it "works" do
-      (1 + 1).should == 2
+      Thing.new.average.should == 20
+    end
+
+    it "works with private module methods" do
+      Thing.new.inced_one.should == 2
     end
   end
+
   context 'adding methods to blocks' do
-    it "works" do
-      (1 + 1).should == 2
+    it "works with individual modules" do
+      Rns::using(Math::Arithmetic => [:inc],
+                 Math::Statistics => [:avg]) do
+        avg((1..10).to_a.map(&method(:inc))).should == 6.5
+      end
+    end
+
+    it "works with nested modules" do
+      Rns::using(Math => {:Arithmetic => [:inc],
+                          :Statistics => [:avg]}) do
+        avg((1..10).to_a.map(&method(:inc))).should == 6.5
+      end
+    end
+
+    it "works with mix of module declaration styles" do
+      Rns::using(Math::Arithmetic => [:inc],
+                 Math => [:identity,
+                          {:Statistics => [:avg]}]) do
+        identity(1).should == 1
+        inc(10).should == 11
+        avg((1..10).to_a.map(&method(:inc))).should == 6.5
+      end
     end
   end
 end

metadata

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