nineteen-eighty-two 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8adb225e0b27b75def30e8cbcf6cfaf4d93ec5b
-  data.tar.gz: 437eb48a19094395b0a30193727bbd36784d3ac2
+  metadata.gz: 966a5f8d59bfe35e4a089eb778286579a85502e1
+  data.tar.gz: d645dd42ca4b355dec967cb7b741f9dfb2c1d1de
 SHA512:
-  metadata.gz: 1853d80dc42dfec864e4e9fde5803aebcd90842d027ec8d7ecb84eb44d8744b236422b0666255e0ee0053f5972f4986c14650bc962fc55e65f1f475a22c588a7
-  data.tar.gz: d319135567cc68edb911f1ce80a9e68afb329e41d8b2887b389f7087077c29cbee9a6098c7196e711f2ca504ddaa7b3ed9696946dd23d91160a0f39c1f142506
+  metadata.gz: b48d485b1a8b55a704aa5c31223e4ca204551db6a184caf5ea55690d0eaceab369579cb11d8cc74dde1cad5610594a400b6b7b4a653d1f23288f4afc1e3c96a4
+  data.tar.gz: 9cfbdb519c1cdca9adc18af672fdc22da8e0f606aff002ee7a74daa169cfc73b3ae86bdf1fa93b5ab9048752ab03e5b3b0811ef5f296505e16d7cb3fa0cb399f

data/config/colours.yml

@@ -0,0 +1,3 @@
+red: 0xbf0000
+green: 0x00bf00
+blue: 0x0000bf

data/config/messages.yml

@@ -0,0 +1,28 @@
+'0': OK
+'1': NEXT without FOR
+'2': Variable not found
+'3': Subscript wrong
+'4': Out of Memory
+'5': Out of screen
+'6': Number too big
+'7': RETURN without GO SUB
+'8': End of file
+'9': STOP statement
+A: Invalid Argument
+B: Integer out of range
+C: Nonsense in BASIC
+D: BREAK
+E: Out of DATA
+F: Invalid file name
+G: No room for line
+H: STOP in INPUT
+I: FOR without NEXT
+J: Invalid I/O device
+K: Invalid colour
+L: BREAK into program
+M: RAMTOP no good
+N: Statement lost
+O: Invalid stream
+P: FN without DEF
+Q: Parameter error
+R: Tape loading error

data/lib/nineteen/eighty/two.rb

@@ -4,6 +4,9 @@ require 'erubis'
 
 require 'nineteen/eighty/two/version'
 require 'nineteen/eighty/two/spectrum'
+require 'nineteen/eighty/two/messages'
+require 'nineteen/eighty/two/colours'
+require 'nineteen/eighty/two/exceptions'
 
 require 'nineteen/eighty/two/decorators/run_length_encoder'
 

data/lib/nineteen/eighty/two/colours.rb

@@ -0,0 +1,33 @@
+module Nineteen
+  module Eighty
+    module Two
+      class Colours
+
+        PRIMARIES = YAML.load_file File.join File.dirname(__FILE__), '..', '..', '..', '..', 'config', 'colours.yml'
+        PRIMARIES.keys.map do |p|
+          self.const_set p.upcase, PRIMARIES[p]
+        end
+
+        BLACK = 0
+        YELLOW = RED + GREEN
+        CYAN = GREEN + BLUE
+        MAGENTA = RED + BLUE
+        WHITE = RED + GREEN + BLUE
+
+        def self.[] key
+          hex = "%06x" % (self.const_get key.upcase)
+          return brighten hex if key.upcase == key
+          hex
+        end
+
+        def self.method_missing m, *args
+          self[m]
+        end
+
+        def self.brighten colour
+          colour.gsub 'b', 'f'
+        end
+      end
+    end
+  end
+end

data/lib/nineteen/eighty/two/exceptions.rb

@@ -0,0 +1,15 @@
+module Nineteen
+  module Eighty
+    module Two
+      module Exceptions
+        class SpectrumException < Exception
+          attr_reader :message
+          
+          def initialize message
+            @message = message
+          end
+        end
+      end
+    end
+  end
+end

data/lib/nineteen/eighty/two/formatters/html_table_formatter.rb

@@ -4,11 +4,11 @@ module Nineteen
       module Formats
         class HTMLTable
           def self.format text
-            lines = Spectrum[text]
+            lines = Spectrum[*text]
 
             t = File.read File.open File.join Nineteen::Eighty::Two.templates_dir, 'html', 'table', 'table.eruby'
             context = {
-              title: text,
+              title: text.to_s.gsub('"', ''),
               blanks: blanks(lines.first),
               rows: lines.map { |l| row(l) }.join("\n")
             }

data/lib/nineteen/eighty/two/formatters/json_formatter.rb

@@ -5,8 +5,8 @@ module Nineteen
         class JSON
           def self.format text
             {
-              id: text,
-              data: Spectrum[text]
+              id: text.to_s.gsub('"', ''),
+              data: Spectrum[*text]
             }.to_json
           end
         end

data/lib/nineteen/eighty/two/formatters/svg_formatter.rb

@@ -17,16 +17,13 @@ module Nineteen
           end
 
           def self.body text
-            s = ''
+            rows = []
             text.each_with_index do |line, count|
-              rows = []
               Spectrum[line].each_with_index do |line, index|
                 rows.push row(line, index + (count * 8))
               end
-              s << rows.join("\n")
             end
-
-            s.strip
+            rows.flatten
           end
 
           def self.row list, index = 0
@@ -42,12 +39,12 @@ module Nineteen
                   height: 1,
                   style: 'on'
                 }
-                cells.push Erubis::Eruby.new(t).evaluate(context)
+                cells.push Erubis::Eruby.new(t).evaluate(context).strip
               end
               x += item.width
             end
 
-            cells.join("\n").strip
+            cells
           end
 
           def self.longest list

data/lib/nineteen/eighty/two/formatters/text_formatter.rb

@@ -7,7 +7,11 @@ module Nineteen
             on = options.fetch(:on, '1')
             off = options.fetch(:off, '0')
 
-            Spectrum[text].map { |t| t.join }.join("\n").gsub('0', off).gsub('1', on)
+            Spectrum[*text].map do |t|
+              t.join
+            end.join("\n").
+                gsub('0', off).
+                gsub('1', on)
           end
         end
       end

data/lib/nineteen/eighty/two/messages.rb

@@ -0,0 +1,43 @@
+module Nineteen
+  module Eighty
+    module Two
+      class Messages
+        MESSAGES = YAML.load_file File.join File.dirname(__FILE__), '..', '..', '..', '..', 'config', 'messages.yml'
+
+        def self.[] key
+          key = key.to_s.upcase
+          raise Exceptions::SpectrumException.new "Q - #{MESSAGES['Q']}" unless MESSAGES.has_key? key
+          "#{key} - #{MESSAGES[key]}"
+        end
+
+        def self.method_missing m, *args
+          key = case m
+          when :zero
+            0
+          when :one
+            1
+          when :two
+            2
+          when :three
+            3
+          when :four
+            4
+          when :five
+            5
+          when :six
+            6
+          when :seven
+            7
+          when :eight
+            8
+          when :nine
+            9
+          else
+            m.to_s
+          end
+          self[key]
+        end
+      end
+    end
+  end
+end

data/lib/nineteen/eighty/two/spectrum.rb

@@ -3,9 +3,15 @@ module Nineteen
     module Two
       class Spectrum
         CHARACTERS = YAML.load_file File.join File.dirname(__FILE__), '..', '..', '..', '..', 'config', 'characters.yml'
-        
-        def self.[] text
-          Spectrum.linify text.chars.map { |c| Spectrum.get(c) }
+
+        def self.[] *text
+        #  require "pry" ; binding.pry
+          a = []
+          text.each do |t|
+            a += Spectrum.linify(t.chars.map { |c| Spectrum.get(c) })
+          end
+
+          a
         end
 
         def self.get key

data/lib/nineteen/eighty/two/templates/svg/document.eruby

@@ -7,6 +7,6 @@
     ]]>
   </style>
   <g>
-<%= @body %>
+<%= @body.map { |b| "    #{b}" }.join "\n" %>
   </g>
 </svg>

data/lib/nineteen/eighty/two/version.rb

@@ -1,7 +1,7 @@
 module Nineteen
   module Eighty
     module Two
-      VERSION = "0.1.3"
+      VERSION = "0.1.4"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nineteen-eighty-two
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - pikesley
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -98,12 +98,17 @@ files:
 - bin/console
 - bin/setup
 - config/characters.yml
+- config/colours.yml
+- config/messages.yml
 - lib/nineteen/eighty/two.rb
+- lib/nineteen/eighty/two/colours.rb
 - lib/nineteen/eighty/two/decorators/run_length_encoder.rb
+- lib/nineteen/eighty/two/exceptions.rb
 - lib/nineteen/eighty/two/formatters/html_table_formatter.rb
 - lib/nineteen/eighty/two/formatters/json_formatter.rb
 - lib/nineteen/eighty/two/formatters/svg_formatter.rb
 - lib/nineteen/eighty/two/formatters/text_formatter.rb
+- lib/nineteen/eighty/two/messages.rb
 - lib/nineteen/eighty/two/spectrum.rb
 - lib/nineteen/eighty/two/templates/html/table/cell.eruby
 - lib/nineteen/eighty/two/templates/html/table/row.eruby