glimmer 0.6.0 → 0.7.0

data/RUBY_VERSION

@@ -0,0 +1 @@
+jruby-9.2.11.1

data/VERSION

@@ -0,0 +1 @@
+0.7.0

data/lib/glimmer.rb

@@ -23,47 +23,12 @@ module Glimmer
 
   class << self
     def included(klass)
-      if import_swt_packages
+      if Config.import_swt_packages
         klass.include(SWT::Packages)
         klass.extend(SWT::Packages)
         klass.extend(Glimmer)
       end
     end
-
-    # Tells Glimmer to import SWT packages into including class (default: true)
-    def import_swt_packages=(value)
-      @@import_swt_packages = !!value
-    end
-
-    # Returns whether Glimmer will import SWT packages into including class
-    def import_swt_packages
-      unless defined? @@import_swt_packages
-        @@import_swt_packages = true
-      end
-      @@import_swt_packages
-    end
-
-    # Returns Glimmer logger (standard Ruby logger)
-    def logger
-      # unless defined? @@logger
-      #   @@logger = Logger.new(STDOUT).tap {|logger| logger.level = Logger::WARN}
-      # end
-      @@logger if defined? @@logger
-    end
-
-    def enable_logging
-      @@logger = Logger.new(STDOUT).tap {|logger| logger.level = Logger::WARN}
-    end
-
-    # Sets current DSL (e.g. :swt)
-    def dsl=(dsl_name)
-      Glimmer::DSL::Engine.dsl = dsl_name
-    end
-
-    # Currently set DSL (e.g. :swt or :xml)
-    def dsl
-      Glimmer::DSL::Engine.dsl
-    end
   end
 
   def method_missing(method_symbol, *args, &block)
@@ -71,30 +36,23 @@ module Glimmer
     if method_symbol.to_s.match(REGEX_METHODS_EXCLUDED)
       raise InvalidKeywordError, "Glimmer excluded keyword: #{method_symbol}"
     end
-    Glimmer.logger&.debug "Interpreting keyword: #{method_symbol}"
+    Glimmer::Config.logger&.debug "Interpreting keyword: #{method_symbol}"
     Glimmer::DSL::Engine.interpret(method_symbol, *args, &block)
   rescue InvalidKeywordError => e
     if !method_symbol.to_s.match(REGEX_METHODS_EXCLUDED)
-      Glimmer.logger&.error e.message
+      Glimmer::Config.logger&.error e.message
     end
-    Glimmer.logger&.debug "#{e.message}\n#{e.backtrace.join("\n")}"
+    Glimmer::Config.logger&.debug "#{e.message}\n#{e.backtrace.join("\n")}"
     super(method_symbol, *args, &block)
   end
 end
 
-if ENV['GLIMMER_LOGGER_LEVEL']
-  Glimmer.enable_logging
-  Glimmer.logger.level = ENV['GLIMMER_LOGGER_LEVEL'].downcase
-end
-
 $LOAD_PATH.unshift(File.expand_path('..', __FILE__))
 
-require 'glimmer/launcher'
-require Glimmer::Launcher.swt_jar_file
+require 'glimmer/config'
 require 'glimmer/swt/packages'
 require 'glimmer/dsl/swt/dsl'
 require 'glimmer/dsl/xml/dsl'
 require 'glimmer/dsl/css/dsl'
 require 'glimmer/error'
 require 'glimmer/invalid_keyword_error'
-require 'glimmer/ui/video'

data/lib/glimmer/config.rb

@@ -0,0 +1,35 @@
+module Glimmer
+  module Config
+    class << self
+      # Tells Glimmer to import SWT packages into including class (default: true)
+      def import_swt_packages=(value)
+        @@import_swt_packages = !!value
+      end
+  
+      # Returns whether Glimmer will import SWT packages into including class
+      def import_swt_packages
+        unless defined? @@import_swt_packages
+          @@import_swt_packages = true
+        end
+        @@import_swt_packages
+      end
+  
+      # Returns Glimmer logger (standard Ruby logger)
+      def logger
+        # unless defined? @@logger
+        #   @@logger = Logger.new(STDOUT).tap {|logger| logger.level = Logger::WARN}
+        # end
+        @@logger if defined? @@logger
+      end
+  
+      def enable_logging
+        @@logger = Logger.new(STDOUT).tap {|logger| logger.level = Logger::WARN}
+      end
+    end
+  end
+end
+
+if ENV['GLIMMER_LOGGER_LEVEL']
+  Glimmer::Config.enable_logging
+  Glimmer::Config.logger.level = ENV['GLIMMER_LOGGER_LEVEL'].downcase
+end

data/lib/glimmer/css/{rule_set.rb → rule.rb}

@@ -1,6 +1,6 @@
 module Glimmer
   module CSS
-    class RuleSet
+    class Rule
       attr_reader :selector, :properties
 
       def initialize(selector)
@@ -14,10 +14,8 @@ module Glimmer
       end
 
       def to_css
-        css = "#{@selector} {\n"
-        @properties.each do |name, value|
-          css << "  #{name}: #{value};\n"
-        end
+        css = "#{@selector}{"
+        css << @properties.map { |name, value| "#{name}:#{value}" }.join(';')
         css << "}"
       end
 

data/lib/glimmer/css/style_sheet.rb

@@ -1,17 +1,16 @@
-require 'glimmer/css/rule_set'
+require 'glimmer/css/rule'
 
 module Glimmer
   module CSS
     class StyleSheet
-      attr_reader :rule_sets
+      attr_reader :rules
 
       def initialize
-        @rule_sets = []
+        @rules = []
       end
 
       def to_css
-        rule_set_css = rule_sets.map(&:to_css).join("\n\n")
-        "#{rule_set_css}\n"
+        rules.map(&:to_css).join
       end
 
       alias to_s to_css      

data/lib/glimmer/data_binding/observable_model.rb

@@ -76,7 +76,7 @@ module Glimmer
         end
       rescue => e
         # ignore writing if no property writer exists
-        Glimmer.logger&.debug "No need to observe property writer: #{property_writer_name}\n#{e.message}\n#{e.backtrace.join("\n")}"
+        Glimmer::Config.logger&.debug "No need to observe property writer: #{property_writer_name}\n#{e.message}\n#{e.backtrace.join("\n")}"
       end
 
       def unregister_dependent_observers(property_name, old_value)

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

@@ -4,7 +4,7 @@ Dir[File.expand_path('../*_expression.rb', __FILE__)].each {|f| require f}
 Glimmer::DSL::Engine.add_dynamic_expressions(
   Glimmer::DSL::CSS,
   %w[
-    rule_set
-    property
+    rule
+    dynamic_property
   ]
 )

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

@@ -0,0 +1,12 @@
+require 'glimmer/dsl/expression'
+require 'glimmer/dsl/css/property_expression'
+
+module Glimmer
+  module DSL
+    module CSS
+      class DynamicPropertyExpression < Expression
+        include PropertyExpression
+      end
+    end
+  end
+end

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

@@ -1,14 +1,14 @@
 require 'glimmer/dsl/expression'
-require 'glimmer/css/rule_set'
+require 'glimmer/css/rule'
 
 module Glimmer
   module DSL
     module CSS
-      class PropertyExpression < Expression
+      module PropertyExpression
         include ParentExpression
 
         def can_interpret?(parent, keyword, *args, &block)
-          parent.is_a?(Glimmer::CSS::RuleSet) and
+          parent.is_a?(Glimmer::CSS::Rule) and
             !block_given? and
             !args.empty?
         end

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

@@ -0,0 +1,17 @@
+require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/css/property_expression'
+
+module Glimmer
+  module DSL
+    module CSS
+      # Static keyword 'pv' version of CSS DSL dynamic property expression
+      class PVExpression < StaticExpression
+        include PropertyExpression
+
+        def interpret(parent, keyword, *args, &block)
+          parent.add_property(args[0], args[1])
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/css/{rule_set_expression.rb → rule_expression.rb}

@@ -1,11 +1,11 @@
 require 'glimmer/dsl/expression'
 require 'glimmer/css/style_sheet'
-require 'glimmer/css/rule_set'
+require 'glimmer/css/rule'
 
 module Glimmer
   module DSL
     module CSS
-      class RuleSetExpression < Expression
+      class RuleExpression < Expression
         include ParentExpression
 
         def can_interpret?(parent, keyword, *args, &block)
@@ -15,8 +15,8 @@ module Glimmer
         end
 
         def interpret(parent, keyword, *args, &block)
-          Glimmer::CSS::RuleSet.new(keyword.to_s.downcase).tap do |rule_set|
-            parent.rule_sets << rule_set
+          Glimmer::CSS::Rule.new(keyword.to_s.downcase).tap do |rule|
+            parent.rules << rule
           end
         end
       end

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

@@ -1,6 +1,6 @@
 require 'glimmer/dsl/static_expression'
 require 'glimmer/css/style_sheet'
-require 'glimmer/css/rule_set'
+require 'glimmer/css/rule'
 
 module Glimmer
   module DSL
@@ -16,8 +16,8 @@ module Glimmer
         end
 
         def interpret(parent, keyword, *args, &block)
-          Glimmer::CSS::RuleSet.new(args.first.to_s).tap do |rule_set|
-            parent.rule_sets << rule_set
+          Glimmer::CSS::Rule.new(args.first.to_s).tap do |rule|
+            parent.rules << rule
           end
         end
       end

data/lib/glimmer/dsl/engine.rb

@@ -24,6 +24,36 @@ module Glimmer
           dsl_stack.last
         end
 
+        def dsls
+          static_expressions.values.map(&:keys).flatten.uniq
+        end
+
+        def disable_dsl(dsl_name)
+          dsl_name = dsl_name.to_sym
+          disabled_dsls << dsl_name
+        end
+
+        def enable_dsl(dsl_name)
+          dsl_name = dsl_name.to_sym
+          disabled_dsls.delete(dsl_name)
+        end
+
+        def disabled_dsls
+          @disabled_dsls ||= []
+        end
+
+        def enabled_dsls=(dsl_names)
+          dsls.each {|dsl_name| disable_dsl(dsl_name)}
+          dsl_names.each {|dsl_name| enable_dsl(dsl_name)}
+        end
+    
+        # Resets Glimmer's engine activity and configuration. Useful in rspec before or after blocks in tests.
+        def reset
+          parent_stack.clear
+          dsl_stack.clear
+          disabled_dsls.clear
+        end
+
         # Dynamic expression chains of responsibility indexed by dsl
         def dynamic_expression_chains_of_responsibility
           @dynamic_expression_chains_of_responsibility ||= {}
@@ -46,7 +76,7 @@ module Glimmer
           dynamic_expression_chains_of_responsibility[dsl] = expression_names.reverse.map do |expression_name|
             expression_class(dsl_namespace, expression_name).new
           end.reduce(nil) do |last_expresion_handler, expression|
-            Glimmer.logger&.debug "Adding dynamic expression: #{expression.class.name}"
+            Glimmer::Config.logger&.debug "Adding dynamic expression: #{expression.class.name}"
             expression_handler = ExpressionHandler.new(expression)
             expression_handler.next = last_expresion_handler if last_expresion_handler
             expression_handler
@@ -54,7 +84,7 @@ module Glimmer
         end
 
         def add_static_expression(static_expression)
-          Glimmer.logger&.debug "Adding static expression: #{static_expression.class.name}"
+          Glimmer::Config.logger&.debug "Adding static expression: #{static_expression.class.name}"
           keyword = static_expression.class.keyword
           static_expression_dsl = static_expression.class.dsl
           static_expressions[keyword] ||= {}
@@ -62,7 +92,7 @@ module Glimmer
           Glimmer.define_method(keyword) do |*args, &block|
             begin
               retrieved_static_expression = Glimmer::DSL::Engine.static_expressions[keyword][Glimmer::DSL::Engine.dsl]            
-              static_expression_dsl = Glimmer::DSL::Engine.static_expressions[keyword].keys.first if retrieved_static_expression.nil?
+              static_expression_dsl = (Glimmer::DSL::Engine.static_expressions[keyword].keys - Glimmer::DSL::Engine.disabled_dsls).first if retrieved_static_expression.nil?
               if retrieved_static_expression.nil? && Glimmer::DSL::Engine.dsl && (static_expression_dsl.nil? || !Glimmer::DSL::Engine.static_expressions[keyword][static_expression_dsl].is_a?(TopLevelExpression))
                 begin
                   return Glimmer::DSL::Engine.interpret(keyword, *args, &block)
@@ -76,7 +106,7 @@ module Glimmer
               if !static_expression.can_interpret?(Glimmer::DSL::Engine.parent, keyword, *args, &block)
                 raise Error, "Invalid use of Glimmer keyword #{keyword} with args #{args} under parent #{Glimmer::DSL::Engine.parent}"
               else
-                Glimmer.logger&.debug "#{static_expression.class.name} will handle expression keyword #{keyword}"
+                Glimmer::Config.logger&.debug "#{static_expression.class.name} will handle expression keyword #{keyword}"
                 return static_expression.interpret(Glimmer::DSL::Engine.parent, keyword, *args, &block).tap do |ui_object|
                   Glimmer::DSL::Engine.add_content(ui_object, static_expression, &block) unless block.nil?
                   Glimmer::DSL::Engine.dsl_stack.pop
@@ -100,7 +130,7 @@ module Glimmer
         # Interprets Glimmer dynamic DSL expression consisting of keyword, args, and block (e.g. shell(:no_resize) { ... })
         def interpret(keyword, *args, &block)
           keyword = keyword.to_s
-          dynamic_expression_dsl = dynamic_expression_chains_of_responsibility.keys.first if dsl.nil?
+          dynamic_expression_dsl = (dynamic_expression_chains_of_responsibility.keys - disabled_dsls).first if dsl.nil?
           dsl_stack.push(dynamic_expression_dsl || dsl)
           expression = dynamic_expression_chains_of_responsibility[dsl].handle(parent, keyword, *args, &block)
           expression.interpret(parent, keyword, *args, &block).tap do |ui_object|            

data/lib/glimmer/dsl/expression_handler.rb

@@ -23,9 +23,9 @@ module Glimmer
       # Otherwise, it forwards to the next handler configured via `#next=` method
       # If there is no handler next, then it raises an error
       def handle(parent, keyword, *args, &block)
-        Glimmer.logger&.debug "Attempting to handle #{keyword} with #{@expression.class.name.split(":").last}"
+        Glimmer::Config.logger&.debug "Attempting to handle #{keyword} with #{@expression.class.name.split(":").last}"
         if @expression.can_interpret?(parent, keyword, *args, &block)
-          Glimmer.logger&.debug "#{@expression.class.name} will handle expression keyword #{keyword}"
+          Glimmer::Config.logger&.debug "#{@expression.class.name} will handle expression keyword #{keyword}"
           return @expression
         elsif @next_expression_handler
           return @next_expression_handler.handle(parent, keyword, *args, &block)
@@ -34,7 +34,7 @@ module Glimmer
           message = "Glimmer keyword #{keyword} with args #{args} cannot be handled"
           message += " inside parent #{parent}" if parent
           message += "! Check the validity of the code."
-          # Glimmer.logger&.error message
+          # Glimmer::Config.logger&.error message
           raise InvalidKeywordError, message
         end
       end

data/lib/glimmer/dsl/swt/color_expression.rb

@@ -1,4 +1,5 @@
 require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/top_level_expression'
 require 'glimmer/swt/color_proxy'
 require 'glimmer/swt/display_proxy'
 
@@ -6,6 +7,7 @@ module Glimmer
   module DSL
     module SWT
       class ColorExpression < StaticExpression
+        include TopLevelExpression
         include_package 'org.eclipse.swt.widgets'
   
         def interpret(parent, keyword, *args, &block)

data/lib/glimmer/dsl/swt/dsl.rb

@@ -1,3 +1,5 @@
+require 'glimmer/launcher'
+require Glimmer::Launcher.swt_jar_file
 require 'glimmer/dsl/engine'
 Dir[File.expand_path('../*_expression.rb', __FILE__)].each {|f| require f}
 

data/lib/glimmer/dsl/swt/tab_item_expression.rb

@@ -18,7 +18,7 @@ module Glimmer
             if parent.swt_widget.is_a?(TabFolder)
               return true
             else
-              Glimmer.logger&.error "tab_item widget may only be used directly under a tab_folder widget!"
+              Glimmer::Config.logger&.error "tab_item widget may only be used directly under a tab_folder widget!"
             end
           end
           false

data/lib/glimmer/dsl/swt/widget_listener_expression.rb

@@ -8,17 +8,17 @@ module Glimmer
         include_package 'org.eclipse.swt.widgets'
   
         def can_interpret?(parent, keyword, *args, &block)
-          Glimmer.logger&.debug "keyword starts with on_: #{keyword.start_with?('on_')}"
+          Glimmer::Config.logger&.debug "keyword starts with on_: #{keyword.start_with?('on_')}"
           return false unless keyword.start_with?('on_')
           widget_or_display_parentage = widget?(parent) || parent.is_a?(Glimmer::SWT::DisplayProxy)
-          Glimmer.logger&.debug "parent is a widget or display: #{widget_or_display_parentage}"
+          Glimmer::Config.logger&.debug "parent is a widget or display: #{widget_or_display_parentage}"
           return false unless widget_or_display_parentage
-          Glimmer.logger&.debug "block exists?: #{!block.nil?}"
+          Glimmer::Config.logger&.debug "block exists?: #{!block.nil?}"
           raise Glimmer::Error, "Listener is missing block for keyword: #{keyword}" unless block_given?
-          Glimmer.logger&.debug "args are empty?: #{args.empty?}"
+          Glimmer::Config.logger&.debug "args are empty?: #{args.empty?}"
           raise Glimmer::Error, "Invalid listener arguments for keyword: #{keyword}(#{args})" unless args.empty?
           result = parent.can_handle_observation_request?(keyword)
-          Glimmer.logger&.debug "can add listener? #{result}"
+          Glimmer::Config.logger&.debug "can add listener? #{result}"
           raise Glimmer::Error, "Invalid listener keyword: #{keyword}" unless result
           true
         end

data/lib/glimmer/dsl/xml/name_space_expression.rb

@@ -24,7 +24,7 @@ module Glimmer
             name_space_visitor = Glimmer::XML::NameSpaceVisitor.new(args[0].to_s)
             Glimmer::XML::DepthFirstSearchIterator.new(node, name_space_visitor).iterate
             def node.process_block(block)
-              Glimmer.logger&.debug 'block'
+              Glimmer::Config.logger&.debug 'block'
               #NOOP
             end
           end