nineteen-eighty-two 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f46e15b6304a47beff3b22b3eecfc36a19314d87
-  data.tar.gz: 8edb0ae9ea7535e45f03cc2bd0a4bba9d5afc229
+  metadata.gz: 333300256f217b8dfadb4c4cd9e4fb0762f07fd2
+  data.tar.gz: 2fa6d7ac8d22628cc6fb28faf780edd78450e043
 SHA512:
-  metadata.gz: 2e29b9d32afebf91e731a3d4ff36ec5ef713e8296e9730816d4e0c3dc13b5a65c2c122ba604aab0ad5f105a48e754f640842a7aa5b6161237470ec0ceee601cc
-  data.tar.gz: ab91284f03235968ea6b6d191064be0be223339d46298361a90f10827cd8400cd83b6e202ee3631bfdd9dc4fd8ddf37bb0a1458adc7ad0176bd63bc46d1df5d3
+  metadata.gz: 1d1845d8f10db6883e0d4df8f5a4786d51664ed913a66f18f2db05efd524a6ec008210bf82cd0db1675700fb39ccb82179724cac41e1bcf8ce459c095e8636a6
+  data.tar.gz: 39415ce95392aa2eb1a0ebe5b1364070e1c9f1859f1c7b9a0a024e88cb237d176996a50a6260fd0ae65cbe3ec3469f06b00f4dc7bb1111b4bd4071cdc19f9249

data/lib/nineteen/eighty/two/decorators/run_length_encoder.rb

@@ -14,9 +14,7 @@ module Nineteen
               if nxt == current
                 count += 1
               else
-                result << {
-                  current => count + 1
-                }
+                result << (Span.new current, count + 1)
                 count = 0
                 current = nxt
               end

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

@@ -1,55 +1,47 @@
 module Nineteen
   module Eighty
     module Two
-      module Formatters
-        class HTMLTableFormatter
+      module Formats
+        class HTMLTable
           def self.format text
-            s = '<!-- %s -->' % text
-            s << '<table class="sinclair">'
-
             lines = Spectrum[text]
-            s << self.build_row(self.make_blanks(lines.first))
-
-            lines.each { |line| s << self.build_row(Nineteen::Eighty::Two::Decorators::RunLengthEncoder.encode line) }
 
-            s << '</table>'
-            s
+            t = File.read File.open File.join templates_dir, 'table.eruby'
+            context = {
+              title: text,
+              blanks: blanks(lines.first),
+              rows: lines.map { |l| row(l) }.join("\n")
+            }
+            Erubis::Eruby.new(t).evaluate(context).strip
           end
 
-          def self.make_blanks text
-            a = []
-            (text.length * 8).times do |bit|
-              a << { 0 => 1 }
-            end
-
-            a
+          def self.blanks lines
+            t = File.read File.open File.join templates_dir, 'row.eruby'
+            context = {
+              cells: lines.map { |b| cell Span.new(0, 1) }.join
+            }
+            Erubis::Eruby.new(t).evaluate(context).strip
           end
 
-          def self.convert_line line
-            line.map! { |i|
-              {
-                :class   => i.keys[0] == 1 ? "on" : "off",
-                :colspan => i.values[0]
-              }
+          def self.cell span
+            t = File.read File.open File.join templates_dir, 'cell.eruby'
+            context = {
+              style: span.type == 1 ? 'on' : 'off',
             }
+            context[:colspan] = span.width if span.width > 1
+            Erubis::Eruby.new(t).evaluate(context).strip
           end
 
-          def self.build_row line
-            s = '<tr class="sinclair">'
-
-            convert_line line
-
-            line.each do |bit|
-              s << '<td class="%s"' % bit[:class]
-              if bit[:colspan] > 1
-                s << ' colspan="%d"' % bit[:colspan]
-              end
-              s << '> </td>'
-            end
-
-            s << '</tr>'
+          def self.row list
+            t = File.read File.open File.join templates_dir, 'row.eruby'
+            context = {
+              cells: Decorators::RunLengthEncoder.encode(list).map { |i| cell i }.join
+            }
+            Erubis::Eruby.new(t).evaluate(context).strip
+          end
 
-            s
+          def self.templates_dir
+            File.join File.dirname(__FILE__),'..', 'templates', 'html', 'table'
           end
         end
       end

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

@@ -1,8 +1,8 @@
 module Nineteen
   module Eighty
     module Two
-      module Formatters
-        class JSONFormatter
+      module Formats
+        class JSON
           def self.format text
             {
               id: text,

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

@@ -0,0 +1,53 @@
+module Nineteen
+  module Eighty
+    module Two
+      module Formats
+        class SVG
+          def self.format text, options = {}
+            t = File.read File.open File.join templates_dir, 'document.eruby'
+            context = {
+              width: text.length * 8,
+              height: 8,
+              fill_colour: options.fetch(:on_colour, '#000000'),
+              body: body(text)
+            }
+            Erubis::Eruby.new(t).evaluate(context)
+          end
+
+          def self.body text
+            rows = []
+            Spectrum[text].each_with_index do |line, index|
+              rows.push row(line, index)
+            end
+            rows.join("\n").strip
+          end
+
+          def self.row list, index = 0
+            x = 0
+            cells = []
+            Decorators::RunLengthEncoder.encode(list).each do |item|
+              if item.type == 1
+                t = File.read File.open File.join templates_dir, 'cell.eruby'
+                context = {
+                  x: x,
+                  y: index,
+                  width: item.width,
+                  height: 1,
+                  style: 'on'
+                }
+                cells.push Erubis::Eruby.new(t).evaluate(context)
+              end
+              x += item.width
+            end
+
+            cells.join("\n").strip
+          end
+
+          def self.templates_dir
+            File.join File.dirname(__FILE__),'..', 'templates', 'svg'
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,8 +1,8 @@
 module Nineteen
   module Eighty
     module Two
-      module Formatters
-        class TextFormatter
+      module Formats
+        class Text
           def self.format text, options = {}
             on = options.fetch(:on, '1')
             off = options.fetch(:off, '0')

data/lib/nineteen/eighty/two/templates/html/table/cell.eruby

@@ -0,0 +1 @@
+<td class='<%= @style %>'<% if @colspan %> colspan='<%= @colspan %>'<% end %>> </td>

data/lib/nineteen/eighty/two/templates/html/table/row.eruby

@@ -0,0 +1 @@
+<tr><%= @cells %></tr>

data/lib/nineteen/eighty/two/templates/html/table/table.eruby

@@ -0,0 +1,5 @@
+<!-- <%= @title %> -->
+<table class='sinclair'>
+<%= @blanks %>
+<%= @rows %>
+</table>

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

@@ -0,0 +1 @@
+<rect x='<%= @x %>' y='<%= @y %>' width='<%= @width %>' height='<%= @height %>' class='<%= @style %>' />

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

@@ -0,0 +1,12 @@
+<svg viewBox='0 0 <%= @width %> <%= @height %>' xmlns='http://www.w3.org/2000/svg'>
+  <style type='text/css'>
+    <![CDATA[
+      rect.on {
+        fill: <%= @fill_colour %>;
+      }
+    ]]>
+  </style>
+  <g>
+<%= @body %>
+  </g>
+</svg>

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

@@ -1,7 +1,7 @@
 module Nineteen
   module Eighty
     module Two
-      VERSION = "0.1.0"
+      VERSION = "0.1.1"
     end
   end
 end

data/lib/nineteen/eighty/two.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'matrix'
+require 'erubis'
 
 require 'nineteen/eighty/two/version'
 require 'nineteen/eighty/two/spectrum'
@@ -9,3 +10,18 @@ require 'nineteen/eighty/two/decorators/run_length_encoder'
 require 'nineteen/eighty/two/formatters/text_formatter'
 require 'nineteen/eighty/two/formatters/json_formatter'
 require 'nineteen/eighty/two/formatters/html_table_formatter'
+require 'nineteen/eighty/two/formatters/svg_formatter'
+
+class Span < Hash
+  def initialize type, width
+    self[type] = width
+  end
+
+  def type
+    self.keys.first
+  end
+
+  def width
+    self.values.first
+  end
+end

data/nineteen-eighty-two.gemspec

@@ -19,8 +19,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'erubis'
+  
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'coveralls', '~> 0.8'  
+  spec.add_development_dependency 'coveralls', '~> 0.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nineteen-eighty-two
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - pikesley
@@ -10,6 +10,20 @@ bindir: exe
 cert_chain: []
 date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -88,8 +102,14 @@ files:
 - lib/nineteen/eighty/two/decorators/run_length_encoder.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/spectrum.rb
+- lib/nineteen/eighty/two/templates/html/table/cell.eruby
+- lib/nineteen/eighty/two/templates/html/table/row.eruby
+- lib/nineteen/eighty/two/templates/html/table/table.eruby
+- lib/nineteen/eighty/two/templates/svg/cell.eruby
+- lib/nineteen/eighty/two/templates/svg/document.eruby
 - lib/nineteen/eighty/two/version.rb
 - nineteen-eighty-two.gemspec
 homepage: http://pikesley.org