glimmer 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31b586dfb4cb23af36ebd26ad97a46625fe122c64d9725b237c8f88f0c72ce71
-  data.tar.gz: 14ff7f5996588c4261cf4d102d5ffca28fc59cef5bd151d07c273038efae3da5
+  metadata.gz: a991d3df0f065a0caa7cd20d43c026561b99b334b4db9d67d37d54a9aa125a70
+  data.tar.gz: c9660908ac2b7b8d2c00a8af33c793ad8f2789bb513553fb1e8e2b4abf2f3db1
 SHA512:
-  metadata.gz: 6eb266dffd64ba21842038fd272c06a3342f3399b5729d178b966b9543dfdbb9eb45eea079782d0db205e68cc9b63a5a0a4222a9d77c9f5df2cacc01126fed51
-  data.tar.gz: 123a861f812ac0e4ee2e4c802255ff017c2459a65de79cb52863897a0b017fc8037d9b57eb8e041dc75005d68ee4a3835b07a7cd03f87c30f524c5fef67717ca
+  metadata.gz: 289e423f490a3bb338fa91ab5502b03936c5e03088f48dafbb74aa4b31e606637e873c8b26a46167cb10306cab22ae09a733318ef98382ff424207fb06c93fac
+  data.tar.gz: d6d865f226ab24151983c5c9a3c0dc18bd73d7d4c8ca02a4e99fe4d231500ade3215d245add615e11d1713e39b8a9da5e47006bc13d8406ad4b7208679e38d07

data/README.markdown

@@ -1,4 +1,4 @@
-# Glimmer 0.7.1 Beta (JRuby Desktop UI DSL + Data-Binding)
+# Glimmer 0.7.2 Beta (JRuby Desktop UI DSL + Data-Binding)
 [![Gem Version](https://badge.fury.io/rb/glimmer.svg)](http://badge.fury.io/rb/glimmer)
 [![Coverage Status](https://coveralls.io/repos/github/AndyObtiva/glimmer/badge.svg?branch=master)](https://coveralls.io/github/AndyObtiva/glimmer?branch=master)
 
@@ -71,7 +71,7 @@ NOTE: Glimmer is in beta mode. Please help make better by adopting for small or
 ## Table of Contents
 
 <!-- TOC START min:1 max:3 link:true asterisk:false update:true -->
-- [Glimmer 0.7.1 Beta (JRuby Desktop UI DSL + Data-Binding)](#glimmer-058-beta-jruby-desktop-ui-dsl--data-binding)
+- [Glimmer 0.7.2 Beta (JRuby Desktop UI DSL + Data-Binding)](#glimmer-058-beta-jruby-desktop-ui-dsl--data-binding)
   - [Examples](#examples)
     - [Hello World](#hello-world)
     - [Tic Tac Toe](#tic-tac-toe)
@@ -164,7 +164,7 @@ Please follow these instructions to make the `glimmer` command available on your
 
 Run this command to install directly:
 ```
-jgem install glimmer -v 0.7.1
+jgem install glimmer -v 0.7.2
 ```
 
 `jgem` is JRuby's version of `gem` command. 
@@ -175,7 +175,7 @@ Otherwise, you may also run `jruby -S gem install ...`
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer', '~> 0.7.1'
+gem 'glimmer', '~> 0.7.2'
 ```
 
 And, then run:

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/lib/glimmer/data_binding/model_binding.rb

@@ -203,10 +203,9 @@ module Glimmer
       end
 
       def evaluate_property
-        unless model.nil?
-          value = invoke_property_reader(model, property_name)
-          convert_on_read(value)        
-        end
+        value = nil        
+        value = invoke_property_reader(model, property_name) unless model.nil?
+        convert_on_read(value)
       end
 
       def evaluate_options_property

data/lib/glimmer/dsl/engine.rb

@@ -100,7 +100,7 @@ module Glimmer
                   return Glimmer::DSL::Engine.interpret(keyword, *args, &block)
                 rescue => e
                   Glimmer::DSL::Engine.reset
-                  raise e if static_expression_dsl.nil?
+                  raise e if static_expression_dsl.nil? || !Glimmer::DSL::Engine.static_expressions[keyword][static_expression_dsl].is_a?(TopLevelExpression)
                 end
               end
               raise Glimmer::Error, "Unsupported keyword: #{keyword}" unless static_expression_dsl || retrieved_static_expression
@@ -153,12 +153,13 @@ module Glimmer
         #
         # For example, a shell widget would get properties set and children added
         def add_content(parent, expression, &block)
-          time = Time.now.to_f
-          dsl_stack.push(expression.class.dsl)
-          parent_stack.push(parent) if expression.is_a?(ParentExpression)
-          expression.add_content(parent, &block) if block_given?
-          parent_stack.pop if expression.is_a?(ParentExpression)
-          dsl_stack.pop
+          if block_given? && expression.is_a?(ParentExpression)
+            dsl_stack.push(expression.class.dsl)
+            parent_stack.push(parent) 
+            expression.add_content(parent, &block)
+            parent_stack.pop
+            dsl_stack.pop
+          end
         end
 
         # Current parent while evaluating Glimmer DSL (nil if just started or done evaluatiing)

data/lib/glimmer/launcher.rb

@@ -3,6 +3,8 @@ require 'rake'
 
 require_relative 'rake_task'
 
+load File.expand_path('./Rakefile') if File.exist?(File.expand_path('./Rakefile'))
+
 module Glimmer
   class Launcher
     OPERATING_SYSTEMS_SUPPORTED = ["mac", "windows", "linux"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-11 00:00:00.000000000 Z
+date: 2020-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement