glug 0.0.5 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b05a6948c910e308dea8ebd778d54f9c78780040
-  data.tar.gz: 5b8b0ee7600b6d5eea6e1e3dd036d00488fa7e0c
+SHA256:
+  metadata.gz: 5340ccbd34dc2766a2f0ed580bcca372cb71cd35d1f6c33009003ca112cd1bc5
+  data.tar.gz: 1946ed3fc268779af7f929a1648893b83dcd4883f96be5ca4c9f2db3947c783c
 SHA512:
-  metadata.gz: 34a2fb6fcbbd168477d8ada1cd77db7c9992b45f435aa1f0e91f997d229bba28e3ff8cc7793329321e2fe6ba8bf358bc9152ef75a6c1bdfd6741301ad776955a
-  data.tar.gz: 7751afb79f71087aa6e6e7389ec485169aba0525767003c64e1898eea0f9c628421c8e5232af373dd4bb404f3d975dce887d23e17c2eec9ab3852ab8949ee40d
+  metadata.gz: 1591989f74b37a697e9ddf4dbd0345fcaddfe71d157e74a3825b383a1cfb5c7cf4bd14a1c3b12178b554f5493f34daaa432f38c62007e4002ddd8189bd8a25ee
+  data.tar.gz: 7c8b934f20ef7fe44d8d4aee3a46abd3a0c57f2d8ec86ff231f567cef08a22196e060541762b6704ba6e6ba01b1206d904bb1f79125b73965f56ed125309505c

data/lib/glug/condition.rb

@@ -0,0 +1,129 @@
+module Glug # :nodoc:
+
+	# -----	Subscriptable
+	#       allows us to create conditions with syntax
+	#         any[(highway=='primary'),(highway=='trunk')]
+
+	class Subscriptable
+		def initialize(type)
+			@type=type
+		end
+		def [](*arguments)
+			Condition.new.from_list(@type, arguments)
+		end
+	end
+
+	# -----	Condition
+	#       represents a GL filter of the form [operator, key, value] (etc.)
+	#       can be merged with other conditions via the & and | operators
+
+	class Condition
+		attr_accessor :values, :operator
+
+		# GL operators we can't use verbatim (mostly Ruby reserved words)
+		SUBSTITUTIONS = {
+			string_format: "format",
+			is_in: "in",
+			case_when: "case",
+			_!: "!",
+			subtract: "-", divide: "/", pow: "^", # so we can write 'subtract(100,height)'
+			feature_id: "id" # Glug already uses 'id'
+		}
+
+		# GL operators that make sense to use as suffixed dot methods
+		DOT_METHODS = [
+			:array, :boolean, :string_format, :image, :number, :number_format, :object, :string,
+			:to_boolean, :to_color, :to_number, :to_string, :typeof,
+			:length, :slice, :match,
+			:downcase, :upcase, :is_supported_script, :to_rgba,
+			:abs, :acos, :asin, :atan, :ceil, :cos, :floor, :ln, :log10, :log2, :round, :sin, :sqrt, :tan
+		]
+
+		def is(*args); Condition.new.from_key(:==, self, args) end
+		def ==(*args); Condition.new.from_key(:==, self, args) end
+		def !=(*args); Condition.new.from_key(:!=, self, args) end
+		def  <(*args); Condition.new.from_key(:< , self, args) end
+		def  >(*args); Condition.new.from_key(:> , self, args) end
+		def <=(*args); Condition.new.from_key(:<=, self, args) end
+		def >=(*args); Condition.new.from_key(:>=, self, args) end
+		def  %(*args); Condition.new.from_key(:% , self, args) end
+		def  +(*args); Condition.new.from_key(:+ , self, args) end
+		def  -(*args); Condition.new.from_key(:- , self, args) end
+		def  *(*args); Condition.new.from_key(:* , self, args) end
+		def  /(*args); Condition.new.from_key(:/ , self, args) end
+		def **(*args); Condition.new.from_key(:^ , self, args) end
+		def in(*args); Condition.new.from_key(:in, self, [[:literal,args.flatten]]) end
+		def [](*args); Condition.new.from_key(:at, args[0], [self]) end
+		def coerce(other); [Condition.new.just_value(other), self] end
+
+		def initialize
+			@values=[]
+		end
+		def from_key(operator, key, list)
+			@operator = SUBSTITUTIONS[operator] || operator.to_s.gsub('_','-')
+			@values = [key].concat(list)
+			self
+		end
+		def from_list(operator, list)
+			@operator = SUBSTITUTIONS[operator] || operator.to_s.gsub('_','-')
+			@values = list
+			self
+		end
+		def just_value(val)
+			@operator = nil
+			@values = [val]
+			self
+		end
+
+		def &(cond); merge(:all,cond) end
+		def |(cond); merge(:any,cond) end
+		def merge(op,cond)
+			if cond.nil?
+				self
+			elsif @operator==op
+				Condition.new.from_list(op, @values + [cond])
+			elsif cond.operator==op
+				Condition.new.from_list(op, [self] + cond.values)
+			else
+				Condition.new.from_list(op, [self, cond])
+			end
+		end
+		def <<(cond); @values << cond.encode; self end
+
+		# Support dot access for most methods
+		def method_missing(method_sym, *args)
+			if DOT_METHODS.include?(method_sym)
+				Condition.new.from_key(method_sym, self, args)
+			else
+				super
+			end
+		end
+
+		# Encode into an array for GL JSON (recursive)
+		def encode
+			transform_underscores
+			values = @values.map { |v| v.is_a?(Condition) ? v.encode : v }
+			@operator.nil? ? values[0] : [@operator.to_s, *values]
+		end
+		def to_json(opts)
+			encode.to_json(opts)
+		end
+		def to_s
+			"<Condition #{@operator} #{@values}>"
+		end
+
+		# Transform nested { font_scale: 0.8 } to { "font-scale"=>0.8 }
+		def transform_underscores
+			@values.map! do |v|
+				if v.is_a?(Hash)
+					new_hash = {}
+					v.each { |hk,hv| new_hash[hk.is_a?(Symbol) ? hk.to_s.gsub('_','-') : hk] = hv }
+					new_hash
+				else
+					v
+				end
+			end
+		end
+		
+	end # class Condition
+end # module Glug

data/lib/glug/extensions.rb

@@ -0,0 +1,27 @@
+require 'chroma'
+require 'hsluv'
+
+# Colour methods on Integer
+
+class Integer
+	def chroma_hex(op,p)
+		("#"+to_s(16).rjust(6,'0')).paint.send(op,p).to_hex
+	end
+	def chroma(op,p)
+		chroma_hex(op,p).gsub('#','0x').to_i(16)
+	end
+	def to_hex_color
+		'#' + to_s(16).rjust(6,'0')
+	end
+end
+
+# Top-level colour generators
+
+def hsluv(h,s,l)
+	arr = Hsluv.rgb_prepare(Hsluv.hsluv_to_rgb(h,s*100,l*100))
+	(arr[0]*256 + arr[1])*256 + arr[2]
+end
+def hsl(h,s,l)
+	rgb = Chroma::RgbGenerator::FromHslValues.new('hex6',h,s,l).generate[0]
+	((rgb.r).to_i*256 + (rgb.g).to_i)*256 + rgb.b.to_i
+end

data/lib/glug/layer.rb

@@ -0,0 +1,261 @@
+module Glug # :nodoc:
+
+	# -----	Layer
+	#       a layer in a GL style
+	#       this is where most of the hard work happens, including 'method_missing' and 'on' calls to provide the grammar
+
+	class Layer
+
+		# GL properties (as distinct from OSM keys)
+		LAYOUT    = [ :visibility,
+		              :line_cap, :line_join, :line_miter_limit, :line_round_limit, 
+		              :symbol_placement, :symbol_spacing, :symbol_avoid_edges, :symbol_z_order,
+		              :icon_allow_overlap, :icon_ignore_placement, :icon_optional, :icon_rotation_alignment, :icon_size,
+		              :icon_image, :icon_rotate, :icon_padding, :icon_keep_upright, :icon_offset, 
+		              :icon_text_fit, :icon_text_fit_padding, :icon_anchor, :icon_pitch_alignment,
+		              :text_rotation_alignment, :text_field, :text_font, :text_size, :text_max_width, :text_line_height,
+		              :text_letter_spacing, :text_justify, :text_anchor, :text_max_angle, :text_rotate, :text_padding,
+		              :text_keep_upright, :text_transform, :text_offset, :text_allow_overlap, :text_ignore_placement, :text_optional,
+		              :text_pitch_alignment ]
+		PAINT     = [ :background_color, :background_pattern, :background_opacity,
+		              :fill_antialias, :fill_opacity, :fill_color, :fill_outline_color, :fill_translate, :fill_translate_anchor, :fill_pattern,
+		              :line_opacity, :line_color, :line_translate, :line_translate_anchor, :line_width, :line_gap_width, :line_offset,
+		              :line_blur, :line_dasharray, :line_pattern, :line_gradient,
+		              :icon_opacity, :icon_color, :icon_halo_color, :icon_halo_width, :icon_halo_blur, :icon_translate, :icon_translate_anchor,
+		              :text_opacity, :text_color, :text_halo_color, :text_halo_width, :text_halo_blur, :text_translate, :text_translate_anchor,
+		              :raster_opacity, :raster_hue_rotate, :raster_brightness_min, :raster_brightness_max, :raster_saturation, :raster_contrast, :raster_resampling, :raster_fade_duration,
+		              :circle_radius, :circle_color, :circle_blur, :circle_opacity, :circle_translate, :circle_translate_anchor,
+		              :circle_pitch_scale, :circle_pitch_alignment, :circle_stroke_width, :circle_stroke_color, :circle_stroke_opacity,
+		              :fill_extrusion_opacity, :fill_extrusion_color, :fill_extrusion_translate, :fill_extrusion_translate_anchor,
+		              :fill_extrusion_pattern, :fill_extrusion_height, :fill_extrusion_base, :fill_extrusion_vertical_gradient,
+		              :heatmap_radius, :heatmap_weight, :heatmap_intensity, :heatmap_color, :heatmap_opacity, 
+		              :hillshade_illumination_direction, :hillshade_illumination_anchor, :hillshade_exaggeration,
+		              :hillshade_shadow_color, :hillshade_highlight_color, :hillshade_accent_color ]
+		TOP_LEVEL = [ :metadata, :zoom, :interactive ]
+		HIDDEN    = [ :ref, :source, :source_layer, :id, :type, :filter, :layout, :paint ]	# top level, not settable by commands
+		EXPRESSIONS=[ :array, :boolean, :collator, :string_format, :image, :literal, :number,
+		              :number_format, :object, :string, :to_boolean, :to_color, :to_number, :to_string,
+		              :typeof, :accumulated, :feature_state, :geometry_type, :feature_id,
+		              :line_progress, :properties, :at, :get, :has, :is_in, :index_of,
+		              :length, :slice,
+					  :all, :any, :case_when, :coalesce, :match, :within,
+					  :interpolate, :interpolate_hcl, :interpolate_lab, :step,
+					  :let, :var, :concat, :downcase, :upcase,
+					  :is_supported_script, :resolved_locale,
+					  :rgb, :rgba, :to_rgba, :abs, :acos, :asin, :atan, :ceil, :cos, :distance,
+					  :e, :floor, :ln, :ln2, :log10, :log2, :max, :min, :pi, :round, :sin, :sqrt, :tan,
+					  :distance_from_center, :pitch, :zoom, :heatmap_density,
+					  :subtract, :divide, :pow, :_! ]
+
+		# Shared properties that can be recalled by using a 'ref' 
+		REF_PROPERTIES = ['type', 'source', 'source-layer', 'minzoom', 'maxzoom', 'filter', 'layout']
+
+		attr_accessor :kv				# key-value pairs for layout, paint, and top level
+		attr_accessor :condition		# filter condition
+		attr_accessor :stylesheet		# parent stylesheet object
+
+		def initialize(stylesheet, args={})
+			@stylesheet = stylesheet
+			@condition = args[:condition]
+			@kv = args[:kv] || {}
+			@kv[:id] = args[:id]
+			if args[:zoom] then @kv[:zoom]=args[:zoom] end
+
+			@type = nil							# auto-detected layer type
+			@write = true						# write this layer out, or has it been suppressed?
+			@cascade_cond = nil					# are we currently evaluating a cascade directive?
+			@cascades = args[:cascades] || []	# cascade list to apply to all subsequent layers
+			@uncascaded = nil					# condition to add to non-cascaded layers
+
+			@kv[:source] ||= stylesheet.sources.find {|k,v| v[:default] }[0]
+			@kv[:source_layer] ||= args[:id] if stylesheet.sources[@kv[:source]][:type]=="vector"
+			@child_num = 0				# incremented sublayer suffix
+		end
+
+		# Handle all missing 'method' calls
+		# If we can match it to a GL property, it's an assignment:
+		# otherwise it's an OSM key
+		def method_missing(method_sym, *arguments)
+			if EXPRESSIONS.include?(method_sym)
+				return Condition.new.from_list(method_sym, arguments)
+			elsif LAYOUT.include?(method_sym) || PAINT.include?(method_sym) || TOP_LEVEL.include?(method_sym)
+				v = arguments.length==1 ? arguments[0] : arguments
+				if v.is_a?(Proc) then v=v.call(@kv[method_sym]) end
+				if @cascade_cond.nil?
+					@kv[method_sym] = v
+				else
+					_add_cascade_condition(method_sym, v)
+				end
+			else
+				return Condition.new.from_list("get", [method_sym])
+			end
+		end
+
+		# Convenience so we can write literal(1,2,3) rather than literal([1,2,3])
+		def literal(*args)
+			if args.length==1 && args[0].is_a?(Hash)
+				# Hashes - literal(frog: 1, bill: 2)
+				Condition.new.from_list(:literal, [args[0]])
+			else
+				# Arrays - literal(1,2,3)
+				Condition.new.from_list(:literal, [args])
+			end
+		end
+
+		# Return a current value from @kv
+		# This allows us to do: line_width current_value(:line_width)/2.0
+		def current_value(key)
+			@kv[key]
+		end
+
+		# Add a sublayer with an additional filter
+		def on(*args, &block)
+			@child_num+=1
+			r = Layer.new(@stylesheet,
+					:id => "#{@kv[:id]}__#{@child_num}".to_sym,
+					:kv => @kv.dup, :cascades => @cascades.dup)
+
+			# Set zoom level
+			if args[0].is_a?(Range) || args[0].is_a?(Integer)
+				r.kv[:zoom] = args.shift
+			end
+
+			# Set condition
+			sub_cond = nil
+			if args.empty?
+				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 = nilsafe_merge(sub_cond, @condition)
+			end
+			r._set_filter(nilsafe_merge(sub_cond, @uncascaded))
+			r.instance_eval(&block)
+			@stylesheet._add_layer(r)
+
+			# Create cascaded layers
+			child_chr='a'
+			@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(nilsafe_merge(sub_cond, c_cond))
+				l.kv.merge!(c_kv)
+				@stylesheet._add_layer(l)
+				child_chr.next!
+			end
+		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)
+			@cascade_cond = cond
+			self.instance_eval(&block)
+			@cascade_cond = nil
+		end
+		def _add_cascade_condition(k, v)
+			if @cascades.length>0 && @cascades[-1][0].to_s==@cascade_cond.to_s
+				@cascades[-1][1][k]=v
+			else
+				@cascades << [@cascade_cond, { k=>v }]
+			end
+		end
+		def uncascaded(*args)
+			cond = case args.length
+				when 0; nil
+				when 1; args[0]
+				else; Condition.new.from_list(:any,args)
+			end
+			@uncascaded = cond
+		end
+
+		# Setters for @condition (making sure we copy when inheriting)
+		def filter(*args)
+			_set_filter(args.length==1 ? args[0] : Condition.new.from_list(:any,args))
+		end
+		def _set_filter(condition)
+			@condition = condition.nil? ? nil : condition.dup
+		end
+
+		# Set layer name
+		def id(name)
+			@kv[:id] = name
+		end
+		
+		# Suppress output of this layer
+		def suppress; @write = false end
+		def write?; @write end
+
+		# Square-bracket filters (any[...], all[...])
+		def any ; return Subscriptable.new(:any ) end
+		def all ; return Subscriptable.new(:all ) end
+
+		# Deduce 'type' attribute from style attributes
+		def set_type_from(s)
+			return unless s.include?('-')
+			t = (s=~/^fill-extrusion/ ? "fill-extrusion" : s.split('-')[0]).to_sym
+			if t==:icon || t==:text then t=:symbol end
+			if @type && @type!=t then raise "Attribute #{s} conflicts with deduced type #{@type} in layer #{@kv[:id]}" end
+			@type=t
+		end
+
+		# Create a GL-format hash from a layer definition
+		def to_hash
+			hash = { :layout=> {}, :paint => {} }
+
+			# Assign key/values to correct place
+			@kv.each do |k,v|
+				s = k.to_s.gsub('_','-')
+				if s.include?('-color') && v.is_a?(Integer) then v = "#%06x" % v end
+				if v.respond_to?(:encode) then v=v.encode end
+
+				if LAYOUT.include?(k)
+					hash[:layout][s]=v
+					set_type_from s
+				elsif PAINT.include?(k)
+					hash[:paint][s]=v
+					set_type_from s
+				elsif TOP_LEVEL.include?(k) || HIDDEN.include?(k)
+					hash[s]=v
+				else raise "#{s} isn't a recognised layer attribute"
+				end
+			end
+
+			hash['type'] = @type
+			if @condition then hash['filter'] = @condition.encode end
+
+			# 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
+				hash.delete('zoom')
+			end
+
+			# See if we can reuse an earlier layer's properties
+			mk = ref_key(hash)
+			if stylesheet.refs[mk]
+				REF_PROPERTIES.each { |k| hash.delete(k) }
+				hash['ref'] = stylesheet.refs[mk]
+			else
+				stylesheet.refs[mk] = hash['id']
+			end
+
+			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...)
+		def ref_key(hash)
+			(REF_PROPERTIES.collect { |k| hash[k] } ).to_json
+		end
+
+	end # class Layer
+end # module Glug

data/lib/glug/stylesheet.rb

@@ -0,0 +1,57 @@
+module Glug # :nodoc:
+
+	# -----	Stylesheet
+	#       the main document object
+
+	class Stylesheet
+		attr_accessor :sources, :kv, :refs, :base_dir, :params
+
+		def initialize(base_dir: nil, params: nil, &block)
+			@sources = {}
+			@kv = {}
+			@layers = []
+			@refs = {}
+			@base_dir = base_dir || ''
+			@params = params || {}
+			instance_eval(&block)
+		end
+
+		# Set a property, e.g. 'bearing 29'
+		def method_missing(method_sym, *arguments)
+			@kv[method_sym] = arguments[0]
+		end
+
+		# Add a source 
+		def source(source_name, opts={})
+			@sources[source_name] = opts
+		end
+
+		# Add a layer
+		# creates a new Layer object using the block supplied
+		def layer(id, opts={}, &block)
+			r = Layer.new(self, :id=>id, :kv=>opts)
+			@layers << r
+			r.instance_eval(&block)
+		end
+
+		# Assemble into GL JSON format
+		def to_hash
+			out = @kv.dup
+			out['sources'] = @sources.dup
+			out['sources'].each { |k,v| v.delete(:default); out['sources'][k] = v }
+			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
+
+		# Setter for Layer to add sublayers
+		def _add_layer(layer)
+			@layers << layer
+		end
+		
+		# Load file
+		def include_file(fn)
+			instance_eval(File.read(File.join(@base_dir, fn)))
+		end
+	end
+end

data/lib/glug.rb

@@ -1,335 +1,10 @@
 require 'json'
 require 'neatjson'
 
-module Glug # :nodoc:
-
-	# -----	Subscriptable
-	#       allows us to create conditions with syntax
-	#         any[(highway=='primary'),(highway=='trunk')]
-
-	class Subscriptable
-		def initialize(type)
-			@type=type
-		end
-		def [](*arguments)
-			Condition.new.from_list(@type, arguments)
-		end
-	end
-
-	# -----	Condition
-	#       represents a Mapbox GL filter of the form [operator, key, value] (etc.)
-	#       can be merged with other conditions via the & and | operators
-
-	class Condition
-		attr_accessor :values, :operator
-		def initialize
-			@values=[]
-		end
-		def from_key(operator, key, list)
-			@operator = operator
-			@values = [key].concat(list)
-			self
-		end
-		def from_list(operator, list)
-			@operator = operator
-			@values = list
-			self
-		end
-		def &(cond); merge(:all,cond) end
-		def |(cond); merge(:any,cond) end
-		def merge(op,cond)
-			if cond.nil?
-				self
-			elsif @operator==op
-				Condition.new.from_list(op, @values + [cond])
-#				@values << cond; self
-			elsif cond.operator==op
-				Condition.new.from_list(op, [self] + cond.values)
-#				cond.values << self; cond
-			else
-				Condition.new.from_list(op, [self, cond])
-			end
-		end
-		# Encode into an array for Mapbox GL JSON (recursive)
-		def encode
-			[@operator.to_s, *@values.map { |v| v.is_a?(Condition) ? v.encode : v } ]
-		end
-		def to_s; "<Condition #{@operator} #{@values}>" end
-	end
-
-	# -----	Stylesheet
-	#       the main document object
-
-	class Stylesheet
-		attr_accessor :sources, :kv, :refs
-
-		def initialize(&block)
-			@sources = {}
-			@kv = {}
-			@layers = []
-			@refs = {}
-			instance_eval(&block)
-		end
-
-		# Set a property, e.g. 'bearing 29'
-		def method_missing(method_sym, *arguments)
-			@kv[method_sym] = arguments[0]
-		end
-
-		# Add a source 
-		def source(source_name, opts={})
-			@sources[source_name] = opts
-		end
-
-		# Add a layer
-		# creates a new Layer object using the block supplied
-		def layer(id, opts={}, &block)
-			r = Layer.new(self, :id=>id, :kv=>opts)
-			@layers << r
-			r.instance_eval(&block)
-		end
-
-		# Assemble into Mapbox GL JSON format
-		def to_hash
-			out = @kv.dup
-			out['sources'] = @sources.dup
-			out['sources'].each { |k,v| v.delete(:default); out['sources'][k] = v }
-			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
-
-		# Setter for Layer to add sublayers
-		def _add_layer(layer)
-			@layers << layer
-		end
-	end
-
-	# -----	OSMKey
-	#       enables us to write "population<30000" and have it magically converted into a Condition
-
-	class OSMKey
-		def initialize(k)
-			@k=k
-		end
-		def is(*args); Condition.new.from_key(:==,@k,args) end
-		def ==(*args); Condition.new.from_key(:==,@k,args) end
-		def !=(*args); Condition.new.from_key(:!=,@k,args) end
-		def  <(*args); Condition.new.from_key(:< ,@k,args) end
-		def  >(*args); Condition.new.from_key(:> ,@k,args) end
-		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('!in',@k,args) end
-	end
-
-	# -----	Layer
-	#       a layer in an Mapbox GL style
-	#       this is where most of the hard work happens, including 'method_missing' and 'on'
-	#         calls to provide the grammar
-
-	class Layer
-
-		# Mapbox GL properties (as distinct from OSM keys)
-		LAYOUT    = [ :visibility, :line_cap, :line_join, :line_miter_limit, :line_round_limit, :symbol_placement, :symbol_spacing, :symbol_avoid_edges, :icon_allow_overlap, :icon_ignore_placement, :icon_optional, :icon_rotation_alignment, :icon_size, :icon_image, :icon_rotate, :icon_padding, :icon_keep_upright, :icon_offset, :text_rotation_alignment, :text_field, :text_font, :text_size, :text_max_width, :text_line_height, :text_letter_spacing, :text_justify, :text_anchor, :text_max_angle, :text_rotate, :text_padding, :text_keep_upright, :text_transform, :text_offset, :text_allow_overlap, :text_ignore_placement, :text_optional ]
-		PAINT     = [ :background_color, :background_pattern, :background_opacity, :fill_antialias, :fill_opacity, :fill_color, :fill_outline_color, :fill_translate, :fill_translate_anchor, :fill_pattern, :line_opacity, :line_color, :line_translate, :line_translate_anchor, :line_width, :line_gap_width, :line_blur, :line_dasharray, :line_pattern, :icon_opacity, :icon_color, :icon_halo_color, :icon_halo_width, :icon_halo_blur, :icon_translate, :icon_translate_anchor, :text_opacity, :text_color, :text_halo_color, :text_halo_width, :text_halo_blur, :text_translate, :text_translate_anchor, :raster_opacity, :raster_hue_rotate, :raster_brightness_min, :raster_brightness_max, :raster_saturation, :raster_contrast, :raster_fade_duration, :circle_radius, :circle_color, :circle_blur, :circle_opacity, :circle_translate, :circle_translate_anchor ]
-		TOP_LEVEL = [ :metadata, :zoom, :interactive ]
-		HIDDEN    = [ :ref, :source, :source_layer, :id, :type, :filter, :layout, :paint ]	# top level, not settable by commands
-
-		# Shared properties that can be recalled by using a 'ref' 
-		REF_PROPERTIES = ['type', 'source', 'source-layer', 'minzoom', 'maxzoom', 'filter', 'layout']
-
-		attr_accessor :kv				# key-value pairs for layout, paint, and top level
-		attr_accessor :condition		# filter condition
-		attr_accessor :stylesheet		# parent stylesheet object
-
-		def initialize(stylesheet, args={})
-			@stylesheet = stylesheet
-			@condition = args[:condition]
-			@kv = args[:kv] || {}
-			@kv[:id] = args[:id]
-			if args[:zoom] then @kv[:zoom]=args[:zoom] end
-
-			@type = nil							# auto-detected layer type
-			@write = true						# write this layer out, or has it been suppressed?
-			@cascade_cond = nil					# are we currently evaluating a cascade directive?
-			@cascades = args[:cascades] || []	# cascade list to apply to all subsequent layers
-			@uncascaded = nil					# condition to add to non-cascaded layers
-
-			@kv[:source] ||= stylesheet.sources.find {|k,v| v[:default] }[0]
-			@kv[:source_layer] ||= args[:id]
-			@child_num = 0				# incremented sublayer suffix
-		end
-
-		# Handle all missing 'method' calls
-		# If we can match it to a Mapbox GL property, it's an assignment:
-		# otherwise it's an OSM key
-		def method_missing(method_sym, *arguments)
-			if LAYOUT.include?(method_sym) || PAINT.include?(method_sym) || TOP_LEVEL.include?(method_sym)
-				v = arguments.length==1 ? arguments[0] : arguments
-				if v.is_a?(Proc) then v=v.call(@kv[method_sym]) end
-				if @cascade_cond.nil?
-					@kv[method_sym] = v
-				else
-					_add_cascade_condition(method_sym, v)
-				end
-			else
-				return OSMKey.new(method_sym.to_s)
-			end
-		end
-
-		# Add a sublayer with an additional filter
-		def on(*args, &block)
-			@child_num+=1
-			r = Layer.new(@stylesheet,
-					:id => "#{@kv[:id]}__#{@child_num}".to_sym,
-					:kv => @kv.dup, :cascades => @cascades.dup)
-
-			# Set zoom level
-			if args[0].is_a?(Range) || args[0].is_a?(Fixnum)
-				r.kv[:zoom] = args.shift
-			end
-
-			# Set condition
-			sub_cond = nil
-			if args.empty?
-				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 = nilsafe_merge(sub_cond, @condition)
-			end
-			r._set_filter(nilsafe_merge(sub_cond, @uncascaded))
-			r.instance_eval(&block)
-			@stylesheet._add_layer(r)
-
-			# Create cascaded layers
-			child_chr='a'
-			@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(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)
-			@cascade_cond = cond
-			self.instance_eval(&block)
-			@cascade_cond = nil
-		end
-		def _add_cascade_condition(k, v)
-			if @cascades.length>0 && @cascades[-1][0].to_s==@cascade_cond.to_s
-				@cascades[-1][1][k]=v
-			else
-				@cascades << [@cascade_cond, { k=>v }]
-			end
-		end
-		def uncascaded(*args)
-			cond = case args.length
-				when 0; nil
-				when 1; args[0]
-				else; Condition.new.from_list(:any,args)
-			end
-			@uncascaded = cond
-		end
-
-		# Setters for @condition (making sure we copy when inheriting)
-		def filter(*args)
-			_set_filter(args.length==1 ? args[0] : Condition.new.from_list(:any,args))
-		end
-		def _set_filter(condition)
-			@condition = condition.nil? ? nil : condition.dup
-		end
-
-		# Set layer name
-		def id(name)
-			@kv[:id] = name
-		end
-		
-		# Suppress output of this layer
-		def suppress; @write = false end
-		def write?; @write end
-
-		# Square-bracket filters (any[...], all[...], none[...])
-		def any ; return Subscriptable.new(:any ) end
-		def all ; return Subscriptable.new(:all ) end
-		def none; return Subscriptable.new(:none) end
-
-		# Deduce 'type' attribute from style attributes
-		def set_type_from(s)
-			return unless s.include?('-')
-			t = s.split('-')[0].to_sym
-			if t==:icon || t==:text then t=:symbol end
-			if @type && @type!=t then raise "Attribute #{s} conflicts with deduced type #{@type} in layer #{@kv[:id]}" end
-			@type=t
-		end
-
-		# Create a Mapbox GL-format hash from a layer definition
-		def to_hash
-			hash = { :layout=> {}, :paint => {} }
-
-			# Assign key/values to correct place
-			@kv.each do |k,v|
-				s = k.to_s.gsub('_','-')
-				if s.include?('-color') && v.is_a?(Fixnum) then v = "#%06x" % v end
-
-				if LAYOUT.include?(k)
-					hash[:layout][s]=v
-					set_type_from s
-				elsif PAINT.include?(k)
-					hash[:paint][s]=v
-					set_type_from s
-				elsif TOP_LEVEL.include?(k) || HIDDEN.include?(k)
-					hash[s]=v
-				else raise "#{s} isn't a recognised layer attribute"
-				end
-			end
-
-			hash['type'] = @type
-			if @condition then hash['filter'] = @condition.encode end
-
-			# 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
-				hash.delete('zoom')
-			end
-
-			# See if we can reuse an earlier layer's properties
-			mk = ref_key(hash)
-			if stylesheet.refs[mk]
-				REF_PROPERTIES.each { |k| hash.delete(k) }
-				hash['ref'] = stylesheet.refs[mk]
-			else
-				stylesheet.refs[mk] = hash['id']
-			end
-
-			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...)
-		def ref_key(hash)
-			(REF_PROPERTIES.collect { |k| hash[k] } ).to_json
-		end
-	end
+module Glug
 end
+
+require_relative 'glug/condition'
+require_relative 'glug/stylesheet'
+require_relative 'glug/layer'
+require_relative 'glug/extensions'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glug
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.8
 platform: ruby
 authors:
 - Richard Fairhurst
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-15 00:00:00.000000000 Z
+date: 2022-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neatjson
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: chroma
+  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'
+- !ruby/object:Gem::Dependency
+  name: hsluv
+  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
 email: richard@systemeD.net
 executables:
@@ -33,6 +61,10 @@ extra_rdoc_files: []
 files:
 - bin/glug
 - lib/glug.rb
+- lib/glug/condition.rb
+- lib/glug/extensions.rb
+- lib/glug/layer.rb
+- lib/glug/stylesheet.rb
 homepage: http://github.com/systemed/glug
 licenses:
 - FTWPL
@@ -52,8 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Glug