classic_omah 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3c80ae1a706e3126a6bf41e70f1eba07168b610
-  data.tar.gz: 08bb8098af80655f401b0268ffff56d391ceae5a
+  metadata.gz: 7b0756f3a39dbec192b6f58fea57cb5f39636a54
+  data.tar.gz: ee9eca76d50cbf498e8b10a6fb628959072bfbde
 SHA512:
-  metadata.gz: 3d402c01ea9fff984fda2384438c9fa058c5d72693f26484e28f919ef77eae6d640d32040e7be9fff89afe981d2f70cbda4918c2a5a873147ae5bd41f719edb2
-  data.tar.gz: 69bc243ff93c2f6a940a23086f12e185d92b34489eb333045a5d77f513fb4ff305a60c1314c51964c87d48ae4f03171872d0b2ad403ceed2150fc0172fdc6de2
+  metadata.gz: c5a665f3e1f9fb705b8f4569289154e9c61d1c00d834f600f426f3ff3f3e8dc4b54559f6fe63bf6acf6067b71e5b650e1ff53bb95b09ec694678c7c08a457f41
+  data.tar.gz: 32b5e475746603f8c3fd78fc2a76c5d2f23332b479b2ee2b7fb5e9fb89972eb7504d646c8153890e977584b4718fc6302397125def7024fa200c892c355d35d5

data/lib/classic_omah.rb

@@ -4,14 +4,14 @@
 
 require 'mail'
 require 'omah'
-require 'sps-pub'
 
-class ClassicOmah
 
-  def initialize(user: 'user', filepath: '.', mail: {}, sps: {}, email_address: nil)
+class ClassicOmah < Omah
 
-    @user = user    
+  def initialize(user: 'user', filepath: '.', mail: {}, \
+               email_address: nil, options: {xslt: 'listing.xsl'}, plugins: [])
 
+    
     @mail = {    address: '',
                     port: 110,
                user_name: '',
@@ -19,14 +19,14 @@ class ClassicOmah
               enable_ssl: false }.merge mail
 
     field = %i(address user_name password).detect {|x| @mail[x].empty?}
-    return "ClassicOmah: missing %s" % field if field
-
-    @sps = SPSPub.new(address: sps[:address], port: sps[:port]) if sps
-    @email_address = email_address ? email_address : \
-          @mail[:user_name] + '@' + @mail[:address].split('.')[1..-1].join('.')
-
-    Dir.chdir filepath
-
+    return "ClassicOmah: missing %s" % field if field        
+    
+    @variables = {user_name: @mail[:user_name] , \
+                  address: @mail[:address], email_address: email_address}
+    
+    super(user: user, filepath: filepath, plugins: plugins, options: options)    
+    
+    
   end
 
   def fetch_email()
@@ -59,20 +59,11 @@ class ClassicOmah
 
     end
 
-    o = Omah.new user: @user
 
-    # messages are stored to the file dynarexdaily.xml
-    o.store messages
-
-    m = 'message'
-    m += 's' if messages.length > 1
-    fqm = "email/new: %s received %s new %s" \
-                                  % [@email_address, messages.length, m]
-    
-    @sps.notice fqm if @sps
+    # messages are stored in the file dynarexdaily.xml
+    self.store messages
 
     Mail.delete_all
-    
-    fqm
+    messages.length.to_s + " new messages"
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: classic_omah
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -39,20 +39,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -73,26 +73,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.3
-- !ruby/object:Gem::Dependency
-  name: sps-pub
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
 description: 
 email: james@r0bertson.co.uk
 executables: []