adknowledge 0.0.3 → 0.0.4

data/.gitignore

@@ -2,3 +2,5 @@
 .bundle
 Gemfile.lock
 pkg/*
+coverage/*
+.rbx/*

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - jruby-19mode
+  - rbx-19mode

data/Gemfile

@@ -2,3 +2,15 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in adstation.gemspec
 gemspec
+
+group :development, :test do
+  platforms :jruby do
+    gem 'gson'
+    gem 'libxml-jruby'
+  end
+
+  platforms :mri do
+    gem 'ox'
+    gem 'oj'
+  end
+end

data/README.md

@@ -1,5 +1,6 @@
 Adknowledge <a id='top'></a>
 ===========
+[![Build Status](https://travis-ci.org/spiegela/adknowledge.png?branch=develop)](https://travis-ci.org/spiegela/adknowledge) [![Gem Version](https://badge.fury.io/rb/adknowledge.png)](http://badge.fury.io/rb/adknowledge) [![Dependency Status](https://gemnasium.com/spiegela/adknowledge.png)](https://gemnasium.com/spiegela/adknowledge) [![Code Climate](https://codeclimate.com/github/spiegela/adknowledge.png)](https://codeclimate.com/github/spiegela/adknowledge) [![Coverage Status](https://coveralls.io/repos/spiegela/adknowledge/badge.png?branch=master)](https://coveralls.io/r/spiegela/adknowledge)
 
 A very Ruby client library for [Adknowledge](http://www.adknowledge.com) APIs
 

data/adknowledge.gemspec

@@ -19,15 +19,15 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   s.add_development_dependency "pry"
   s.add_development_dependency "rspec"
-  s.add_development_dependency "webmock", "1.10"
+  s.add_development_dependency "webmock"
   s.add_development_dependency "vcr"
+  s.add_development_dependency "coveralls"
   s.add_runtime_dependency "rake"
   s.add_runtime_dependency "activesupport"
-  s.add_runtime_dependency "oj"
-  s.add_runtime_dependency "ox"
   s.add_runtime_dependency "multi_xml"
+  s.add_runtime_dependency "multi_json"
+  s.add_runtime_dependency "nokogiri"
   s.add_runtime_dependency "addressable"
   s.add_runtime_dependency "faraday"
-  s.add_runtime_dependency "faraday_middleware"
-  s.add_runtime_dependency "faraday_middleware-parse_oj"
+  s.add_runtime_dependency "faraday_middleware-multi_json"
 end

data/lib/adknowledge/integrated.rb

@@ -1,8 +1,8 @@
 require 'faraday'
-require 'ox'
 require 'addressable/uri'
 require 'faraday_middleware/response/parse_xml'
 require 'active_support/core_ext/module/delegation'
+require 'nokogiri'
 
 module Adknowledge
   class Integrated
@@ -47,14 +47,15 @@ module Adknowledge
     # @return [String] prepared XML request for recipient array
     def recipients= recipient_hashes
       @recipients = recipient_hashes
-      doc = Ox::Document.new version: '1.0'
-      req = Ox::Element.new 'request'
-      doc << Ox::Instruct.new('xml version="1.0" encoding="UTF-8"') << req
-      recipient_hashes.each do |recipient_hash|
-        email_hash = recipient_hash.select{|x| VALID_FIELDS.include? x}
-        req << email_xml(email_hash)
+      doc = Nokogiri::XML::Builder.new do |root|
+        root.request do |req|
+          recipient_hashes.each do |recipient_hash|
+            email_hash = recipient_hash.select{|x| VALID_FIELDS.include? x}
+            email_xml(email_hash, req)
+          end
+        end
       end
-      @request = Ox.dump(doc, indent: 0, with_instruct: true).gsub(/\n/, '')
+      @request = doc.to_xml(save_with: Nokogiri::XML::Node::SaveOptions::AS_XML).gsub("\n", '')
     end
 
 
@@ -174,19 +175,15 @@ module Adknowledge
       uri.query
     end
 
-    def email_xml email_hash
+    def email_xml email_hash, doc
       unless (MANDATORY_FIELDS - email_hash.keys).empty?
         raise ArgumentError, 'One or more mandatory fields were not submitted'
       end
-      e = Ox::Element.new(:email)
-      email_hash.each do |field, value|
-        e << field_xml(field, value)
+      doc.email do |email|
+        email_hash.each do |field, value|
+          email.send(field, value)
+        end
       end
-      e
-    end
-
-    def field_xml field, value
-      Ox::Element.new(field) << value.to_s
     end
 
   end

data/lib/adknowledge/performance.rb

@@ -1,6 +1,6 @@
 require 'faraday'
 require 'faraday_middleware'
-require 'faraday_middleware/parse_oj'
+require 'faraday_middleware/multi_json'
 require 'active_support/core_ext/module/delegation'
 
 module Adknowledge
@@ -66,11 +66,7 @@ module Adknowledge
     # @param [Array] selection(s)
     # @return [Adknowledge::Performance] query object
     def select *selection
-      selection = selection.map{|x| x.to_sym} # handle strings & symbols equally
-      unless (selection - VALID_MEASURES).empty?
-        raise ArgumentError, 'Invalid measurement selection'
-      end
-      @measures.merge! Hash[selection.zip([1] * selection.count)]
+      @measures.merge! paramerize(selection, VALID_MEASURES, 'Invalid measurement selection')
       self
     end
 
@@ -79,11 +75,7 @@ module Adknowledge
     # @param [Array] grouping(s)
     # @return [Adknowledge::Performance] query object
     def group_by *groupings
-      groupings = groupings.map{|x| x.to_sym} # handle strings & symbols equally
-      unless (groupings - VALID_DIMENSIONS).empty?
-        raise ArgumentError, 'Invalid dimension grouping'
-      end
-      @dimensions.merge! Hash[groupings.zip([1] * groupings.count)]
+      @dimensions.merge! paramerize(groupings, VALID_DIMENSIONS, 'Invalid dimension group')
       self
     end
 
@@ -129,10 +121,7 @@ module Adknowledge
     # @param [Boolean] full
     # @return [Adknowledge::Performance] query object
     def full full
-      unless !!full == full #Boolean check
-        raise ArgumentError, 'Full option must be a boolean'
-      end
-      @options[:full] = full ? '1' : '0'
+      @options[:full] = booleanize 'Full', full
       self
     end
 
@@ -141,10 +130,7 @@ module Adknowledge
     # @param [Boolean] nocache
     # @return [Adknowledge::Performance] query object
     def nocache nocache
-      unless !!nocache == nocache #Boolean check
-        raise ArgumentError, 'NoCache option must be a boolean'
-      end
-      @options[:nocache] = nocache ? '1' : '0'
+      @options[:nocache] = booleanize 'NoCache', nocache
       self
     end
 
@@ -153,10 +139,7 @@ module Adknowledge
     # @param [Boolean] display_all
     # @return [Adknowledge::Performance] query object
     def display_all display_all
-      unless !!display_all == display_all #Boolean check
-        raise ArgumentError, "display_all option must be a boolean"
-      end
-      @options[:all] = display_all ? '1' : '0'
+      @options[:all] = booleanize 'DisplayAll', display_all
       self
     end
 
@@ -223,11 +206,26 @@ module Adknowledge
 
     def conn
       @conn ||= Faraday.new(:url => URL) do |b|
-        b.response :oj
+        b.response :multi_json
         b.adapter  Faraday.default_adapter
       end
     end
 
+    def paramerize array, valid, error_str
+      array = array.map{|x| x.to_sym} # handle strings & symbols equally
+      unless (array - valid).empty?
+        raise ArgumentError, error_str
+      end
+      Hash[array.zip([1] * array.count)]
+    end
+
+    def booleanize name, value
+      unless !!value == value #Boolean check
+        raise ArgumentError, "#{name} option must be a boolean"
+      end
+      value ? '1' : '0'
+    end
+
     def valid_pivot_values
       dimensions.keys + ['*']
     end

data/lib/adknowledge/version.rb

@@ -1,3 +1,3 @@
 module Adknowledge
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/adknowledge/integrated_spec.rb

@@ -23,7 +23,7 @@ describe Adknowledge::Integrated do
 
   let :request_xml do
     %q[
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <request>
 <email>
 <recipient>004c58927df600d73d58c817bafc2155</recipient>

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require 'adknowledge'
 require 'rspec'
 require 'vcr'
+require 'coveralls'
 
 VCR.configure do |c|
   c.hook_into :webmock
@@ -14,3 +15,5 @@ VCR.configure do |c|
     match_requests_on: [ :method ]
   }
 end
+
+Coveralls.wear!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adknowledge
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -48,17 +48,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -76,14 +76,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -92,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -108,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -124,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ox
+  name: multi_xml
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -140,7 +140,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: multi_xml
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -156,7 +156,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -172,7 +172,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -188,7 +188,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -204,7 +204,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware-parse_oj
+  name: faraday_middleware-multi_json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -227,6 +227,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -256,18 +257,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 387899590965844068
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 387899590965844068
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -282,3 +277,4 @@ test_files:
 - spec/cassettes/map_single_success.yml
 - spec/cassettes/performance.yml
 - spec/spec_helper.rb
+has_rdoc: