hershey 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b66efface3022d72fefa4018088205dac320f54
-  data.tar.gz: 44954d2d7e45d07e1e336b308edf6f90e6964e46
+  metadata.gz: c9c688d14b0bd9107c74e8769d6768d34f636c71
+  data.tar.gz: 44f04e9cae8c79a34905e9625c404fbd80148d63
 SHA512:
-  metadata.gz: b956249989149548c9fcd40c1c04d56039484527766385489e0a90122f74372d2821d80d368b4d9c5e0f4f87c0d0caec48143c440cfe4b69e8b768457955fb9b
-  data.tar.gz: 400c6362d3ed6ae09c09237c9cb4225904123fd48303eb6af941bdf4a8ed88cbb83cef3d2ccb3eff7b5d3c8a46a9fd37e778167257e94cc6d2678fcd23a52cb5
+  metadata.gz: 8a34513f559fd08ccaede631da951339af6e4088e3d59caffca460fc6e69e4d391fab62b088b3bc55fa2aad252f1aba348bc149df1684794e244933176e071dd
+  data.tar.gz: 1e3b71b4557c0be9c62a65d24739e8934c025bb357df63a409fece7a22039ffd1840705cc74ffaa38b411a6d0e26eaedf04272187616ef5c19d879cf6cc27dac

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--order rand

data/Rakefile

@@ -1,2 +1,7 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
 
+RSpec::Core::RakeTask.new('spec')
+
+# If you want to make this the default task
+task :default => :spec

data/bin/hershey

@@ -3,7 +3,7 @@
 require 'hershey'
 
 file = ARGV.shift
-width = ARGV.shift
+width = ARGV.shift.to_i
 text = ARGV.join(' ')
 
 open(file, 'w') {|f| f.write(Hershey.svg(text, width: width))}

data/hershey.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", '~> 3.1.0'
+  spec.add_development_dependency "rspec", '~> 3.1'
 
   spec.required_ruby_version = '>= 2.0.0'
 end

data/lib/hershey/document.rb

@@ -24,9 +24,21 @@ module Hershey
     end
 
     def <<(text)
-      text.split(' ').each do |word|
-        @words << Word.new(word, font: @font)
+      word = ""
+      text.each_char do |c|
+        if c == " "
+          @words << :space
+          @words << Word.new(word, font: @font)
+          word = ''
+        elsif c == "\n"
+          @words << :break
+          @words << Word.new(word, font: @font)
+          word = ''
+        else
+          word << c
+        end
       end
+      @words << Word.new(word, font: @font) unless word == ''
     end
 
     alias_method :write, :<<
@@ -44,13 +56,21 @@ module Hershey
       current_offset = SIDE
       @svg << %Q{<g transform="translate(#{SIDE},#{@line})">}
       @words.each do |word|
-        if word.spacing + current_offset > @width
+        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})">}
         end
-        @svg << word.to_path(current_offset)
-        current_offset += word.spacing + space
       end
       @svg << "</g></svg>"
       @svg.gsub!(HEIGHT_STRING, (@line + BUFFER).to_s)

data/lib/hershey/version.rb

@@ -1,3 +1,3 @@
 module Hershey
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/spec/character_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Hershey::Character do
+  let (:a) {Hershey::Character.new('a', font: :futural)}
+
+  describe "path" do
+    it "should be predictable" do
+      a.to_path(0).should == "<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>"
+    end
+  end
+end

data/spec/document_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe Hershey::Document do
+  it "should produce same output" do
+    Hershey.svg("It's all OKAY!", font: :futural, width: 500).should == File.read("spec/ex.svg")
+  end
+end

data/spec/ex.svg

@@ -0,0 +1,6 @@
+<?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="500" height="40" version="1.1"
+  xmlns="http://www.w3.org/2000/svg">
+<g transform="translate(10,20)"><g transform="translate(26,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(89,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>

data/spec/font_spec.rb

@@ -0,0 +1,9 @@
+describe Hershey::FONTS do
+  it "should have all the keys" do
+    Hershey::FONTS.keys.sort.should == [:astrology, :cursive, :cyrillic,
+      :futural, :futuram, :gothiceng, :gothicger, :gothicita, :greek,
+      :japanese, :markers, :mathlow, :mathupp, :meteorology, :music, :scriptc,
+      :scripts, :symbolic, :timesg, :timesi, :timesib, :timesr, :timesrb
+    ]
+  end
+end

data/spec/hershey_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe Hershey do
+  it "should create the same output as a normal call" do
+    doc = Hershey::Document.new
+    doc.write("hi")
+    Hershey.svg("hi").should == doc.svg
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,10 @@
+require 'bundler/setup'
+Bundler.setup
+
+require 'hershey' # and any other gems you need
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = :should
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hershey
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Winston Durand
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
 description: 
 email:
 - me@winstondurand.com
@@ -61,6 +61,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -74,6 +75,12 @@ files:
 - lib/hershey/page.rb
 - lib/hershey/version.rb
 - lib/hershey/word.rb
+- spec/character_spec.rb
+- spec/document_spec.rb
+- spec/ex.svg
+- spec/font_spec.rb
+- spec/hershey_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/R167/hershey
 licenses:
 - MIT
@@ -98,4 +105,10 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Generates an SVG with text using the Hershey Vector Font
-test_files: []
+test_files:
+- spec/character_spec.rb
+- spec/document_spec.rb
+- spec/ex.svg
+- spec/font_spec.rb
+- spec/hershey_spec.rb
+- spec/spec_helper.rb