glug 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8426da28bdb893a064adf7e2e79a72791af6520b115185c41766f03749697b1c
-  data.tar.gz: f03ae85175a83109aa75db59225cc7086e28651814d826cc163c61889408e724
+  metadata.gz: 5340ccbd34dc2766a2f0ed580bcca372cb71cd35d1f6c33009003ca112cd1bc5
+  data.tar.gz: 1946ed3fc268779af7f929a1648893b83dcd4883f96be5ca4c9f2db3947c783c
 SHA512:
-  metadata.gz: e232e3273af876c58257603c9c0245ffd6350aa8a75f136f2da556128c28f2384d86925db66feee5f76b5e1373b4d90b5fdd0ec0d827b6eafb8f58d635655a89
-  data.tar.gz: b152ed4020b693e72998fa9b7ee1277e99dc8601e58a133a2aa03ee58d2d75bb27acf01ff1a8ad245cf5e6a14bb617589d4b267f7f988a35cfc6aed30f3bee96
+  metadata.gz: 1591989f74b37a697e9ddf4dbd0345fcaddfe71d157e74a3825b383a1cfb5c7cf4bd14a1c3b12178b554f5493f34daaa432f38c62007e4002ddd8189bd8a25ee
+  data.tar.gz: 7c8b934f20ef7fe44d8d4aee3a46abd3a0c57f2d8ec86ff231f567cef08a22196e060541762b6704ba6e6ba01b1206d904bb1f79125b73965f56ed125309505c

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
 

data/lib/glug/stylesheet.rb

@@ -4,13 +4,15 @@ module Glug # :nodoc:
 	#       the main document object
 
 	class Stylesheet
-		attr_accessor :sources, :kv, :refs
+		attr_accessor :sources, :kv, :refs, :base_dir, :params
 
-		def initialize(&block)
+		def initialize(base_dir: nil, params: nil, &block)
 			@sources = {}
 			@kv = {}
 			@layers = []
 			@refs = {}
+			@base_dir = base_dir || ''
+			@params = params || {}
 			instance_eval(&block)
 		end
 
@@ -46,5 +48,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.8
 platform: ruby
 authors:
 - Richard Fairhurst
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-16 00:00:00.000000000 Z
+date: 2022-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neatjson
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !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: