json2properties 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb0a92e8a82c2ec9072de8fd475464f96c3c7fff
-  data.tar.gz: 3031dd7fc136835c11b0ecb49b1828671963bb9c
+  metadata.gz: ce4e12d23e2781e874254350edd145a45772dbc1
+  data.tar.gz: 86585c38a402169b8f7d68dec5cca19df0969b8b
 SHA512:
-  metadata.gz: ed84c5b0709f4d3c6fb2c69095a3e627b371c1a0db097bc7f7c1c8f24a8b80a01bfd0ee5bf22f961c91c10b2096bee369141fa910dc2cc4b41d9bd5f6f3e480e
-  data.tar.gz: 77d10f97dc540870205af293729d029909683d17f038505b6075bc06c839ade747be2dfc01ecb92607853b22a73c65a8fede5023d1ac7c61e5721a64e7bbb260
+  metadata.gz: b72d55af9793187ba60ba3b219cc29db1941816085221ba44c10c6dbf79bf80db77be6754bc88da45dee99fbf77f405316fbe891f5bccc7a18e4ff0a294de5a1
+  data.tar.gz: b7d45b5e2c8647a220872e48f858ace322d24767467c3d4b7f8a617d5d2989230f1769b91508c6b8f8b012cf8ad8aeb6b7276f72bc98f7da0671865f82029f9e

data/bin/json2properties

@@ -3,4 +3,4 @@
 require_relative '../lib/json2properties_cli'
 
 cli = Json2propertiesCli.new(ARGV)
-cli.run
+cli.convert_file

data/bin/properties2json

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require_relative '../lib/json2properties_cli'
+
+cli = Json2propertiesCli.new(ARGV)
+cli.unconvert_file

data/lib/json2properties.rb

@@ -1,38 +1,100 @@
 require 'json'
 require 'java-properties'
+require 'active_support'
+require 'active_support/core_ext/hash'
+
+class String
+	def is_i?
+		/\A\d+\z/ === self
+	end
+
+	def is_numeric?
+		return true if self.is_i?
+		true if Float(self) rescue false
+	end
+end
 
 class Json2properties
-	VERSION = '0.0.1'
+	VERSION = '0.0.2'
 	SEPARATOR = '.'
 
 	def initialize
-		@prefix = ''
-		@ret = {}
+		reset_state
 	end
 
+	# json => properites
 	def convert_file(src, dest)
 		JavaProperties.write(json2kv(File.read(src)), dest)
 	end
 
+	# properites => json
+	def unconvert_file(src, dest)
+		kv = JavaProperties.load(src)
+		File.write(dest, kv2json(kv))
+	end
+
+	# json string => flat k-v hash
 	def json2kv(json)
+		reset_state
 		data = JSON.parse(json)
-		process(data)
+		process_json_hash(data)
 		@ret
 	end
 
+	# flat k-v hash => json string
+	def kv2json(kv)
+		reset_state
+		kv.stringify_keys!
+		ret = {}
+		kv.each_pair do |k,v|
+			tmp = ret
+			parts = k.split(SEPARATOR)
+			parts.each_index do |i|
+				part = parts[i]
+				next_part = parts[i+1]
+
+				part = part.to_i if part.is_i?
+				if tmp[part].nil?
+					if next_part.nil?
+						tmp[part] = fix_type(v)
+					elsif next_part.is_i?
+						tmp[part] = []
+					else
+						tmp[part] = {}
+					end
+				end
+				tmp = tmp[part]
+			end
+		end
+		JSON.pretty_generate(ret)
+	end
+
 	private
 
-	def process(data, prefix='')
+	def fix_type(v)
+		return v.to_i if v.is_i?
+		return v.to_f if v.is_numeric?
+		return true if v == "true"
+		return false if v == "false"
+		v
+	end
+
+	def reset_state
+		@prefix = ''
+		@ret = {}
+	end
+
+	def process_json_hash(data, prefix='')
 		if data.is_a?(Array)
 			data.each_index do |k|
 				v = data[k]
 				key = prefix.empty? ? k : prefix+SEPARATOR+k.to_s
-				process(v, key)
+				process_json_hash(v, key)
 			end
 		elsif data.is_a?(Hash)
 			data.each_pair do |k,v|
 				key = prefix.empty? ? k : prefix+SEPARATOR+k.to_s
-				process(v, key)
+				process_json_hash(v, key)
 			end
 		else
 			@ret[prefix] = data

data/lib/json2properties_cli.rb

@@ -8,16 +8,27 @@ class Json2propertiesCli
 		@dest = @argv[1] || ''
 	end
 
-	def run
+	def unconvert_file
+		validate_argv('properties2json')
+		Json2properties.new.unconvert_file(@src, @dest)
+	end
+
+	def convert_file
+		validate_argv('json2properties')
+		Json2properties.new.convert_file(@src, @dest)
+	end
+
+	private
+
+	def validate_argv(mode)
 		if @src.empty? || @dest.empty?
-			STDERR.puts "Usage: json2properties <SRC_FILE> <DEST_FILE>"
+			STDERR.puts "Usage: #{mode} <SRC_FILE> <DEST_FILE>"
 			exit 1
 		end
 		unless File.exists? @src
 			STDERR.puts "Given source file doesn't exist: #{@src}"
 			exit 1
 		end
-		Json2properties.new.convert_file(@src, @dest)
 	end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json2properties
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Bartek Wilczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: java-properties
@@ -24,15 +24,31 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: 
 email:
 - bwilczek@gmail.com
 executables:
 - json2properties
+- properties2json
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/json2properties
+- bin/properties2json
 - lib/json2properties.rb
 - lib/json2properties_cli.rb
 homepage: https://github.com/bwilczek/json2properties