glimmer-dsl-opal 0.15.1 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 724c0f462ad5dd94ef3eb8705f6ceb54b350c0f83976a6a7bb3f0506afe67f65
-  data.tar.gz: 0ba2076cb72f46bbe855c746e80c3747d0d2834f73167266fb42752d873e6290
+  metadata.gz: f8072dfb955151aa374817c0f2f175bf9c7adfd115eca1bbd6df6c2c3b0725e4
+  data.tar.gz: 94304037d23dfe1719087fc93d3dc9056be7701f6fdac1044bfe2719e61e43b0
 SHA512:
-  metadata.gz: c52727efe6e7efc09cffe80991ccddf6fb4ee69835ecb46f21321ab912997980f6dd9ba9fc68117ce5864f61d63809037139d64b741ff509f66dfda09a2ab0a1
-  data.tar.gz: e00c6998ab192d91340f27567c29b2b6ee63a65680ec316d0a3c74353c0905a04ed2f3771423b527c7441ee6d2dd8870d7c758a09e8151dd0223a4e6053f8a7a
+  metadata.gz: 7f85477240562b1eb7c3bfb3e147577bf6ac7f265c54b6d5acad7ae295a65b1226ff41798eb2a8d41804d2c56d999992f6e6e98b64bde1bed5708c52c46862f0
+  data.tar.gz: 847b86e900e53586993c74982b37d68ede27f399982188187de524dec31b1d5ffdf0ffc31694da38510060f3e5224c71acc7ca85d75fdef398a8e42c287ca666

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.16.0
+
+- Support label widget background_image attribute
+- Have File.expand_path support expanding paths even if they did not base off of __dir__ or __FILE__
+- Custom specification of gems having image paths via server-side configuration in Glimmer::Config.gems_having_image_paths
+
 ## 0.15.1
 
 - Auto-expose images of gems that depend on glimmer-dsl-opal as downloadable asset links providing `/glimmer/image_paths` server call to obtain them

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 Opal 0.15.1 (Pure Ruby Web GUI)
+# [<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 Opal 0.16.0 (Pure Ruby Web GUI)
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-opal.svg)](http://badge.fury.io/rb/glimmer-dsl-opal)
 [![Join the chat at https://gitter.im/AndyObtiva/glimmer](https://badges.gitter.im/AndyObtiva/glimmer.svg)](https://gitter.im/AndyObtiva/glimmer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
@@ -14,6 +14,8 @@ Glimmer DSL for Opal successfully reuses the entire [Glimmer](https://github.com
 
 #### Hello, Table! Sample
 
+Code: [lib/glimmer-dsl-opal/samples/hello/hello_table.rb](lib/glimmer-dsl-opal/samples/hello/hello_table.rb)
+
 Glimmer GUI code from [glimmer-dsl-opal/samples/hello/hello_table.rb](lib/glimmer-dsl-opal/samples/hello/hello_table.rb):
 
 ```ruby
@@ -141,7 +143,7 @@ Hello, Table! Game Booked
 
 NOTE: Glimmer DSL for Opal is an alpha project. Please help make better by contributing, adopting for small or low risk projects, and providing feedback. It is still an early alpha, so the more feedback and issues you report the better.
 
-**Alpha Version** 0.15.1 only supports bare-minimum capabilities for the included [samples](https://github.com/AndyObtiva/glimmer-dsl-opal#samples) (originally written for [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt))
+**Alpha Version** 0.16.0 only supports bare-minimum capabilities for the included [samples](https://github.com/AndyObtiva/glimmer-dsl-opal#samples) (originally written for [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt))
 
 Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
 - [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt): Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)
@@ -151,7 +153,7 @@ Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
 
 ## Table of Contents
 
-- [Glimmer DSL for Opal 0.15.1 (Pure Ruby Web GUI)](#-glimmer-dsl-for-opal-0151-pure-ruby-web-gui)
+- [Glimmer DSL for Opal 0.16.0 (Pure Ruby Web GUI)](#-glimmer-dsl-for-opal-0160-pure-ruby-web-gui)
   - [Principles](#principles)
   - [Background](#background)
   - [Pre-requisites](#pre-requisites)
@@ -252,7 +254,7 @@ Add the following to `Gemfile`:
 gem 'opal-rails', '~> 1.1.2'
 gem 'opal-async', '~> 1.2.0'
 gem 'opal-jquery', '~> 0.4.4'
-gem 'glimmer-dsl-opal', '~> 0.15.1'
+gem 'glimmer-dsl-opal', '~> 0.16.0'
 gem 'glimmer-dsl-xml', '~> 1.2.0', require: false
 gem 'glimmer-dsl-css', '~> 1.2.0', require: false
 

data/VERSION

@@ -1 +1 @@
-0.15.1
+0.16.0

data/app/controllers/glimmer/image_paths_controller.rb

@@ -3,8 +3,13 @@ require 'fileutils'
 module Glimmer
   class ImagePathsController < ApplicationController
     def index
+      # TODO apply caching in the future to avoid recopying files on every request
       Gem.loaded_specs.map(&:last).select {|s| s.name == 'glimmer-dsl-opal' || s.dependencies.detect {|dep| dep.name == 'glimmer-dsl-opal'} }
-      full_gem_specs = Gem.loaded_specs.map(&:last).select {|s| s.name == 'glimmer-dsl-opal' || s.dependencies.detect {|dep| dep.name == 'glimmer-dsl-swt'} }
+      full_gem_specs = Gem.loaded_specs.map(&:last).select do |s|
+        s.name == 'glimmer-dsl-opal' ||
+          Glimmer::Config.gems_having_image_paths.to_a.include?(s.name) || # consider turning into a Glimmer::Config server-side option
+          s.dependencies.detect {|dep| dep.name == 'glimmer-dsl-swt'}
+      end
       full_gem_paths = full_gem_specs.map {|gem_spec| gem_spec.full_gem_path}
       full_gem_names = full_gem_paths.map {|path| File.basename(path)}
       full_gem_image_path_collections = full_gem_paths.map do |gem_path|
@@ -32,7 +37,7 @@ module Glimmer
         end
       end
       download_gem_image_paths = download_gem_image_paths.map {|p| "/assets/#{p}"}
-      
+            
       # TODO apply a security white list
       render json: download_gem_image_paths
     end

data/lib/glimmer-dsl-opal.rb

@@ -102,5 +102,6 @@ if RUBY_ENGINE == 'opal'
     result ||= method == 'handle'
   end
 else
+  require_relative 'glimmer/config'
   require_relative 'glimmer/engine'
 end

data/lib/glimmer-dsl-opal/ext/file.rb

@@ -37,22 +37,16 @@ class File
     alias expand_path_without_glimmer expand_path
     def expand_path(path, base=nil)
       get_image_paths unless image_paths
-      if base
-        path = expand_path_without_glimmer(path, base)
-      end
+      path = expand_path_without_glimmer(path, base) if base
       path_include_dir_or_file = !!path.match(REGEXP_DIR_FILE)
-      if !path_include_dir_or_file
-        path
-      else
-        essential_path = path.split('(dir)').last.split('(file)').last
-        image_paths.detect do |image_path|
-          image_path.include?(essential_path)
-        end
+      essential_path = path.split('(dir)').last.split('(file)').last.split('../').last.split('./').last
+      image_paths.detect do |image_path|
+        image_path.include?(essential_path)
       end
     end
     
     def get_image_paths
-      image_paths_json = Net::HTTP.get(`window.location.origin`, '/glimmer/image_paths.json')
+      image_paths_json = Net::HTTP.get(`window.location.origin`, "/glimmer/image_paths.json")
       self.image_paths = JSON.parse(image_paths_json)
     end
     

data/lib/glimmer/config.rb

@@ -0,0 +1,11 @@
+module Glimmer
+  # Consumer Rails apps can set these attributes in their assets.rb file
+  module Config
+    class << self
+      # (server-side option) used to collect image paths for copying to assets & matching in Opal to download and use in Glimmer GUI
+      def gems_having_image_paths
+        @gems_having_image_paths ||= []
+      end
+    end
+  end
+end

data/lib/glimmer/swt/label_proxy.rb

@@ -40,12 +40,12 @@ module Glimmer
         text&.gsub("\n", '<br />')
       end
       
-      def background_image=(*image_options)
+#       def background_image=(*image_options)
         # TODO consider if there is a difference between background_image and image in label and to have one reuse the other
         # TODO finish implementation
 #         @background_image = Glimmer::SWT::ImageProxy.create(*image_options)
 #         dom_element.css('background-image', @background_image.image_data.dom_element.src)
-      end
+#       end
       
       def image=(*image_options)
         # TODO finish implementation
@@ -53,6 +53,19 @@ module Glimmer
 #         dom_element.css('background-image', @image.image_data.dom_element.src)
       end
       
+      # background image
+      def background_image
+        @background_image
+      end
+      
+      # background image is stretched by default
+      def background_image=(value)
+        @background_image = value
+        dom_element.css('background-image', "url(#{background_image})")
+        dom_element.css('background-repeat', 'no-repeat')
+        dom_element.css('background-size', 'cover')
+      end
+      
       def element
         'label'
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-12 00:00:00.000000000 Z
+date: 2021-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -324,6 +324,7 @@ files:
 - lib/glimmer-dsl-opal/vendor/jquery-ui/package.json
 - lib/glimmer-dsl-opal/vendor/jquery.js
 - lib/glimmer-dsl-swt.rb
+- lib/glimmer/config.rb
 - lib/glimmer/config/opal_logger.rb
 - lib/glimmer/data_binding/element_binding.rb
 - lib/glimmer/data_binding/list_selection_binding.rb