ciphr 0.0.2 → 0.0.4

data/lib/ciphr/functions/reader.rb

@@ -1,44 +1,46 @@
-# strictly used by parser classes for literals/wiring
-# TODO: disable registration
-
-module Ciphr::Functions::Reader
-  class StringReader < Ciphr::Functions::Function
-    def apply
-      StringProc.new(options[:string])
-    end
-
-    class StringProc #extend Proc?
-      def initialize(str)
-        @str = str
-      end
-
-      def call
-        begin
-          @str
-        ensure
-          @str = nil
-        end
-      end
-    end      
-  end
-
-  class FileReader < Ciphr::Functions::Function
-    def apply
-      f = File.open(options[:file], "r")
-      Proc.new do
-        chunk = f.read(256)
-        f.close if ! chunk
-        chunk
-      end
-    end
-  end
-
-  class IoReader < Ciphr::Functions::Function
-    def apply
-      input = args[0]
-      Proc.new do
-        input.read(256)
-      end
-    end
-  end    
-end
+# strictly used by parser classes for literals/wiring
+# TODO: disable registration
+
+module Ciphr::Functions::Reader
+  class StringReader < Ciphr::Functions::Function
+    def apply
+      StringProc.new(options[:string])
+    end
+
+    class StringProc #extend Proc?
+      def initialize(str)
+        @str = str
+      end
+
+      def call
+        begin
+          @str
+        ensure
+          @str = nil
+        end
+      end
+    end      
+  end
+
+  class FileReader < Ciphr::Functions::Function
+    def apply
+      f = File.open(options[:file], "r")
+      f.binmode
+      Proc.new do
+        chunk = f.read(256)
+        f.close if ! chunk
+        chunk
+      end
+    end
+  end
+
+  class IoReader < Ciphr::Functions::Function
+    def apply
+      input = args[0]
+      input.binmode
+      Proc.new do
+        input.read(256)
+      end
+    end
+  end    
+end

data/lib/ciphr/functions/simple.rb

@@ -1,121 +1,121 @@
-module Ciphr::Functions::Simple
-  class Cat < Ciphr::Functions::Function
-    def self.variants
-      [[['cat','catenate'], {}]]
-    end
-
-    def self.params
-      [:input]
-    end
-
-    def apply
-      inputs = @args
-      i = 0
-      chunk = nil
-      Proc.new do
-        chunk = inputs[i].read(256)
-        if ! chunk
-          i += 1
-          chunk = inputs[i] && inputs[i].read(256)
-        end
-        #while !(chunk = inputs[i].read(256)) && i < inputs.size
-        #  i++
-        #end 
-        chunk
-      end
-    end
-  end 
-
-  class Repack < Ciphr::Functions::Function
-    def apply
-      input, ch1in, ch2in = @args
-      content, ch1, ch2 = [input.read, ch1in.read, ch2in.read]
-      Proc.new do
-        if content
-          begin
-            content.unpack(ch1).pack(ch2)
-          ensure
-            content = nil
-          end
-        else
-          nil
-        end
-      end
-    end
-
-    def self.variants
-      [ [['repack'], {}] ]
-    end
-
-    def self.params
-      [:input,:ch1,:ch2]
-    end
-  end
-
-  class Translate < Ciphr::Functions::Function
-    def apply
-      input, ch1in, ch2in = @args
-      ch1, ch2 = [ch1in.read, ch2in.read]
-      Proc.new do
-        inchunk = input.read(1)
-        if inchunk
-          inchunk.tr(ch1, ch2)
-        else
-          nil
-        end
-      end
-    end
-
-    def self.variants
-      [ [['tr','translate'], {}] ]
-    end
-
-    def self.params
-      [:input,:ch1,:ch2]
-    end
-  end
-
-  class Replace < Ciphr::Functions::Function
-    def apply
-      input, searchin, replacein = @args
-      search, replace = [searchin.read, replacein.read]
-      buf = ""
-      Proc.new do
-        if buf.size == search.size && search.size > 0
-          buf = ""
-          replace
-        else
-          inchunk = input.read(1)
-          if inchunk 
-            if inchunk == search[buf.size]
-              buf += inchunk
-              ""
-            else
-              buf += inchunk
-              input.prepend(buf[1,buf.size])
-              ret = buf[0]
-              buf = ""
-              ret
-            end
-          else
-            if buf.size > 0
-              ret = buf
-              buf = ""
-              ret
-            else
-              nil
-            end
-          end
-        end
-      end
-    end
-
-    def self.variants
-      [ [['repl','replace'], {}] ]
-    end
-
-    def self.params
-      [:input,:search,:replace]
-    end
-  end
-end
+module Ciphr::Functions::Simple
+  class Cat < Ciphr::Functions::Function
+    def self.variants
+      [[['cat','catenate'], {}]]
+    end
+
+    def self.params
+      [:input]
+    end
+
+    def apply
+      inputs = @args
+      i = 0
+      chunk = nil
+      Proc.new do
+        chunk = inputs[i].read(256)
+        if ! chunk
+          i += 1
+          chunk = inputs[i] && inputs[i].read(256)
+        end
+        #while !(chunk = inputs[i].read(256)) && i < inputs.size
+        #  i++
+        #end 
+        chunk
+      end
+    end
+  end 
+
+  class Repack < Ciphr::Functions::Function
+    def apply
+      input, ch1in, ch2in = @args
+      content, ch1, ch2 = [input.read, ch1in.read, ch2in.read]
+      Proc.new do
+        if content
+          begin
+            content.unpack(ch1).pack(ch2)
+          ensure
+            content = nil
+          end
+        else
+          nil
+        end
+      end
+    end
+
+    def self.variants
+      [ [['repack'], {}] ]
+    end
+
+    def self.params
+      [:input,:ch1,:ch2]
+    end
+  end
+
+  class Translate < Ciphr::Functions::Function
+    def apply
+      input, ch1in, ch2in = @args
+      ch1, ch2 = [ch1in.read, ch2in.read]
+      Proc.new do
+        inchunk = input.read(1)
+        if inchunk
+          inchunk.tr(ch1, ch2)
+        else
+          nil
+        end
+      end
+    end
+
+    def self.variants
+      [ [['tr','translate'], {}] ]
+    end
+
+    def self.params
+      [:input,:ch1,:ch2]
+    end
+  end
+
+  class Replace < Ciphr::Functions::Function
+    def apply
+      input, searchin, replacein = @args
+      search, replace = [searchin.read, replacein.read]
+      buf = ""
+      Proc.new do
+        if buf.size == search.size && search.size > 0
+          buf = ""
+          replace
+        else
+          inchunk = input.read(1)
+          if inchunk 
+            if inchunk == search[buf.size]
+              buf += inchunk
+              ""
+            else
+              buf += inchunk
+              input.prepend(buf[1,buf.size])
+              ret = buf[0]
+              buf = ""
+              ret
+            end
+          else
+            if buf.size > 0
+              ret = buf
+              buf = ""
+              ret
+            else
+              nil
+            end
+          end
+        end
+      end
+    end
+
+    def self.variants
+      [ [['repl','replace'], {}] ]
+    end
+
+    def self.params
+      [:input,:search,:replace]
+    end
+  end
+end

data/lib/ciphr/functions/url.rb

@@ -1,38 +1,38 @@
-require 'cgi'
-
-module Ciphr::Functions::URL
-  #TODO: differentiate between URL and CGI encoding (with '+' char)
-  class UrlEncoding < Ciphr::Functions::InvertibleFunction
-    def apply
-      input = @args[0]
-      if !invert
-        Proc.new do
-          chunk = input.read(1)
-          chunk && CGI.escape(chunk)
-        end
-      else
-        Proc.new do
-          chunk = input.read(1)
-          if (chunk == "%")
-            chunk += input.read(2)
-            chunk && CGI.unescape(chunk)
-          elsif chunk == '+'
-            ' '
-          else
-            chunk
-          end
-        end
-      end
-    end
-
-    def self.variants
-      [
-        [['url','uri','cgi'],{}]
-      ]
-    end
-
-    def self.params 
-      [:input]
-    end      
-  end
-end
+require 'cgi'
+
+module Ciphr::Functions::URL
+  #TODO: differentiate between URL and CGI encoding (with '+' char)
+  class UrlEncoding < Ciphr::Functions::InvertibleFunction
+    def apply
+      input = @args[0]
+      if !invert
+        Proc.new do
+          chunk = input.read(1)
+          chunk && CGI.escape(chunk)
+        end
+      else
+        Proc.new do
+          chunk = input.read(1)
+          if (chunk == "%")
+            chunk += input.read(2)
+            chunk && CGI.unescape(chunk)
+          elsif chunk == '+'
+            ' '
+          else
+            chunk
+          end
+        end
+      end
+    end
+
+    def self.variants
+      [
+        [['url','uri','cgi'],{}]
+      ]
+    end
+
+    def self.params 
+      [:input]
+    end      
+  end
+end

data/lib/ciphr/functions/zlib.rb

@@ -1,94 +1,95 @@
-require 'zlib'
-
-module Ciphr::Functions::ZLib
-  class Deflate < Ciphr::Functions::InvertibleFunction
-    def apply
-      input = @args[0]
-      zstream = invert ? Zlib::Inflate.new : Zlib::Deflate.new
-      Proc.new do
-        chunk = input.read(256)
-        if chunk
-          if invert
-            zstream.inflate(chunk)
-          else
-            zstream.deflate(chunk,Zlib::SYNC_FLUSH)
-          end
-        else
-          begin
-            #zstream.finish if invert
-          ensure
-            zstream.close
-          end
-        end
-      end
-    end
-
-    def self.variants
-      [
-        [['deflate'], {}]
-      ]
-    end
-
-    def self.params 
-      [:input]
-    end
-  end
-
-
-  class Gzip < Ciphr::Functions::InvertibleFunction
-    class UncloseableIOProxy # hack to prevent GzipWriter from closing StringIO
-      def initialize(delegate)
-        @delegate = delegate
-      end
-      
-      def method_missing(meth, *args, &block)
-        if meth.to_s != "close"
-          @delegate.send(meth, *args, &block)
-        else
-          nil
-        end
-      end
-    end
-    
-    def apply
-      input = @args[0]
-      sio = StringIO.new
-      gz = !invert ? Zlib::GzipWriter.new(UncloseableIOProxy.new(sio)) : Zlib::GzipReader.new(input) 
-      Proc.new do
-        if invert # unzip
-          gz.read(256)
-        else # zip
-          chunk = input.read(256)
-          if chunk
-            gz.write chunk 
-            sio.rewind
-            ret = sio.read
-            sio.rewind
-            sio.truncate(0)
-            ret
-          elsif gz
-            gz.close
-            gz = nil
-            sio.rewind
-            ret = sio.read
-            sio.rewind
-            sio.truncate(0)
-            ret
-          else
-            nil
-          end
-        end
-      end
-    end
-
-    def self.variants
-      [
-        [['gzip','gz'], {}]
-      ]
-    end
-
-    def self.params 
-      [:input]
-    end
-  end
-end
+require 'zlib'
+
+module Ciphr::Functions::ZLib
+  class Deflate < Ciphr::Functions::InvertibleFunction
+    def apply
+      input = @args[0]
+      zstream = invert ? Zlib::Inflate.new : Zlib::Deflate.new
+      Proc.new do
+        chunk = input.read(256)
+        if chunk
+          if invert
+            zstream.inflate(chunk)
+          else
+            zstream.deflate(chunk,Zlib::SYNC_FLUSH)
+          end
+        else
+          begin
+            #zstream.finish if invert
+          ensure
+            zstream.close
+          end
+        end
+      end
+    end
+
+    def self.variants
+      [
+        [['deflate'], {}]
+      ]
+    end
+
+    def self.params 
+      [:input]
+    end
+  end
+
+
+  class Gzip < Ciphr::Functions::InvertibleFunction
+    class UncloseableIOProxy # hack to prevent GzipWriter from closing StringIO
+      def initialize(delegate)
+        @delegate = delegate
+      end
+      
+      def method_missing(meth, *args, &block)
+        if meth.to_s != "close"
+          @delegate.send(meth, *args, &block)
+        else
+          nil
+        end
+      end
+    end
+    
+    def apply
+      input = @args[0]
+      sio = StringIO.new
+      sio.binmode
+      gz = !invert ? Zlib::GzipWriter.new(UncloseableIOProxy.new(sio)) : Zlib::GzipReader.new(input) 
+      Proc.new do
+        if invert # unzip
+          gz.read(256)
+        else # zip
+          chunk = input.read(256)
+          if chunk
+            gz.write chunk 
+            sio.rewind
+            ret = sio.read
+            sio.rewind
+            sio.truncate(0)
+            ret
+          elsif gz
+            gz.close
+            gz = nil
+            sio.rewind
+            ret = sio.read
+            sio.rewind
+            sio.truncate(0)
+            ret
+          else
+            nil
+          end
+        end
+      end
+    end
+
+    def self.variants
+      [
+        [['gzip','gz'], {}]
+      ]
+    end
+
+    def self.params 
+      [:input]
+    end
+  end
+end