jsong 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f05b92d2d4d9c80a01731563832b5d5d930e8830
-  data.tar.gz: bd7589eb0625f25dea9c691d5ade8c82dd3f1cbe
+  metadata.gz: 99c467f0e6a1c61b775db7cc78d7f2032c54422b
+  data.tar.gz: d92ccc25ac55046d376d34a8ac932f1071ad2fc6
 SHA512:
-  metadata.gz: 7f58ebb56bbacc01599737049e0f4700ba8451c69b2b74b2c4b03caf23f63baa8d7073ffc1b7674d660787241a5c6ea416d6f0433216ab9f8ca0dad536663406
-  data.tar.gz: 5dbcde6e2f269464a29da18eb29c23fb1893969731463fbab9097bcaf5c4641dcd85289da6391781dcc35cd6b855506db692f165d2037d2daf992affb5fe2277
+  metadata.gz: f74f1a134cb4f435b6269b6503ea9a20f5af656d18e7ef910fe76c9d7fa567e700e9bc6755fc893cc263b77f8dcc62d1b20e5bf24ae233a7ded37bc2ac0e1568
+  data.tar.gz: 06f7684bab0f24b4a075da57d4c25419ff979adc214d3b44f02ecd7fd09e35b745f59faa1a35c5cf47cc9d5a03c4e2ff2bddbc31f24183a91cc834561d171321

data/lib/jsong/version.rb

@@ -1,3 +1,3 @@
 module Jsong
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/lib/jsong.rb

@@ -1,6 +1,7 @@
 require 'jsong/version'
 require 'chunky_png'
 require 'json'
+require 'yaml'
 
 module Jsong
   DEFAULT = {
@@ -18,7 +19,7 @@ module Jsong
     }]
   }.freeze
 
-  def Jsong.to_jsong(file_name, comment = nil)
+  def Jsong.to_jsong(file_name, comment = nil, yaml = false)
     image = ChunkyPNG::Image.from_file file_name
 
     if comment.nil? && image.metadata['Title']
@@ -46,12 +47,16 @@ module Jsong
       end
     end
 
-    data.to_json
+    if yaml
+      data.to_yaml
+    else
+      data.to_json
+    end
   end
 
-  def Jsong.from_jsong(json_text, file_name)
-    json_text = json_text.read if json_text.respond_to? :read
-    data = JSON.parse json_text
+  def Jsong.from_jsong(text, file_name, yaml = false)
+    text = text.read if text.respond_to? :read
+    data = if yaml; YAML.load text; else; JSON.parse text; end
     default_color = Jsong.encode_pixel data['layers'][-1]['default_color']
     w, h = data['size']['width'], data['size']['height']
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsong
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Illia K.