iragsdale-rubydkim 0.2 → 0.3

data/Rakefile

@@ -46,10 +46,11 @@ end
 if defined?(Gem) and defined?(Rake::GemPackageTask)
   
   spec_ext = Gem::Specification.new do |s|
-    s.name = 'rubydkim'
+    s.name = 'iragsdale-rubydkim'
     s.version = PKG_VERSION
     s.summary = "A gem for creating & verifying DKIM signatures"
     s.description = "This is a DKIM implementation as a Ruby extension in C."
+    s.add_dependency('dnsruby')
 
     s.files = PKG_FILES
 

data/VERSION

@@ -1 +1 @@
-0.2
+0.3

data/bin/dkim_sign.rb

@@ -3,7 +3,7 @@
 require "dkim"
 
 domain, selector, keyfile = ARGV
-key = File.readlines(keyfile).to_s
+key = File.readlines(keyfile).join
 
 # read the email
 signer = DKIM::Signer.new(domain, selector, key)

data/rubydkim.gemspec

@@ -1,12 +1,12 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{rubydkim}
-  s.version = "0.2"
+  s.name = %q{iragsdale-rubydkim}
+  s.version = "0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ian Ragsdale"]
-  s.date = %q{2009-09-04}
+  s.date = %q{2009-09-11}
   s.default_executable = %q{dkim_verify.rb}
   s.description = %q{This is a DKIM implementation as a Ruby extension in C.}
   s.email = %q{ian.ragsdale@gmail.com}
@@ -23,8 +23,11 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<dnsruby>, [">= 0"])
     else
+      s.add_dependency(%q<dnsruby>, [">= 0"])
     end
   else
+    s.add_dependency(%q<dnsruby>, [">= 0"])
   end
 end

data/src/dkim/signer/signer.c

@@ -1,15 +1,18 @@
 #include "ruby.h"
-#include "rubyio.h"
 #include "pdkim1.h"
+#ifndef GetWriteFile
+  #include "ruby/io.h"
+  #define GetWriteFile(fp) rb_io_stdio_file(fp)
+  #define OpenFile rb_io_t
+#else
+  #include "rubyio.h"
+#endif
 
 static VALUE mDKIM, cDKIMSigner, cDKIMSignature, cTime;
 
 // feed data to the dkim context
 VALUE signer_feed(VALUE obj, VALUE text)
-{
-    // create a pointer for the length of the string
-    int length;
-                 
+{                 
     // get the dkim context
     pdkim_ctx *ctx;
     Data_Get_Struct(obj, pdkim_ctx, ctx);
@@ -18,10 +21,10 @@ VALUE signer_feed(VALUE obj, VALUE text)
     char * data = StringValuePtr(text);
     
     // pass the string data to pdkim_feed while setting the length
-    int i = 0;
     if ( pdkim_feed(ctx, data, strlen(data)) != PDKIM_OK) {
         printf("pdkim_feed() error\n");
     }
+    return Qnil;
 }
 
 // create a signature object from a pdkim_signature
@@ -35,22 +38,22 @@ VALUE new_signature(pdkim_signature *sig)
     rb_iv_set(rsig, "@canon_body", INT2FIX(sig->canon_body));
     rb_iv_set(rsig, "@querymethod", INT2FIX(sig->querymethod));
     if (sig->selector != NULL)
-        rb_iv_set(rsig, "@selector", rb_str_new2(sig->selector));
+        rb_iv_set(rsig, "@selector", rb_str_dup(sig->selector));
     if (sig->domain != NULL)
-        rb_iv_set(rsig, "@domain", rb_str_new2(sig->domain));
+        rb_iv_set(rsig, "@domain", rb_str_dup(sig->domain));
     if (sig->identity != NULL)
-        rb_iv_set(rsig, "@identity", rb_str_new2(sig->identity));
+        rb_iv_set(rsig, "@identity", rb_str_dup(sig->identity));
     if (sig->created > 0)
         rb_iv_set(rsig, "@created", rb_funcall(cTime, rb_intern("at"), 1, INT2FIX(sig->created)));
     if (sig->expires > 0)
         rb_iv_set(rsig, "@expires", rb_funcall(cTime, rb_intern("at"), 1, INT2FIX(sig->expires)));
     rb_iv_set(rsig, "@bodylength", INT2FIX(sig->bodylength));
     if (sig->headernames != NULL)
-        rb_iv_set(rsig, "@headernames", rb_str_new2(sig->headernames));
+        rb_iv_set(rsig, "@headernames", rb_str_dup(sig->headernames));
     if (sig->copiedheaders != NULL)
-        rb_iv_set(rsig, "@copiedheaders", rb_str_new2(sig->copiedheaders));
+        rb_iv_set(rsig, "@copiedheaders", rb_str_dup(sig->copiedheaders));
     if (sig->signature_header != NULL)
-        rb_iv_set(rsig, "@signature_header", rb_str_new2(sig->signature_header));
+        rb_iv_set(rsig, "@signature_header", rb_str_dup(sig->signature_header));
     rb_iv_set(rsig, "@verify_status", INT2FIX(sig->verify_status));
     rb_iv_set(rsig, "@verify_ext_status", INT2FIX(sig->verify_ext_status));
     // rb_iv_set(rsig, "@pubkey", );
@@ -66,17 +69,18 @@ VALUE signer_finish(VALUE obj)
     
     // create a signature object
     pdkim_signature *signature;
-    if ( pdkim_feed_finish(ctx,&signature) == PDKIM_OK ) {
+    int result = pdkim_feed_finish(ctx,&signature);
+    if ( result == PDKIM_OK ) {
         return new_signature(signature);   
     }
     else {
-        printf("pdkim_feed_finish error");
-        return rb_str_new2("");
+        rb_raise(rb_eRuntimeError, "error finishing signature: %d", result);
     }
 }
 
 // frees the class when we're done
 static void signer_free(void *ctx) {
+  printf("freeing ctx\n");
   pdkim_free_ctx(ctx);
 }
 
@@ -124,6 +128,7 @@ VALUE signer_debug(VALUE obj, VALUE file)
     else {
         rb_raise(rb_eTypeError, "debug requires a file handle");
     }
+    return RUBY_T_NONE;
 }
 
 // defines the new ruby class and hooks up the proper methods

data/src/dkim/verifier/verifier.c

@@ -1,15 +1,18 @@
 #include "ruby.h"
-#include "rubyio.h"
 #include "pdkim1.h"
+#ifndef GetWriteFile
+  #include "ruby/io.h"
+  #define GetWriteFile(fp) rb_io_stdio_file(fp)
+  #define OpenFile rb_io_t
+#else
+  #include "rubyio.h"
+#endif
 
 static VALUE mDKIM, cDKIMVerifier, cDKIMResolver, cDKIMSignature, cTime;
 
 // feed data to the dkim context
 VALUE verifier_feed(VALUE obj, VALUE text)
 {
-    // create a pointer for the length of the string
-    int length;
-                 
     // get the dkim context
     pdkim_ctx *ctx;
     Data_Get_Struct(obj, pdkim_ctx, ctx);
@@ -18,10 +21,10 @@ VALUE verifier_feed(VALUE obj, VALUE text)
     char * data = StringValuePtr(text);
     
     // pass the string data to pdkim_feed while setting the length
-    int i = 0;
     if ( pdkim_feed(ctx, data, strlen(data)) != PDKIM_OK) {
         printf("pdkim_feed() error\n");
     }
+    return Qnil;
 }
 
 // create a signature object from a pdkim_signature
@@ -67,7 +70,9 @@ VALUE verifier_finish(VALUE obj)
     
     // finish up the call
     pdkim_signature *signatures;
-    if ( pdkim_feed_finish(ctx,&signatures) == PDKIM_OK ) {
+    
+    int result = pdkim_feed_finish(ctx,&signatures);
+    if ( result == PDKIM_OK ) {
         
         // create an array to hold the new signatures
         VALUE rsigs = rb_ary_new();
@@ -84,8 +89,7 @@ VALUE verifier_finish(VALUE obj)
         return rsigs;
     }
     else {
-        printf("pdkim_feed_finish error");
-        return rb_str_new2("");
+        rb_raise(rb_eRuntimeError, "error finishing signature: %d", result);
     }
 }
 
@@ -147,6 +151,7 @@ VALUE verifier_debug(VALUE obj, VALUE file)
     else {
         rb_raise(rb_eTypeError, "debug requires a file handle");
     }
+    return Qnil;
 }
 
 // defines the new ruby class and hooks up the proper methods

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: iragsdale-rubydkim
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  hash: 13
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - Ian Ragsdale
@@ -9,10 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-04 00:00:00 -07:00
+date: 2009-09-11 00:00:00 -05:00
 default_executable: dkim_verify.rb
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: dnsruby
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: This is a DKIM implementation as a Ruby extension in C.
 email: ian.ragsdale@gmail.com
 executables: 
@@ -24,10 +42,8 @@ extensions:
 extra_rdoc_files: []
 
 files: 
-- bin
 - bin/dkim_sign.rb
 - bin/dkim_verify.rb
-- lib
 - lib/dkim.rb
 - LICENSE
 - Rakefile
@@ -35,17 +51,15 @@ files:
 - rubydkim.gemspec
 - sample_key
 - sample_key.pub
-- src
-- src/dkim
-- src/dkim/signer
 - src/dkim/signer/extconf.rb
 - src/dkim/signer/signer.c
-- src/dkim/verifier
 - src/dkim/verifier/extconf.rb
 - src/dkim/verifier/verifier.c
 - VERSION
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/iragsdale/rubydkim
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -53,21 +67,27 @@ require_paths:
 - lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 2
 summary: A gem for creating & verifying DKIM signatures