glimmer 0.1.5.470 → 0.1.8.470

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5614f3671026c45846b7f6bfadd538f8ce93b8bddcc8b10407fa3c046b041a1
-  data.tar.gz: 97450f0a03ea502699b7ecd38ed7444f0f6c6ab9494a6d01d12d7a5986fb7851
+  metadata.gz: 33d1e6ed089bc7dd67eee706f264787cda60ebe2fc1c3fdf1697c277ff5adad4
+  data.tar.gz: 7c7b23d0827e273289502df018308c7ab383c6e7299e75c6da89a9034113af53
 SHA512:
-  metadata.gz: 7168e408c5b7095a7852033a33635bec397681b3211ca64bef8ff7980b7b16ec5bf3123d2f21426b8527849019539333af2d5ecee989df0b3b8eccce8e23090b
-  data.tar.gz: 6d194c420b0daa51f2e23ceaae47e11c495aabbcf8b6a41b264b3270c5a515a2bfd25924b1582104a1e1f9ee41396b7688b2e5613473638e94e81ea31751cb78
+  metadata.gz: 917f8181c1085e246bca952bd4861974081a95486b415e7e6f6c1dcc465776b79ae02ad18b1071f40823c74fdc721186ae5d008a4e1cadd4da2a0da6db40136f
+  data.tar.gz: 2011b3eedcb1018624bdb872aef40f5900ba2892e680e5ec23cffd495fea4574fd34a66e9720263a343f4ae30e56a91adba5a87529fe9bcf50408cd0e2548c4d

data/.coveralls.yml

@@ -0,0 +1 @@
+repo_token: dvAuyH3RuZ3lslleCHAeovxv0kQpFdrsB

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/Gemfile

@@ -4,6 +4,8 @@ gem 'facets', '3.1.0'
 gem 'os', '1.0.0'
 
 group :development do
+  gem "rspec", "~> 3.5.0"
+  gem "rspec-mocks", "~> 3.5.0"
   gem "rdoc", "~> 2.3.0"
   gem "bundler", "~> 1.0"
   gem "jeweler", "~> 2.3.0"

data/README.markdown

@@ -1,4 +1,5 @@
 # Glimmer (The Original One And Only)
+[![Coverage Status](https://coveralls.io/repos/github/AndyObtiva/glimmer/badge.svg?branch=master)](https://coveralls.io/github/AndyObtiva/glimmer?branch=master)
 
 Glimmer is a cross-platform Ruby desktop development library. Glimmer's main innovation is a JRuby DSL that enables easy and efficient authoring of desktop application user-interfaces while relying on the robust platform-independent Eclipse SWT library. Glimmer additionally innovates by having built-in desktop UI data-binding support to greatly facilitate synchronizing the UI with domain models. As a result, that achieves true decoupling of object oriented components, enabling developers to solve business problems without worrying about UI concerns, or alternatively drive development UI-first, and then write clean business components test-first afterward.
 
@@ -25,7 +26,7 @@ Please follow these instructions to make the `glimmer` command available on your
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer', '~> 0.1.5.470'
+gem 'glimmer', '~> 0.1.8.470'
 ```
 
 And, then run:
@@ -37,7 +38,7 @@ bundle install
 
 Run this command to get directly:
 ```
-gem install glimmer -v 0.1.5.470
+gem install glimmer -v 0.1.8.470
 ```
 
 ## Usage
@@ -55,6 +56,10 @@ It downloads and sets up the SWT jar whether missing or not.
 Example 3: `glimmer --setup`
 This downloads and sets up the SWT jar whether missing or not.    
 
+## Girb (Glimmer irb)
+
+You may run girb instead of standard irb to have SWT preloaded and the Glimmer required and included for quick Glimmer coding/testing.  
+
 ## Samples
 
 Check the "samples" folder for examples on how to write Glimmer applications.

data/Rakefile

@@ -21,18 +21,17 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{JRuby DSL that enables easy and efficient authoring of user-interfaces using the robust platform-independent Eclipse SWT library}
   gem.email = "andy.am@gmail.com"
   gem.authors = ["AndyMaleh"]
-  gem.executables = ['glimmer']
+  gem.executables = ['glimmer', 'girb']
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'samples' << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
   additional_options = OS.mac? ? "-J-XstartOnFirstThread" : ""
-  test.ruby_opts = ["#{additional_options} -J-classpath \"#{GlimmerApplication::SWT_JAR_FILE}\" -Xcli.debug=true --debug"]
+  spec.ruby_opts = ["#{additional_options} -J-classpath \"#{GlimmerApplication::SWT_JAR_FILE}\" -Xcli.debug=true --debug"]
 end
 
-task :default => :test
+task :default => :spec

data/TODO.md

@@ -2,5 +2,5 @@
 
 Here is a list of tasks to do (please delete once done):
 
-* Increase test coverage to 80% (debug failure of test suite despite passing tests)
 * Support Tree databinding
+* Explore rewriting shine with Ruby 2 support

data/VERSION

@@ -1 +1 @@
-0.1.5.470
+0.1.8.470

data/bin/girb

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+system "irb -r #{File.expand_path(File.join(__FILE__, '..', 'girb_runner.rb'))}"

data/bin/girb_runner.rb

@@ -0,0 +1,5 @@
+require_relative '../lib/glimmer_application'
+include Java
+$CLASSPATH << GlimmerApplication::SWT_JAR_FILE
+require_relative '../lib/glimmer'
+include Glimmer

data/glimmer.gemspec

@@ -2,24 +2,26 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer 0.1.5.470 ruby lib
+# stub: glimmer 0.1.8.470 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer".freeze
-  s.version = "0.1.5.470"
+  s.version = "0.1.8.470"
 
   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 = "2017-07-22"
+  s.date = "2017-07-23"
   s.description = "JRuby DSL that enables easy and efficient authoring of user-interfaces using the robust platform-independent Eclipse SWT library".freeze
   s.email = "andy.am@gmail.com".freeze
-  s.executables = ["glimmer".freeze]
+  s.executables = ["glimmer".freeze, "girb".freeze]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.markdown"
   ]
   s.files = [
+    ".coveralls.yml",
+    ".rspec",
     ".ruby-gemset",
     ".ruby-version",
     "Gemfile",
@@ -28,6 +30,8 @@ Gem::Specification.new do |s|
     "Rakefile",
     "TODO.md",
     "VERSION",
+    "bin/girb",
+    "bin/girb_runner.rb",
     "bin/glimmer",
     "glimmer.gemspec",
     "images/Bitter-sweet.jpg",
@@ -87,21 +91,21 @@ Gem::Specification.new do |s|
     "samples/login.rb",
     "samples/tictactoe/tic_tac_toe.rb",
     "samples/tictactoe/tic_tac_toe_board.rb",
-    "test/glimmer_combo_data_binding_test.rb",
-    "test/glimmer_constant_test.rb",
-    "test/glimmer_data_binding_test.rb",
-    "test/glimmer_list_data_binding_test.rb",
-    "test/glimmer_listeners_test.rb",
-    "test/glimmer_shine_data_binding_test.rb",
-    "test/glimmer_tab_item_test.rb",
-    "test/glimmer_table_data_binding_test.rb",
-    "test/glimmer_test.rb",
-    "test/helper.rb",
-    "test/observable_model_test.rb",
-    "test/r_widget_test.rb",
-    "test/samples/contactmanager/contact_manager_presenter_test.rb",
-    "test/samples/tictactoe/tic_tac_toe_test.rb",
-    "test/xml/glimmer_xml_test.rb"
+    "spec/lib/command_handlers/models/observable_model_spec.rb",
+    "spec/lib/command_handlers/models/r_widget_spec.rb",
+    "spec/lib/glimmer__combo_data_binding__spec.rb",
+    "spec/lib/glimmer__constant__spec.rb",
+    "spec/lib/glimmer__data_binding__spec.rb",
+    "spec/lib/glimmer__list_data_binding__spec.rb",
+    "spec/lib/glimmer__listeners__spec.rb",
+    "spec/lib/glimmer__shine_data_binding__spec.rb",
+    "spec/lib/glimmer__tab_item__spec.rb",
+    "spec/lib/glimmer__table_data_binding__spec.rb",
+    "spec/lib/glimmer_spec.rb",
+    "spec/lib/xml/glimmer_xml_spec.rb",
+    "spec/samples/contactmanager/contact_manager_presenter_spec.rb",
+    "spec/samples/tictactoe/tic_tac_toe_spec.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/AndyObtiva/glimmer".freeze
   s.licenses = ["MIT".freeze]
@@ -114,6 +118,8 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<facets>.freeze, ["= 3.1.0"])
       s.add_runtime_dependency(%q<os>.freeze, ["= 1.0.0"])
+      s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
+      s.add_development_dependency(%q<rspec-mocks>.freeze, ["~> 3.5.0"])
       s.add_development_dependency(%q<rdoc>.freeze, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.3.0"])
@@ -123,6 +129,8 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<facets>.freeze, ["= 3.1.0"])
       s.add_dependency(%q<os>.freeze, ["= 1.0.0"])
+      s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
+      s.add_dependency(%q<rspec-mocks>.freeze, ["~> 3.5.0"])
       s.add_dependency(%q<rdoc>.freeze, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
       s.add_dependency(%q<jeweler>.freeze, ["~> 2.3.0"])
@@ -133,6 +141,8 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<facets>.freeze, ["= 3.1.0"])
     s.add_dependency(%q<os>.freeze, ["= 1.0.0"])
+    s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
+    s.add_dependency(%q<rspec-mocks>.freeze, ["~> 3.5.0"])
     s.add_dependency(%q<rdoc>.freeze, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
     s.add_dependency(%q<jeweler>.freeze, ["~> 2.3.0"])

data/lib/glimmer_application.rb

@@ -37,8 +37,7 @@ class GlimmerApplication
 
     if application
       puts "Starting Glimmer Application #{application}"
-      additional_options
-      `ruby #{additional_options} -J-classpath "#{SWT_JAR_FILE}" #{application}`
+      system "ruby #{additional_options} -J-classpath \"#{SWT_JAR_FILE}\" #{application}"
     end
   end
 

data/lib/shine.rb

@@ -1,21 +1,23 @@
-require File.dirname(__FILE__) + "/glimmer"
-
-class Array
-  include Glimmer
-  
-  alias original_compare <=>
-  
-  def <=>(other)
-    if (self[0].class.name == "RWidget")
-      add_contents(self[0]) {
-        if (other.size == 2)
-          eval("#{self[1]} bind (other[0], other[1])")
-        elsif (other.size == 3)
-          eval("#{self[1]} bind (other[0], other[1], other[2])")
-        end
-      }
-    else
-      original_compare(other)
-    end
-  end
-end
+## NOTE: Unsupported in Ruby 2 syntax
+#
+# require File.dirname(__FILE__) + "/glimmer"
+#
+# class Array
+#   include Glimmer
+#
+#   alias original_compare <=>
+#
+#   def <=>(other)
+#     if (self[0].class.name == "RWidget")
+#       add_contents(self[0]) {
+#         if (other.size == 2)
+#           eval("#{self[1]} bind (other[0], other[1])")
+#         elsif (other.size == 3)
+#           eval("#{self[1]} bind (other[0], other[1], other[2])")
+#         end
+#       }
+#     else
+#       original_compare(other)
+#     end
+#   end
+# end

data/lib/xml_command_handlers/models/node.rb

@@ -3,9 +3,9 @@ require File.dirname(__FILE__) + "/xml_visitor"
 
 class Node
   include Parent, Glimmer
-  
+
   attr_accessor :children, :name, :contents, :attributes, :is_name_space, :is_attribute, :name_space, :parent
-    
+
   def initialize(parent, name, attributes, &contents)
     @is_name_space = false
     @children = []
@@ -21,35 +21,35 @@ class Node
     if @attributes
       @attributes.each_key do |attribute|
         if attribute.is_a?(Node)
-          attribute.is_attribute = true 
+          attribute.is_attribute = true
           attribute.parent.children.delete(attribute) if attribute.parent
           attribute.parent = nil #attributes do not usually have parents
         end
       end
-      p attributes
+      Glimmer.logger.debug(attributes)
     end
   end
-  
+
   def method_missing(symbol, *args, &block)
     @is_name_space = true
     parent.children.delete(self) if parent
     Glimmer.add_contents(self) {@tag = super}
     @tag
   end
-  
+
   def to_xml
     xml_visitor = XmlVisitor.new
     DepthFirstSearchIterator.new(self, xml_visitor).iterate
     xml_visitor.document
   end
-   
+
   def process_block(block)
     return_value = block.call(@widget)
     if return_value.is_a?(String) and !@children.include?(return_value)
       text = return_value
       first_match = text.match(/[#][^{]+[{][^}]+[}]/)
       match = first_match
-      while (match) 
+      while (match)
         Glimmer.module_eval(text_command(match.pre_match))
         tag_text = match.to_s
         Glimmer.module_eval(rubyize(tag_text))
@@ -61,11 +61,11 @@ class Node
       @children << return_value unless first_match
     end
   end
-  
+
   def text_command(text)
     "text \"#{text}\""
   end
-  
+
   def rubyize(text)
     text = text.gsub(/[}]/, '"}')
     text = text.gsub(/[{]/, '{"')
@@ -76,5 +76,5 @@ class Node
   def id
     method_missing(:id)
   end
-  
+
 end

data/lib/xml_command_handlers/models/xml_visitor.rb

@@ -1,13 +1,13 @@
 require File.dirname(__FILE__) + "/node_visitor"
 
 class XmlVisitor < NodeVisitor
-  
+
   attr_reader :document
-  
+
   def initialize
     @document = ""
   end
-  
+
   def process_before_children(node)
     if (node.is_a?(String))
       @document << node
@@ -17,27 +17,27 @@ class XmlVisitor < NodeVisitor
     append_attributes(node) if node.attributes
     end_open_tag(node)
   end
-  
+
   def process_after_children(node)
     return if (node.is_a?(String))
     append_close_tag(node)
   end
-  
+
   def begin_open_tag(node)
     @document << "<"
     @document << "#{node.name_space.name}:" if node.name_space
     @document << node.name
   end
-  
+
   def end_open_tag(node)
-    if (node.contents) 
+    if (node.contents)
       @document << ">"
     else
       @document << " " if node.attributes.keys.size > 0
       @document << "/>"
     end
   end
-  
+
   def append_close_tag(node)
     if (node.contents)
       @document << "</"
@@ -45,15 +45,15 @@ class XmlVisitor < NodeVisitor
       @document << "#{node.name}>"
     end
   end
-  
+
   def append_attributes(node)
     Glimmer.logger.debug "Take 3"
-    p node.attributes
+    Glimmer.logger.debug(node.attributes)
     node.attributes.each_key do |attribute|
       attribute_name = attribute
       attribute_name = "#{attribute.name_space.name}:#{attribute.name}" if attribute.is_a?(Node)
       @document << " #{attribute_name}=\"#{node.attributes[attribute]}\""
     end
   end
-  
-end
+
+end

data/samples/tictactoe/tic_tac_toe.rb

@@ -3,20 +3,20 @@ require_relative "tic_tac_toe_board"
 
 
 class TicTacToe
-  
+
   include_package 'org.eclipse.swt'
   include_package 'org.eclipse.swt.widgets'
   include_package 'org.eclipse.swt.layout'
-  
+
   include Glimmer
 
   def initialize
     @tic_tac_toe_board = TicTacToeBoard.new
-    @main = 
+    @main =
     @shell = shell {
       text "Tic-Tac-Toe"
       composite {
-        layout GridLayout.new(3,true) 
+        layout GridLayout.new(3,true)
         (1..3).each { |row_number|
           (1..3).each { |column_number|
             button {
@@ -34,20 +34,20 @@ class TicTacToe
     @tic_tac_toe_board.extend(ObservableModel) #make board an observable model
     @tic_tac_toe_board.add_observer("game_status", self)
   end
-  
-  def update(game_status) 
+
+  def update(game_status)
     display_win_message if game_status == TicTacToeBoard::WIN
     display_draw_message if game_status == TicTacToeBoard::DRAW
   end
-  
+
   def display_win_message()
     display_game_over_message("Player #{@tic_tac_toe_board.winning_sign} has won!")
   end
-  
+
   def display_draw_message()
     display_game_over_message("Draw!")
   end
-  
+
   def display_game_over_message(message)
     message_box = MessageBox.new(@shell.widget)
     message_box.setText("Game Over")
@@ -55,9 +55,9 @@ class TicTacToe
     message_box.open
     @tic_tac_toe_board.reset
   end
-  
+
   def open 
-      @main.open
+    @main.open
   end
 end