Ensure expressions assigned to ivars are stored as conditions

Author: gravitystorm

lib/glug/stylesheet_dsl.rb

@@ -26,7 +26,11 @@ def respond_to_missing?(*)
 
     # Set a property, e.g. 'bearing 29'
     def method_missing(method_sym, *args)
-      @__impl.add_property(method_sym, *args)
+      if Layer::EXPRESSIONS.include?(method_sym)
+        Condition.new.from_list(method_sym, args)
+      else
+        @__impl.add_property(method_sym, *args)
+      end
     end
   end
 end

spec/fixtures/expression_ivars.glug

@@ -0,0 +1,12 @@
+version 8
+name 'Expression ivars test'
+source :shortbread, type: 'vector', url: 'https://vector.openstreetmap.org/shortbread_v1/tilejson.json'
+
+# Expression assigned to ivar at stylesheet level
+@my_halo = rgba(255, 255, 255, 0.8)
+@my_color = rgb(100, 200, 50)
+
+layer(:labels, zoom: 5.., source: :shortbread) do
+  text_halo_color @my_halo
+  text_color @my_color
+end

spec/fixtures/expression_ivars.json

@@ -0,0 +1,23 @@
+{
+  "version":8,
+  "name":"Expression ivars test",
+  "sources":{
+    "shortbread":{
+      "type":"vector",
+      "url":"https://vector.openstreetmap.org/shortbread_v1/tilejson.json"
+    }
+  },
+  "layers":[
+    {
+      "paint":{
+        "text-halo-color":["rgba",255,255,255,0.8],
+        "text-color":["rgb",100,200,50]
+      },
+      "source":"shortbread",
+      "id":"labels",
+      "source-layer":"labels",
+      "type":"symbol",
+      "minzoom":5
+    }
+  ]
+}

spec/lib/glug/stylesheet_spec.rb

@@ -104,5 +104,14 @@
       output = File.read(File.join(fixture_dir, 'ivars_with_include.json'))
       expect(stylesheet.to_json).to eql(output.strip)
     end
+
+    it 'stores expressions in ivars at stylesheet level' do
+      glug = File.read(File.join(fixture_dir, 'expression_ivars.glug'))
+      stylesheet = described_class.new(base_dir: fixture_dir) do
+        instance_eval(glug)
+      end
+      output = File.read(File.join(fixture_dir, 'expression_ivars.json'))
+      expect(stylesheet.to_json).to eql(output.strip)
+    end
   end
 end