label_definitions 1.0.0 → 1.0.1

data/labels.yml

@@ -18,7 +18,7 @@ Avery 5160:
   height: 25.4
   row_gutter: 0.0
   column_gutter: 3.175
-  page_size: Letter
+  page_size: LETTER
 Avery 5395:
   rows: 4
   columns: 2
@@ -26,7 +26,7 @@ Avery 5395:
   height: 59.267
   row_gutter: 4.0527
   column_gutter: 9.5
-  page_size: Letter
+  page_size: LETTER
 Avery 5418:
   rows: 9
   columns: 4

data/lib/label_definitions/label.rb

@@ -1,7 +1,6 @@
 module LabelDefinitions
   class Label
-    attr_reader :name, :rows, :columns, :width, :height, :row_gutter, :column_gutter,
-                :page_size, :page_width, :page_height
+    attr_reader :name, :rows, :columns, :width, :height, :row_gutter, :column_gutter
 
     def initialize(attributes = {})
       @name          = attributes.fetch(:name)
@@ -11,14 +10,35 @@ module LabelDefinitions
       @height        = attributes.fetch(:height).to_f
       @row_gutter    = attributes.fetch(:row_gutter).to_f
       @column_gutter = attributes.fetch(:column_gutter).to_f
-      if attributes.has_key? :page_size
-        @page_size   = attributes.fetch(:page_size)
-      else
-        @page_width  = attributes.fetch(:page_width).to_f
-        @page_height = attributes.fetch(:page_height).to_f
-      end
+      @page_width    = attributes.fetch(:page_width).to_f
+      @page_height   = attributes.fetch(:page_height).to_f
     end
 
+    def page
+      @page ||= Page.new page_width, page_height, page_top_margin, page_left_margin
+    end
+
+    private
+
+    def page_width
+      @page_width
+    end
+
+    def page_height
+      @page_height
+    end
 
+    def page_top_margin
+      ( page_height - (rows * height) - ((rows-1) * row_gutter) ) / 2
+    end
+
+    def page_left_margin
+      ( page_width - (columns * width) - ((columns-1) * column_gutter) ) / 2
+    end
+
+    class Page < Struct.new(:width, :height, :top_margin, :left_margin)
+      alias :bottom_margin :top_margin
+      alias :right_margin :left_margin
+    end
   end
 end

data/lib/label_definitions/page_size.rb

@@ -0,0 +1,10 @@
+module LabelDefinitions
+  module PageSize
+
+    SIZES = {
+          'A4' => [210, 297],
+      'LETTER' => [215.9, 279.4]
+    }
+
+  end
+end

data/lib/label_definitions/version.rb

@@ -1,3 +1,3 @@
 module LabelDefinitions
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/label_definitions.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'label_definitions/label'
+require 'label_definitions/page_size'
 require 'label_definitions/version'
 
 module LabelDefinitions
@@ -10,6 +11,7 @@ module LabelDefinitions
       load_definitions.each do |name, definition|
         symbolize_keys! definition
         name_and_aliases(name, definition).each do |n|
+          convert_page_size! definition
           labels << Label.new(definition.merge({name: n}))
         end
       end
@@ -28,6 +30,14 @@ module LabelDefinitions
 
   private
 
+  def self.convert_page_size!(definition)
+    if (size = definition.delete :page_size)
+      width, height = LabelDefinitions::PageSize::SIZES[size]
+      definition[:page_width]  = width
+      definition[:page_height] = height
+    end
+  end
+
   def self.name_and_aliases(name, definition)
     [name] + definition.fetch(:aliases, '').split(',').map(&:strip)
   end

data/test/label_definitions_test.rb

@@ -38,6 +38,12 @@ class LabelDefinitionsTest < TestCase
     assert_equal count, LabelDefinitions.all.length
   end
 
+  test 'converts page size to width and height' do
+    label = LabelDefinitions.find 'Avery 5395'
+    assert_equal 215.9, label.page.width
+    assert_equal 279.4, label.page.height
+  end
+
   private
 
   def example_label
@@ -48,7 +54,8 @@ class LabelDefinitionsTest < TestCase
                                 height: 42,
                                 row_gutter: 0,
                                 column_gutter: 0,
-                                page_size: 'A4'
+                                page_width: 210,
+                                page_height: 297
   end
 
 end

data/test/label_test.rb

@@ -3,22 +3,25 @@ require 'label_definitions/label'
 
 class LabelTest < TestCase
 
-  test 'requires page size or (page width and height)' do
-    assert_raises(KeyError) { LabelDefinitions::Label.new attributes }
-    assert LabelDefinitions::Label.new(attributes.merge(page_size: 'A4'))
-    assert LabelDefinitions::Label.new(attributes.merge(page_width: 42, page_height: 153))
+  test 'page' do
+    page = LabelDefinitions::Label.new(attributes.merge(page_width: 200, page_height: 300)).page
+    assert_equal 41.0, page.top_margin
+    assert_equal 41.0, page.bottom_margin
+
+    assert_equal 17.5, page.left_margin
+    assert_equal 17.5, page.right_margin
   end
 
   private
 
   def attributes
     { name: 'Some label',
-      rows: 3,
-      columns: 5,
-      width: 153,
+      rows: 5,
+      columns: 3,
+      width: 53,
       height: 42,
-      row_gutter: 0,
-      column_gutter: 0 }
+      row_gutter: 2,
+      column_gutter: 3 }
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: label_definitions
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,6 +75,7 @@ files:
 - labels.yml
 - lib/label_definitions.rb
 - lib/label_definitions/label.rb
+- lib/label_definitions/page_size.rb
 - lib/label_definitions/version.rb
 - test/helper.rb
 - test/label_definitions_test.rb
@@ -94,7 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3975846568932287638
+      hash: 4118092927290813753
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -103,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3975846568932287638
+      hash: 4118092927290813753
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23