ruby_android 0.7.3 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b8b5ad6ad64099b1a2c7db897fa0696d7c9a6ed
-  data.tar.gz: ca832ea8a999e9f0d338f2f3d925dc32aeba9b2c
+  metadata.gz: 9c8f1c24d2815da2ff133718135ac22d2a477725
+  data.tar.gz: c463e9c968e4fac78690f62da20404c8efe73e98
 SHA512:
-  metadata.gz: e2511d76730f44ca07c84de0ea88fddc4ba7e9979b690049251b354c24437cc12640162670e5ccdae47ffbdc05fccf93336b3e2f49664271acbbe3dc5be6288a
-  data.tar.gz: 2a80baeaf4a147f34e03c6770638d504e1c36c597d67496707526c6a06f089b16200b9bc133fd5bf2639d81374d31aa0976ffbe1e142751bd736ed4877c6a393
+  metadata.gz: 68ed3bdb91e8f57c341479a17f4ed88e63150e8bca3129070ccbd199971ad0479cc3945c797f457f3b1e4af2ff5273923c73e888387e776d556fc7e0c135887e
+  data.tar.gz: 0591ac870d7c4b08b6f4a60384d92c30ea60cd533e2f443646a00d15ae7059a721843df6f8bfef5646bd90536136ccefb1a25bd7fb5faecd7654af2617a5437a

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.7.3

data/lib/android/resource.rb

@@ -255,6 +255,7 @@ module Android
       private :parse
 
       def extract_res_strings
+        @res_strings_default = {}
         @res_strings_lang = {}
         @res_strings_contry = {}
         begin
@@ -275,10 +276,10 @@ module Android
           lang = type.config.locale_lang
           contry = type.config.locale_contry
           if lang.nil? && contry.nil?
-            @res_strings_default = str_hash
+            @res_strings_default.merge!(str_hash)
           else
-            @res_strings_lang[lang] = str_hash unless lang.nil?
-            @res_strings_contry[contry] = str_hash unless contry.nil?
+            @res_strings_lang[lang] = (@res_strings_lang[lang] || {}).merge(str_hash) unless lang.nil?
+            @res_strings_contry[contry] = (@res_strings_contry[contry] || {}).merge(str_hash) unless contry.nil?
           end
         end
       end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: ruby_android
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.5
 platform: ruby
 authors:
 - Michal Tajchert
+- Kamil Trzcinski
 - SecureBrain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip