glug 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8426da28bdb893a064adf7e2e79a72791af6520b115185c41766f03749697b1c
-  data.tar.gz: f03ae85175a83109aa75db59225cc7086e28651814d826cc163c61889408e724
+  metadata.gz: bebac26dd70c1755650c029aba0ae0d5031018f167d4638c0c362595a6f7622d
+  data.tar.gz: 1d3ca7e158a4cef60d8d2934aea595bc1c5e570382ab71768c067a58082e3f94
 SHA512:
-  metadata.gz: e232e3273af876c58257603c9c0245ffd6350aa8a75f136f2da556128c28f2384d86925db66feee5f76b5e1373b4d90b5fdd0ec0d827b6eafb8f58d635655a89
-  data.tar.gz: b152ed4020b693e72998fa9b7ee1277e99dc8601e58a133a2aa03ee58d2d75bb27acf01ff1a8ad245cf5e6a14bb617589d4b267f7f988a35cfc6aed30f3bee96
+  metadata.gz: 7be8a1cb44b2ae801708166f4df56daa62b1874d8276e607b9504ac513ed50d312222c9f18c33eee53097d11247e7e4ff706f22c9397cbd6198bddba6909354d
+  data.tar.gz: 7d494d4030edca1328173d1b5f9e025df08350faaf4a23ee428c6897a802a977612b806ec36010461028d073236c668817113e77e0ef651d56e557744561232d

data/lib/glug/condition.rb

@@ -54,6 +54,7 @@ module Glug # :nodoc:
 		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=[]
@@ -68,6 +69,11 @@ module Glug # :nodoc:
 			@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
@@ -96,7 +102,8 @@ module Glug # :nodoc:
 		# Encode into an array for GL JSON (recursive)
 		def encode
 			transform_underscores
-			[@operator.to_s, *@values.map { |v| v.is_a?(Condition) ? v.encode : v } ]
+			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)

data/lib/glug/extensions.rb

@@ -1,4 +1,8 @@
 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
@@ -6,4 +10,18 @@ class Integer
 	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

@@ -68,7 +68,7 @@ module Glug # :nodoc:
 			@uncascaded = nil					# condition to add to non-cascaded layers
 
 			@kv[:source] ||= stylesheet.sources.find {|k,v| v[:default] }[0]
-			@kv[:source_layer] ||= args[:id]
+			@kv[:source_layer] ||= args[:id] if stylesheet.sources[@kv[:source]][:type]=="vector"
 			@child_num = 0				# incremented sublayer suffix
 		end
 
@@ -76,8 +76,10 @@ module Glug # :nodoc:
 		# 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)
+			if @stylesheet.extensions.include?(method_sym)
+				self.instance_exec(*arguments, &@stylesheet.extensions[method_sym])
+			elsif EXPRESSIONS.include?(method_sym)
+				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
@@ -87,7 +89,7 @@ module Glug # :nodoc:
 					_add_cascade_condition(method_sym, v)
 				end
 			else
-				return Condition.new.from_list("get", [method_sym])
+				Condition.new.from_list("get", [method_sym])
 			end
 		end
 

data/lib/glug/stylesheet.rb

@@ -4,21 +4,29 @@ module Glug # :nodoc:
 	#       the main document object
 
 	class Stylesheet
-		attr_accessor :sources, :kv, :refs
+		attr_accessor :sources, :kv, :refs, :base_dir, :params, :extensions
 
-		def initialize(&block)
+		def initialize(base_dir: nil, params: nil, &block)
 			@sources = {}
 			@kv = {}
 			@layers = []
 			@refs = {}
+			@extensions = {}
+			@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]
+			arg = arguments[0]
+			if arg.is_a?(Proc)
+				@extensions[method_sym] = arg
+			else
+				@kv[method_sym] = arguments[0]
+			end
 		end
-
+		
 		# Add a source 
 		def source(source_name, opts={})
 			@sources[source_name] = opts
@@ -46,5 +54,10 @@ module Glug # :nodoc:
 		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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glug
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Richard Fairhurst
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-16 00:00:00.000000000 Z
+date: 2025-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neatjson
@@ -38,7 +38,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Text-based markup for Mapbox GL styles
+- !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/Maplibre GL styles
 email: richard@systemeD.net
 executables:
 - glug