ejson 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e7a3d4927ceae8e72ece8df8749391e2620d683
-  data.tar.gz: d3f5c4b1c24e2d73cde70f136f3a64c6ed0abb18
+  metadata.gz: d196aa010f463d032df01e73e296fee007ab032d
+  data.tar.gz: 22256d7a3eb5779e059f94f6d709a78dff3f2aba
 SHA512:
-  metadata.gz: 8925b554189010a94fe8760c184c92ab3ab72771ef3cd217192f9a04067f4a650e086d3d3e9ed77c83e21f20ceb34fc63ef52d05965982e747706e3c72c7f490
-  data.tar.gz: 7b14d361b4e9b0398208205de262d9c360aeb82a6828e8e324ec0322258b18a2a3cb1a05544425c70d13f758c5ac421f2e3f6561e5903b95615efbc19339b391
+  metadata.gz: 0145e7b10b201d63dad67d8ead58debf9c294364070721ab9c0fb481bd5aa4bc96ab0e279945315bb54481cd6806bfec440c8a105768aa3065b286cac66d72e6
+  data.tar.gz: ffc080d94d6fb9bcd353c0195ff83de2c92d75a544ff774aac1fddaa0859e6d989e362d1192cbfdc16db2764ddc1d54f06a758931f2f19a95805381c41f9572f

data/lib/ejson.rb

@@ -14,6 +14,27 @@ class EJSON
     Data.new(JSON.load(json_text), @encryption)
   end
 
+  def serializer
+    @serializer ||= Serializer.new(@encryption)
+  end
+
+  class Serializer
+
+    def initialize(encryption)
+      @encryption = encryption
+    end
+
+    def dump(data)
+      data = Data.new(data, @encryption) unless data.is_a?(Data)
+      data.dump
+    end
+
+    def load(data)
+      Data.new(JSON.parse(data), @encryption).decrypt_all
+    end
+
+  end
+
   class Data
     extend Forwardable
     def_delegators :@data, :[]=

data/lib/ejson/cli.rb

@@ -12,14 +12,14 @@ class EJSON
     default_task :encrypt
 
     desc "decrypt [file]", "decrypt some data from file to stdout"
-    method_option :inplace, type: :boolean, default: false, aliases: "-i", desc: "Overwrite input file rather than dumping to stdout"
+    method_option :out, type: :string, default: false, aliases: "-o", desc: "Write to a file rather than stdout"
     def decrypt(file)
       ciphertext = File.read(file)
       ej = EJSON.new(pubkey, options[:privkey])
       output = JSON.pretty_generate(ej.load(ciphertext).decrypt_all)
-      if options[:inplace]
-        File.open(file, "w") { |f| f.puts output }
-        puts "Wrote #{output.size} bytes to #{file}"
+      if options[:out]
+        File.open(options[:out], "w") { |f| f.puts output }
+        puts "Wrote #{output.size} bytes to #{options[:out]}"
       else
         puts output
       end

data/lib/ejson/version.rb

@@ -1,3 +1,3 @@
 class EJSON
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/test/ejson_test.rb

@@ -43,7 +43,7 @@ class CLITest < Minitest::Unit::TestCase
     encrypted = JSON.load(File.read(f.path))
     assert_match(/\AENC\[MIIB.*\]\z/, encrypted["a"])
 
-    runcli "decrypt", "-i", "-p", pubkey, "-k", privkey, f.path
+    runcli "decrypt", "-o", f.path, "-p", pubkey, "-k", privkey, f.path
     decrypted = JSON.load(File.read(f.path))
     refute_match(/\AENC\[MIIB.*\]\z/, decrypted["a"])
   ensure
@@ -87,6 +87,18 @@ class CLITest < Minitest::Unit::TestCase
     assert_equal private_key, @enc.instance_variable_get(:@private_key_rsa).to_s
   end
 
+  def test_serializer_api
+    serializer = EJSON.new(pubkey, privkey).serializer
+    data = {'foo' => 'bar'}
+
+    assert_equal data, serializer.load(serializer.dump(data))
+  end
+
+  def test_serializer_safety
+    serializer = EJSON.new(pubkey, privkey).serializer
+    refute serializer.dump('foo' => 'bar').include?('bar')
+  end
+
   private
 
   def encrypt(path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ejson
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Burke Libbey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor