rescpos 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rescpos (0.0.2)
+    rescpos (0.0.3)
 
 GEM
   remote: http://rubygems.org/

data/examples/escposes/bill_list.escpos.erb

@@ -0,0 +1,9 @@
+<%= text(key_value("结帐单号", @bill[:id])) %>
+<%= text(key_value("打印时间", Time.now.strftime("%Y-%m-%d %H:%M").to_s)) %>
+<%= single_splitline %>
+<%= table(@bill_items){|t| t.config([9]); t.td([:name, :quantity])} %>
+<%= double_splitline %>
+<%= text(key_value("客户签名", underline(27))) %>
+
+
+

data/examples/print.rb

@@ -4,13 +4,17 @@ $:.unshift(File.join(File.dirname(__FILE__)))
 
 require 'rescpos'
 require 'reports/dish_item_report'
+require 'reports/bill_list_report'
 
 Rescpos.configure do |config|
   config.template_path = File.expand_path(File.join(File.dirname(__FILE__), 'escposes'))
 end
 
 report = DishItemReport.new
+report1 = BillListReport.new
 
 printer = Rescpos::Printer.open("192.168.1.3", 9100)
 printer.print_report(report, :encoding => 'GBK')
+# print table 
+printer.print_report(report1, :encoding => 'GBK')
 printer.close

data/examples/reports/bill_list_report.rb

@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+$:.unshift(File.join(File.dirname(__FILE__), "../../lib"))
+
+require 'rescpos'
+
+class BillListReport < Rescpos::Report
+  attr_reader :bill, :bill_items
+
+  def initialize
+    @bill_items = [{
+      :name => '广靓油条',
+      :quantity => 2,
+      :dish_category => '面组'
+    }, {
+      :name => '靓油条',
+      :quantity => 3,
+      :dish_category => '面组'
+    }, {
+      :name => '广式靓油条',
+      :quantity => 1,
+      :dish_category => '面组'
+    }]
+
+    @bill = {
+      :id => "20110819000002",
+      :waiter => '000',
+      :created_at => '2011-08-18 13:11:03',
+      :table => '01B[大堂]',
+      :num_of_people => 2, 
+    }
+  end
+end

data/lib/rescpos/printer.rb

@@ -15,10 +15,8 @@ module Rescpos
       @socket.close
     end
 
-    def print(content, opts={})
-      if opts[:encoding]
-        content = Iconv.iconv("#{opts[:encoding]}//IGNORE","UTF-8//IGNORE", content)[0]
-      end
+    def print(content, opts={:encoding => 'GBK'})
+      content = Iconv.iconv("#{opts[:encoding]}//IGNORE","UTF-8//IGNORE", content)[0]
       @socket.send(content, Socket::MSG_OOB)
       cut
     end

data/lib/rescpos/report_util.rb

@@ -2,6 +2,9 @@ module Rescpos
   module ReportUtil
     FONT_NORMAL = "\x00"
     FONT_BIG = "\x11"
+    ALIGN_C = "\x01"
+    ALIGN_L = "\x00"
+    ALIGN_R = "\x02"
 
     def single_splitline
       text("-" * 42, :font_size => FONT_NORMAL)
@@ -25,6 +28,7 @@ module Rescpos
       formatted_text = ''
       formatted_text << fontsize(font_size)
       formatted_text << grayscale(options[:gray]) if options[:gray]
+      formatted_text << align(options[:align_type]) if options[:align_type]
       formatted_text << txt if txt
     end
     
@@ -40,22 +44,31 @@ module Rescpos
       "#{label}: #{value}"
     end
 
-    def align(format)
-      if format == 'C'
-        return "\x1b\x61\x01"
-      elsif format == 'L'
-        return "\x1b\x61\x00"
-      elsif format == 'R'
-        return "\x1b\x61\x02"
-      end
+    def align(type)
+      "\x1b\x61" << type.to_s
     end
     
-    def table(positions)
+    def table(data)
+      table = Rescpos::Table.new(data)
+      yield table
       command = "\x1b\x44"
-      for position in positions
-        command << ascii(position)
+      table.positions.each do |position|
+        command << position.chr
       end
       command << "\x00"
+      table.data.each do |item|
+        table.keys.each do |key|
+          begin
+            if item[key]
+              command << "#{item[key]}"+"\x09"
+            end
+          rescue
+              command << "#{item.send(key)}"+"\x09"
+          end
+        end
+        command << "\n"
+      end
+      command
     end
 
     def horizontal_tab

data/lib/rescpos/table.rb

@@ -0,0 +1,16 @@
+module Rescpos
+  class Table
+    attr_reader :data, :positions, :keys
+    def initialize(data)
+      @data = data
+    end
+
+    def config(positions)
+      @positions = positions
+    end
+
+    def td(keys)
+      @keys = keys
+    end
+  end
+end

data/lib/rescpos/version.rb

@@ -1,3 +1,3 @@
 module Rescpos
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/rescpos.rb

@@ -5,6 +5,7 @@ require "core_ext/string"
 
 require "rescpos/version"
 require "rescpos/printer"
+require "rescpos/table"
 require "rescpos/report_util"
 require "iconv"
 require "rescpos/configuration"

data/spec/lib/rescpos/report_util_spec.rb

@@ -5,6 +5,10 @@ class ReportUtilTest
   include Rescpos::ReportUtil
 end
 
+class BillItemTest
+  attr_accessor :name, :quantity 
+end
+
 describe ReportUtilTest do
   before :each do
     @report_util = ReportUtilTest.new
@@ -39,7 +43,7 @@ describe ReportUtilTest do
   end
 
   it "should return a formmat text" do
-    @report_util.text('abc', {:font_size => ReportUtilTest::FONT_BIG, :gray => 4}).should == "\x1d\x21\x11\x1b\x6d34abc"
+    @report_util.text('abc', {:font_size => ReportUtilTest::FONT_BIG, :gray => 4, :align_type => ReportUtilTest::ALIGN_C}).should == "\x1d\x21\x11\x1b\x6d34\x1b\x61\x01abc"
   end
 
   it "should return a formatted key and value pair" do
@@ -47,8 +51,31 @@ describe ReportUtilTest do
   end
 
   it "should return a align" do
-    @report_util.align('C').should == "\x1b\x61\x01"
-    @report_util.align('L').should == "\x1b\x61\x00"
-    @report_util.align('R').should == "\x1b\x61\x02"
+    @report_util.align(ReportUtilTest::ALIGN_C).should == "\x1b\x61\x01"
+    @report_util.align(ReportUtilTest::ALIGN_L).should == "\x1b\x61\x00"
+    @report_util.align(ReportUtilTest::ALIGN_R).should == "\x1b\x61\x02"
+  end
+
+  it "give a hash should return a table" do
+    bill_item = {
+      :name => 'a',
+      :quantity => 2,
+    }
+    table = @report_util.table([bill_item]) do |t|
+      t.config([9])
+      t.td([:name, :quantity])
+    end
+    table.should == "\x1b\x44#{9.chr}\x00a\x092\x09\n"
+  end
+
+  it "give a object should return a table" do
+    bill_item = BillItemTest.new 
+    bill_item.name = 'a'
+    bill_item.quantity = 2
+    table = @report_util.table([bill_item]) do |t|
+      t.config([9])
+      t.td([:name, :quantity])
+    end
+    table.should == "\x1b\x44#{9.chr}\x00a\x092\x09\n"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rescpos
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-28 00:00:00.000000000Z
+date: 2011-08-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &80126060 !ruby/object:Gem::Requirement
+  requirement: &82882830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80126060
+  version_requirements: *82882830
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &80125540 !ruby/object:Gem::Requirement
+  requirement: &82882360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80125540
+  version_requirements: *82882360
 - !ruby/object:Gem::Dependency
   name: rspec-instafail
-  requirement: &80124890 !ruby/object:Gem::Requirement
+  requirement: &82881740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80124890
+  version_requirements: *82881740
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &80124110 !ruby/object:Gem::Requirement
+  requirement: &82880970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80124110
+  version_requirements: *82880970
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &80123580 !ruby/object:Gem::Requirement
+  requirement: &82880300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80123580
+  version_requirements: *82880300
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &80122640 !ruby/object:Gem::Requirement
+  requirement: &82879370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80122640
+  version_requirements: *82879370
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
-  requirement: &80121900 !ruby/object:Gem::Requirement
+  requirement: &82878680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80121900
+  version_requirements: *82878680
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &80121130 !ruby/object:Gem::Requirement
+  requirement: &82877790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80121130
+  version_requirements: *82877790
 description: Print formatted docs with Winpos WP-800
 email:
 - towerhe@gmail.com
@@ -114,8 +114,10 @@ files:
 - Guardfile
 - README.textile
 - Rakefile
+- examples/escposes/bill_list.escpos.erb
 - examples/escposes/dish_item.escpos.erb
 - examples/print.rb
+- examples/reports/bill_list_report.rb
 - examples/reports/dish_item_report.rb
 - features/render_report.feature
 - features/step_definitions/.gitkeep
@@ -128,6 +130,7 @@ files:
 - lib/rescpos/printer.rb
 - lib/rescpos/report.rb
 - lib/rescpos/report_util.rb
+- lib/rescpos/table.rb
 - lib/rescpos/version.rb
 - rescpos.gemspec
 - spec/lib/core_ext/string_spec.rb