monocle-print 1.0.2 → 1.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTJhOTg2ZGRkZTUzMDYxOTAxMmNhMWI2ZTJjM2ViM2E0NTk4YzBmMQ==
+    MGVhMTAyZWIyYjRmMzdlMjJlNzkzNDM5MjdmYzExOWYxODA5YjFlMg==
   data.tar.gz: !binary |-
-    NmMyYWJmNzEyZDc1ZWZlODE5NDgwY2RiNjI1NDAzYjdjYzdhNWY1OA==
+    OWFiZWYxNzUzYjgwZmFhZDU0OWI2ZDIyMzRmMDU4MWQ5MzgzMTFjNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDE0ZDQwOTk5MTk1ZDVkYjM5NjJjZjg3OGFmZWVlMmRhMTFkOTcxMWNkNDgz
-    ODExMTQ5ODFmMzkxZTgxMTNlYmExODUzY2M1MWZlODE4MTlmNWY2NTViYzY5
-    ZmM3ZjZjNGZiZTU3YzI4ZmYwNTQzNDc0ODEwNGQ2ZDE5OTkyZjE=
+    ZjAyNzQzNDAxMmVhMTYxYmVmZjgwNzlkYmI2ZWU4OWZiMzE4MjQ3NjQ1YjIz
+    ZTkxNDYyY2MzYjA0MDlkMDc4OGQ5ZjFhMjNjMjFkMTVmZWQxNjgxYzllNTRm
+    MjQwNTQ1NTJjYzc4NDkxNWZlZWE2ZDFhNTg1ZTkzNGQyOTVlM2Q=
   data.tar.gz: !binary |-
-    MGUyN2Q0NzkyN2I5ZWY0NjUzNzE2NWRlNDc3MTg4NGE2NDRiMDZjMjAzZDlm
-    YWZjM2Q2YzkyNWMzNWJiZDcyZmNjYzUyNTliMmJlY2U0ZmFiNzRjNDUwNjNk
-    YzRlNmJmMWQ0MGE5MjQ0NjM0ODk3MjRjODg0MzQ2ZWNkNzFmOGI=
+    MjIzZDUyODIzNGU1Yzc0ODc5ODkwMzQ4NTJlMjNjMmZmNGFiNTc3ZTdlMDE2
+    ZGUxM2QwZDllZTFlNDFjMDk2NTExZTQzNzY4OTUyZWRmOTdiMDhjMDRhYjBl
+    MTc5YmY3ZDA5NGFiMTEwMjMzMjRlYTA0ZmE3ZjFjMjdmMDhmODg=

data/lib/monocle-print.rb

@@ -7,8 +7,11 @@ rescue LoadError
   # ignore
 end
 
+require 'delegate'
+autoload :StringIO, 'stringio' unless defined?( StringIO )
+
 module MonoclePrint
-  VERSION = '1.0.2'
+  VERSION = '1.0.4'
 
   def self.version
     VERSION
@@ -54,7 +57,7 @@ module_function
   end
 
   def Style( obj )
-    Graphics === obj ? obj : Graphics::NAMED_STYLES[ obj.to_s ]
+    Graphics === obj ? obj : Graphics.style( obj )
   end
 
   def Rectangle( obj )

data/lib/monocle-print/graphics.rb

@@ -1,56 +1,36 @@
 #!/usr/bin/ruby
 # encoding: utf-8
 
+require 'monocle-print/graphics/registry'
 
 module MonoclePrint
-Graphics = Struct.new(
-  :ew,  # west east - horizontal line
-  :ns,  # north south - vertical line
-  :es,  # north west - top right corner
-  :sw,  # north east
-  :nw,  # south east
-  :en,  # south west
-  :ens, # north south east
-  :nsw, # north south west
-  :enw, # east north west
-  :esw, # east south west
-  :ensw, # east north south west - intersection of horiz & vertical lines
-  :tree_fork,
-  :tree_tail,
-  :blank
-)
+Graphics =
+  Struct.new(
+    :ew,  # west east - horizontal line
+    :ns,  # north south - vertical line
+    :es,  # north west - top right corner
+    :sw,  # north east
+    :nw,  # south east
+    :en,  # south west
+    :ens, # north south east
+    :nsw, # north south west
+    :enw, # east north west
+    :esw, # east south west
+    :ensw, # east north south west - intersection of horiz & vertical lines
+    :tree_fork,
+    :tree_tail,
+    :blank
+  )
 
 class Graphics
   include MonoclePrint
-  NAMED_STYLES = Hash.new { |h, k| h[ DEFAULT_STYLE ].dup  }
-  
-  def self.styles
-    NAMED_STYLES.keys
-  end
-  
-  def self.define( name, *parts )
-    parts.map! { | p | Line( p ).freeze }
-    NAMED_STYLES[ name.to_s ] = new( *parts ).freeze
-  end
-  
+  extend GraphicsRegistry
+
   define :blank, '', '', '', '', '', '', '', '', '', '', '', '', ''
   define :ascii, '-', '|', '+', '+', '+', '+', '+', '+', '+', '+', '+', '|', '`'
   define :single_line, '─', '│', '┌', '┐', '┘', '└', '├', '┤', '┴', '┬', '┼', '├', '└'
   define :double_line, '═', '║', '╔', '╗', '╝', '╚', '╠', '╣', '╩', '╦', '╬', '╠', '╚'
-  
-  default_style = ENV.fetch( 'MONOCLE_PRINT_STYLE', 'ascii' )
-  unless styles.include?( default_style )
-    message = <<-END.gsub!( /^\s*\| ?/, '' ).strip!.gsub!( /\s+/, ' ' )
-    | cannot set MonoclePrint's default graphics style
-    | from the MONOCLE_PRINT_STYLE environment variable as `%p'
-    | is not a known style; defaulting to `ascii'
-    END
-    warn( message % default_style )
-    default_style = 'ascii'
-  end
-  
-  DEFAULT_STYLE = default_style
-  
+
   def format( description )
     out = Line( description )
     out.gsub!( /<([nsewlrtbudhv]+)(?::(\d+))?>/i ) do
@@ -59,41 +39,40 @@ class Graphics
     end
     return( out )
   end
-  
+
   def horizontal_line( width )
     ew.tile( width )
   end
-  
+
   def box_top( width )
     format( "<se><ew:#{ width }><sw>" )
   end
-  
+
   def box_bottom( width )
     format( "<ne><ew:#{ width }><nw>" )
   end
-  
+
   def table_top( *column_widths )
     nw + line_with_joints( esw, column_widths ) + ne
   end
-  
+
   def table_divide( *column_widths )
     ens + line_with_joints( ensw, column_widths ) + nsw
   end
-  
+
   def table_bottom( *column_widths )
     sw + line_with_joints( enw, column_widths ) + se
   end
-  
+
   def line_with_joints( joint, *widths )
     widths.map { | w | horizontal_line( w ) }.join( joint )
   end
-  
+
   alias h ew
   alias v ns
-  
-  
-private
-  
+
+  private
+
   def resolve_name( name )
     name.downcase!
     name.tr!( 'lrtbud', 'wensns' )
@@ -103,9 +82,5 @@ private
     chars.uniq!
     self[ chars.join('') ]
   end
-  
-  
-  
 end
-
 end

data/lib/monocle-print/output-device.rb

@@ -1,8 +1,6 @@
 #!/usr/bin/ruby
 # encoding: utf-8
 
-require 'delegate'
-autoload :StringIO, 'stringio' unless defined?( StringIO )
 
 module MonoclePrint
 class OutputDevice < DelegateClass( IO )
@@ -424,8 +422,8 @@ private
           detected_height, detected_width = size.height, size.width
         end
         Pair.new(
-          @forced_height || detected_height,
-          @forced_width  || detected_width
+          @forced_width  || detected_width,
+          @forced_height || detected_height
         )
       rescue Exception
         default_size

data/lib/monocle-print/presentation.rb

@@ -10,7 +10,7 @@ module Presentation
     super
     klass.extend( ClassMethods )
   end
-  
+
   attr_accessor :owner
   protected :owner=
 
@@ -41,7 +41,7 @@ module Presentation
 
   def style( value = nil )
     value and self.style = value
-    @style or @owner ? @owner.style : Graphics::NAMED_STYLES[ 'ascii' ]
+    @style or @owner ? @owner.style : Graphics.default
   end
 
   def style= value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: monocle-print
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - monocle-print