gls_agent 0.2.0 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODI0NTc3YTlhN2NhZTcxMzcyM2QyY2NkZjg1YjY0OWUzNjI1NjgyNw==
+    ZDk4YzRmNDRkYzIxNDdlMDY0MGRiYTFmODZiN2FiNDdmNDhlZDljYQ==
   data.tar.gz: !binary |-
-    YTcyYmEyZWEyMjgwYTE1NjNjZGNiMjBmYzg3N2M1MThkMzUwYWJhMQ==
+    YWQ1OTY3NzlkZjJiOWMwMDkwZmMzNDk0MDU2NWZlOTVmNTkxNTUxMA==
 SHA512:
   metadata.gz: !binary |-
-    ODYxMWExZGI3Y2RlZjljMDljZWZlNDIwN2Q5YWY3MjQwODM5MWNiOTQ0Y2Q2
-    NmM4NTUwNzIxOTE5OWE5ZTdmNDA2YWQ4YmZlNjM1ZWY2MzBjMzIyYWI0Y2Rm
-    ODNlNThiYTQ0OWVmNWU3YWQwZjhlYWYwYTM3ODQ2NDhhMTJlOGU=
+    ODY5Y2M1YzBiY2ViMDA3YWUyNGNiMTZlNDBiZjM5YTc3ZmMwODVkN2QwYWIw
+    YzQ4MTVjNmUzZGE2NDk0NmJmMjMzMjVhNmJlNDlkYzkwODQ0OTljY2ZjY2Q5
+    YTI4NDI3OWZjMjZjNzZhMWJiNTNhZDcwYzVkNzY0NWFmYjMwZTM=
   data.tar.gz: !binary |-
-    OWM3YzNmODIwMjNjYzcyMzhhM2Q5MDA5OWQwNDg0YTMxYzI4NWEwY2M1ZmUx
-    MDExYTI0YzUyYjMxNzczMmE2OTY2YjcxYWFiYzRmMmI4MjRiZmQzZjQwNjU3
-    ZDNjN2EzMDlkMTEyMzY1MDcwMWU5YzYzZWY5YTJmNzgwZTZiMjc=
+    ZTQ2NjUwMTZkODVmNzAyYzE3MDVjZjY4MjU3MjdmZGVmNDM3Y2Y5YjZmODhl
+    OTYxMDg4YzI0ZjFmNzY5NjlhY2YwODJiNTZmNGI3NmM0ZWM4NzBmYmY0OTk0
+    NzMyNTE3NWRjYTRhZjI1N2IwNzllNjUwZTRhYTNiNjc5ZGViNDQ=

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--format documentation
+

data/README.md

@@ -24,7 +24,7 @@ Or install it yourself as:
 
 There is a small standalone script:
 
-    $ gls_create_label -u glsuser -p glspass -d "John Doe,Home Street,1,1234,City,1" -o output.pdf
+    $ gls_create_label -u glsuser -p glspass -d "12.12.2014,John Doe,Home Street,1,1234,City,1" -o output.pdf
 
 Note that while not gemified, use
 
@@ -45,10 +45,10 @@ To use gls_agent in your ruby project, install the gem and use something along t
     mech.user = options[:user]
     mech.pass = options[:pass]
 
-    GLSAgent::ParcelJob.new('Frank Sinatra','CloudStreet','1',1234,'HeavenCity','1')
+    GLSAgent::ParcelJob.new('31.01.2014','Frank Sinatra','CloudStreet','1',1234,'HeavenCity','1')
     saved_as = mech.save_parcel_label parcel,'gls_label_frank_sinatra.pdf'
 
-## Configuration
+### Configuration
 
 You can invoke gls_agent without any configuration by specifying command line parameters.
 If you do not want to retype your gls credentials or do not want them to travel the wire (ssh), be present in the history (i.e. bash) or visible in the process list, you can put credentials or delivery details in ~/.gls_agent .

data/bin/gls_create_label

@@ -22,10 +22,11 @@ optparse = OptionParser.new do |opts|
 
   opts.on('-l', '--label-data DATA', 'Label data, comma-separated.') do |l|
     fields = l.split(',')
-    if fields.length != 6
-      STDERR.puts 'Error: label data has to be in format "John Doe,Home Street,1,1234,City,1".'
+    if fields.length != 7
+      STDERR.puts 'Error: label data has to be in format "01.01.2016,John Doe,Home Street,1,1234,City,1".'
       exit 1
     end
+    options[:date] = fields.shift
     options[:name] = fields.shift
     options[:street] = fields.shift
     options[:streetno] = fields.shift
@@ -57,14 +58,14 @@ end
 optparse.parse!
 
 defaults = GLSAgent::Dotfile::get_opts
-options = default.merge options
+options = defaults.merge options
 
 if !options[:user] || !options[:pass]
   STDERR.puts 'Error: Need to specify user and pass in ~/.gls_agent or -u -p .'
   exit 1
 end
 
-if !options[:name] || !options[:street] || !options[:streetno] || !options[:zip] || !options[:city] || !options[:weight]
+if !options[:date] || !options[:name] || !options[:street] || !options[:streetno] || !options[:zip] || !options[:city] || !options[:weight]
   STDERR.puts 'Error: Need to specify delivery data in ~/.gls_agent or -l .'
   exit 1
 end

data/lib/gls_agent/gls_mech.rb

@@ -20,7 +20,7 @@ class GLSMech
 
   # Saves parcel label as pdf, does not overwrite file if exists,
   # returns filename that label was saved to.
-  # returns nil if login or redirection failed.
+  # returns nil if login, creation or redirect failed.
   def save_parcel_label parcel_job, filename
     return nil if !login! @user, @pass
 
@@ -32,9 +32,19 @@ class GLSMech
     form.field_with(:name => 'txtZipCodeDisplay').value = parcel_job.zip
     form.field_with(:name => 'txtCity').value = parcel_job.city
     form.field_with(:name => 'txtWeight').value = parcel_job.weight
+    form.field_with(:name => 'txtDate').value = parcel_job.date
     
     @mech.submit(form, form.buttons.first)
-    @mech.page.iframes.first.content.save_as filename
+
+    pdf_iframe = @mech.page.iframes.first
+
+    if pdf_iframe
+      return @mech.page.iframes.first.content.save_as filename
+    elsif @mech.log
+      @mech.page.save_as "gls_agent_debug_save-parcel-fail.html"
+    end
+
+    return nil
   end
 
   private

data/lib/gls_agent/version.rb

@@ -1,3 +1,3 @@
 module GLSAgent
-  VERSION = "0.2.0".freeze
+  VERSION = "0.3.0".freeze
 end

data/lib/gls_agent.rb

@@ -3,11 +3,11 @@ require 'gls_agent/gls_mech'
 require 'gls_agent/dotfile'
 
 module GLSAgent
-  ParcelJob = Struct.new(:name, :street, :streetno, :zip, :city, :weight)
+  ParcelJob = Struct.new(:date, :name, :street, :streetno, :zip, :city, :weight)
 
   def self.job_from_csv string
     fields = string.split(',')
-    if fields.length != 6
+    if fields.length != 7
       fail 'job_from_csv needs 6 fields'
       return nil
     end
@@ -15,6 +15,6 @@ module GLSAgent
   end
 
   def self.job_from_hash hash
-    ParcelJob.new(hash[:name], hash[:street], hash[:streetno], hash[:zip], hash[:city], hash[:weight])
+    ParcelJob.new(hash[:date], hash[:name], hash[:street], hash[:streetno], hash[:zip], hash[:city], hash[:weight])
   end
 end

data/spec/gls_agent_spec.rb

@@ -2,7 +2,8 @@ require_relative '../lib/gls_agent'
 
 describe 'GLSAgent Module helpers' do
   it 'creates ParcelJob from csv string' do
-    job = GLSAgent::job_from_csv 'Name,Street,1,1234,City,1'
+    job = GLSAgent::job_from_csv '02.02.2014,Name,Street,1,1234,City,1'
+    expect(job.date).to eq '02.02.2014'
     expect(job.name).to eq 'Name'
     expect(job.street).to eq 'Street'
     expect(job.streetno).to eq '1'
@@ -12,8 +13,9 @@ describe 'GLSAgent Module helpers' do
   end
 
   it 'creates ParcelJob from hash' do
-    hash = {:name => 'Name', :street => 'Street', :streetno => '1', :zip => '1234', :city => 'City', :weight => '1'}
+    hash = {:date => '02.12.2012', :name => 'Name', :street => 'Street', :streetno => '1', :zip => '1234', :city => 'City', :weight => '1'}
     job = GLSAgent::job_from_hash hash
+    expect(job.date).to eq '02.12.2012'
     expect(job.name).to eq 'Name'
     expect(job.street).to eq 'Street'
     expect(job.streetno).to eq '1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gls_agent
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Felix Wolfsteller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -75,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .rvmrc
 - Gemfile
 - LICENSE.txt
@@ -86,6 +87,7 @@ files:
 - lib/gls_agent/dotfile.rb
 - lib/gls_agent/gls_mech.rb
 - lib/gls_agent/version.rb
+- lib/ruby-gls-agent_0.0.1_all.deb
 - spec/gls_agent_spec.rb
 homepage: https://github.com/fwolfst/gls_agent
 licenses: