pt_papersize 0.0.2 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c94227eceeebfb6fbdc106dc4b874ec8e0a41ce
-  data.tar.gz: 424f3133e6c0a730b8561f2be277786d3f143df7
+  metadata.gz: ad68ee4834a02400b9a43d814d91d8592b7883d1
+  data.tar.gz: c23153b8d1b63c549739338529387d5460b63066
 SHA512:
-  metadata.gz: e84e080fc01076b4799b296c15c24d372ddab7e34143bde92727cbf16f6bf3fcc0ab940b090846c4ced480148c22c36318d0c956bb80ce4f0527937526a5a95d
-  data.tar.gz: 4eb3ed1ee2a599d60105645c43123b214ca0a2c8a390abfa19a695311179e8aa20f5be7c38711f68f4a2d464cd62042d448ff9f56e60d9fef96d886476e96bb5
+  metadata.gz: 06d220e7e0e2e78ebcb692ab59b12f0d4cbfd0cdfaef2bfadeb35e31d39ca086407dbdf194cc7d88cb4c135b9139abc600954759ded386d599a721ff02bb6ca5
+  data.tar.gz: 7fcb4c07fd686f8e7c249807940b91d87332da311573c2e51664c0329685ad829203b0118961a0f916348dba9579e70ee2111ee5072df037f585d39877cff414

data/lib/pt/papersize.rb

@@ -3,31 +3,27 @@ require 'pt/papersize/paper_sizes'
 
 module PT
   class PaperSize
-    def initialize(width, height)
-      @width = width
-      @height = height
-    end
-
-    def name
-      short_edge_pt = [@width,@height].min
-      long_edge_pt = [@width,@height].max
-
-      short_edge_mm = (short_edge_pt.to_f / 72.0) * 25.4
-      long_edge_mm = (long_edge_pt.to_f / 72.0) * 25.4
+    def self.find(width, height, units = :pt)
+      short_edge = [width, height].min
+      long_edge = [width, height].max
 
-      short_edge_floor = short_edge_mm.floor
-      short_edge_ceil = short_edge_mm.ceil
-
-      long_edge_floor = long_edge_mm.floor
-      long_edge_ceil = long_edge_mm.ceil
+      case units
+      when :pt, :point, :points
+        short_edge_mm = ((short_edge.to_f / 72.0) * 25.4).round
+        long_edge_mm = ((long_edge.to_f / 72.0) * 25.4).round
+      when :mm, :millimetre, :millimetres
+        short_edge_mm = short_edge
+        long_edge_mm = long_edge
+      when :inch, :inches
+        short_edge_mm = (short_edge.to_f * 25.4).round
+        long_edge_mm = (long_edge.to_f * 25.4).round
+      end
 
       available_sizes = PT::PaperSize::PAPER_SIZES.select do |entry|
-        paper_short = [entry[:width], entry[:height]].min
-        paper_long = [entry[:width], entry[:height]].max
-        (paper_short == short_edge_floor || paper_short == short_edge_ceil) && (paper_long == long_edge_floor || paper_long == long_edge_ceil)
+        (short_edge_mm == entry[:width]) && (long_edge_mm == entry[:height])
       end
 
-      available_sizes.length > 0 ? available_sizes.first[:name] : 'Custom'
+      available_sizes.length > 0 ? available_sizes.first : { name: 'Custom', width: short_edge_mm, height: long_edge_mm, units: :mm}
     end
   end
 end

data/lib/pt/papersize/paper_sizes.rb

@@ -1,41 +1,61 @@
 module PT
   class PaperSize
     PAPER_SIZES = [
-      { name: 'A0', standard: 'ISO', width: 841, height: 1189 },
-      { name: 'A1', standard: 'ISO', width: 594, height: 841 },
-      { name: 'A2', standard: 'ISO', width: 420, height: 594 },
-      { name: 'A3', standard: 'ISO', width: 297, height: 420 },
-      { name: 'A4', standard: 'ISO', width: 210, height: 297 },
-      { name: 'A5', standard: 'ISO', width: 148, height: 210 },
-      { name: 'A6', standard: 'ISO', width: 105, height: 148 },
-      { name: 'A7', standard: 'ISO', width: 74, height: 105 },
-      { name: 'A8', standard: 'ISO', width: 52, height: 74 },
-      { name: 'A9', standard: 'ISO', width: 37, height: 52 },
-      { name: 'A10', standard: 'ISO', width: 26, height: 37 },
+      # ISO paper sizes
+      { name: 'A0', standard: 'ISO216', width: 841, height: 1189 },
+      { name: 'A1', standard: 'ISO216', width: 594, height: 841 },
+      { name: 'A2', standard: 'ISO216', width: 420, height: 594 },
+      { name: 'A3', standard: 'ISO216', width: 297, height: 420 },
+      { name: 'A4', standard: 'ISO216', width: 210, height: 297 },
+      { name: 'A5', standard: 'ISO216', width: 148, height: 210 },
+      { name: 'A6', standard: 'ISO216', width: 105, height: 148 },
+      { name: 'A7', standard: 'ISO216', width: 74, height: 105 },
+      { name: 'A8', standard: 'ISO216', width: 52, height: 74 },
+      { name: 'A9', standard: 'ISO216', width: 37, height: 52 },
+      { name: 'A10', standard: 'ISO216', width: 26, height: 37 },
 
-      { name: 'B0', standard: 'ISO', width: 1000, height: 1414 },
-      { name: 'B1', standard: 'ISO', width: 707, height: 1000 },
-      { name: 'B2', standard: 'ISO', width: 500, height: 707 },
-      { name: 'B3', standard: 'ISO', width: 353, height: 500 },
-      { name: 'B4', standard: 'ISO', width: 250, height: 353 },
-      { name: 'B5', standard: 'ISO', width: 176, height: 250 },
-      { name: 'B6', standard: 'ISO', width: 125, height: 176 },
-      { name: 'B7', standard: 'ISO', width: 88, height: 125 },
-      { name: 'B8', standard: 'ISO', width: 62, height: 88 },
-      { name: 'B9', standard: 'ISO', width: 44, height: 62 },
-      { name: 'B10', standard: 'ISO', width: 31, height: 44 },
+      { name: 'B0', standard: 'ISO216', width: 1000, height: 1414 },
+      { name: 'B1', standard: 'ISO216', width: 707, height: 1000 },
+      { name: 'B2', standard: 'ISO216', width: 500, height: 707 },
+      { name: 'B3', standard: 'ISO216', width: 353, height: 500 },
+      { name: 'B4', standard: 'ISO216', width: 250, height: 353 },
+      { name: 'B5', standard: 'ISO216', width: 176, height: 250 },
+      { name: 'B6', standard: 'ISO216', width: 125, height: 176 },
+      { name: 'B7', standard: 'ISO216', width: 88, height: 125 },
+      { name: 'B8', standard: 'ISO216', width: 62, height: 88 },
+      { name: 'B9', standard: 'ISO216', width: 44, height: 62 },
+      { name: 'B10', standard: 'ISO216', width: 31, height: 44 },
 
-      { name: 'C0', standard: 'ISO', width: 917, height: 1297 },
-      { name: 'C1', standard: 'ISO', width: 648, height: 917 },
-      { name: 'C2', standard: 'ISO', width: 458, height: 648 },
-      { name: 'C3', standard: 'ISO', width: 324, height: 458 },
-      { name: 'C4', standard: 'ISO', width: 229, height: 324 },
-      { name: 'C5', standard: 'ISO', width: 162, height: 229 },
-      { name: 'C6', standard: 'ISO', width: 114, height: 162 },
-      { name: 'C7', standard: 'ISO', width: 81, height: 114 },
-      { name: 'C8', standard: 'ISO', width: 57, height: 81 },
-      { name: 'C9', standard: 'ISO', width: 40, height: 57 },
-      { name: 'C10', standard: 'ISO', width: 28, height: 40 },
+      { name: 'C0', standard: 'ISO216', width: 917, height: 1297 },
+      { name: 'C1', standard: 'ISO216', width: 648, height: 917 },
+      { name: 'C2', standard: 'ISO216', width: 458, height: 648 },
+      { name: 'C3', standard: 'ISO216', width: 324, height: 458 },
+      { name: 'C4', standard: 'ISO216', width: 229, height: 324 },
+      { name: 'C5', standard: 'ISO216', width: 162, height: 229 },
+      { name: 'C6', standard: 'ISO216', width: 114, height: 162 },
+      { name: 'C7', standard: 'ISO216', width: 81, height: 114 },
+      { name: 'C8', standard: 'ISO216', width: 57, height: 81 },
+      { name: 'C9', standard: 'ISO216', width: 40, height: 57 },
+      { name: 'C10', standard: 'ISO216', width: 28, height: 40 },
+
+      # Other metric sizes
+      { name: 'DL', width: 99, height: 210 },
+      { name: 'DLE', width: 110, height: 220 },
+      { name: 'F4', width: 210, height: 330 },
+      { name: 'RA0', width: 841, height: 1189 },
+      { name: 'RA1', width: 610, height: 860 },
+      { name: 'RA2', width: 430, height: 610 },
+      { name: 'RA3', width: 305, height: 430 },
+      { name: 'RA4', width: 215, height: 305 },
+      { name: 'SRA0', width: 900, height: 1280 },
+      { name: 'SRA1', width: 640, height: 900 },
+      { name: 'SRA2', width: 450, height: 640 },
+      { name: 'SRA3', width: 320, height: 450 },
+      { name: 'SRA4', width: 225, height: 320 },
+      { name: 'A3+', width: 29, height: 483 },
     ]
   end
 end
+
+
+

data/lib/pt/papersize/version.rb

@@ -1,5 +1,5 @@
 module PT
   class PaperSize
-    VERSION = "0.0.2"
+    VERSION = "0.1.1"
   end
 end

data/spec/pt_papersize_spec.rb

@@ -1,13 +1,18 @@
 require 'pt/papersize'
 
 describe PT::PaperSize do
-  it "names ISO A4" do
-    pt_papersize = PT::PaperSize.new(842,595)
-    pt_papersize.name.should eq('A4')
+  it "names ISO A4 from PostScript points" do
+    PT::PaperSize.find(595,842,:pt)[:name].should eq('A4')
+    PT::PaperSize.find(842,595,:pt)[:name].should eq('A4')
+  end
+
+  it "names SRA3 from various units" do
+    PT::PaperSize.find(320,450,:mm)[:name].should eq('SRA3')
+    PT::PaperSize.find(907,1276,:pt)[:name].should eq('SRA3')
+    PT::PaperSize.find(12.6,17.7,:inch)[:name].should eq('SRA3')
   end
 
   it "names random size as Custom" do
-    pt_papersize = PT::PaperSize.new(120,20)
-    pt_papersize.name.should eq('Custom')
+    PT::PaperSize.find(120,20,:mm)[:name].should eq('Custom')
   end
 end

data/spec/spec_helper.rb

@@ -0,0 +1,3 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'pt/papersize'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pt_papersize
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.1
 platform: ruby
 authors:
 - Paul Chilton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-16 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,6 +69,7 @@ files:
 - lib/pt/papersize/version.rb
 - pt_papersize.gemspec
 - spec/pt_papersize_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/pchilton/pt_papersize
 licenses:
 - MIT
@@ -95,3 +96,4 @@ specification_version: 4
 summary: Identify standard page sizes from PostScript point sizes
 test_files:
 - spec/pt_papersize_spec.rb
+- spec/spec_helper.rb