contactology 0.1.2 → 1.0.0

data/.gitignore

@@ -1,5 +1,19 @@
+spec/contactology.yml
+
 *.gem
+*.rbc
 .bundle
+.config
+.yardoc
 Gemfile.lock
-pkg/*
-spec/contactology.yml
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/.rspec

@@ -1,3 +1,2 @@
 --color
 --format documentation
---tty

data/.rvmrc

@@ -3,39 +3,50 @@
 # This is an RVM Project .rvmrc file, used to automatically load the ruby
 # development environment upon cd'ing into the directory
 
-# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
-environment_id="ruby-1.9.2-p180@contactology"
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
+# Only full ruby name is supported here, for short names use:
+#     echo "rvm use 1.9.3" > .rvmrc
+environment_id="ruby-1.9.3-p385@contactology"
+
+# Uncomment the following lines if you want to verify rvm version per project
+# rvmrc_rvm_version="1.18.8 (stable)" # 1.10.1 seams as a safe start
+# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
+#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
+#   return 1
+# }
 
-#
 # First we attempt to load the desired environment directly from the environment
-# file. This is very fast and efficicent compared to running through the entire
+# file. This is very fast and efficient compared to running through the entire
 # CLI and selector. If you want feedback on which environment was used then
 # insert the word 'use' after --create as this triggers verbose mode.
-#
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
   && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
 then
   \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-
-  if [[ -s ".rvm/hooks/after_use" ]]
-  then
-    . ".rvm/hooks/after_use"
+  [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
+    \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
+  if [[ $- == *i* ]] # check for interactive shells
+  then echo "Using: $(tput setaf 2)$GEM_HOME$(tput sgr0)" # show the user the ruby and gemset they are using in green
+  else echo "Using: $GEM_HOME" # don't use colors in non-interactive shells
   fi
 else
   # If the environment file has not yet been created, use the RVM CLI to select.
-  if ! rvm --create  "$environment_id"
-  then
-    echo "Failed to create RVM environment 'ruby-1.8.7-p334@contactology'."
-  fi
+  rvm --create use  "$environment_id" || {
+    echo "Failed to create RVM environment '${environment_id}'."
+    return 1
+  }
 fi
 
-#
-# If you use an RVM gemset file to install a list of gems (*.gems), you can have
-# it be automatically loaded. Uncomment the following and adjust the filename if
-# necessary.
-#
-# filename=".gems"
-# if [[ -s "$filename" ]] ; then
-#   rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d'
+# If you use bundler, this might be useful to you:
+# if [[ -s Gemfile ]] && {
+#   ! builtin command -v bundle >/dev/null ||
+#   builtin command -v bundle | GREP_OPTIONS= \grep $rvm_path/bin/bundle >/dev/null
+# }
+# then
+#   printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
+#   gem install bundler
+# fi
+# if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
+# then
+#   bundle install | GREP_OPTIONS= \grep -vE '^Using|Your bundle is complete'
 # fi
-

data/.travis.yml

@@ -1,5 +1,11 @@
 rvm:
-  - ree
-  - 1.8.7
   - 1.9.2
-script: "cp spec/contactology.example.yml spec/contactology.yml; bundle exec rake spec"
+  - 1.9.3
+before_script:
+  - cp spec/contactology.example.yml spec/contactology.yml
+script:
+  - bundle exec rspec spec
+notifications:
+  email:
+    on_success: change
+    on_failure: always

data/CHANGELOG.markdown

@@ -0,0 +1,46 @@
+# contactology changelog
+
+## [Unreleased][unreleased]
+
+No significant changes.
+
+## [1.0.0][v1.0.0] / 2013-02-22
+
+* Enhancement
+  * Updated and/or loosened dependent library versions in runtime and
+    development. This, though, means that **testing is no longer maintained for
+    MRI 1.8.7 or REE**. Currently, the library does support them, but
+    development dependencies will not install and therefore cannot be
+    explicitly tested in those environments.
+  * Removed json\_pure, watchr, and infinity\_test development dependencies.
+
+## [0.1.2][v0.1.2] / 2011-08-25
+
+* Enhancement
+  * Campaign.find\_by\_name now returns the newest, matching campaign
+  * Campaign#start\_time is now returned as a Time instance
+
+* Bug fixes
+  * SendResult now captures generic API errors
+  * Campaign children now have proper reference of their parent properties
+
+## [0.1.1][v0.1.1] / 2011-08-25
+
+* Bug fixes
+  * Return the correct campaign class from Campaign#find and
+    Campaign#find\_by\_name
+
+## [0.1.0][v0.1.0] / 2011-08-25
+
+* Enhancements
+  * Add Contactology::Campaigns::Transactional#send\_campaign
+  * Allow Issues to be created from Hash-derived instances
+  * Restrict versions of HTTParty and MultiJson
+
+* Bug fixes
+  * Fix failure messages for Campaign#create request timeouts
+
+[unreleased]: http://github.com/nbibler/contactology/compare/v0.1.2...master
+[v0.1.2]: http://github.com/nbibler/contactology/compare/v0.1.1...v0.1.2
+[v0.1.1]: http://github.com/nbibler/contactology/compare/v0.1.0...v0.1.1
+[v0.1.0]: http://github.com/nbibler/contactology/compare/v0.0.2...v0.1.0

data/Gemfile

@@ -1,9 +1,2 @@
 source 'http://rubygems.org'
 gemspec
-
-gem 'json_pure'
-
-group :development, :test do
-  gem 'rake'
-  gem 'webmock', :git => 'https://github.com/bblimke/webmock.git', :ref => 'af4c05480571905be786fc35b8b9703c3ea7fe6c'
-end

data/README.markdown

@@ -54,10 +54,12 @@ your needs.
 This library uses [Travis CI][ci] to continuously test and remain compatible
 with the following Rubies:
 
-* MRI Ruby 1.8.7,
-* MRI Ruby 1.9.2, and
-* REE 1.8.7
+* MRI Ruby 1.9.2,
+* MRI Ruby 1.9.3
 
+Currently, the library should also work with MRI 1.8.7 and REE, but the
+development dependencies (factory_girl) are no longer compatible and therefore
+have been removed from continuous integration.
 
 [api]: http://www.contactology.com/email-marketing-api/ (Contactology API Documentation)
 [ci]: http://travis-ci.org/nbibler/contactology

data/contactology.gemspec

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'contactology/version'
 
 Gem::Specification.new do |s|
@@ -11,19 +12,18 @@ Gem::Specification.new do |s|
   s.summary     = %q{A Ruby interface to the Contactology email marketing API}
   s.description = %q{This library provides Ruby calls to interact with the Contactology email marketing API}
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.files         = `git ls-files`.split($/)
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency 'hashie', '~> 1.1'
-  s.add_dependency 'httparty', '~> 0.7.8'
+  s.add_dependency 'hashie', '>= 1.1', '< 3.0'
+  s.add_dependency 'httparty', '>= 0.7.8', '<= 0.10.2'
   s.add_dependency 'multi_json', '~> 1.0'
 
-  s.add_development_dependency 'vcr', '~> 1.5'
+  s.add_development_dependency 'vcr', '~> 2.0'
+  s.add_development_dependency 'webmock', '~> 1.6'
   s.add_development_dependency 'rspec', '~> 2.0'
-  s.add_development_dependency 'infinity_test'
-  s.add_development_dependency 'factory_girl', '~> 2.0'
+  s.add_development_dependency 'factory_girl', '~> 4.0'
   s.add_development_dependency 'rack', '~> 1.2'
-  s.add_development_dependency 'watchr'
 end

data/lib/contactology/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Contactology
-  VERSION = '0.1.2'
+  VERSION = '1.0.0'
 end

data/spec/cassettes/campaign/destroy.yml

@@ -0,0 +1,293 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.emailcampaigns.net/2/REST/?key=%{API_KEY}&method=List_Add_Public&name=Factory%20List
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/json
+      User-Agent:
+      - contactology/0.1.2 (Rubygems; Ruby 1.9.3 x86_64-darwin12.2.0)
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Powered-By:
+      - PHP/5.2.10
+      Set-Cookie:
+      - PHPSESSID=87171deb249617176befd9fb28463bcb; path=/
+      Expires:
+      - Thu, 19 Nov 1981 08:52:00 GMT
+      Cache-Control:
+      - no-store, no-cache, must-revalidate, post-check=0, pre-check=0
+      Pragma:
+      - no-cache
+      Content-Type:
+      - text/plain;charset=UTF-8
+      Connection:
+      - close
+      Transfer-Encoding:
+      - chunked
+      Date:
+      - Wed, 20 Feb 2013 05:18:16 GMT
+      Server:
+      - lighttpd/1.4.28
+    body:
+      encoding: US-ASCII
+      string: '189'
+    http_version: 
+  recorded_at: Wed, 20 Feb 2013 05:18:16 GMT
+- request:
+    method: get
+    uri: https://api.emailcampaigns.net/2/REST/?key=%{API_KEY}&listId=189&method=List_Get_Info
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/json
+      User-Agent:
+      - contactology/0.1.2 (Rubygems; Ruby 1.9.3 x86_64-darwin12.2.0)
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Powered-By:
+      - PHP/5.2.10
+      Set-Cookie:
+      - PHPSESSID=3330dd1a21f6bfe2350d4face0af3f77; path=/
+      Expires:
+      - Thu, 19 Nov 1981 08:52:00 GMT
+      Cache-Control:
+      - no-store, no-cache, must-revalidate, post-check=0, pre-check=0
+      Pragma:
+      - no-cache
+      Content-Type:
+      - text/plain;charset=UTF-8
+      Connection:
+      - close
+      Transfer-Encoding:
+      - chunked
+      Date:
+      - Wed, 20 Feb 2013 05:18:16 GMT
+      Server:
+      - lighttpd/1.4.28
+    body:
+      encoding: US-ASCII
+      string: ! '{"listId":"189","name":"Factory List","description":null,"type":"public","created":"2013-02-20
+        05:18:16","optIn":false}'
+    http_version: 
+  recorded_at: Wed, 20 Feb 2013 05:18:16 GMT
+- request:
+    method: get
+    uri: https://api.emailcampaigns.net/2/REST/?campaignName=factory%20campaign&content%5Btext%5D=This%20is%20a%20good%20message!%20%7BCOMPANY_ADDRESS%7D&key=%{API_KEY}&method=Campaign_Create_Standard&recipients%5Blist%5D=189&senderEmail=sender@example.com&senderName=Sender%20Example&subject=Factory%20Campaign%20Message
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/json
+      User-Agent:
+      - contactology/0.1.2 (Rubygems; Ruby 1.9.3 x86_64-darwin12.2.0)
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Powered-By:
+      - PHP/5.2.10
+      Set-Cookie:
+      - PHPSESSID=79f3c42c233d33f322c8eb26943953ac; path=/
+      Expires:
+      - Thu, 19 Nov 1981 08:52:00 GMT
+      Cache-Control:
+      - no-store, no-cache, must-revalidate, post-check=0, pre-check=0
+      Pragma:
+      - no-cache
+      Content-Type:
+      - text/plain;charset=UTF-8
+      Connection:
+      - close
+      Transfer-Encoding:
+      - chunked
+      Date:
+      - Wed, 20 Feb 2013 05:18:16 GMT
+      Server:
+      - lighttpd/1.4.28
+    body:
+      encoding: US-ASCII
+      string: '117'
+    http_version: 
+  recorded_at: Wed, 20 Feb 2013 05:18:16 GMT
+- request:
+    method: get
+    uri: https://api.emailcampaigns.net/2/REST/?campaignId=117&key=%{API_KEY}&method=Campaign_Get_Info
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/json
+      User-Agent:
+      - contactology/0.1.2 (Rubygems; Ruby 1.9.3 x86_64-darwin12.2.0)
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Powered-By:
+      - PHP/5.2.10
+      Set-Cookie:
+      - PHPSESSID=c5916ecd71a3b1f7d8c9f11024c4b63a; path=/
+      Expires:
+      - Thu, 19 Nov 1981 08:52:00 GMT
+      Cache-Control:
+      - no-store, no-cache, must-revalidate, post-check=0, pre-check=0
+      Pragma:
+      - no-cache
+      Content-Type:
+      - text/plain;charset=UTF-8
+      Connection:
+      - close
+      Transfer-Encoding:
+      - chunked
+      Date:
+      - Wed, 20 Feb 2013 05:18:17 GMT
+      Server:
+      - lighttpd/1.4.28
+    body:
+      encoding: US-ASCII
+      string: ! '{"campaignId":"117","campaignName":"factory campaign","type":"standard","contentType":"standard","status":"draft","recipients":{"list":["189"]},"exclusions":[],"subject":"Factory
+        Campaign Message","senderName":"Sender Example","senderEmail":"sender@example.com","recipientName":"","replyToName":"","replyToEmail":null,"content":{"html":"","text":"This
+        is a good message! {COMPANY_ADDRESS}"},"startTime":"2013-02-20 05:18:16","authenticate":false,"trackReplies":false,"showInArchive":false,"viewInBrowser":false,"trackOpens":true,"trackClickThruHTML":true,"trackClickThruText":true,"googleAnalyticsName":null,"clickTaleName":null,"clickTaleCustomFields":[""],"useCustomUrlParameters":null,"customUrlParameters":null,"footerId":"0","facebookAutopost":{"facebookAccount":null,"facebookLocation":null,"facebookName":null,"facebookDescription":null,"facebookPicture":null},"twitterAutopost":{"twitterAccount":null}}'
+    http_version: 
+  recorded_at: Wed, 20 Feb 2013 05:18:17 GMT
+- request:
+    method: get
+    uri: https://api.emailcampaigns.net/2/REST/?campaignId=117&key=%{API_KEY}&method=Campaign_Delete
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/json
+      User-Agent:
+      - contactology/0.1.2 (Rubygems; Ruby 1.9.3 x86_64-darwin12.2.0)
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Powered-By:
+      - PHP/5.2.10
+      Set-Cookie:
+      - PHPSESSID=13447e4859a6a336f5b032af413770a3; path=/
+      Expires:
+      - Thu, 19 Nov 1981 08:52:00 GMT
+      Cache-Control:
+      - no-store, no-cache, must-revalidate, post-check=0, pre-check=0
+      Pragma:
+      - no-cache
+      Content-Type:
+      - text/plain;charset=UTF-8
+      Connection:
+      - close
+      Transfer-Encoding:
+      - chunked
+      Date:
+      - Wed, 20 Feb 2013 05:18:17 GMT
+      Server:
+      - lighttpd/1.4.28
+    body:
+      encoding: US-ASCII
+      string: 'true'
+    http_version: 
+  recorded_at: Wed, 20 Feb 2013 05:18:17 GMT
+- request:
+    method: get
+    uri: https://api.emailcampaigns.net/2/REST/?campaignId=117&key=%{API_KEY}&method=Campaign_Get_Info
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/json
+      User-Agent:
+      - contactology/0.1.2 (Rubygems; Ruby 1.9.3 x86_64-darwin12.2.0)
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Powered-By:
+      - PHP/5.2.10
+      Set-Cookie:
+      - PHPSESSID=f0fd9412be958c8c61f623fd396810b9; path=/
+      Expires:
+      - Thu, 19 Nov 1981 08:52:00 GMT
+      Cache-Control:
+      - no-store, no-cache, must-revalidate, post-check=0, pre-check=0
+      Pragma:
+      - no-cache
+      Content-Type:
+      - text/plain;charset=UTF-8
+      Connection:
+      - close
+      Transfer-Encoding:
+      - chunked
+      Date:
+      - Wed, 20 Feb 2013 05:18:18 GMT
+      Server:
+      - lighttpd/1.4.28
+    body:
+      encoding: US-ASCII
+      string: ! '{"result":"error","message":"Input Error: campaignId 117 not found","code":601}'
+    http_version: 
+  recorded_at: Wed, 20 Feb 2013 05:18:18 GMT
+- request:
+    method: get
+    uri: https://api.emailcampaigns.net/2/REST/?key=%{API_KEY}&listId=189&method=List_Delete
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/json
+      User-Agent:
+      - contactology/0.1.2 (Rubygems; Ruby 1.9.3 x86_64-darwin12.2.0)
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Powered-By:
+      - PHP/5.2.10
+      Set-Cookie:
+      - PHPSESSID=4569538230ace7bfbe824d5815fb50da; path=/
+      Expires:
+      - Thu, 19 Nov 1981 08:52:00 GMT
+      Cache-Control:
+      - no-store, no-cache, must-revalidate, post-check=0, pre-check=0
+      Pragma:
+      - no-cache
+      Content-Type:
+      - text/plain;charset=UTF-8
+      Connection:
+      - close
+      Transfer-Encoding:
+      - chunked
+      Date:
+      - Wed, 20 Feb 2013 05:18:18 GMT
+      Server:
+      - lighttpd/1.4.28
+    body:
+      encoding: US-ASCII
+      string: 'true'
+    http_version: 
+  recorded_at: Wed, 20 Feb 2013 05:18:18 GMT
+recorded_with: VCR 2.4.0