hershey 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1d369a961b88080090e905175732f71280ba796
-  data.tar.gz: f74a3fd226e961b6f0e35c14dcf1b18f9fbc2c41
+  metadata.gz: 9b24545d2a0e0d007d513ce0503af4b8629054a4
+  data.tar.gz: e5a24d52e8c171e2fa92f4d98ed39cb13378c84d
 SHA512:
-  metadata.gz: 802d3d453dd9036a60d5b71fd313b401dbd063375570bf939713c3c18f79f3d20119b332e65ddac6e5e8782803e3fe2081110e64ed79c2441afe7d3b778b7a6d
-  data.tar.gz: f8a2e3db4d69ce7a5f6e5ffd88bbeba0ea428dfb1c0940019412e904d1c24fab1d86b42bf4e834fcc25a0f83aa5aee2a4a88062f08edd070ffa47fe2738ef46b
+  metadata.gz: d4226c797de0ce2a83db348fdb6beb88b959750b54c40137b8445540090ad9f8b83e9e9e3221bd2ba6ef4f3fec1f38efbe957f809e08a2c735c2dec247b773cb
+  data.tar.gz: 1098108380a568961ca20afb29a9c0daf080077ce881725aedc4b8c230195a77f41862fae35e614d32539a3c0eb7d09e2d306dab22b052eb56402dd6dc60921b

data/bin/hershey

@@ -1,9 +1,61 @@
-#!/usr/bin/env ruby -w
+#!/usr/bin/env ruby
 
 require 'hershey'
+require 'optparse'
 
-file = ARGV.shift
-width = ARGV.shift.to_i
-text = ARGV.join(' ')
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: hershey [options]"
 
-open(file, 'w') {|f| f.write(Hershey.svg(text, width: width))}
+  opts.on("-w", "--width WIDTH", Integer, "Width of the pages") do |vars|
+    options[:width] = vars
+  end
+
+  opts.on("-h", "--height HEIGHT", Integer, "The height per page (defaults to 8.5x11 ratio)") do |f|
+    options[:height] = f
+  end
+
+
+  opts.on("-i", "--input INFILE", "The input file (required)") do |f|
+    options[:input] = f
+  end
+
+  opts.on("-o", "--output OUTFILE", "The output file base name (required)") do |f|
+    options[:output] = f
+  end
+
+  options[:max] = 100
+  opts.on("-m", "--max MAX", Integer, "Max pages") do |range|
+    options[:max] = range
+  end
+
+  opts.on("-o", "--output OUTFILE", "The output file base name") do |f|
+    options[:output] = f
+  end
+
+  opts.on("-f", "--font FONT", Hershey::FONTS.keys, "The font to use") do |f|
+    options[:font] = f.downcase
+  end
+  opts.separator("Fonts: #{Hershey::FONTS.keys.map {|k| k.to_s}.join(', ')}")
+
+  opts.on("--help", "Shows this help message") do
+    puts opts
+    exit
+  end
+end.parse!
+
+unless options[:width].is_a?(Integer)
+  puts "Missing number of variables for equation"
+  puts "Call with -h or --help for help"
+  exit(1)
+end
+
+options[:height] ||= (options[:width] / 8.5 * 11 / 20).ceil * 20
+
+pages = Hershey.svgs(File.read(options[:input]), options.select{|k,_| [:width,:height,:font].include?(k)})
+
+pages.each_with_index do |page, i|
+  f = "#{options[:output]}_#{i}.svg"
+  puts "#{f}: #{page.each_char.inject(0) {|m,s| s == 'L' ? m + 1 : m}} line segments."
+  open(f, 'w') {|f| f.write(page)}
+end

data/lib/hershey.rb

@@ -6,9 +6,20 @@ require_relative "hershey/version"
 require_relative "hershey/word"
 
 module Hershey
+  def self.new(options = {})
+    doc = Document.new(options)
+  end
+
   def self.svg(text, options = {})
     doc = Document.new(options)
     doc.write(text)
     doc.svg
   end
+
+  def self.svgs(text, options = {})
+    puts options
+    doc = Document.new(options)
+    doc.write(text)
+    doc.svgs
+  end
 end

data/lib/hershey/document.rb

@@ -4,7 +4,7 @@ module Hershey
     SIDE = 10.freeze
     HEIGHT_STRING = "jfdsklahfdjksjhaljfdskahj".freeze
 
-    def initialize(width: 500, height: 500, spacing: 3, vertical: 20, font: :futural)
+    def initialize(width: 1000, height: 1300, spacing: 3, vertical: 20, font: :futural, stroke: 1)
       @words = []
       @pages = []
       @width = width
@@ -14,13 +14,15 @@ module Hershey
       @vertical = vertical
       @closed = false
       @font = font
-      @svg = <<-HEADER
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="#{@width}" height="#{HEIGHT_STRING}" version="1.1"
-  xmlns="http://www.w3.org/2000/svg">
-      HEADER
+      @stroke = stroke
+    end
+
+    def [](page)
+      @pages[page].svg
+    end
+
+    def length
+      @pages.length
     end
 
     def <<(text)
@@ -45,41 +47,30 @@ module Hershey
 
     def svg
       write_out unless @closed
-      @svg
+      self[0]
+    end
+
+    def svgs
+      write_out unless @closed
+      @pages.map {|page| page.svg}
     end
 
     private
 
     def write_out
-      # new_page
-      space = Character.new(' ').spacing
-      current_offset = SIDE
-      @svg << %Q{<g transform="translate(#{SIDE},#{@line})">}
+      new_page
       @words.each do |word|
-        if word.is_a?(Word)
-          if word.spacing + current_offset > @width
-            @line += BUFFER * 2
-            current_offset = SIDE
-            @svg << %Q{</g><g transform="translate(#{SIDE},#{@line})">}
-          end
-          @svg << word.to_path(current_offset)
-          current_offset += word.spacing
-        elsif word == :space
-          current_offset += space
-        elsif word == :break
-          @line += BUFFER * 2
-          current_offset = SIDE
-          @svg << %Q{</g><g transform="translate(#{SIDE},#{@line})">}
+        begin
+          @pages.last.write(word)
+        rescue PageFullError => e
+          new_page
+          retry
         end
       end
-      @svg << "</g></svg>"
-      @svg.gsub!(HEIGHT_STRING, (@line + BUFFER).to_s)
-      @closed = true
     end
 
     def new_page
-      @pages << Page.new(width: @width, height: @height)
-      @line = BUFFER
+      @pages << Page.new(width: @width, height: @height, stroke: @stroke)
     end
   end
 end

data/lib/hershey/page.rb

@@ -1,22 +1,66 @@
 module Hershey
   class Page
-    def initialize(width: 400, heigth: 400)
-      @text = "<g>"
+    SPACE = Character.new(' ').spacing.freeze
+    BUFFER = 20.freeze
+    SIDE = 10.freeze
+    HEIGHT_STRING = "jfdsklahfdjksjhaljfdskahj".freeze
+
+    def initialize(width: 1000, height: 1300, stroke: 1)
       @close = false
+      @height = height
+      @width = width
+      @current_offset = SIDE
+      @line = BUFFER
+      @svg = <<-HEADER
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="#{@width}" height="#{HEIGHT_STRING}" version="1.1"
+  xmlns="http://www.w3.org/2000/svg" style="stroke-width:#{stroke};">
+      HEADER
+      @svg << %Q{<g transform="translate(#{SIDE},#{@line})">}
     end
 
     def <<(word)
-
+      if word.is_a?(Word)
+        if word.spacing + @current_offset > @width
+          new_line
+        end
+        @svg << word.to_path(@current_offset)
+        @current_offset += word.spacing
+      elsif word == :space
+        @current_offset += SPACE
+      elsif word == :break
+        new_line
+      end
     end
     alias_method :write, :<<
 
     def write_out
       close
-      @text
+      @svg
+    end
+    alias_method :svg, :write_out
+
+    private
+
+    def new_line
+      @line += BUFFER * 2
+      if @line > @height
+        @line -= BUFFER
+        raise PageFullError, "The page is full"
+      else
+        @current_offset = SIDE
+        @svg << %Q{</g><g transform="translate(#{SIDE},#{@line})">}
+      end
     end
 
     def close
-      @text << "</g>" unless @close
+      unless @close
+        @svg << "</g></svg>"
+        @svg.gsub!(HEIGHT_STRING, (@line + BUFFER).to_s)
+        @close = true
+      end
     end
   end
 

data/lib/hershey/version.rb

@@ -1,3 +1,3 @@
 module Hershey
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/ex.svg

@@ -2,5 +2,5 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg width="500" height="40" version="1.1"
-  xmlns="http://www.w3.org/2000/svg">
+  xmlns="http://www.w3.org/2000/svg" style="stroke-width:1;">
 <g transform="translate(10,20)"><g transform="translate(10,0)"><path stroke="black" fill="none" d="M0 -12 L0 9" transform="translate(4,0)"></path><path stroke="black" fill="none" d="M0 -12 L0 5 L1 8 L3 9 L5 9 M-3 -5 L4 -5" transform="translate(13,0)"></path><path stroke="black" fill="none" d="M0 -10 L-1 -11 L0 -12 L1 -11 L1 -9 L0 -7 L-1 -6" transform="translate(25,0)"></path><path stroke="black" fill="none" d="M6 -2 L5 -4 L2 -5 L-1 -5 L-4 -4 L-5 -2 L-4 0 L-2 1 L3 2 L5 3 L6 5 L6 6 L5 8 L2 9 L-1 9 L-4 8 L-5 6" transform="translate(38,0)"></path></g><g transform="translate(73,0)"><path stroke="black" fill="none" d="M6 -5 L6 9 M6 -2 L4 -4 L2 -5 L-1 -5 L-3 -4 L-5 -2 L-6 1 L-6 3 L-5 6 L-3 8 L-1 9 L2 9 L4 8 L6 6" transform="translate(9,0)"></path><path stroke="black" fill="none" d="M0 -12 L0 9" transform="translate(23,0)"></path><path stroke="black" fill="none" d="M0 -12 L0 9" transform="translate(31,0)"></path></g><g transform="translate(124,0)"><path stroke="black" fill="none" d="M-2 -12 L-4 -11 L-6 -9 L-7 -7 L-8 -4 L-8 1 L-7 4 L-6 6 L-4 8 L-2 9 L2 9 L4 8 L6 6 L7 4 L8 1 L8 -4 L7 -7 L6 -9 L4 -11 L2 -12 L-2 -12" transform="translate(11,0)"></path><path stroke="black" fill="none" d="M-7 -12 L-7 9 M7 -12 L-7 2 M-2 -3 L7 9" transform="translate(33,0)"></path><path stroke="black" fill="none" d="M0 -12 L-8 9 M0 -12 L8 9 M-5 2 L5 2" transform="translate(52,0)"></path><path stroke="black" fill="none" d="M-8 -12 L0 -2 L0 9 M8 -12 L0 -2" transform="translate(70,0)"></path><path stroke="black" fill="none" d="M0 -12 L0 2 M0 7 L-1 8 L0 9 L1 8 L0 7" transform="translate(84,0)"></path></g></g></svg>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hershey
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Winston Durand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-31 00:00:00.000000000 Z
+date: 2015-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler