glug 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 021d7f8ef27d817a09761e33a6768f58f8d94848
-  data.tar.gz: ae6f46a63cc86c955683f64f44118e50efc28845
+  metadata.gz: f31f80c7aff2ed19ae265806fcdd335481c9a499
+  data.tar.gz: c7e0077ef04f37c3efef47574cc39432e25672ae
 SHA512:
-  metadata.gz: '039967c1194fabd0c105c3f4eb2e328ffb4589d7fda079037d109338aac9b09ebee55db91ba9b4a5421f45aab7aaa20aa7acc51e4868a79860925be964bb0ce7'
-  data.tar.gz: 89e4ec1f4a0dd64cd3186f4e911e24088c9104623df83483b180c7987fe21fe76f7084dfaadf71783bf70a2d2b9c4239976f3e5b69b49d1f2b343081bcc3b48e
+  metadata.gz: 033c50d05dfbbdc53fe38d38f4dbb4c5bea6a334abcf468821a41b5487c8bffd9e78294204aa509f163d2966cde6841103f468391163a637ad11b2a06d834421
+  data.tar.gz: 3808af2c1e2de6a7120b9e2a834304749ddf4017f90a6a0b9a54b732a74ab17a2b457de04de329f838bf70333d7211a55b77bc05b41fbad15d2379ad6883c458

data/lib/glug.rb

@@ -92,7 +92,8 @@ module Glug # :nodoc:
 		# Assemble into Mapbox GL JSON format
 		def to_hash
 			out = @kv.dup
-			out['sources'] = @sources
+			out['sources'] = @sources.dup
+			out['sources'].each { |k,v| p k; p v; v.delete(:default); out['sources'][k] = v }
 			out['layers'] = @layers.select { |r| r.write? }.collect { |r| r.to_hash }.compact
 			out
 		end
@@ -317,7 +318,13 @@ module Glug # :nodoc:
 				stylesheet.refs[mk] = hash['id']
 			end
 
-			hash[:layout].empty? && hash[:paint].empty? ? nil : hash
+			if hash[:layout].empty? && hash[:paint].empty?
+				nil
+			else
+				hash.delete(:layout) if hash[:layout].empty?
+				hash.delete(:paint) if hash[:paint].empty?
+				hash
+			end
 		end
 
 		# Key to identify matching layer properties (slow but...)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glug
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Richard Fairhurst
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-23 00:00:00.000000000 Z
+date: 2018-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neatjson