glug 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58209224a893c7908aec8ff0b9f9c85211353842
-  data.tar.gz: 5b75fb0f41c1276914b0bddd27569be07c352002
+  metadata.gz: 021d7f8ef27d817a09761e33a6768f58f8d94848
+  data.tar.gz: ae6f46a63cc86c955683f64f44118e50efc28845
 SHA512:
-  metadata.gz: f3368acdea157ec8e53f69f9361d185d44dc35f97f3bf8ecd1e0edad04ddf16fb491429341cb4045beaaaacfa3a2547334a04704a6c0729608fd2c2746d13a7b
-  data.tar.gz: 1fbf8f7471e5a029400b8bc0239ccec3d2599867f8844203ea0d85b502299a929dc97ed8758e3e4382c96d9ca066b483f8bf230528837bc6bbae3911ff8d7db9
+  metadata.gz: '039967c1194fabd0c105c3f4eb2e328ffb4589d7fda079037d109338aac9b09ebee55db91ba9b4a5421f45aab7aaa20aa7acc51e4868a79860925be964bb0ce7'
+  data.tar.gz: 89e4ec1f4a0dd64cd3186f4e911e24088c9104623df83483b180c7987fe21fe76f7084dfaadf71783bf70a2d2b9c4239976f3e5b69b49d1f2b343081bcc3b48e

data/lib/glug.rb

@@ -93,7 +93,7 @@ module Glug # :nodoc:
 		def to_hash
 			out = @kv.dup
 			out['sources'] = @sources
-			out['layers'] = @layers.select { |r| r.write? }.collect { |r| r.to_hash }
+			out['layers'] = @layers.select { |r| r.write? }.collect { |r| r.to_hash }.compact
 			out
 		end
 		def to_json(*args); JSON.neat_generate(to_hash) end
@@ -119,7 +119,7 @@ module Glug # :nodoc:
 		def <=(*args); Condition.new.from_key(:<=,@k,args) end
 		def >=(*args); Condition.new.from_key(:>=,@k,args) end
 		def in(*args); Condition.new.from_key(:in,@k,args) end
-		def not_in(*args); Condition.new.from_key(:not_in,@k,args) end
+		def not_in(*args); Condition.new.from_key('!in',@k,args) end
 	end
 
 	# -----	Layer
@@ -195,9 +195,9 @@ module Glug # :nodoc:
 				sub_cond = @condition						# just inherit parent layer's condition
 			else
 				sub_cond = (args.length==1) ? args[0] : Condition.new.from_list(:any,args)
-				sub_cond = sub_cond & @condition
+				sub_cond = nilsafe_merge(sub_cond, @condition)
 			end
-			r._set_filter(sub_cond & @uncascaded)
+			r._set_filter(nilsafe_merge(sub_cond, @uncascaded))
 			r.instance_eval(&block)
 			@stylesheet._add_layer(r)
 
@@ -206,13 +206,23 @@ module Glug # :nodoc:
 			@cascades.each do |c|
 				c_cond, c_kv = c
 				l = Layer.new(@stylesheet, :id=>"#{r.kv[:id]}__#{child_chr}", :kv=>r.kv.dup)
-				l._set_filter(sub_cond & c_cond)
+				l._set_filter(nilsafe_merge(sub_cond, c_cond))
 				l.kv.merge!(c_kv)
 				@stylesheet._add_layer(l)
 				child_chr.next!
 			end
 		end
 		
+		# Short-form key constructor - for reserved words
+		def tag(k)
+			OSMKey.new(k)
+		end
+
+		# Nil-safe merge
+		def nilsafe_merge(a,b)
+			a.nil? ? b : (a & b)
+		end
+
 		# Add a cascading condition
 		def cascade(*args, &block)
 			cond = (args.length==1) ? args[0] : Condition.new.from_list(:any,args)
@@ -241,7 +251,7 @@ module Glug # :nodoc:
 			_set_filter(args.length==1 ? args[0] : Condition.new.from_list(:any,args))
 		end
 		def _set_filter(condition)
-			@condition = condition.dup
+			@condition = condition.nil? ? nil : condition.dup
 		end
 
 		# Set layer name
@@ -291,7 +301,7 @@ module Glug # :nodoc:
 			hash['type'] = @type
 			if @condition then hash['filter'] = @condition.encode end
 
-			# Convert zoom level
+			# Convert zoom level
 			if (v=hash['zoom'])
 				hash['minzoom'] = v.is_a?(Range) ? v.first : v
 				hash['maxzoom'] = v.is_a?(Range) ? v.last  : v
@@ -306,7 +316,8 @@ module Glug # :nodoc:
 			else
 				stylesheet.refs[mk] = hash['id']
 			end
-			hash
+
+			hash[:layout].empty? && hash[:paint].empty? ? nil : hash
 		end
 
 		# Key to identify matching layer properties (slow but...)

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: glug
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Richard Fairhurst
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2018-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neatjson
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Text-based markup for Mapbox GL styles
@@ -31,8 +31,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/glug.rb
 - bin/glug
+- lib/glug.rb
 homepage: http://github.com/systemed/glug
 licenses:
 - FTWPL
@@ -43,17 +43,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Glug