smtpapi 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e949a527b106a2ad0ec5530c0b305bcf568c5f0d
-  data.tar.gz: 521f1c2cd08b6eba6e8759741d2639cd11324af4
+  metadata.gz: 7d0cf9cd0aedd6c845663105d15cd861e5992876
+  data.tar.gz: 983fb09ac9fab4ce5d893bf4643a9878ceac29a9
 SHA512:
-  metadata.gz: 254df808552bb9c2f296379a6a9a0c45d902e82d0cf2bd1bfbefafbd19564ebbf66cb9a2916a0e78eeef1d89b250b38d2028cc27e99acf53e177eb9a6676ad48
-  data.tar.gz: 0d3a6acb3a98a89e938f3a94a0d35f047c5a8cd3b0e1c817962bf0d0977a8e7830a968baa6eb79825b4a78c2c4a9df11b006f2c22d536b6dc7fbb4f6ef5fa638
+  metadata.gz: 22673f984c4f7d320ff054f2ee921c20d560a34fbde5e58ebc7c6757c6dd2733f17eb7be1c059923bce7f9d1c3351a983de7db60cd8afbc6f9d2cd742054da23
+  data.tar.gz: 79078fd61f6585749873b938a7217ec833abd7b0ce5f6a5ce3ec6641331041da41449f011049c110db08cc0c1c927095f90851c381d275b25a134937ad1a7fe9

data/.rubocop.yml

@@ -0,0 +1,31 @@
+# メソッド名のprefixに「set_」「get_」を許可
+AccessorMethodName:
+  Enabled: false
+
+# メソッドの行数上限を変更
+MethodLength:
+  CountComments: true  # count full line comments?
+  Max: 20
+
+# 引数上限を変更
+ParameterLists:
+  Max: 6
+  CountKeywordArgs: true
+
+# AbcSizeの上限を変更
+AbcSize:
+  Max: 34
+
+# %r 内で利用できるスラッシュの数の制限変更
+RegexpLiteral:
+  MaxSlashes: 0
+
+ClassLength:
+  Max: 200
+  CountComments: true
+
+CyclomaticComplexity:
+  Max: 11
+
+PerceivedComplexity:
+  Max: 11

data/.travis.yml

@@ -1,10 +1,14 @@
 language: ruby
 rvm:
-  - "1.9.2"
   - "1.9.3"
   - "2.0.0"
   - "2.1.0"
+  - "2.1.2"
+  - "2.1.3"
+  - "2.1.4"
+  - "2.1.5"
 before_script:
   - bundle install
 script:
+  - rubocop --fail-level=W
   - rake test

data/Rakefile

@@ -1,9 +1,8 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new do |t|
-  t.libs << "test"
+  t.libs << 'test'
   t.test_files = FileList['test/test*.rb']
   t.verbose = true
 end
-

data/lib/smtpapi.rb

@@ -1,12 +1,15 @@
 # -*- encoding: utf-8 -*-
-$:.unshift File.dirname(__FILE__)
-require "smtpapi/version"
-require "json"
+$LOAD_PATH.unshift File.dirname(__FILE__)
+require 'smtpapi/version'
+require 'json'
 
 module Smtpapi
+  #
+  # SendGrid smtpapi header implementation
+  #
   class Header
-
-    attr_reader :to, :sub, :section, :category, :unique_args, :filters, :send_at, :send_each_at, :asm_group_id, :ip_pool
+    attr_reader :to, :sub, :section, :category, :unique_args, :filters
+    attr_reader :send_at, :send_each_at, :asm_group_id, :ip_pool
 
     def initialize
       @to = []
@@ -21,12 +24,12 @@ module Smtpapi
       @ip_pool = nil
     end
 
-    def add_to(address, name=nil)
+    def add_to(address, name = nil)
       if address.is_a?(Array)
         @to.concat(address)
       else
         value = address
-        value = "#{name} <#{address}>" if name != nil
+        value = "#{name} <#{address}>" unless name.nil?
         @to.push(value)
       end
       self
@@ -78,8 +81,10 @@ module Smtpapi
     end
 
     def add_filter(filter_name, parameter_name, parameter_value)
-      @filters[filter_name] = {}    if @filters[filter_name] == nil
-      @filters[filter_name]['settings'] = {}  if @filters[filter_name]['settings'] == nil
+      @filters[filter_name] = {} if @filters[filter_name].nil?
+      if @filters[filter_name]['settings'].nil?
+        @filters[filter_name]['settings'] = {}
+      end
       @filters[filter_name]['settings'][parameter_name] = parameter_value
       self
     end
@@ -91,56 +96,61 @@ module Smtpapi
 
     def set_send_at(send_at)
       @send_at = send_at
+      self
     end
 
     def set_send_each_at(send_each_at)
       @send_each_at = send_each_at
+      self
     end
 
     def set_asm_group(group_id)
       @asm_group_id = group_id
+      self
     end
 
     def set_ip_pool(pool_name)
       @ip_pool = pool_name
+      self
     end
 
     def to_array
       data = {}
-      data["to"]  = @to     if @to.length > 0
-      data["sub"]   = @sub    if @sub.length > 0
-      data["section"]   = @section  if @section.length > 0
-      data["unique_args"] = @unique_args if @unique_args.length > 0
-      data["category"]  = @category   if @category.length > 0
-      data["filters"]   = @filters  if @filters.length > 0
-      data["send_at"] = @send_at.to_i if @send_at != nil
-      data["asm_group_id"] = @asm_group_id.to_i if @asm_group_id != nil
-      data["ip_pool"] = @ip_pool if @ip_pool != nil
+      data['to'] = @to if @to.length > 0
+      data['sub'] = @sub if @sub.length > 0
+      data['section'] = @section if @section.length > 0
+      data['unique_args'] = @unique_args if @unique_args.length > 0
+      data['category'] = @category if @category.length > 0
+      data['filters'] = @filters if @filters.length > 0
+      data['send_at'] = @send_at.to_i unless @send_at.nil?
+      data['asm_group_id'] = @asm_group_id.to_i unless @asm_group_id.nil?
+      data['ip_pool'] = @ip_pool unless @ip_pool.nil?
       str_each_at = []
-      @send_each_at.each {|val|
+      @send_each_at.each do |val|
         str_each_at.push(val.to_i)
-      }
-      data["send_each_at"] = str_each_at if str_each_at.length > 0
+      end
+      data['send_each_at'] = str_each_at if str_each_at.length > 0
       data
     end
+
     protected :to_array
 
     def json_string
-      escape_unicode(self.to_array.to_json)
+      escape_unicode(to_array.to_json)
     end
     alias_method :to_json, :json_string
 
     def escape_unicode(str)
-      str.unpack('U*').map{|i|
-        if i > 65535 then
-          "\\u#{"%04x" % ((i - 0x10000) / 0x400 + 0xD800)}\\u#{"%04x" % ((i - 0x10000) % 0x400 + 0xDC00)}" if i > 65535
-        elsif i > 127 then
-          "\\u#{"%04x" % i}"
+      str.unpack('U*').map do |i|
+        if i > 65_535
+          "\\u#{format('%04x', ((i - 0x10000) / 0x400 + 0xD800))}"\
+          "\\u#{format('%04x', ((i - 0x10000) % 0x400 + 0xDC00))}" if i > 65_535
+        elsif i > 127
+          "\\u#{format('%04x', i)}"
         else
-          i.chr("UTF-8")
+          i.chr('UTF-8')
         end
-      }.join
+      end.join
     end
-
   end
 end

data/lib/smtpapi/version.rb

@@ -1,3 +1,6 @@
+#
+# SendGrid smtpapi
+#
 module Smtpapi
-  VERSION = "0.0.11"
+  VERSION = '0.0.12'
 end

data/smtpapi.gemspec

@@ -4,20 +4,21 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'smtpapi/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "smtpapi"
+  spec.name          = 'smtpapi'
   spec.version       = Smtpapi::VERSION
-  spec.authors       = ["Wataru Sato"]
-  spec.email         = ["awwa500@gmail.com"]
-  spec.summary       = %q{Smtpapi library for SendGrid.}
-  spec.description   = %q{Smtpapi library for SendGrid.}
-  spec.homepage      = "https://github.com/sendgridjp/smtpapi-ruby"
-  spec.license       = "MIT"
+  spec.authors       = ['Wataru Sato']
+  spec.email         = ['awwa500@gmail.com']
+  spec.summary       = 'Smtpapi library for SendGrid.'
+  spec.description   = 'Smtpapi library for SendGrid.'
+  spec.homepage      = 'https://github.com/sendgridjp/smtpapi-ruby'
+  spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency 'bundler', '~> 1.5'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency('rubocop', '>=0.29.0', '<0.30.0')
 end

data/test/test.rb

@@ -1,94 +1,122 @@
 # -*- encoding: utf-8 -*-
-require "test/unit"
-require "./lib/smtpapi"
+require 'test/unit'
+require './lib/smtpapi'
 
+#
+# SmtpapiTest implementation
+#
 class SmtpapiTest < Test::Unit::TestCase
-
   def test_version
-    assert_equal("0.0.11", Smtpapi::VERSION)
+    assert_equal('0.0.12', Smtpapi::VERSION)
   end
 
   def test_empty
     header = Smtpapi::Header.new
-    assert_equal("{}",header.json_string)
+    assert_equal('{}', header.json_string)
   end
 
   def test_add_to
     header = Smtpapi::Header.new
     header.add_to('you@youremail.com')
     header.add_to('other@otheremail.com', 'Other Name')
-    assert_equal("{\"to\":[\"you@youremail.com\",\"Other Name <other@otheremail.com>\"]}",header.json_string)
+    assert_equal(
+      '{"to":["you@youremail.com","Other Name <other@otheremail.com>"]}',
+      header.json_string)
   end
 
   def test_add_to_array
     header = Smtpapi::Header.new
     header.add_to(['you@youremail.com', 'my@myemail.com'])
-    assert_equal("{\"to\":[\"you@youremail.com\",\"my@myemail.com\"]}",header.json_string)
+    assert_equal(
+      '{"to":["you@youremail.com","my@myemail.com"]}',
+      header.json_string)
   end
 
   def test_set_tos
     header = Smtpapi::Header.new
     header.set_tos(['you@youremail.com', 'other@otheremail.com'])
-    assert_equal("{\"to\":[\"you@youremail.com\",\"other@otheremail.com\"]}",header.json_string)
+    assert_equal(
+      '{"to":["you@youremail.com","other@otheremail.com"]}',
+      header.json_string)
   end
 
   def test_add_substitution
     header = Smtpapi::Header.new
-    header.add_substitution('keep', ['secret'])        # sub = {keep: ['secret']}
-    header.add_substitution('other', ['one', 'two'])   # sub = {keep: ['secret'], other: ['one', 'two']}
-    assert_equal("{\"sub\":{\"keep\":[\"secret\"],\"other\":[\"one\",\"two\"]}}",header.json_string)
+    header.add_substitution('keep', ['secret'])
+    header.add_substitution('other', %w(one two))
+    assert_equal(
+      '{"sub":{"keep":["secret"],"other":["one","two"]}}',
+      header.json_string)
   end
 
   def test_set_substitutions
     header = Smtpapi::Header.new
-    header.set_substitutions({'keep' => ['secret']})  # sub = {'keep': ['secret']}
-    assert_equal("{\"sub\":{\"keep\":[\"secret\"]}}",header.json_string)
+    header.set_substitutions('keep' => ['secret'])
+    assert_equal('{"sub":{"keep":["secret"]}}', header.json_string)
   end
 
   def test_add_section
     header = Smtpapi::Header.new
     header.add_section('-charge-', 'This ship is useless.')
     header.add_section('-bomber-', 'Only for sad vikings.')
-    assert_equal("{\"section\":{\"-charge-\":\"This ship is useless.\",\"-bomber-\":\"Only for sad vikings.\"}}",header.json_string)
+    assert_equal(
+      '{"section":'\
+        '{"-charge-":"This ship is useless.",'\
+          '"-bomber-":"Only for sad vikings."}}',
+      header.json_string)
   end
 
   def test_set_sections
     header = Smtpapi::Header.new
-    header.set_sections({'-charge-' => 'This ship is useless.'})
-    assert_equal("{\"section\":{\"-charge-\":\"This ship is useless.\"}}",header.json_string)
+    header.set_sections('-charge-' => 'This ship is useless.')
+    assert_equal(
+      '{"section":{"-charge-":"This ship is useless."}}',
+      header.json_string
+    )
   end
 
   def test_add_unique_arg
     header = Smtpapi::Header.new
     header.add_unique_arg('cat', 'dogs')
-    assert_equal("{\"unique_args\":{\"cat\":\"dogs\"}}",header.json_string)
+    assert_equal('{"unique_args":{"cat":"dogs"}}', header.json_string)
   end
 
   def test_set_unique_args
     header = Smtpapi::Header.new
-    header.set_unique_args({'cow' => 'chicken'})
-    header.set_unique_args({'dad' => 'proud'})
-    assert_equal("{\"unique_args\":{\"dad\":\"proud\"}}",header.json_string)
+    header.set_unique_args('cow' => 'chicken')
+    header.set_unique_args('dad' => 'proud')
+    assert_equal('{"unique_args":{"dad":"proud"}}', header.json_string)
   end
 
   def test_add_category
     header = Smtpapi::Header.new
-    header.add_category('tactics') # category = ['tactics']
-    header.add_category('advanced') # category = ['tactics', 'advanced']
-    assert_equal("{\"category\":[\"tactics\",\"advanced\"]}",header.json_string)
+    header.add_category('tactics')
+    header.add_category('advanced')
+    assert_equal('{"category":["tactics","advanced"]}', header.json_string)
   end
 
   def test_set_categories
     header = Smtpapi::Header.new
-    header.set_categories(['tactics', 'advanced']) # category = ['tactics', 'advanced']
-    assert_equal("{\"category\":[\"tactics\",\"advanced\"]}",header.json_string)
+    header.set_categories(%w(tactics advanced))
+    assert_equal('{"category":["tactics","advanced"]}', header.json_string)
   end
 
   def test_add_filter
     header = Smtpapi::Header.new
     header.add_filter('footer', 'enable', 1)
     header.add_filter('footer', 'text/html', '<strong>boo</strong>')
-    assert_equal("{\"filters\":{\"footer\":{\"settings\":{\"enable\":1,\"text/html\":\"<strong>boo</strong>\"}}}}",header.json_string)
+    assert_equal(
+      '{"filters":'\
+        '{"footer":'\
+          '{"settings":'\
+            '{"enable":1,'\
+              '"text/html":"<strong>boo</strong>"'\
+            '}'\
+          '}'\
+        '}'\
+      '}',
+      header.json_string
+    )
   end
 
   def test_set_filters
@@ -97,22 +125,44 @@ class SmtpapiTest < Test::Unit::TestCase
       'footer' => {
         'setting' => {
           'enable' => 1,
-          "text/plain" => 'You can haz footers!'
+          'text/plain' => 'You can haz footers!'
         }
       }
     }
     header.set_filters(filter)
-    assert_equal("{\"filters\":{\"footer\":{\"setting\":{\"enable\":1,\"text/plain\":\"You can haz footers!\"}}}}",header.json_string)
+    assert_equal(
+      '{"filters":'\
+        '{"footer":'\
+          '{"setting":'\
+            '{"enable":1,"text/plain":"You can haz footers!"}'\
+          '}'\
+        '}'\
+      '}',
+      header.json_string
+    )
   end
 
   def test_add_category_unicode
     header = Smtpapi::Header.new
     header.add_category('Martí')
-    header.add_category('天破活殺')    # category = ['天破活殺']
-    header.add_category('天翔十字鳳')  # category = ['天破活殺', '天翔十字鳳']
-    assert_equal("{\"category\":[\"Mart\\u00ed\",\"\\u5929\\u7834\\u6d3b\\u6bba\",\"\\u5929\\u7fd4\\u5341\\u5b57\\u9cf3\"]}",header.json_string)
-    header.add_category('鼖')         # category = ['天破活殺', '天翔十字鳳', '鼖']
-    assert_equal("{\"category\":[\"Mart\\u00ed\",\"\\u5929\\u7834\\u6d3b\\u6bba\",\"\\u5929\\u7fd4\\u5341\\u5b57\\u9cf3\",\"\\ud87e\\ude1b\"]}",header.json_string)
+    header.add_category('天破活殺')
+    header.add_category('天翔十字鳳')
+    assert_equal(
+      '{"category":'\
+        '["Mart\\u00ed",'\
+          '"\\u5929\\u7834\\u6d3b\\u6bba",'\
+          '"\\u5929\\u7fd4\\u5341\\u5b57\\u9cf3"]}',
+      header.json_string
+    )
+    header.add_category('鼖')
+    assert_equal(
+      '{"category":'\
+        '["Mart\\u00ed",'\
+          '"\\u5929\\u7834\\u6d3b\\u6bba",'\
+          '"\\u5929\\u7fd4\\u5341\\u5b57\\u9cf3",'\
+          '"\\ud87e\\ude1b"]}',
+      header.json_string
+    )
   end
 
   def test_sent_send_at
@@ -130,20 +180,25 @@ class SmtpapiTest < Test::Unit::TestCase
     localtime3 = Time.local(2015,  9,  1,  4,  5,  6)
     header.set_send_each_at([localtime1, localtime2, localtime3])
 
-    assert_equal("{\"send_each_at\":[#{localtime1.to_i},#{localtime2.to_i},#{localtime3.to_i}]}", header.json_string)
+    assert_equal(
+      '{"send_each_at":'\
+        "[#{localtime1.to_i},#{localtime2.to_i},#{localtime3.to_i}]"\
+      '}',
+      header.json_string
+    )
   end
 
   def test_asm_group_id
     header = Smtpapi::Header.new
     header.set_asm_group(2)
 
-    assert_equal("{\"asm_group_id\":2}", header.json_string)
+    assert_equal('{"asm_group_id":2}', header.json_string)
   end
 
   def test_ip_pool
     header = Smtpapi::Header.new
-    header.set_ip_pool("test_pool")
+    header.set_ip_pool('test_pool')
 
-    assert_equal("{\"ip_pool\":\"test_pool\"}", header.json_string)
+    assert_equal('{"ip_pool":"test_pool"}', header.json_string)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smtpapi
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Wataru Sato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-14 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.29.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.30.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.29.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.30.0
 description: Smtpapi library for SendGrid.
 email:
 - awwa500@gmail.com
@@ -46,6 +66,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -75,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Smtpapi library for SendGrid.