ordo 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 859241b0c0396d87392134cbcd910097b386c300
-  data.tar.gz: 767bbecacd458fbd61d8b1faa61c529a83396cb6
+  metadata.gz: 04e607b11a82dde05b1b45e926adb043c9fb11f4
+  data.tar.gz: 002a998c4afb7e42ae674ab7c58bd1d48e9a1a15
 SHA512:
-  metadata.gz: 2f10f47305efd9b0cc9b0598b28cc4f555239147f9dec543a6cb18dc7cc45e33457f739739d972f227a22007efdf7aaccac03f15c25b98d05d08772a6a9f28ad
-  data.tar.gz: 5c3045c41570bdcbe9e93c42dc3227c79ecb77c6bc165260fce485d9900a8824c8ea61d9a0ebc7755e657b90bbda937d1dd725669219f03ff29e7cf804c23678
+  metadata.gz: ee6e1a1b1f838553726948af3fc34f2befa61df9d1ceb701c8027b315252bc867dc2f2a6497569f86d11ceac7b0f3694e15c5edf77fdf9f976b1d85bb3b53cb2
+  data.tar.gz: 709ed72d6d3f65028562aa59a28f57f22c647ff5af04d67f7aa56eb6c77806c01ac404185490524d0dfd915d6d60d6d7d58e3ee4ab70309779ecb3b07b247235

data/CHANGES.md

@@ -0,0 +1,7 @@
+0.0.2 (06-07-2014)
+------------------
+* Support for base64 encoded message bodies
+
+0.0.1 (06-01-2014)
+------------------
+* Initial release

data/README.md

@@ -1,6 +1,7 @@
 ![ORDO: Ordered Representation for Distinguished Objects](https://raw.githubusercontent.com/cryptosphere/ordo/master/logo.png)
 =========================================================
 
+[![Gem Version](https://badge.fury.io/rb/ordo.png)](http://rubygems.org/gems/ordo)
 [![Build Status](https://travis-ci.org/cryptosphere/ordo.png?branch=master)](https://travis-ci.org/cryptosphere/ordo)
 [![Code Climate](https://codeclimate.com/github/cryptosphere/ordo.png)](https://codeclimate.com/github/cryptosphere/ordo)
 [![Coverage

data/lib/ordo.rb

@@ -3,7 +3,7 @@
 require 'ordo/version'
 require 'ordo/message'
 
-# Ordered Representation of Distinguished Objects
+# Ordered Representation for Distinguished Objects
 module ORDO
   # Couldn't parse the given message
   ParseError = Class.new(StandardError)

data/lib/ordo/message/parser.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'strscan'
+require 'base64'
 
 module ORDO
   class Message
@@ -70,7 +71,14 @@ module ORDO
       end
 
       def parse_body
-        @body = @scanner.rest
+        raw_body = @scanner.rest
+        encoding = @fields['Content-Transfer-Encoding']
+
+        @body = case encoding
+                when 'base64' then Base64.strict_decode64(raw_body)
+                when 'binary', NilClass then raw_body
+                else fail ArgumentError, "invalid message encoding: #{encoding}"
+                end
       end
 
       def parse_error(message)

data/lib/ordo/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Ordered Representation of Distinguished Objects
+# Ordered Representation for Distinguished Objects
 module ORDO
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/ordo/message/parser_spec.rb

@@ -17,46 +17,69 @@ describe ORDO::Message::Parser do
   let(:example_body)    { 'Some things are better left unread' }
   let(:example_message) { example_header + example_body }
 
-  it 'parses messages' do
-    parser = subject.parse(example_message)
+  let(:example_header64)  { example_header.sub('binary', 'base64') }
+  let(:example_body64)    { Base64.strict_encode64(example_body) }
+  let(:example_message64) { example_header64 + example_body64 }
 
-    expect(parser.version).to eq example_version
-    expect(parser.fields).to eq(
-      'Cipher'                    => example_cipher,
-      'Content-Length'            => example_body.length.to_s,
-      'Content-Transfer-Encoding' => example_encoding
-    )
+  context 'binary encoding' do
+    it 'parses messages' do
+      parser = subject.parse(example_message)
 
-    expect(parser.body).to eq example_body
-  end
+      expect(parser.version).to eq example_version
+      expect(parser.fields).to eq(
+        'Cipher'                    => example_cipher,
+        'Content-Length'            => example_body.length.to_s,
+        'Content-Transfer-Encoding' => example_encoding
+      )
 
-  it 'raises ParseError if no ORDO MSG header found' do
-    begin
-      subject.parse('garbage')
-    rescue ORDO::ParseError => ex # rubocop:disable all
+      expect(parser.body).to eq example_body
     end
+  end
+
+  context 'base64 encoding' do
+    it 'parses messages' do
+      parser = subject.parse(example_message64)
 
-    expect(ex).to be_a ORDO::ParseError
-    expect(ex.to_s).to match(/no.*header/)
+      expect(parser.version).to eq example_version
+      expect(parser.fields).to eq(
+        'Cipher'                    => example_cipher,
+        'Content-Length'            => example_body.length.to_s,
+        'Content-Transfer-Encoding' => 'base64'
+      )
+
+      expect(parser.body).to eq example_body
+    end
   end
 
-  it 'raises ParseError if version is invalid' do
-    begin
-      subject.parse('---ORDO MSG vX---')
-    rescue ORDO::ParseError => ex # rubocop:disable all
+  context 'parse errors' do
+    it 'raises ParseError if no ORDO MSG header found' do
+      begin
+        subject.parse('garbage')
+      rescue ORDO::ParseError => ex # rubocop:disable all
+      end
+
+      expect(ex).to be_a ORDO::ParseError
+      expect(ex.to_s).to match(/no.*header/)
     end
 
-    expect(ex).to be_a ORDO::ParseError
-    expect(ex.to_s).to match(/invalid version/)
-  end
+    it 'raises ParseError if version is invalid' do
+      begin
+        subject.parse('---ORDO MSG vX---')
+      rescue ORDO::ParseError => ex # rubocop:disable all
+      end
 
-  it 'raises ParseError if invalid fields are encountered' do
-    begin
-      subject.parse("---ORDO MSG v0---\r\nfoo: bar\r\n\r\n")
-    rescue ORDO::ParseError => ex # rubocop:disable all
+      expect(ex).to be_a ORDO::ParseError
+      expect(ex.to_s).to match(/invalid version/)
     end
 
-    expect(ex).to be_a ORDO::ParseError
-    expect(ex.to_s).to match(/invalid.*field name/)
+    it 'raises ParseError if invalid fields are encountered' do
+      begin
+        subject.parse("---ORDO MSG v0---\r\nfoo: bar\r\n\r\n")
+      rescue ORDO::ParseError => ex # rubocop:disable all
+      end
+
+      expect(ex).to be_a ORDO::ParseError
+      expect(ex.to_s).to match(/invalid.*field name/)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ordo
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-01 00:00:00.000000000 Z
+date: 2014-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -77,6 +77,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGES.md
 - Gemfile
 - Guardfile
 - LICENSE.txt