glimmer-cs-calculator 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f0e0c7392ffb6936fc36800a01b046828abdedd02a87b0b5e9ac9a2a2123df0
-  data.tar.gz: 60f45b6cc247b361845f8dc183202b486be7e4347649b600a247b8b479faae07
+  metadata.gz: ec35f63a2331f52aeb09b998b3bec6314f140ab8b2377c2d8c6bae2ee39c4fd4
+  data.tar.gz: 0a586ad6ad389bace7d4f0edb0d9f3586bd6ffaaa540f88842f9c134d7923f9f
 SHA512:
-  metadata.gz: 4deffe701265a3e8780556445e84b3f0438d89d3ec0cf4b2c3bea5e8ebd8697171f7c3d8a961272cafdbb9044516cf57da4c2566d3c238de4e82fa9a099a1aba
-  data.tar.gz: b1579e191220e1d267bb3a5d525229f563378868008a543b02d88addfa31ab8bdade4af85bf892ab0974d3965dd683059edc4dc01517d20718cbcbedae17a25c
+  metadata.gz: 0bef94466c9b52f77b328f821840bbf532f90a76ca6ed58add979e98db63fb58138a5ac59e919d94d9b2cb83160932262cac2cdd0e39bb8e9bdbea6e3fb3579b
+  data.tar.gz: 64e525f32d00449388ade751e304bdbb433fc51b53867797b47b02f55b01ab33f25ccbb3acfa922077fecbe36097411c6a1b9e4c5ef4c88e6ae3134c17257c35

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 1.1.1
+
+- Official Windows support
+- Official Linux support
+- Refactorings, extracting method-based custom widgets
+
 ## 1.1.0
 
 - Upgrade support for glimmer-dsl-swt to 4.17.2.0 up to 5.0.0.0

data/README.md

@@ -2,22 +2,41 @@
 ## [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 /> Glimmer Custom Shell](https://github.com/AndyObtiva/glimmer-dsl-swt#custom-shell-gem)
 [![Gem Version](https://badge.fury.io/rb/glimmer-cs-calculator.svg)](http://badge.fury.io/rb/glimmer-cs-calculator)
 
+Glimmer Calculator on Mac
+
 ![Calculator](glimmer-cs-calculator-screenshot.png)
 
+Glimmer Calculator on Windows
+
+![Calculator](glimmer-cs-calculator-screenshot-windows.png)
+
+Glimmer Calculator on Linux
+
+![Calculator](glimmer-cs-calculator-screenshot-linux.png)
+
 Glimmer Calculator is a sample desktop GUI application built with [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) (JRuby Desktop Development GUI Library).
 
-It is developed test-first following TDD (Test Driven Development). 
+Architectural Pattern is MVP (Model View Presenter) thanks to [Glimmer data-binding](https://github.com/AndyObtiva/glimmer-dsl-swt#data-binding) support.
+
+Glimmer Calculator was developed test-first following TDD (Test Driven Development) after [Glimmer Scaffolding](https://github.com/AndyObtiva/glimmer-dsl-swt#scaffolding). 
+
 Design Patterns discovered in the process were Presenter/Facade and Command Pattern.
 
-Follows the MVP architectural pattern (Model View Presenter) thanks to [Glimmer data-binding](https://github.com/AndyObtiva/glimmer-dsl-swt#data-binding) support.
+Here are the calculator commands under the [models directory](lib/models/glimmer/calculator):
+
+![Calculator Commands](glimmer-cs-calculator-command-pattern.png)
+
+[<img alt="Glimmer Calculator Icon" src="glimmer-cs-calculator-icon.png" height=40 />Download Glimmer Calculator v1.1.1 DMG for Mac](https://www.dropbox.com/s/2wbyy0z0w875n39/Glimmer%20Calculator-1.1.1.dmg?dl=1)
+
+[<img alt="Glimmer Calculator Icon" src="glimmer-cs-calculator-icon.png" height=40 />Download Glimmer Calculator v1.1.1 MSI for Windows](https://www.dropbox.com/s/e8b586s2xgjn9bg/Glimmer%20Calculator-1.1.1.msi?dl=1)
 
-[<img alt="Glimmer Calculator Icon" src="glimmer-cs-calculator-icon.png" height=40 />Download Glimmer Calculator v1.1.0 for the Mac](https://www.dropbox.com/s/6c39vunxmx1eztz/Glimmer%20Calculator-1.1.0.dmg?dl=1)
+[<img alt="Glimmer Calculator Icon" src="glimmer-cs-calculator-icon.png" height=40 />Download Glimmer Calculator v1.1.1 GEM for Linux](#setup-instructions)
 
 ## Platforms
 
-- Mac: Tested and [packaged](https://github.com/AndyObtiva/glimmer-dsl-swt#packaging--distribution) for the Mac. ([Download Here](https://www.dropbox.com/s/6c39vunxmx1eztz/Glimmer%20Calculator-1.1.0.dmg?dl=1))
-- Linux: Not tested/packaged for Linux, but should work by following setup instructions below.
-- Windows: Not tested/packaged for Windows, but should work by following setup instructions below.
+- Mac: Tested and [packaged](https://github.com/AndyObtiva/glimmer-dsl-swt#packaging--distribution) for Mac. ([Download Here](https://www.dropbox.com/s/2wbyy0z0w875n39/Glimmer%20Calculator-1.1.1.dmg?dl=1))
+- Windows: Tested and [packaged](https://github.com/AndyObtiva/glimmer-dsl-swt#packaging--distribution) for Windows. ([Download Here](https://www.dropbox.com/s/e8b586s2xgjn9bg/Glimmer%20Calculator-1.1.1.msi?dl=1))
+- Linux: Tested and [packaged](http://rubygems.org/gems/glimmer-cs-calculator) for Linux (Follow [setup instructions](#setup-instructions) to install [gem](http://rubygems.org/gems/glimmer-cs-calculator) and run `calculator` command)
 
 ## Development Environment Pre-requisites
 
@@ -46,7 +65,7 @@ To reuse Calculator as a Glimmer Custom Shell inside another Glimmer application
 following to the application's `Gemfile`:
 
 ```
-gem 'glimmer-cs-calculator', '1.1.0'
+gem 'glimmer-cs-calculator', '1.1.1'
 ```
 
 Run:

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/bin/calculator

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env jruby
 
 require 'glimmer/launcher'
 

data/bin/glimmer-cs-calculator

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require_relative '../lib/glimmer-cs-calculator'
 
 include Glimmer

data/glimmer-cs-calculator.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-cs-calculator 1.1.0 ruby lib
+# stub: glimmer-cs-calculator 1.1.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-cs-calculator".freeze
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Andy Maleh".freeze]
-  s.date = "2020-09-27"
+  s.date = "2020-10-14"
   s.description = "Calculator - Glimmer Custom Shell".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer-cs-calculator".freeze, "calculator".freeze]
@@ -39,7 +39,9 @@ Gem::Specification.new do |s|
     "lib/models/glimmer/calculator/command/operation/subtract.rb",
     "lib/models/glimmer/calculator/command/point.rb",
     "lib/models/glimmer/calculator/presenter.rb",
-    "lib/views/glimmer/calculator.rb"
+    "lib/views/glimmer/calculator.rb",
+    "package/macosx/Glimmer Calculator.icns",
+    "package/windows/Glimmer Calculator.ico"
   ]
   s.homepage = "http://github.com/AndyObtiva/glimmer-cs-calculator".freeze
   s.licenses = ["MIT".freeze]
@@ -51,7 +53,7 @@ Gem::Specification.new do |s|
   end
 
   if s.respond_to? :add_runtime_dependency then
-    s.add_runtime_dependency(%q<glimmer-dsl-swt>.freeze, [">= 4.17.2.0", "< 5.0.0.0"])
+    s.add_runtime_dependency(%q<glimmer-dsl-swt>.freeze, [">= 4.17.2.2", "< 5.0.0.0"])
     s.add_runtime_dependency(%q<easily_typable>.freeze, ["~> 1.0.2"])
     s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
     s.add_development_dependency(%q<jeweler>.freeze, ["= 2.3.9"])
@@ -59,7 +61,7 @@ Gem::Specification.new do |s|
     s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
     s.add_development_dependency(%q<glimmer-cs-gladiator>.freeze, [">= 0.3.0"])
   else
-    s.add_dependency(%q<glimmer-dsl-swt>.freeze, [">= 4.17.2.0", "< 5.0.0.0"])
+    s.add_dependency(%q<glimmer-dsl-swt>.freeze, [">= 4.17.2.2", "< 5.0.0.0"])
     s.add_dependency(%q<easily_typable>.freeze, ["~> 1.0.2"])
     s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
     s.add_dependency(%q<jeweler>.freeze, ["= 2.3.9"])

data/lib/glimmer-cs-calculator.rb

@@ -1,4 +1,5 @@
 $LOAD_PATH.unshift(File.expand_path('..', __FILE__))
 
 require 'glimmer-dsl-swt'
+require 'bigdecimal'
 require 'views/glimmer/calculator'

data/lib/models/glimmer/calculator/command/operation.rb

@@ -13,7 +13,7 @@ module Glimmer
         end
         
         def calculate
-          calculation_result = number1.send(operation_method, number2)
+          calculation_result = BigDecimal.new(number1.to_s).send(operation_method, BigDecimal.new(number2.to_s)).to_f
           calculation_result.to_s.match(/\.0+$/) ? calculation_result.to_i : calculation_result
         end
         

data/lib/views/glimmer/calculator.rb

@@ -6,6 +6,7 @@ module Glimmer
   class Calculator
     include Glimmer::UI::CustomShell
 
+    APP_ROOT = File.expand_path('../../../..', __FILE__)
     VERSION = File.read(File.expand_path(File.join('..', '..', '..', '..', 'VERSION'), __FILE__))
     LICENSE = File.read(File.expand_path(File.join('..', '..', '..', '..', 'LICENSE.txt'), __FILE__))
 
@@ -50,8 +51,8 @@ module Glimmer
     #
     body {
       shell {
-        # Replace example content below with custom shell content
-        minimum_size 320, 240
+        minimum_size (OS.mac? ? 320 : (OS.windows? ? 390 : 520)), 240
+        image File.join(APP_ROOT, 'package', 'windows', "Glimmer Calculator.ico") if OS.windows?
         text "Glimmer - Calculator"
         grid_layout 4, true
         # Setting styled_text to multi in order for alignment options to activate
@@ -66,184 +67,54 @@ module Glimmer
           editable false
           caret nil
         }
-        button {
-          text 'AC'
-          font @button_font
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('AC')
-          }
-        }
-        button {
-          text '÷'
-          font @button_font_operation
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('/')
-          }
-        }
-        button {
-          text '×'
-          font @button_font_operation
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('*')
-          }
-        }
-        button {
-          text '−'
-          font @button_font_operation
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('-')
-          }
-        }
-        button {
-          text '7'
-          font @button_font
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('7')
-          }
-        }
-        button {
-          text '8'
-          font @button_font
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('8')
-          }
-        }
-        button {
-          text '9'
-          font @button_font
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('9')
-          }
-        }
-        button {
-          text '+'
-          font @button_font_big
-          
-          layout_data(:fill, :fill, true, true) {          
-            vertical_span 2
-          }
-          
-          on_widget_selected {
-            @presenter.press('+')
-          }
-        }
-        button {
-          text '4'
-          font @button_font
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('4')
-          }
-        }
-        button {
-          text '5'
-          font @button_font
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('5')
-          }
-        }
-        button {
-          text '6'
-          font @button_font
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('6')
-          }
-        }
-        button {
-          text '1'
-          font @button_font
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('1')
-          }
-        }
-        button {
-          text '2'
-          font @button_font
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('2')
-          }
-        }
-        button {
-          text '3'
-          font @button_font
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('3')
-          }
-        }
-        button {
-          text '='
-          font @button_font_big
-          
-          layout_data(:fill, :fill, true, true) {          
-            vertical_span 2
-          }
-          
-          on_widget_selected {
-            @presenter.press('=')
-          }
-        }
-        button {
-          text '0'
-          font @button_font
-          
-          layout_data(:fill, :fill, true, true) {          
-            horizontal_span 2
-          }
-          
-          on_widget_selected {
-            @presenter.press('0')
-          }
-        }
-        button {
-          text '.'
-          font @button_font_operation
-          
-          layout_data(:fill, :fill, true, true)
-          
-          on_widget_selected {
-            @presenter.press('.')
-          }
-        }
+        command_button('AC')
+        operation_button('÷')
+        operation_button('×')
+        operation_button('−')
+        (7..9).each { |number|
+          number_button(number)
+        }
+        operation_button('+', font: @button_font_big, vertical_span: 2)
+        (4..6).each { |number|
+          number_button(number)
+        }        
+        (1..3).each { |number|
+          number_button(number)
+        }        
+        command_button('=', font: @button_font_big, vertical_span: 2)
+        number_button(0, horizontal_span: 2)
+        operation_button('.')
       }
     }
+    
+    def number_button(number, options = {})
+      command_button(number, options)
+    end
+    
+    def operation_button(operation, options = {})
+      command_button(operation, options.merge(font: @button_font_operation))
+    end
+    
+    def command_button(command, options = {})
+      command = command.to_s
+      options[:font] ||= @button_font
+      options[:horizontal_span] ||= 1
+      options[:vertical_span] ||= 1
+      
+      button { |proxy|
+        text command
+        font options[:font]
+        
+        layout_data(:fill, :fill, true, true) {
+          horizontal_span options[:horizontal_span]
+          vertical_span options[:vertical_span]
+        }
+        
+        on_widget_selected {
+          @presenter.press(command)
+        }
+      }    
+    end
 
     def display_about_dialog
       message_box(body_root) {

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-calculator
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-27 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.17.2.0
+        version: 4.17.2.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.17.2.0
+        version: 4.17.2.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0.0
@@ -144,6 +144,8 @@ files:
 - lib/models/glimmer/calculator/command/point.rb
 - lib/models/glimmer/calculator/presenter.rb
 - lib/views/glimmer/calculator.rb
+- package/macosx/Glimmer Calculator.icns
+- package/windows/Glimmer Calculator.ico
 homepage: http://github.com/AndyObtiva/glimmer-cs-calculator
 licenses:
 - MIT