postmark 0.2.5 → 0.3.0

data/README.rdoc

@@ -37,6 +37,11 @@ Then
 The gem relies on TMail for building the message. You will also need postmark account, server and sender signature set up to use it.
 If you plan using it in a rails project, check out the postmark-rails gem, which is meant to integrate with ActionMailer.
 
+The plugin will try to use ActiveSupport Json if it is already included. If not, it will attempt using the built-in ruby Json library.
+You can also explicitly specify which one to be used, using
+
+    Postmark.response_parser_class = :Json # :ActiveSupport or :Yajl is also supported.
+
 == Limitations
   Currently postmark API does not support multiple recipients, or attachments. For more information, check the docs here:
   TODO: URL to docs.

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.3.0

data/lib/postmark.rb

@@ -2,7 +2,6 @@ require 'net/http'
 require 'net/https'
 require 'rubygems'
 require 'tmail'
-require 'json'
 require 'postmark/tmail_mail_extension'
 
 module Postmark
@@ -12,6 +11,12 @@ module Postmark
   class InvalidMessageError < StandardError; end
   class InternalServerError < StandardError; end
 
+  module ResponseParsers
+    autoload :Json,          'postmark/response_parsers/json'
+    autoload :ActiveSupport, 'postmark/response_parsers/active_support'
+    autoload :Yajl,          'postmark/response_parsers/yajl'
+  end
+
   HEADERS = {
     'Content-type' => 'application/json',
     'Accept'       => 'application/json'
@@ -21,6 +26,12 @@ module Postmark
     attr_accessor :host, :host_path, :port, :secure, :api_key, :http_open_timeout, :http_read_timeout,
       :proxy_host, :proxy_port, :proxy_user, :proxy_pass
 
+    attr_writer :response_parser_class
+
+    def response_parser_class
+      @response_parser_class ||= Object.const_defined?(:ActiveSupport) ? :ActiveSupport : :Json
+    end
+
     # The port on which your Postmark server runs.
     def port
       @port || (secure ? 443 : 80)
@@ -59,6 +70,7 @@ module Postmark
     end
 
     def send_through_postmark(message) #:nodoc:
+      ResponseParsers.const_get(response_parser_class) # loads JSON lib, defining #to_json
       http = Net::HTTP::Proxy(proxy_host,
                               proxy_port,
                               proxy_user,
@@ -87,7 +99,15 @@ module Postmark
     end
 
     def error_message(response_body)
-      JSON.parse(response_body)["Message"]
+      decode_json(response_body)["Message"]
+    end
+
+    def decode_json(data)
+      ResponseParsers.const_get(response_parser_class).decode(data)
+    end
+
+    def encode_json(data)
+      ResponseParsers.const_get(response_parser_class).encode(data)
     end
 
     def convert_tmail(message)
@@ -107,4 +127,6 @@ module Postmark
 
   end
 
+  self.response_parser_class = nil
+
 end

data/lib/postmark/response_parsers/active_support.rb

@@ -0,0 +1,10 @@
+# assume activesupport is already loaded
+module Postmark
+  module ResponseParsers
+    module ActiveSupport
+      def self.decode(data)
+        ActiveSupport::JSON.decode(data)
+      end
+    end
+  end
+end

data/lib/postmark/response_parsers/json.rb

@@ -0,0 +1,10 @@
+require 'json'
+module Postmark
+  module ResponseParsers
+    module Json
+      def self.decode(data)
+        JSON.parse(data)
+      end
+    end
+  end
+end

data/lib/postmark/response_parsers/yajl.rb

@@ -0,0 +1,11 @@
+require 'yajl'
+Yajl::Encoder.enable_json_gem_compatability
+module Postmark
+  module ResponseParsers
+    module Yajl
+      def self.decode(data)
+        ::Yajl::Parser.parse(data)
+      end
+    end
+  end
+end

data/postmark.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{postmark}
-  s.version = "0.2.5"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Petyo Ivanov"]
-  s.date = %q{2009-12-08}
+  s.date = %q{2009-12-15}
   s.description = %q{Ruby gem for sending emails through http://postmarkapp.com HTTP API. It relieas on TMail::Mail for message construction.}
   s.email = %q{underlog@gmail.com}
   s.extra_rdoc_files = [
@@ -28,6 +28,10 @@ Gem::Specification.new do |s|
      "features/step_definitions/postmark_steps.rb",
      "features/support/env.rb",
      "lib/postmark.rb",
+     "lib/postmark/response_parsers/active_support.rb",
+     "lib/postmark/response_parsers/json.rb",
+     "lib/postmark/response_parsers/yajl.rb",
+     "lib/postmark/tmail_mail_extension.rb",
      "lib/postmark/tmail_mail_extension.rb",
      "postmark.gemspec",
      "spec/postmark_spec.rb",
@@ -69,4 +73,3 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<tmail>, [">= 0"])
   end
 end
-

data/spec/postmark_spec.rb

@@ -102,4 +102,19 @@ describe "Postmark" do
     end
   end
 
+  context "JSON library support" do
+    [:Json, :ActiveSupport, :Yajl].each do |lib|
+      begin
+        original_parser_class = Postmark.response_parser_class
+        Postmark.response_parser_class = lib
+        it "parses error message with #{lib}" do
+          Postmark.error_message(%({"Message":"OK"})).should == "OK"
+        end
+        Postmark.response_parser_class = original_parser_class
+      rescue LoadError # No ActiveSupport or Yajl :(
+      end
+    end
+
+  end
+
 end

data/spec/spec_helper.rb

@@ -6,6 +6,12 @@ require 'ruby-debug'
 require 'spec'
 require 'spec/autorun'
 
+if ENV['JSONGEM']
+  # `JSONGEM=Yajl rake spec`
+  Postmark.response_parser_class = ENV['JSONGEM'].to_sym
+  puts "Setting ResponseParser class to #{Postmark::ResponseParsers.const_get Postmark.response_parser_class}"
+end
+
 Spec::Runner.configure do |config|
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: postmark
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors: 
 - Petyo Ivanov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-08 00:00:00 +02:00
+date: 2009-12-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,6 +63,9 @@ files:
 - features/step_definitions/postmark_steps.rb
 - features/support/env.rb
 - lib/postmark.rb
+- lib/postmark/response_parsers/active_support.rb
+- lib/postmark/response_parsers/json.rb
+- lib/postmark/response_parsers/yajl.rb
 - lib/postmark/tmail_mail_extension.rb
 - postmark.gemspec
 - spec/postmark_spec.rb