gson-class-generator 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31edff5ae4bbb5516c78e6de582d195b766171b7
-  data.tar.gz: 9a52c4c0cecb7523f40cc91e4081a6708e5752e6
+  metadata.gz: cf5063f622783c4ff013907bea9254c96323b2f1
+  data.tar.gz: f5072e956389cd1ade7ed1b7ff06667e3784c27e
 SHA512:
-  metadata.gz: efb5fbdcbd12fe87cd37cd0a26e51c6438375d03bed6e4bdeddd3376408a9ef109df6f496a516e5485bc91f78d7fdd47785c0027e74af492c16cb6cc1bb01c24
-  data.tar.gz: 41b5df16e9ba959c8b3c62978763ac4fd8105ab6a69a3b7400a39552af664fc8c6d251eaeda79d424c353a273430673e6dc23149353ff057b5b7274018f9ac7f
+  metadata.gz: f41e33b6ac77d6f040c3979a8fcc09f349cd7dec85e99c5fcb1d25fde17ad6922c66f4c70cd75ebf1122f1c2f40a8be07315cc1c153799128c49f5a40c58e459
+  data.tar.gz: a5edab69555f7a3e291c28f470685cdc4a03e895bfa5689f1cb860f49fa04abad8bf840b252cbef574dbffe6fdd8da2da68ec54e10e2d65dfbcceeb001bc796c

data/lib/gson-class-generator.rb

@@ -397,7 +397,7 @@ module GSONClassGenerator
 		end
 		
 		def self.javaify_key(json_key, is_array)
-			field_name = json_key
+			field_name = json_key.dup
 			
 			if (is_array)
 				if (!field_name.end_with?("s"))
@@ -407,19 +407,22 @@ module GSONClassGenerator
 			end
 			
 			# Clean up first character
-			field_name = field_name.gsub(/^[^\p{Pc}\p{Alnum}\p{Sc}]+/, "")
+			field_name.gsub!(/^[^\p{Pc}\p{Alnum}\p{Sc}]+/, "")
 	
 			# Clean up allowed characters
-			field_name = field_name.gsub(/[^\p{Pc}\p{Alnum}\p{Sc}]/, "_")
+			field_name.gsub!(/[^\p{Pc}\p{Alnum}\p{Sc}]/, "_")
 			
 			# Camel case underscores
-			field_name = field_name.gsub(/(?!^_)_+(.)/) { $1.upcase }
+			field_name.gsub!(/(?!^_)_+(.)/) { $1.upcase }
 			
 			# Clean up field name in case its a Java keyword
 			if (!(JAVA_KEYWORDS.index(field_name) === nil))
 				field_name += "_"
 			end
 			
+			# Lower case first letter, but allow if 2 or more upper case characters are present
+			field_name.gsub!(/^(\p{Upper})(?!\p{Upper}+)/) { $1.downcase }
+			
 			field_name
 		end
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gson-class-generator
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Rich Hodgkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-01 00:00:00.000000000 Z
+date: 2014-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json