church 0.0.8 → 0.0.10

data/lib/church/array.rb

@@ -47,7 +47,7 @@ module Church
     ret = coll[0]
     i = 1
 
-    (reducer = -> {
+    sz == 1 ? ret : (reducer = -> {
       ret = fn[ret, coll[i]]
       (i += 1) == sz ? ret : reducer[]
     })[]

data/lib/church/io.rb

@@ -10,4 +10,17 @@ module Church
   PRINT = -> obj { $> << obj }
 
   PUTS =  -> obj { $> << obj << "\n" }
+
+  CHARS = -> str {
+    sz = SIZE[str]
+    ret = []
+    i = 0
+
+    (chars_p = -> {
+      ret << str[i]
+      (i += 1) == sz ? ret : chars_p[]
+    })[]
+  }
+
+  JOIN = -> str, delim { str * delim }
 end

data/lib/church/math.rb

@@ -1,42 +1,11 @@
 module Church
-  CMP = -> a, b {
-    a > b ? 1 : a < b ? -1 : 0
-  }
-
-  ADD = -> a, b {
-    b == 0 ? a : ADD[a + CMP[b, 0], b + CMP[0, b]]
-  }
-
-  SUB = -> a, b {
-    b == 0 ? a : SUB[a + (0 <=> b), b + (0 <=> b)]
-  }
+  SQRT = -> n { n ** 2 ** -1 }
 
-  MUL = -> a, b {
-    (mul_p = -> c, d {
-      d == b ? c + a * CMP[0, b] : mul_p[c + a * CMP[b, 0], d + CMP[b, 0]]
-    })[a * CMP[b, 0], 0]
-  }
-
-  DIV = -> a, b {
-    div_p = -> d {
-      d = ADD[d, CMP[b, 0]]
-      a = SUB[a, MUL[b, CMP[b, 0]]]
-      a >= MUL[b, CMP[b, 0]] ? div_p[d] : d
-    }
-    b > a ? 0 : div_p[0]
-  }
-
-  MOD = -> a, b {
-    MOD_p = -> {
-      a = SUB[a, MUL[b, CMP[b, 0]]]
-      a > b ? MOD_p[] : (b < 0 ? SUB[a, b] : a)
-    }
-    MOD_p[]
-  }
+  FLOOR = -> n { n - n % 1 }
 
-  POW = -> a, b {
-    (POW_p = -> c, d {
-      d == b ? c : POW_p[MUL[a, c], ADD[d, 1]]
-    })[1, 0]
+  PRIME = -> n {
+    n = n < 0 ? -n : n
+    n < 3 ? n == 2 : n % 2 == 0 ? false :
+    REDUCE[[1] + MAP[[*3..FLOOR[SQRT[n]]], &-> m { n % m }], &:*] > 0
   }
 end

data/lib/church/utils.rb

@@ -0,0 +1,7 @@
+module Church::Utils
+  ROT13 = -> chr {
+    ord = ORD[chr]
+    ord > 64 && ord <  91 ? CHR[(ord -  78) % 26 + 65] :
+    ord > 96 && ord < 123 ? CHR[(ord - 110) % 26 + 97] : chr
+  }
+end

data/lib/church/version.rb

@@ -1,3 +1,3 @@
 module Church
-  VERSION = "0.0.8"
+  VERSION = "0.0.10"
 end

data/lib/church.rb

@@ -2,4 +2,5 @@ require 'church/array'
 require 'church/hash'
 require 'church/io'
 require 'church/math'
+require 'church/utils'
 require 'church/version'

data/spec/io_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 include Church
 
-describe "CHR" do
+describe 'CHR' do
   (1..122).each do |ord|
     it "should return its argument's corresponding character" do
       expect(CHR[ord]).to eq ord.chr
@@ -10,10 +10,26 @@ describe "CHR" do
   end
 end
 
-describe "ORD" do
+describe 'ORD' do
   ("\1".."z").each do |chr|
     it "should return its argument's corresponding ordinal value" do
       expect(ORD[chr]).to be chr.ord
     end
   end
 end
+
+describe 'CHARS' do
+  it "should return an array of the string's characters" do
+    expect(CHARS['Ruby']).to eq %w[R u b y]
+  end
+end
+
+describe 'JOIN' do
+  it "should join a string on a delimiter" do
+    expect(JOIN[[1, 2, 3], ',']).to eq '1,2,3'
+  end
+
+  it "should be able to join on an empty delimeter" do
+    expect(JOIN[[1, 2, 3], '']).to eq '123'
+  end
+end

data/spec/math_spec.rb

@@ -1,87 +1,24 @@
 require 'spec_helper'
+require 'prime'
 
 include Church
 
-describe 'ADD' do
-  it "should work with an LHS of 0" do
-    expect(ADD[0, 2]).to be 2
-  end
-
-  it "should work with an RHS of 0" do
-    expect(ADD[3, 0]).to be 3
-  end
-
-  it "should work with a negative LHS" do
-    expect(ADD[-2, 4]).to be 2
-  end
-
-  it "should work with a negative RHS" do
-    expect(ADD[2, -4]).to be -2
-  end
-
-  it "should work with two negatives" do
-    expect(ADD[-2, -4]).to be -6
+describe 'SQRT' do
+  it "should return its argument's square root" do
+    expect(SQRT[5]).to eq Math.sqrt 5
   end
 end
 
-describe 'SUB' do
-  it "should work with an LHS of 0" do
-    expect(SUB[0, 2]).to be -2
-  end
-
-  it "should work with an RHS of 0" do
-    expect(SUB[3, 0]).to be 3
-  end
-
-  it "should work with a negative LHS" do
-    expect(SUB[-2, 4]).to be -6
-  end
-
-  it "should work with a negative RHS" do
-    expect(SUB[2, -4]).to be 6
-  end
-
-  it "should work with two negatives" do
-    expect(SUB[-2, -4]).to be 2
+describe 'FLOOR' do
+  it "should round its argument down" do
+    expect(FLOOR[2.5]).to eq 2
   end
 end
 
-describe 'MUL' do
-  it "should work with an LHS of 0" do
-    expect(MUL[0, 2]).to be 0
-  end
-
-  it "should work with an RHS of 0" do
-    expect(MUL[3, 0]).to be 0
-  end
-
-  it "should work with a negative LHS" do
-    expect(MUL[-2, 4]).to be -8
-  end
-
-  it "should work with a negative RHS" do
-    expect(MUL[2, -4]).to be -8
-  end
-
-  it "should work with two negatives" do
-    expect(MUL[-2, -4]).to be 8
-  end
-end
-
-describe 'DIV' do
-  it "should work with an LHS of 0" do
-    expect(DIV[0, 2]).to be 0
-  end
-
-  it "should work with a negative RHS" do
-    expect(DIV[4, -2]).to be -2
-  end
-
-  it "should divide numbers into themselves once" do
-    expect(DIV[3, 3]).to be 1
-  end
-
-  it "should truncate" do
-    expect(DIV[3, 4]).to be 0
+describe 'PRIME' do
+  (-25..25).each do |i|
+    it "should return its argument's primality" do
+      expect(PRIME[i]).to be i.prime?
+    end
   end
 end

data/spec/utils_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+include Church::Utils
+
+describe 'ROT13' do
+  it "should rotate a lowercase letter 13 places" do
+    expect(ROT13['a']).to eq 'n'
+    expect(ROT13['n']).to eq 'a'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: church
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -61,12 +61,14 @@ files:
 - lib/church/hash.rb
 - lib/church/io.rb
 - lib/church/math.rb
+- lib/church/utils.rb
 - lib/church/version.rb
 - spec/array_spec.rb
 - spec/hash_spec.rb
 - spec/io_spec.rb
 - spec/math_spec.rb
 - spec/spec_helper.rb
+- spec/utils_spec.rb
 homepage: https://github.com/threeifbywhiskey/church
 licenses:
 - WTFPL
@@ -99,3 +101,4 @@ test_files:
 - spec/io_spec.rb
 - spec/math_spec.rb
 - spec/spec_helper.rb
+- spec/utils_spec.rb