glimmer-dsl-css 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 967caae689a729dcf6c70d97a761bc48da8e8d285cd19348aada3dee83ffc32a
-  data.tar.gz: 8f896b942182779e573bed0a4c039efbabe724b40b3d82dff6ded1d5d0ebe8fd
+  metadata.gz: a00ff31e682fcc94d72464388bec42ba14ee932dda12bb3c6013b8dd8e406db5
+  data.tar.gz: f78b7fe8fab6e01321ffffb4af61321470e131ccd4da523fed318e753e1b90c6
 SHA512:
-  metadata.gz: b5faae751daf2f5e6c608682fd8c035993f4fef13ce7fa2c8ff21100b30f09338939cb7d3e9b33f225632ee203a5f858610c1992bf14954dc1e0efc1b135dbf6
-  data.tar.gz: '018c7875e4fcbd9c32012f0a489c5524de5cd76be406e1349ce0665204f5f4dac27e27ad0e98e30924816467f2c3ba66aa768533adbb26fa68f5ba506c0b8def'
+  metadata.gz: 278840c459c817881f89642c343ceb56cf201604adbb7d4b26e6f2d6676f9716245c196269422696d9936cc3795c296d48e52127fe1afb05b26b0c8f91bbfefa
+  data.tar.gz: 6e191a28c199a17b44c7e3b5e154d87bb6f36d945eb5e9aafe536fd3db2f87953f79fd99f80af53ef555782052ab822299bfa51ed38308ddec42da9726b723ab

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 1.3.0
+
+- Support media queries
+
 ## 1.2.3
 
 - Add `r`, `ru`, `rul`, `rule`, `_` alternatives to `s` for specifying a CSS rule selector with a block of expressions (e.g. `r('body > h1') { color: red; }`)

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for CSS 1.2.3
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for CSS 1.3.0
 ## Ruby Programmable Cascading Style Sheets
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-css.svg)](http://badge.fury.io/rb/glimmer-dsl-css)
 [![Travis CI](https://travis-ci.com/AndyObtiva/glimmer-dsl-css.svg?branch=master)](https://travis-ci.com/github/AndyObtiva/glimmer-dsl-css)
@@ -18,10 +18,18 @@ include Glimmer
     font_size '1.1em'
     background 'white'
   }
-  r('body > h1') {
+  
+  rule('body > h1') {
     background_color :red
     font_size 24
   }
+  
+  media('screen and (min-width: 30em) and (orientation: landscape)') {
+    rule('body#app h1#title') {
+      font_size 16
+      font_family '"Times New Roman", Times, serif'
+    }
+  }
 }
 puts @css
 ```
@@ -29,7 +37,7 @@ puts @css
 Output (minified CSS):
 
 ```css
-body{font-size:1.1em;background:white}body > h1{background-color:red;font-size:24px}
+body{font-size:1.1em;background:white}body > h1{background-color:red;font-size:24px}@media screen and (min-width: 30em) and (orientation: landscape){body#app h1#title{font-size:16px;font-family:"Times New Roman", Times, serif}}
 ```
 
 The key reason for using the CSS DSL instead of actual CSS is Ruby programmability without getting lost in string concatenations. The CSS DSL helps in including conditional CSS with `if` or ternery expressions as well as looping from lists while building CSS.
@@ -53,7 +61,7 @@ Please follow these instructions to make the `glimmer` command available on your
 
 Run this command to install directly:
 ```
-gem install glimmer-dsl-css -v 1.2.3
+gem install glimmer-dsl-css -v 1.3.0
 ```
 
 Note: In case you are using JRuby, `jgem` is JRuby's version of the `gem` command. RVM allows running `gem` as an alias in JRuby. Otherwise, you may also run `jruby -S gem install ...`
@@ -68,7 +76,7 @@ That's it! Requiring the gem activates the Glimmer CSS DSL automatically.
 
 Add the following to `Gemfile` (after `glimmer-dsl-swt` and/or `glimmer-dsl-opal` if included too):
 ```
-gem 'glimmer-dsl-css', '~> 1.2.3'
+gem 'glimmer-dsl-css', '~> 1.3.0'
 ```
 
 And, then run:

data/VERSION

@@ -1 +1 @@
-1.2.3
+1.3.0

data/glimmer-dsl-css.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-dsl-css 1.2.3 ruby lib
+# stub: glimmer-dsl-css 1.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-css".freeze
-  s.version = "1.2.3".freeze
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["AndyMaleh".freeze]
-  s.date = "2024-01-08"
+  s.date = "2024-05-18"
   s.description = "Glimmer DSL for CSS (Ruby Programmable Cascading Style Sheets)".freeze
   s.email = "andy.am@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -27,13 +27,16 @@ Gem::Specification.new do |s|
     "VERSION",
     "glimmer-dsl-css.gemspec",
     "lib/glimmer-dsl-css.rb",
+    "lib/glimmer/css/media_query.rb",
     "lib/glimmer/css/rule.rb",
+    "lib/glimmer/css/rule_composite.rb",
     "lib/glimmer/css/style_sheet.rb",
     "lib/glimmer/dsl/css/css_expression.rb",
     "lib/glimmer/dsl/css/dsl.rb",
     "lib/glimmer/dsl/css/dynamic_property_expression.rb",
     "lib/glimmer/dsl/css/element_rule_expression.rb",
     "lib/glimmer/dsl/css/general_rule_expression.rb",
+    "lib/glimmer/dsl/css/media_expression.rb",
     "lib/glimmer/dsl/css/property_expression.rb",
     "lib/glimmer/dsl/css/pv_expression.rb",
     "lib/glimmer/dsl/css/ru_expression.rb",
@@ -43,21 +46,21 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/AndyObtiva/glimmer-dsl-css".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.5.3".freeze
+  s.rubygems_version = "3.4.10".freeze
   s.summary = "Glimmer DSL for CSS (Ruby Programmable Cascading Style Sheets)".freeze
 
   s.specification_version = 4
 
-  s.add_runtime_dependency(%q<glimmer>.freeze, [">= 2.0.0".freeze, "< 3.0.0".freeze])
-  s.add_development_dependency(%q<rspec-mocks>.freeze, ["~> 3.0".freeze])
-  s.add_development_dependency(%q<rspec>.freeze, ["~> 3.0".freeze])
-  s.add_development_dependency(%q<puts_debuggerer>.freeze, [">= 0".freeze])
-  s.add_development_dependency(%q<rake>.freeze, [">= 10.1.0".freeze, "< 14.0.0".freeze])
-  s.add_development_dependency(%q<jeweler>.freeze, [">= 2.3.9".freeze, "< 3.0.0".freeze])
-  s.add_development_dependency(%q<rdoc>.freeze, [">= 6.2.1".freeze, "< 7.0.0".freeze])
-  s.add_development_dependency(%q<coveralls>.freeze, ["= 0.8.23".freeze])
-  s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.16.1".freeze])
-  s.add_development_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0".freeze])
-  s.add_development_dependency(%q<rake-tui>.freeze, [">= 0".freeze])
+  s.add_runtime_dependency(%q<glimmer>.freeze, [">= 2.0.0", "< 3.0.0"])
+  s.add_development_dependency(%q<rspec-mocks>.freeze, ["~> 3.0"])
+  s.add_development_dependency(%q<rspec>.freeze, ["~> 3.0"])
+  s.add_development_dependency(%q<puts_debuggerer>.freeze, [">= 0"])
+  s.add_development_dependency(%q<rake>.freeze, [">= 10.1.0", "< 14.0.0"])
+  s.add_development_dependency(%q<jeweler>.freeze, [">= 2.3.9", "< 3.0.0"])
+  s.add_development_dependency(%q<rdoc>.freeze, [">= 6.2.1", "< 7.0.0"])
+  s.add_development_dependency(%q<coveralls>.freeze, ["= 0.8.23"])
+  s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.16.1"])
+  s.add_development_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0"])
+  s.add_development_dependency(%q<rake-tui>.freeze, [">= 0"])
 end
 

data/lib/glimmer/css/media_query.rb

@@ -0,0 +1,34 @@
+# Copyright (c) 2020-2024 - Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+module Glimmer
+  module CSS
+    class MediaQuery < Rule
+      include RuleComposite
+    
+      def to_css
+        css = "@media #{selector}{"
+        css += rules.map(&:to_css).join
+        css += "}"
+      end
+    end
+  end
+end

data/lib/glimmer/css/rule.rb

@@ -24,9 +24,11 @@ module Glimmer
     class Rule
       attr_reader :selector, :properties
 
-      def initialize(selector)
+      def initialize(selector, parent:)
         @selector = selector
         @properties = {}
+        @parent = parent
+        parent.rules << self
       end
 
       def add_property(keyword, *args)

data/lib/glimmer/css/rule_composite.rb

@@ -0,0 +1,30 @@
+# Copyright (c) 2020-2024 - Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+module Glimmer
+  module CSS
+    module RuleComposite
+      def rules
+        @rules ||= []
+      end
+    end
+  end
+end

data/lib/glimmer/css/style_sheet.rb

@@ -19,16 +19,13 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+require 'glimmer/css/rule_composite'
 require 'glimmer/css/rule'
 
 module Glimmer
   module CSS
     class StyleSheet
-      attr_reader :rules
-
-      def initialize
-        @rules = []
-      end
+      include RuleComposite
 
       def to_css
         rules.map(&:to_css).join

data/lib/glimmer/dsl/css/dsl.rb

@@ -29,6 +29,7 @@ require 'glimmer/dsl/css/rul_expression'
 require 'glimmer/dsl/css/ru_expression'
 require 'glimmer/dsl/css/s_expression'
 require 'glimmer/dsl/css/pv_expression'
+require 'glimmer/dsl/css/media_expression'
 
 module Glimmer
   module DSL
@@ -36,6 +37,7 @@ module Glimmer
       Engine.add_dynamic_expressions(
         CSS,
         %w[
+          media
           element_rule
           dynamic_property
         ]

data/lib/glimmer/dsl/css/element_rule_expression.rb

@@ -37,9 +37,7 @@ module Glimmer
         end
 
         def interpret(parent, keyword, *args, &block)
-          Glimmer::CSS::Rule.new(keyword.to_s.downcase).tap do |rule|
-            parent.rules << rule
-          end
+          Glimmer::CSS::Rule.new(keyword.to_s.downcase, parent: parent)
         end
       end
     end

data/lib/glimmer/dsl/css/general_rule_expression.rb

@@ -31,15 +31,16 @@ module Glimmer
         
         def can_interpret?(parent, keyword, *args, &block)
           super(parent, keyword, *args, &block) and
-            parent.is_a?(Glimmer::CSS::StyleSheet) and
+            (
+              parent.is_a?(Glimmer::CSS::StyleSheet) or
+              parent.is_a?(Glimmer::CSS::MediaQuery)
+            ) and
             block_given? and
             !args.empty?
         end
 
         def interpret(parent, keyword, *args, &block)
-          Glimmer::CSS::Rule.new(args.first.to_s).tap do |rule|
-            parent.rules << rule
-          end
+          Glimmer::CSS::Rule.new(args.first.to_s, parent: parent)
         end
       end
     end

data/lib/glimmer/dsl/css/media_expression.rb

@@ -0,0 +1,47 @@
+# Copyright (c) 2020-2024 - Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/dsl/static_expression'
+
+require 'glimmer/css/style_sheet'
+require 'glimmer/css/media_query'
+
+module Glimmer
+  module DSL
+    module CSS
+      class MediaExpression < StaticExpression
+        include ParentExpression
+      
+        def can_interpret?(parent, keyword, *args, &block)
+          super(parent, keyword, *args, &block) and
+            parent.is_a?(Glimmer::CSS::StyleSheet) and
+            block_given? and
+            !args.empty?
+        end
+
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::CSS::MediaQuery.new(args.first.to_s, parent: parent)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-css
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-08 00:00:00.000000000 Z
+date: 2024-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -204,13 +204,16 @@ files:
 - VERSION
 - glimmer-dsl-css.gemspec
 - lib/glimmer-dsl-css.rb
+- lib/glimmer/css/media_query.rb
 - lib/glimmer/css/rule.rb
+- lib/glimmer/css/rule_composite.rb
 - lib/glimmer/css/style_sheet.rb
 - lib/glimmer/dsl/css/css_expression.rb
 - lib/glimmer/dsl/css/dsl.rb
 - lib/glimmer/dsl/css/dynamic_property_expression.rb
 - lib/glimmer/dsl/css/element_rule_expression.rb
 - lib/glimmer/dsl/css/general_rule_expression.rb
+- lib/glimmer/dsl/css/media_expression.rb
 - lib/glimmer/dsl/css/property_expression.rb
 - lib/glimmer/dsl/css/pv_expression.rb
 - lib/glimmer/dsl/css/ru_expression.rb
@@ -236,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Glimmer DSL for CSS (Ruby Programmable Cascading Style Sheets)