glimmer-cs-calculator 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1181ebd61993301957b214666f187c7ecf1be2aea7bb288aa6abb67ddc664225
-  data.tar.gz: 170e6809beb9a4b6dca428a8cd83f9772d496e54ab1a8a92a15982704ffcfa14
+  metadata.gz: 6fc5d5bcc6de0a60924fde4949c34debaf42ba58432eb721b96929e660fb527a
+  data.tar.gz: a7d4865112d117fcd48d387455512eceb4541082aa6f0b8a80503b9043075bee
 SHA512:
-  metadata.gz: 38d88bed477197cfd91b52eeac642ae31ccecdcf56df7324f1e6bbd009c15db28038486df02921ddbdcb36cf0f3858799b09dee26691c601995283e5a131c7f8
-  data.tar.gz: 7680cbdd1555d5db2e55a2724807ad7812ca943a879bd873115150bf342d4e5d88b0845ac5dbf8ff4ac2e1d2273bc777336b0e12322c6143da73b8a207ae5aac
+  metadata.gz: 74bebf88eca7828bd6591fe511d3690efa032e7c4e00a18212387df3f60b6ebeaedb3d27dffc2bd24413ac41b0de8396402af83a1d5a2f1b381f8e6340f147ad
+  data.tar.gz: 2c38aea957bf1251614240a4fffaaac68bb87282ddf4fd7004a1c85d877aafa528e874bc14fbcf8a45a1d14eb0c1f99e1429a2cfda4d1f71c51afa8e8972b535

data/README.md

@@ -12,7 +12,7 @@ Follows the MVP architectural pattern (Model View Presenter) thanks to [Glimmer
 
 ## Platforms
 
-- Mac: Tested and [packaged](https://github.com/AndyObtiva/glimmer#packaging--distribution) for the Mac. ([Download Here<img alt="Glimmer Calculator Icon" src="glimmer-cs-calculator-icon.png" width="30" />](https://www.dropbox.com/s/tdgwt2vfxfh13ro/Glimmer%20Calculator-1.0.0.dmg?dl=1))
+- Mac: Tested and [packaged](https://github.com/AndyObtiva/glimmer#packaging--distribution) for the Mac. ([Download Here<img alt="Glimmer Calculator Icon" src="glimmer-cs-calculator-icon.png" width="30" />](https://www.dropbox.com/s/tdgwt2vfxfh13ro/Glimmer%20Calculator-1.0.1.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.
 
@@ -43,7 +43,7 @@ To reuse Calculator as a Glimmer Custom Shell inside another Glimmer application
 following to the application's `Gemfile`:
 
 ```
-gem 'glimmer-cs-calculator', '1.0.0'
+gem 'glimmer-cs-calculator', '1.0.1'
 ```
 
 Run:
@@ -54,6 +54,11 @@ jruby -S bundle
 
 And, then instantiate the Calculator custom shell in your Glimmer application via the `calculator` Glimmer DSL keyword.
 
+## Change Log
+
+- 1.0.1: Upgraded to glimmer-dsl-swt v0.1.0 / added delete/backspace shortcut for AC / fixed issues with pressing operations without any number
+- 1.0.0: Initial calculator implementation
+
 ## Contributing to glimmer-cs-calculator
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/glimmer-cs-calculator.rb

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

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

@@ -2,7 +2,7 @@ module Glimmer
   class Calculator
     class Command
       class AllClear < Command
-        keywords 'AC', 'c', 'C', 27.chr
+        keywords 'AC', 'c', 'C', 8.chr, 27.chr, 127.chr
 
         def execute
           self.result = '0'

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

@@ -5,11 +5,11 @@ module Glimmer
         keywords '=', "\r"
 
         def execute
-          if operation
+          if number1 && number2 && operation
             self.result = operation.calculate.to_s
             self.number1 = self.result
           else
-            self.result = last_result
+            self.result = last_result || '0'
           end
         end
       end

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

@@ -2,9 +2,24 @@ module Glimmer
   class Calculator
     class Command
       class Operation < Command
-        # Calculate operation result using number1 and number2 attributes
+        def execute          
+          if number1 && number2 && operation && !last_command.equals?
+            self.result = operation.calculate.to_s            
+            self.number1 = self.result
+          else
+            self.result = last_result || '0'
+            self.operation = self
+          end
+        end
+        
         def calculate
-          raise 'Not implemented! A subclass must implement to calculate operation using number1 and number2 attributes'
+          calculation_result = number1.send(operation_method, number2)
+          calculation_result.to_s.match(/\.0+$/) ? calculation_result.to_i : calculation_result
+        end
+        
+        # Subclasses must implement to indicate operation method on number (e.g. :+ for addition)
+        def operation_method
+          raise 'Not implemented!'
         end
       end
     end

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

@@ -4,20 +4,9 @@ module Glimmer
       class Operation < Command      
         class Add < Operation
           keyword '+'
-
-          def execute          
-            if number2 && operation && !last_command.equals?
-              self.result = operation.calculate.to_s            
-              self.number1 = self.result
-            else
-              self.result = last_result
-              self.operation = self
-            end
-          end
           
-          def calculate
-            calculation_result = number1 + number2
-            calculation_result.to_s.match(/\.0+$/) ? calculation_result.to_i : calculation_result
+          def operation_method
+            :+
           end
         end
       end

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

@@ -4,20 +4,9 @@ module Glimmer
       class Operation < Command      
         class Divide < Operation
           keywords '÷', '/'
-
-          def execute          
-            if number2 && operation && !last_command.equals?
-              self.result = operation.calculate.to_s            
-              self.number1 = self.result
-            else
-              self.result = last_result
-              self.operation = self
-            end
-          end
           
-          def calculate
-            calculation_result = number1 / number2
-            calculation_result.to_s.match(/\.0+$/) ? calculation_result.to_i : calculation_result #TODO consider moving this to result= method in Command
+          def operation_method
+            :/
           end
         end
       end

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

@@ -5,19 +5,8 @@ module Glimmer
         class Multiply < Operation
           keywords '×', '*'
 
-          def execute          
-            if number2 && operation && !last_command.equals?
-              self.result = operation.calculate.to_s            
-              self.number1 = self.result
-            else
-              self.result = last_result
-              self.operation = self
-            end
-          end
-          
-          def calculate
-            calculation_result = number1 * number2
-            calculation_result.to_s.match(/\.0+$/) ? calculation_result.to_i : calculation_result
+          def operation_method
+            :*
           end
         end
       end

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

@@ -4,20 +4,9 @@ module Glimmer
       class Operation < Command      
         class Subtract < Operation
           keywords '−', '-'
-
-          def execute          
-            if number2 && operation && !last_command.equals?
-              self.result = operation.calculate.to_s            
-              self.number1 = self.result
-            else
-              self.result = last_result
-              self.operation = self
-            end
-          end
           
-          def calculate
-            calculation_result = number1 - number2
-            calculation_result.to_s.match(/\.0+$/) ? calculation_result.to_i : calculation_result
+          def operation_method
+            :-
           end
         end
       end

data/lib/models/glimmer/calculator/presenter.rb

@@ -3,15 +3,23 @@ require 'models/glimmer/calculator/command'
 module Glimmer
   class Calculator
     class Presenter
+      FORMATTER = {
+        nil   => '0',
+        'NaN' => 'Not a number'
+      }
+    
       attr_accessor :result
       
       def initialize
         self.result = '0'
       end
-  
+      
       def press(button)
         command = Command.for(button)
-        self.result = command.result if command
+        if command
+          new_result = command.result
+          self.result = FORMATTER[new_result] || new_result
+        end
       end
     end
   end

data/lib/views/glimmer/calculator.rb

@@ -25,6 +25,13 @@ module Glimmer
       @button_font_big = {height: 28}
       Display.setAppName('Glimmer Calculator')
       @display = display {
+        on_about {
+          display_about_dialog
+        }
+        on_preferences {
+          # No need for preferences. Just display about dialog.
+          display_about_dialog
+        }
         on_event_keydown { |key_event|
           char = key_event.character.chr rescue nil
           @presenter.press(char)
@@ -47,13 +54,6 @@ module Glimmer
         minimum_size 320, 240
         text "Glimmer - Calculator"
         grid_layout 4, true
-        on_about {
-          display_about_dialog
-        }
-        on_preferences {
-          # No need for preferences. Just display about dialog.
-          display_about_dialog
-        }
         # Setting styled_text to multi in order for alignment options to activate
         styled_text(:multi, :wrap, :border) {
           text bind(@presenter, :result)

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-calculator
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-30 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.7
-  name: glimmer
+        version: 0.1.1
+  name: glimmer-dsl-swt
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -83,34 +83,21 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.2.0
   name: glimmer-cs-gladiator
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.6
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-  name: puts_debuggerer
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.2.0
 description: Calculator - Glimmer Custom Shell
 email: andy.am@gmail.com
 executables:
+- glimmer-cs-calculator
 - calculator
 extensions: []
 extra_rdoc_files: