sendgrid-web 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72f7a0fbf53971295a55c04915c382e9499e8573
-  data.tar.gz: c71046c3bf1adbd9536c3bacbb5bd4af8b80f332
+  metadata.gz: c594c17d9e748b0e23557ccdc6e2bcd564b11a00
+  data.tar.gz: 75bbb2d64fb5fddc2e0d68a8303255a6ef62b9af
 SHA512:
-  metadata.gz: 00b0c2db81803f65e168fbdd9e94f595a3258ff0a1e43c48a771b8bcd6ccd9c9a1b3c0f8fc10d270fa2eeab64f497faab2bf43b901f1c5295bfe9749a6315c4c
-  data.tar.gz: e28781fe17f6ba28e392524548aa7f905ceaca73f771ea5a131275dbe68a6764b2d0682e406854cda68322f08dc4143f316322c925de5351f29372dbc3d042d9
+  metadata.gz: 7c442413581e86a0ec0c4f7612538cf9d17f99176eb19e11d513c26a881813c5a9f25a26b0001a92398912de5136b8c49caf63b38a90949d39872be5909b4000
+  data.tar.gz: 38e6116e220130607d162b129621ca28090680d9fe7a80bfb7b195984df1d1d0c3f5b1dafce9ec23db20b12b6a50e82ac15960a2a730985019b24cee488f1198

data/lib/sendgrid/web/client.rb

@@ -50,14 +50,16 @@ class Sendgrid::Web::Client
   end
 
   def default_params(additions = {})
+    params = Sendgrid::Web::Parameters.new
     defaults = {
       query: {
         api_user: config.username,
         api_key:  config.password
       }
     }
-    defaults[:query].merge!(additions)
-    defaults
+    params.replace(defaults)
+    params[:query].merge!(additions)
+    params
   end
 
   def craft_response(response)

data/lib/sendgrid/web/parameters.rb

@@ -0,0 +1,50 @@
+class Sendgrid::Web::Parameters < Hash
+
+  def []=(key, value)
+    super(key, _cleanse_value(value))
+  end
+
+  def merge!(hash = {})
+    super(_cleanse(hash))
+  end
+
+  def merge(hash = {})
+    super(_cleanse(hash))
+  end
+
+  def replace(hash = {})
+    super(_cleanse(hash))
+  end
+
+  def store(key, value)
+    super(key, _cleanse_value(value))
+  end
+
+  def update(hash = {})
+    super(_cleanse(hash))
+  end
+
+  private
+
+  def _cleanse(hash)
+    cleansed = Sendgrid::Web::Parameters.new
+    hash.each do |k, v|
+      cleansed[k] = _cleanse_value(v) unless v.nil?
+    end
+    cleansed
+  end
+
+  def _cleanse_value(value)
+    if value.is_a?(Hash) || value.is_a?(Sendgrid::Web::Parameters)
+      value = _cleanse(value)
+    elsif value.is_a?(Array)
+      value = value.collect { |v| _cleanse_value(v) }
+    elsif value.respond_to?(:strftime)
+      value = value.strftime('%Y-%m-%d')
+    else
+      value = value.to_s
+    end
+    value
+  end
+
+end

data/lib/sendgrid/web/response.rb

@@ -14,14 +14,21 @@ class Sendgrid::Web::Response
   def errors?
     !parsed_body.nil? &&
     parsed_body.is_a?(Hash) &&
-    parsed_body.has_key?('errors')
+    (parsed_body.has_key?('errors') ||
+    parsed_body.has_key?('error'))
   end
 
   # Fetches an array of error messages from the response.
   #
   # @return [Array<String>] A list of any error messages.
   def error_messages
-    errors? ? parsed_body['errors'] : []
+    if errors?
+      errors = Array(parsed_body['errors'])
+      errors << parsed_body['error']
+      errors.compact
+    else
+      []
+    end
   end
 
 end

data/lib/sendgrid/web/version.rb

@@ -1,5 +1,5 @@
 module Sendgrid
   module Web
-    VERSION = "0.0.7"
+    VERSION = "0.1.0"
   end
 end

data/lib/sendgrid/web.rb

@@ -5,6 +5,7 @@ module Sendgrid
   module Web
     autoload :VERSION,        'sendgrid/web/version'
     autoload :Configurator,   'sendgrid/web/configurator'
+    autoload :Parameters,     'sendgrid/web/parameters'
     autoload :Client,         'sendgrid/web/client'
     autoload :Blocks,         'sendgrid/web/blocks'
     autoload :Bounces,        'sendgrid/web/bounces'

data/spec/sendgrid/web/parameters_spec.rb

@@ -0,0 +1,151 @@
+require 'spec_helper'
+
+describe Sendgrid::Web::Parameters do
+
+  describe 'is based on Hash' do
+    subject { described_class }
+    its(:superclass) { should eql(Hash) }
+  end
+
+  describe 'cleanses when setting values' do
+    context DateTime do
+      before { subject[:provider] = DateTime.new(2013, 01, 23) }
+      it 'converts to YYYY-MM-DD format' do
+        subject[:provider].should eql('2013-01-23')
+      end
+    end
+    context Time do
+      before { subject[:provider] = Time.new(2013, 01, 23) }
+      it 'converts to YYYY-MM-DD format' do
+        subject[:provider].should eql('2013-01-23')
+      end
+    end
+    context true do
+      before { subject[:provider] = true }
+      it 'converts to "true"' do
+        subject[:provider].should eql('true')
+      end
+    end
+    context false do
+      before { subject[:provider] = false }
+      it 'converts to "false"' do
+        subject[:provider].should eql('false')
+      end
+    end
+  end
+
+  describe 'cleanses when merging' do
+    context DateTime do
+      before { subject.merge!(provider: DateTime.new(2013, 01, 23)) }
+      it 'converts to YYYY-MM-DD format' do
+        subject[:provider].should eql('2013-01-23')
+      end
+    end
+    context Time do
+      before { subject.merge!(provider: Time.new(2013, 01, 23)) }
+      it 'converts to YYYY-MM-DD format' do
+        subject[:provider].should eql('2013-01-23')
+      end
+    end
+    context true do
+      before { subject.merge!(provider: true) }
+      it 'converts to "true"' do
+        subject[:provider].should eql('true')
+      end
+    end
+    context false do
+      before { subject.merge!(provider: false) }
+      it 'converts to "false"' do
+        subject[:provider].should eql('false')
+      end
+    end
+    it 'into new Parameters' do
+      params = subject.merge(provider: true)
+      params.should be_instance_of(Sendgrid::Web::Parameters)
+      params[:provider].should eql('true')
+      params.object_id.should_not eql(subject.object_id)
+    end
+  end
+
+  describe 'cleanses when replacing' do
+    context DateTime do
+      before { subject.replace(provider: DateTime.new(2013, 01, 23)) }
+      it 'converts to YYYY-MM-DD format' do
+        subject[:provider].should eql('2013-01-23')
+      end
+    end
+    context Time do
+      before { subject.replace(provider: Time.new(2013, 01, 23)) }
+      it 'converts to YYYY-MM-DD format' do
+        subject[:provider].should eql('2013-01-23')
+      end
+    end
+    context true do
+      before { subject.replace(provider: true) }
+      it 'converts to "true"' do
+        subject[:provider].should eql('true')
+      end
+    end
+    context false do
+      before { subject.replace(provider: false) }
+      it 'converts to "false"' do
+        subject[:provider].should eql('false')
+      end
+    end
+  end
+
+  describe 'cleanses when storing' do
+    context DateTime do
+      before { subject.store(:provider, DateTime.new(2013, 01, 23)) }
+      it 'converts to YYYY-MM-DD format' do
+        subject[:provider].should eql('2013-01-23')
+      end
+    end
+    context Time do
+      before { subject.store(:provider, Time.new(2013, 01, 23)) }
+      it 'converts to YYYY-MM-DD format' do
+        subject[:provider].should eql('2013-01-23')
+      end
+    end
+    context true do
+      before { subject.store(:provider, true) }
+      it 'converts to "true"' do
+        subject[:provider].should eql('true')
+      end
+    end
+    context false do
+      before { subject.store(:provider, false) }
+      it 'converts to "false"' do
+        subject[:provider].should eql('false')
+      end
+    end
+  end
+
+  describe 'cleanses when updating' do
+    context DateTime do
+      before { subject.update(provider: DateTime.new(2013, 01, 23)) }
+      it 'converts to YYYY-MM-DD format' do
+        subject[:provider].should eql('2013-01-23')
+      end
+    end
+    context Time do
+      before { subject.update(provider: Time.new(2013, 01, 23)) }
+      it 'converts to YYYY-MM-DD format' do
+        subject[:provider].should eql('2013-01-23')
+      end
+    end
+    context true do
+      before { subject.update(provider: true) }
+      it 'converts to "true"' do
+        subject[:provider].should eql('true')
+      end
+    end
+    context false do
+      before { subject.update(provider: false) }
+      it 'converts to "false"' do
+        subject[:provider].should eql('false')
+      end
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid-web
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Darren Coxall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-14 00:00:00.000000000 Z
+date: 2013-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -105,6 +105,7 @@ files:
 - lib/sendgrid/web/filter_commands.rb
 - lib/sendgrid/web/invalid_emails.rb
 - lib/sendgrid/web/mail.rb
+- lib/sendgrid/web/parameters.rb
 - lib/sendgrid/web/parse_webhook_settings.rb
 - lib/sendgrid/web/profile.rb
 - lib/sendgrid/web/response.rb
@@ -121,6 +122,7 @@ files:
 - spec/sendgrid/web/filter_commands_spec.rb
 - spec/sendgrid/web/invalid_emails_spec.rb
 - spec/sendgrid/web/mail_spec.rb
+- spec/sendgrid/web/parameters_spec.rb
 - spec/sendgrid/web/parse_webhook_settings_spec.rb
 - spec/sendgrid/web/profile_spec.rb
 - spec/sendgrid/web/response_spec.rb
@@ -162,6 +164,7 @@ test_files:
 - spec/sendgrid/web/filter_commands_spec.rb
 - spec/sendgrid/web/invalid_emails_spec.rb
 - spec/sendgrid/web/mail_spec.rb
+- spec/sendgrid/web/parameters_spec.rb
 - spec/sendgrid/web/parse_webhook_settings_spec.rb
 - spec/sendgrid/web/profile_spec.rb
 - spec/sendgrid/web/response_spec.rb