mail_jack 0.2.4 → 0.2.5

data/lib/mail_jack.rb

@@ -56,6 +56,8 @@ module MailJack
 
     # return configuration if already configured
     return @@config if defined?(@@config) and @@config.kind_of?(Config)
+    
+    raise ArgumentError, "you must configure MailJack to use it.  call MailJack.config{|config| ...} from an initializer" unless block_given?
 
     # yield configuration
     @@config = Config.new
@@ -64,7 +66,7 @@ module MailJack
     # dynamically define the accessors onto Mail::Message
     # so we can assign them later in the Interceptor
     Mail::Message.class_eval do
-      attr_accessor *@@config.trackables.keys
+      attr_accessor *@@config.trackables.keys if @@config.trackables
     end
 
     # include the module that decorates(ie monkey patches)
@@ -76,8 +78,13 @@ module MailJack
     # register the interceptor
     Mail.register_interceptor(MailJack::Interceptor)
 
+    @@config.configured = true
   end
 
+  def self.configured?
+    defined?(@@config) and @@config.configured?
+  end
+  
   # Fetch attributes gets the dynamically defined attributes
   # off the object passed in, the object is ActionMailer::Base instance
   def self.fetch_attributes(mailer)

data/lib/mail_jack/config.rb

@@ -1,6 +1,6 @@
 module MailJack
   class Config
-    attr_accessor :mailers, :href_filter, :trackables, :encode_to
+    attr_accessor :mailers, :href_filter, :trackables, :encode_to, :configured
     def trackable
 
       # use OpenStruct for sugary assignment
@@ -15,5 +15,8 @@ module MailJack
       self.encode_to.present?
     end
 
+    def configured?
+      @configured
+    end
   end
 end

data/lib/mail_jack/params_decoder.rb

@@ -5,6 +5,7 @@ module MailJack
     end
 
     def call(env)
+      return @app.call(env) unless MailJack.configured?
       decode_params(env) if MailJack.config.enable_encoding?
       @status, @headers, @response = @app.call(env)
       [@status, @headers, @response]
@@ -17,13 +18,14 @@ module MailJack
       params = {'QUERY_STRING' => env["QUERY_STRING"], 'REQUEST_URI' => env["REQUEST_URI"].split("?")[1]}
 
       params.each do |key, value|
-        next unless value.present? and value.match(/#{param_name}\=/)
-
+        next unless value.present?
         hash = Rack::Utils.parse_query(value)
+        # next unless hash.has_key?(param_name.to_s)
+        
         encoded = hash.delete(param_name.to_s)
-        decoded = Base64.decode64(encoded)
+        decoded = Base64.decode64(encoded) if encoded 
 
-        env[key].gsub!("#{param_name}=#{encoded}", decoded)
+        env[key].gsub!("#{param_name}=#{encoded}", decoded) if decoded
       end
     end
   end

data/lib/mail_jack/version.rb

@@ -1,4 +1,4 @@
 module MailJack
   # The version of the gem
-  VERSION = '0.2.4'.freeze unless defined?(::MailJack::VERSION)
+  VERSION = '0.2.5'.freeze unless defined?(::MailJack::VERSION)
 end

metadata

@@ -1,23 +1,28 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: mail_jack
-version: !ruby/object:Gem::Version
-  version: 0.2.4
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.2.5
 platform: ruby
-authors:
+authors: 
 - Peter Philips
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+
+date: 2013-06-26 00:00:00 Z
 dependencies: []
+
 description: Autogenerate query parameters to links in emails to track click throughs
-email:
+email: 
 - pete@p373.net
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .document
 - .gitignore
 - Gemfile
@@ -34,26 +39,30 @@ files:
 - mail_jack.gemspec
 homepage: https://github.com/synth/mail_jack
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
       version: 1.3.6
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Autogenerate query parameters to links in emails to track click throughs
 test_files: []
+