cheapredwine 0.2.0 → 0.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b0db300cc3cd1f51a506262396b30650345609de
+  data.tar.gz: d48412833b31a5bfbfceaca49fbdc39cd62e3d45
+SHA512:
+  metadata.gz: 8d1f414e15102ad639243999c88d0b4db26949225fc94512e916bb88750dc1e13f18d153498197faaf8cf7b383e51e22b550e1d503e932c893282afae6856258
+  data.tar.gz: 8814e6f52930c0dd488c612a77a952cd67b260fb1cf41bd1375c005caddbbf86aeecc628e2b053e889b8b2c2e3e5f7722efd645a2f93057b8b3ce26f24e4fe7e

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+
+before_script:
+  - echo 'yes' | sudo add-apt-repository ppa:olivier-berten/fonts
+  - sudo apt-get update
+  - sudo apt-get install libcairo
+  - sudo apt-get install harfbuzz

data/README.md

@@ -18,22 +18,25 @@ It assumes the following is installed and in the case where it applies, accessib
 
 * [cairo](http://www.cairographics.org/releases/)
 * [harfbuzz](http://www.freedesktop.org/software/harfbuzz/release/)
-* [ttx](https://github.com/mcolyer/fonttools)
 
 ## Usage
 
 #### Getting a font object from a simple ttf or otf file:
 
-    font = CheapRedWine.font(font_file)
+    font = CheapRedWine.new font_file
     font.name # => "Font Name"
+    font.family # => "Font Family"
+    font.style # => "Bold Italic"
     font.features # => ["liga", "onum", "dlig", … "salt"]
     
 #### Generating images with text for the font:
 
-    image = CheapRedWine.image(font, "some text", options)
-    
-**Caveat:** `image` is an IO object that can then be use to write to disk. `font` is any object that responds to `#features` and produces a list `["onum", "liga"]` as well as provide a font file object through `#file`. `file` need only know of it's full path to work properly.
+    image = font.image "some text", options
+    # ... do something with image ...
+    image.close
     
+**Caveat:** `image` is an IO object that can then be use to write to disk. You are responsible to close that object.
+   
 ##### Options
 
     options = {
@@ -43,18 +46,6 @@ It assumes the following is installed and in the case where it applies, accessib
       features: [liga, salt]	# list of otf features to be applied
     }
 
-##### Configuration
-
-CheapRedWine needs to know where to put ttx files
-
-    CheapRedWine::TTX.configure do |config|
-      config.output_folder = '/path/to/folder'
-    end
-    
-You can also change the output_folder dynamically through
-    
-    CheapRedWine.ttx_output_folder = "path/to/folder"
-
 ## Contributing
 
 1. Fork it
@@ -65,5 +56,4 @@ You can also change the output_folder dynamically through
 
 ## TODO
 
-1. Create a new utility using fontTools to have more granularity regarding ttx file outputs
-2. Replace hb-view by something more appropriate (C Extension).
+1. Replace hb-view by something more appropriate (C Extension).

data/lib/cheapredwine/image/params.rb

@@ -1,4 +1,4 @@
-module CheapRedWine
+class CheapRedWine
   module Image
     class Params
       attr_reader :font, :color, :text, :features, :size, :margin

data/lib/cheapredwine/image/writer.rb

@@ -1,4 +1,4 @@
-module CheapRedWine
+class CheapRedWine
   module Image
     class Writer 
       def initialize(image, utility = 'hb-view')

data/lib/cheapredwine/info.rb

@@ -1,6 +1,6 @@
 require 'tipo'
 
-module CheapRedWine
+class CheapRedWine
   class Info
     def initialize file
       @info = Tipo.info file

data/lib/cheapredwine/version.rb

@@ -1,3 +1,3 @@
-module CheapRedWine
-  VERSION = "0.2.0"
+class CheapRedWine
+  VERSION = "0.3.1"
 end

data/lib/cheapredwine.rb

@@ -2,56 +2,54 @@ require "cheapredwine/version"
 require "cheapredwine/info"
 require "cheapredwine/image"
 
-
-module CheapRedWine
-  class Meta 
-    attr_accessor :name, :family, :features, :path, :style
-
-    def initialize
-      yield(self) if block_given?
-    end
-
-    def file
-      File.new(path)
+class CheapRedWine
+  extend Forwardable
+  attr_accessor :font
+  def_delegators :@font, :file, :name, :family, :style, :features
+
+  def initialize(file)
+    info = Info.new file
+    @font = Font.new do |font|
+      font.name = info.font_name
+      font.family = info.family_name
+      font.features = info.features
+      font.style = info.style
+      font.path = file
+      font
     end
   end
 
-  def self.meta(file)
-    parser = Info.new file
-    Meta.new do |meta|
-      meta.name = parser.font_name
-      meta.family = parser.family_name
-      meta.features = parser.features
-      meta.style = parser.style
-      meta.path = file
-    end
-  end
-
-  def self.image(font, text, options = {})
+  def image(text, options = {})
     features = merge_features(font.features, options.fetch(:features) { [] })
-    options.merge!({ 
+    
+    params = options.merge({ 
       features: features,
       font: font.file,
       text: text
     })
-    params = Image::Params.new(options)
-    Image::Writer.new(params).exec
-  end
 
-  def self.ttx_output_folder=(folder)
-    CheapRedWine::TTX.configuration.output_folder = folder
-  end
-
-  def self.ttx_output_folder
-    CheapRedWine::TTX.configuration.output_folder
+    params = Image::Params.new(params)
+    Image::Writer.new(params).exec
   end
 
   private
 
-  def self.merge_features(all_features, selected_features)
+  def merge_features(all_features, selected_features)
     all_features.map do |feature|
       prefix = selected_features.include?(feature) ? '+' : '-'
       prefix + feature
     end
   end
+
+  class Font
+    attr_accessor :name, :family, :features, :path, :style
+
+    def initialize
+      yield(self) if block_given?
+    end
+
+    def file
+      File.new(path)
+    end
+  end
 end

data/spec/cheapredwine_spec.rb

@@ -3,16 +3,16 @@ require 'tempfile'
 
 describe CheapRedWine do
   let(:file) { File.new('spec/fixtures/hobo.otf') }
-  let(:meta) { CheapRedWine.meta(file) }
+  let(:wine) { CheapRedWine.new(file) }
 
   it "gets meta information from a font file" do
-    meta.name.should eq "Hobo Std Medium"
-    meta.file.path.should match file.path
+    wine.name.should eq "Hobo Std Medium"
+    wine.file.path.should match file.path
   end
 
   it "can create images from text" do
     options = { size: 26, features: ['liga', 'frac'] }
-    image = CheapRedWine.image(meta, 'ffi 1/2', options)
+    image = wine.image 'ffi 1/2', options
     tempfile = Tempfile.new('image')
     tempfile.write(image.read)
     tempfile.close

data/spec/image/params_spec.rb

@@ -1,13 +1,11 @@
 require 'cheapredwine/image/params'
 
-include CheapRedWine::Image 
-
-describe Params do
+describe CheapRedWine::Image::Params do
   it "takes a bunch of options" do
     font = double
     features = ['kern', 'aalt', 'onum', 'liga']
 
-    params = Params.new(
+    params = CheapRedWine::Image::Params.new(
       font: font,
       color: 'black',
       features: features, 

data/spec/image/writer_spec.rb

@@ -1,21 +1,19 @@
 require 'cheapredwine/image/writer'
 require 'cheapredwine/image/params'
 
-include CheapRedWine::Image
-
-describe Writer do
+describe CheapRedWine::Image::Writer do
   let(:font) { double("font", path: "spec/fixtures/lato-regular.ttf") }
-  let(:image) { Params.new(font: font, text: "Lorem ipsum") } 
+  let(:image) { CheapRedWine::Image::Params.new(font: font, text: "Lorem ipsum") } 
 
   it "builds a command from a Params object" do
-    writer = Writer.new(image)
+    writer = CheapRedWine::Image::Writer.new(image)
     writer.args[0].should eq "--font-file=spec/fixtures/lato-regular.ttf"
   end
 
   it "generates a image of given text" do
     file = File.new('spec/fixtures/test.png')
 
-    writer = Writer.new(image)
+    writer = CheapRedWine::Image::Writer.new(image)
     tempfile = writer.exec
     FileUtils.compare_file(tempfile, file)
   end

data/spec/info_spec.rb

@@ -1,11 +1,9 @@
 require 'cheapredwine/info'
 
-include CheapRedWine
-
-describe Info do
+describe CheapRedWine::Info do
   it "get info out of an otf or ttf font file" do
     font = 'spec/fixtures/hobo.otf'
-    info = Info.new font
+    info = CheapRedWine::Info.new font
     info.font_name.should eq "Hobo Std Medium"
     info.family_name.should eq "Hobo Std"
     info.style.should eq "Regular"

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: cheapredwine
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.1
 platform: ruby
 authors:
 - Hugo Bastien
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tipo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: I needed a way to test fonts on the web. I based this library on myfonts.com.
@@ -70,6 +63,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -94,27 +88,26 @@ files:
 - spec/info_spec.rb
 homepage: https://github.com/hugobast/cheapredwine
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: I needed a way to test fonts on the web. I based this library on myfonts.com.
   CheapRedWine makes use to Harfbuzz' hb-view utility to generate images from fonts
   with a slew of different parameters. It also uses fontTools' ttx utility for font