labels 0.0.6 → 0.0.7

data/dtd/label.dtd

@@ -1,27 +1,28 @@
 <!ELEMENT label (paper,template,layers,data)>
 
-<!ATTLIST paper title CDATA #IMPLIED>
+<!ATTLIST paper title CDATA #REQUIRED>
 <!ELEMENT paper (width,height)>
 
-<!ATTLIST template title CDATA #IMPLIED>
-<!ATTLIST template description CDATA #IMPLIED>
-<!ATTLIST template manufacturer CDATA #IMPLIED>
-<!ATTLIST template category CDATA #IMPLIED>
+<!ATTLIST template title CDATA #REQUIRED>
+<!ATTLIST template description CDATA #REQUIRED>
+<!ATTLIST template manufacturer CDATA #REQUIRED>
+<!ATTLIST template category CDATA #REQUIRED>
 <!ATTLIST template visible (false|true) #REQUIRED>
 <!ELEMENT template (width,height,columns,rows,left-margin,right-margin,top-margin,bottom-margin,horizontal-gutter,vertical-gutter,elliptical,corner-radius)>
 
 <!ELEMENT layers (layer+)>
 
-<!ATTLIST layer title CDATA #IMPLIED>
+<!ATTLIST layer title CDATA #REQUIRED>
 <!ATTLIST layer type CDATA #REQUIRED>
-<!ATTLIST layer column CDATA #IMPLIED>
+<!ATTLIST layer column CDATA #REQUIRED>
 <!ATTLIST layer locked (false|true) #REQUIRED>
 <!ATTLIST layer visible (false|true) #REQUIRED>
 <!ELEMENT layer (x,y,width,height,alpha,rotation,content,corner-radius?,elliptical?,fill?,stroke?,fill-color?,stroke-color?,stroke-weight?,font-family?,font-size?,font-color?,bold?,italic?,justification?,fit?,stretch?,symbology?,bar-width?,bar-height?,color?,caption-height?,caption-size?,captioned?,format?)>
 
-<!ELEMENT data (item+)>
+<!ATTLIST database title CDATA #REQUIRED>
+<!ELEMENT database (row+)>
 
-<!ELEMENT item (key+)>
+<!ELEMENT row (key+)>
 
 <!ATTLIST key name CDATA #REQUIRED>
 <!ATTLIST key type (string|integer|float|boolean|date) #REQUIRED>

data/example/label.xml

@@ -151,18 +151,18 @@
   </layers>
   
   <!-- Data -->
-  <data>
+  <database title="DB">
     
-    <!-- Item -->
-    <item>
+    <!-- Row -->
+    <row>
       <key name="string">000222111</key>
       <key name="data">iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==</key>
       <key name="date">2007-06-01T13:00:00Z</key>
       <key name="integer">123</key>
       <key name="float">1.23</key>
       <key name="boolean">false</key>
-    </item>
+    </row>
     
-    <!-- More items... -->
-  </data>
+    <!-- More rows... -->
+  </database>
 </label>

data/lib/labels/database.rb

@@ -0,0 +1,19 @@
+# A RubyGem for creating mailing, shipping, address, barcode and other labels and rendering as PDF's.
+#
+# Author::    Aaron Wright  (mailto:acwrightdesign@gmail.com)
+# Copyright:: Copyright (c) 2012 Infinite Token LLC
+# License::  MIT License
+
+require 'labels/element'
+
+module Labels
+  
+  # This class represents template types and properties
+  class Database < Element
+    # Title of database
+    attr_accessor :title
+    
+    # Array of database data
+    attr_accessor :data
+  end
+end

data/lib/labels/document.rb

@@ -8,6 +8,7 @@ require 'fileutils'
 
 require 'labels/paper'
 require 'labels/template'
+require 'labels/database'
 require 'labels/xml/builder'
 require 'labels/pdf/builder'
 
@@ -25,11 +26,11 @@ module Labels
     # An array of document Labels::Layer instances
     attr_accessor :layers
     
-    # An array of document data
-    attr_accessor :data
+    # The document Labels::Database instance
+    attr_accessor :database
     
     # Creates a new Labels::Document instance with optional content
-    def initialize(paper=nil, template=nil, layers=[], data=[])
+    def initialize(paper=nil, template=nil, layers=[], database=nil)
       unless paper.nil?
         @paper = paper
       else
@@ -43,7 +44,12 @@ module Labels
       end
       
       @layers = layers
-      @data = data
+      
+      unless database.nil?
+        @database = database
+      else
+        @database = Labels::Database.new
+      end
     end
     
     # Writes document to filename as XML

data/lib/labels/pdf/builder.rb

@@ -7,6 +7,7 @@
 require 'labels/document'
 require 'labels/paper'
 require 'labels/template'
+require 'labels/database'
 require 'labels/shape'
 require 'labels/text'
 require 'labels/image'
@@ -43,7 +44,7 @@ module Labels
         unless @document.nil?
           paper = @document.paper
           template = @document.template
-          data = @document.data
+          database = @document.database
         
           if paper && template
             document_options = {
@@ -55,7 +56,7 @@ module Labels
             }
             
             page_cell_count = template.columns * template.rows
-            page_number_count = (data.length / page_cell_count).ceil
+            page_number_count = (database.data.length / page_cell_count).ceil
             cell = 0
             
             if page_number_count == 0
@@ -95,10 +96,10 @@ module Labels
                         
                         draw = false
                         content = nil
-                        if data.length > 0
-                          if cell < data.length
-                            if data[cell].has_key?(layer.column)
-                              content = data[cell][layer.column]
+                        if database.data.length > 0
+                          if cell < database.data.length
+                            if database.data[cell].has_key?(layer.column)
+                              content = database.data[cell][layer.column]
                             end
                             draw = true
                           end

data/lib/labels/version.rb

@@ -6,5 +6,5 @@
 
 # 
 module Labels
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/labels/xml/builder.rb

@@ -111,10 +111,10 @@ module Labels
                   }
                 end
               }
-              xml.data {
-                @document.data.each do |item|
-                  xml.item {
-                    item.each do |key, value|
+              xml.database(:title => @document.database.title) {
+                @document.database.data.each do |row|
+                  xml.row {
+                    row.each do |key, value|
                       case value
                       when Fixnum
                         xml.key value, :name => key, :type => 'integer'

data/lib/labels/xml/parser.rb

@@ -12,6 +12,7 @@ require 'core_ext/string'
 require 'labels/document'
 require 'labels/paper'
 require 'labels/template'
+require 'labels/database'
 require 'labels/shape'
 require 'labels/text'
 require 'labels/image'
@@ -38,7 +39,8 @@ module Labels
           paper_node = root_node.at_xpath('paper')
           template_node = root_node.at_xpath('template')
           layer_nodes = root_node.xpath('layers/layer')
-          item_nodes = root_node.xpath('data/item')
+          database_node = root_node.at_xpath('database')
+          row_nodes = root_node.xpath('database/row')
           
           unless paper_node.nil?
             paper = Labels::Paper.new({
@@ -142,19 +144,25 @@ module Labels
             end
           end
           
-          unless item_nodes.nil?
-            data = []
-            item_nodes.each do |item_node|
-              item = {}
-              keys_node = item_node.xpath('key')
-              keys_node.each do |key_node|
-                item[key_node['name']] = key_node.text
+          unless database_node.nil?
+            database = Labels::Database.new({
+              :title => database_node['title']
+            })
+            unless row_nodes.nil?
+              data = []
+              row_nodes.each do |row_node|
+                row = {}
+                keys_node = row_node.xpath('key')
+                keys_node.each do |key_node|
+                  row[key_node['name']] = key_node.text
+                end
+                data.push(row)
               end
-              data.push(item)
+              database.data = data
             end
           end
           
-          Labels::Document.new(paper, template, layers, data)
+          Labels::Document.new(paper, template, layers, database)
         end
       end
     end

data/spec/labels/database_spec.rb

@@ -0,0 +1,17 @@
+# A RubyGem for creating mailing, shipping, address, barcode and other labels and rendering as PDF's.
+#
+# Author::    Aaron Wright  (mailto:acwrightdesign@gmail.com)
+# Copyright:: Copyright (c) 2012 Infinite Token LLC
+# License::  MIT License
+
+require 'spec_helper'
+require 'labels/database'
+
+describe Labels::Database do
+  describe "#new" do
+  end
+  
+  describe "#run" do
+    
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labels
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-21 00:00:00.000000000 Z
+date: 2012-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -128,6 +128,7 @@ files:
 - lib/core_ext/string.rb
 - lib/labels.rb
 - lib/labels/barcode.rb
+- lib/labels/database.rb
 - lib/labels/date.rb
 - lib/labels/document.rb
 - lib/labels/element.rb
@@ -143,6 +144,7 @@ files:
 - lib/labels/xml/builder.rb
 - lib/labels/xml/parser.rb
 - spec/labels/barcode_spec.rb
+- spec/labels/database_spec.rb
 - spec/labels/date_spec.rb
 - spec/labels/document_spec.rb
 - spec/labels/element_spec.rb
@@ -172,7 +174,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 876914944690599337
+      hash: 2236236549244294766
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -181,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 876914944690599337
+      hash: 2236236549244294766
 requirements: []
 rubyforge_project: labels
 rubygems_version: 1.8.24
@@ -190,6 +192,7 @@ specification_version: 3
 summary: PDF label creation using Ruby
 test_files:
 - spec/labels/barcode_spec.rb
+- spec/labels/database_spec.rb
 - spec/labels/date_spec.rb
 - spec/labels/document_spec.rb
 - spec/labels/element_spec.rb