church 0.0.14 → 0.1.0

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in risper.gemspec
 gemspec

data/church.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "simplecov", "~> 0.7.1"
 end

data/lib/church.rb

@@ -1,7 +1,7 @@
+require 'church/lambda'
 require 'church/array'
 require 'church/hash'
 require 'church/io'
-require 'church/lambda'
 require 'church/math'
 require 'church/utils'
 require 'church/version'

data/lib/church/array.rb

@@ -4,32 +4,11 @@ module Church
     coll == [] || coll == '' ? 0 : 1 + SIZE[coll[1..-1]]
   }
 
-  # Returns the size of an array or string using iteration.
-  ISIZE = -> coll {
-    sz = 0
-    (slicer = -> {
-      sz += 1
-      (coll = coll[1..-1]) == [] || coll == '' ? sz : slicer[]
-    })[]
-  }
-
   # Maps fn over coll recursively.
   MAP = -> coll, &fn {
     coll == [] ? [] : [fn[coll[0]]] + MAP[coll[1..-1], &fn]
   }
 
-  # Maps fn over coll iteratively.
-  IMAP = -> coll, &fn {
-    sz = SIZE[coll]
-    ret = []
-    i = 0
-
-    (mapper = -> {
-      ret[i] = fn[coll[i]]
-      (i += 1) == sz ? ret : mapper[]
-    })[]
-  }
-
   # Maps fn over coll iteratively and in-place, modifying the original collection.
   MAP_BANG = -> coll, &fn {
     sz = SIZE[coll]
@@ -58,18 +37,6 @@ module Church
     coll == [] ? [] : (fn[coll[0]] ? [coll[0]] : []) + FILTER[coll[1..-1], &fn]
   }
 
-  # Filters coll through fn using iteration.
-  IFILTER = -> coll, &fn {
-    sz = SIZE[coll]
-    ret = []
-    i = 0
-
-    (filterer = -> {
-      fn[coll[i]] ? ret << coll[i] : 0
-      (i += 1) == sz ? ret : filterer[]
-    })[]
-  }
-
   # Performs fn with each element of coll in turn.
   EACH = -> coll, &fn {
     sz = SIZE[coll]
@@ -115,5 +82,5 @@ module Church
   }
 
   # Sorts the collection in reverse order.
-  RSORT = -> coll { REVERSE[SORT[coll]] }
+  RSORT = COMPOSE[REVERSE, SORT]
 end

data/lib/church/utils.rb

@@ -8,11 +8,9 @@ module Church::Utils
 
   # Returns its argument's Collatz sequence as an array
   COLLATZ = -> n {
-    c = [n]
-    (collatz_p = -> {
+    (collatz_p = -> cs {
       n = n % 2 == 0 ? n / 2 : n * 3 + 1
-      c << n
-      n == 1 ? c : collatz_p[]
-    })[]
+      n == 1 ? cs << 1 : collatz_p[cs << n]
+    })[[n]]
   }
 end

data/lib/church/version.rb

@@ -1,3 +1,3 @@
 module Church
-  VERSION = "0.0.14"
+  VERSION = "0.1.0"
 end

data/spec/array_spec.rb

@@ -70,3 +70,11 @@ describe 'INDEXED' do
     expect(INDEXED[[1, 2, 3]]).to eq [[1, 0], [2, 1], [3, 2]]
   end
 end
+
+describe 'EACH' do
+  it "should perform fn for each element in coll" do
+    x = 0
+    EACH[[1, 2, 3], &-> n { x += n }]
+    expect(x).to be 6
+  end
+end

data/spec/math_spec.rb

@@ -16,7 +16,7 @@ describe 'FLOOR' do
 end
 
 describe 'PRIME' do
-  (-6..6).each do |i|
+  (-9..9).each do |i|
     it "should return its argument's primality" do
       expect(PRIME[i]).to be i.prime?
     end

data/spec/spec_helper.rb

@@ -1 +1,4 @@
+require 'simplecov'
+SimpleCov.start
+
 require File.expand_path('../../lib/church', __FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: church
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 description: 
 email:
 - 3ifbyw@gmail.com