salsa_labs 0.0.2.alpha → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47ec06a20ffc63c76de20bb1b485975570f28eb5
-  data.tar.gz: 0a059ad4f635a74052e1f3306e52e016169920e2
+  metadata.gz: f959fc08bf03b183bc7192bfe57e88cd6000bea6
+  data.tar.gz: a16c2bf7e35a05622c185d1e96c758db622ed42c
 SHA512:
-  metadata.gz: e5e1c9420a5905b6c8c8736caf9f668b47a1a85aca7bbee516c8c3fb875da62a9259e2f6a73ad5dff4a312be199b4f4fbc45a733dbf2435cc15599e8867763b0
-  data.tar.gz: b9d8561c84221ec1c9540975b3c42ab9f0a6e92a603ad00b17b82bd38f4daef82154876dfb3deaccc5da52d5987d602272b951294630d04c7b6b2819647ff9a2
+  metadata.gz: d445949a492a7ab0ecb613973504c2be89720d823eb68ef358ba978040a8f8557a98a6694c410368d73526368f75ef86e266d29a091a70a679de73a91c62d9fa
+  data.tar.gz: cc0c9eed3af1871df89eaee964b23ec54881cd6a7b5f36de37a4a16d20754a2f1c9164ba40243ad70e181a9e62895836029efc8042a2ea0ad414137d06d878f0

data/.gitignore

@@ -1,3 +1,4 @@
 coverage
 *.gem
 tmp
+.idea

data/.rspec

@@ -0,0 +1 @@
+--color

data/.ruby-gemset

@@ -0,0 +1 @@
+salsa_labs

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0

data/.travis.yml

@@ -4,7 +4,3 @@ rvm:
   - 2.0.0
   - 2.1.0
   - jruby-19mode
-  - rbx-2.1.1
-  - ruby-head
-  - jruby-head
-  - ree

data/Gemfile.lock

@@ -11,6 +11,12 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.5)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    celluloid-io (0.15.0)
+      celluloid (>= 0.15.0)
+      nio4r (>= 0.5.0)
+    coderay (1.1.0)
     crack (0.4.1)
       safe_yaml (~> 0.9.0)
     diff-lcs (1.2.5)
@@ -18,16 +24,43 @@ GEM
     dotenv (0.9.0)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
+    ffi (1.9.3)
+    formatador (0.2.4)
+    guard (2.5.1)
+      formatador (>= 0.2.4)
+      listen (~> 2.6)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-rspec (4.2.8)
+      guard (~> 2.1)
+      rspec (>= 2.14, < 4.0)
     httparty (0.12.0)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
     json (1.8.1)
+    listen (2.7.0)
+      celluloid (>= 0.15.2)
+      celluloid-io (>= 0.15.0)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.4)
+    method_source (0.8.2)
     mini_portile (0.5.2)
     multi_json (1.8.2)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
+    nio4r (1.0.0)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rake (10.1.1)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.3)
+      ffi (>= 0.5.0)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -42,6 +75,9 @@ GEM
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
+    slop (3.4.7)
+    thor (0.18.1)
+    timers (1.1.0)
     vcr (2.8.0)
     webmock (1.16.1)
       addressable (>= 2.2.7)
@@ -51,6 +87,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  guard
+  guard-rspec
+  rake (~> 10.1.1)
   rspec (~> 2.14)
   salsa_labs!
   simplecov (~> 0.8)

data/Guardfile

@@ -0,0 +1,24 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard :rspec do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+
+  # Capybara features specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end
+

data/README.md

@@ -4,7 +4,7 @@
 Version](https://badge.fury.io/rb/salsa_labs.png)](http://badge.fury.io/rb/salsa_labs)
 [![Build Status](https://travis-ci.org/VelocityStrategies/ruby-salsa_labs.png?branch=master)](https://travis-ci.org/VelocityStrategies/ruby-salsa_labs)
 [![Dependency Status](https://gemnasium.com/VelocityStrategies/ruby-salsa_labs.png)](https://gemnasium.com/VelocityStrategies/ruby-salsa_labs)
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/VelocityStrategies/ruby-salsa_labs)
+[![Code Climate](https://codeclimate.com/github/VelocityStrategies/ruby-salsa_labs.png)](https://codeclimate.com/github/VelocityStrategies/ruby-salsa_labs)
 
 ``salsa_labs`` can fetch data from the [Salsa Labs](http://salsalabs.com) API.
 
@@ -24,9 +24,9 @@ Or install it yourself as:
 
 ## Usage
 
-By default, you can store your API credentials as the environment variables ``SALSA_LABS_API_EMAIL`` and ``SALSA_LABS_API_PASSWORD`` to avoid the need to re-enter your password multiple times. Otherwise you will need to pass your credentials into the ``SalsaLabs::ApiClient`` or appropriate fetching method as you call it.
+By default, you can store your API credentials as the environment variables `SALSA_LABS_API_EMAIL` and `SALSA_LABS_API_PASSWORD` to avoid the need to re-enter your password multiple times. Otherwise you will need to pass your credentials into the ``SalsaLabs::ApiClient`` or appropriate fetching method as you call it.
 
-``SalsaLabs::ApiClient`` is a general-purpose object for performing GET requests from the Salsa API. 
+`SalsaLabs::ApiClient` is a general-purpose object for performing GET requests from the Salsa API. 
 
 ```ruby
 # Create a client
@@ -45,7 +45,7 @@ client.fetch('getObjects.sjs', {object: 'Supporter', State: 'DC'})
 You can get a list of API calls and information about Salsa database objects here:
 [https://help.salsalabs.com/entries/23537918-Getting-data-from-Salsa](https://help.salsalabs.com/entries/23537918-Getting-data-from-Salsa)
 
-Currently specific functionality exists to work with Action campaigns, but more objects will be added later.
+Currently specific functionality exists to work with Action campaigns(`SalsaLabs::Action`), Supporters (`SalsaLabs::Supporter`), and the join table Supporter Actions (`SalsaLabs::SupporterAction`), but more objects will be added later.
 
 ```ruby
 # Fetch all actions from Salsa. First argument is filter criteria, second argument is credentials if you are not storing them as environment variables.
@@ -57,7 +57,7 @@ actions.first.attributes
 # => {'title' => 'My Action Title', 'organization_key' => '90210', action_key => '1234'}
 ```
 
-``SalsaLabs::Action#attributes`` returns a hash corresponding to all the attributes returned by the API, so it should accommodate custom fields and/or new fields added later by SalsaLabs. All attribute names are downcased. 
+`SalsaLabs::Action#attributes` returns a hash corresponding to all the attributes returned by the API, so it should accommodate custom fields and/or new fields added later by SalsaLabs. All attribute names are downcased. 
 
 ## Dependencies
 
@@ -65,7 +65,7 @@ Ruby 1.9 is required.
 
 ## Credits
 
-The ``salsa_labs`` gem was created and is maintained by [Allison Sheren](http://github.com/asheren) and [Geoff Harcourt](http://github.com/geoffharcourt).
+The `salsa_labs` gem was created and is maintained by [Allison Sheren](http://github.com/asheren) and [Geoff Harcourt](http://github.com/geoffharcourt).
 
 Development is generously sponsored by [Velocity](http://wearevelocity.com), in support of their work with progressive organizations.
 
@@ -79,6 +79,6 @@ Development is generously sponsored by [Velocity](http://wearevelocity.com), in
 
 ## License
 
-The ``salsa_labs`` gem is Copyright 2013-2014 Velocity. It is free software, and
+The `salsa_labs` gem is Copyright 2013-2014 Velocity. It is free software, and
 may be redistributed under the terms of the MIT license, specified in the 
 LICENSE file.

data/Rakefile

@@ -1 +1,6 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/salsa_labs/action.rb

@@ -4,13 +4,6 @@ module SalsaLabs
   # the Salsa Labs / DemocracyInAction CRM.
   ##
   class Action < SalsaObject
-
-    attr_reader :attributes
-
-    def initialize(attributes)
-      @attributes = attributes
-    end
-
     def action_key
       (attributes['action_key'] || 0).to_i
     end
@@ -28,8 +21,8 @@ module SalsaLabs
     end
 
     def self.fetch(credentials = {})
-      ActionsFetcher.new(credentials).fetch
+      ObjectsFetcher.fetch(type: 'Action', item_class: self,
+                           credentials: credentials)
     end
-
   end
 end

data/lib/salsa_labs/objects_fetcher.rb

@@ -0,0 +1,71 @@
+module SalsaLabs
+  ##
+  # Service object that fetches a collection of objects from API and
+  # returns them as instances of a specified class
+  ##
+  class ObjectsFetcher
+    def self.fetch(opts = {})
+      filters = opts[:filters] || {}
+      credentials = opts[:credentials] || {}
+      client = SalsaLabs::ApiClient.new(credentials)
+      type = opts.fetch(:type)
+      item_class = opts[:item_class] || SalsaLabs::SalsaObject
+      new(filters: filters, client: client, type: type, item_class: item_class).fetch
+    end
+
+    def initialize(opts = {})
+      @filters = opts[:filters]
+      @client = opts[:client]
+      @type = opts[:type]
+      @item_class = opts[:item_class]
+    end
+
+    def fetch
+      item_nodes.map do |node|
+        item_class.new(SalsaLabsApiObjectNode.new(node).attributes)
+      end
+    end
+
+    private
+
+    attr_reader :client, :filters, :type, :item_class
+
+    def api_call
+      client.fetch('/api/getObjects.sjs', api_parameters)
+    end
+
+    def api_parameters
+      filters.merge(object: type)
+    end
+
+    def item_nodes
+      Nokogiri::XML(api_call).css('item')
+    end
+
+    ##
+    # Object used to translate API's XML node into a hash of attributes for
+    # SalsaLabs::Action creation.
+    ##
+    class SalsaLabsApiObjectNode
+
+      def initialize(xml_element)
+        @node = xml_element
+      end
+
+      def attributes
+        children.inject({}) do |memo, attribute|
+          memo[attribute.name.downcase] = attribute.text if attribute.element?
+          memo
+        end
+      end
+
+      private
+
+      attr_reader :node
+
+      def children
+        node.children
+      end
+    end
+  end
+end

data/lib/salsa_labs/supporter.rb

@@ -0,0 +1,17 @@
+module SalsaLabs
+  class Supporter < SalsaObject
+    def email
+      attributes['email']
+    end
+
+    def supporter_key
+      attributes['supporter_key'].to_i
+    end
+
+    def self.fetch(credentials = {})
+      ObjectsFetcher.fetch(credentials: credentials,
+                           type: 'supporter',
+                           item_class: self)
+    end
+  end
+end

data/lib/salsa_labs/supporter_action.rb

@@ -0,0 +1,21 @@
+module SalsaLabs
+  class SupporterAction < SalsaObject
+    def supporter_key
+      attributes['supporter_key'].to_i if attributes['supporter_key']
+    end
+
+    def action_key
+      attributes['action_key'].to_i if attributes['action_key']
+    end
+
+    def supporter_action_key
+      attributes['supporter_action_key'].to_i if attributes['supporter_action_key']
+    end
+
+    def self.fetch(credentials = {})
+      ObjectsFetcher.fetch(type: 'supporter_action',
+                           item_class: self,
+                           credentials: credentials)
+    end
+  end
+end

data/lib/salsa_labs/version.rb

@@ -1,3 +1,3 @@
 module SalsaLabs
-  VERSION = "0.0.2.alpha"
+  VERSION = '0.0.3'
 end

data/lib/salsa_labs.rb

@@ -5,7 +5,9 @@ require 'salsa_labs/version'
 require 'salsa_labs/api_client'
 require 'salsa_labs/salsa_object'
 require 'salsa_labs/action'
-require 'salsa_labs/actions_fetcher'
+require 'salsa_labs/supporter'
+require 'salsa_labs/supporter_action'
+require 'salsa_labs/objects_fetcher'
 
 module SalsaLabs
 

data/salsa_labs.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.email         = ['asheren@gmail.com']
   gem.description   = %q{A Ruby binding for the Salsa Labs (http://salsalabs.com) API.}
   gem.summary       = %q{Salsa Labs' API contains information about supporters, donations, and actions. This gem faciliates pulling that information into a Ruby application.}
-  gem.homepage      = "http://github.com/geoffharcourt/ruby-salsa_labs"
+  gem.homepage      = 'http://github.com/geoffharcourt/ruby-salsa_labs'
   gem.files         = `git ls-files`.split($/)
   gem.test_files    = gem.files.grep(%r{^(spec)/})
   gem.require_paths = ['lib']
@@ -21,9 +21,11 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'httparty', '~> 0.12'
   gem.add_runtime_dependency 'nokogiri', '~> 1.5'
 
+  gem.add_development_dependency 'guard'
+  gem.add_development_dependency 'guard-rspec'
+  gem.add_development_dependency 'rake', '~> 10.1.1'
   gem.add_development_dependency 'rspec', '~> 2.14'
   gem.add_development_dependency 'simplecov', '~> 0.8'
   gem.add_development_dependency 'vcr', '~> 2.8'
   gem.add_development_dependency 'webmock', '~> 1.16'
-
 end

data/spec/fixtures/getObjects.sjs_supporter.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<data organization_KEY="6120">
+  <supporter>
+    <item>
+      <supporter_KEY>31752865</supporter_KEY>
+      <organization_KEY>6120</organization_KEY>
+      <chapter_KEY/>
+      <Last_Modified>Fri Mar 19 2010 17:43:20 GMT-0400 (EDT)</Last_Modified>
+      <Date_Created>Thu Mar 11 2010 02:29:46 GMT-0500 (EST)</Date_Created>
+      <Title/>
+      <First_Name>Christopher</First_Name>
+      <MI/>
+      <Last_Name>Doorley</Last_Name>
+      <Suffix/>
+      <Email>chris@example.com</Email>
+      <Password/>
+      <Receive_Email>3</Receive_Email>
+      <Email_Status/>
+      <Email_Preference/>
+      <Soft_Bounce_Count>1</Soft_Bounce_Count>
+      <Hard_Bounce_Count/>
+      <Last_Bounce>Fri Mar 19 2010 17:43:20 GMT-0400 (EDT)</Last_Bounce>
+      <Receive_Phone_Blasts_BOOLVALUE>false</Receive_Phone_Blasts_BOOLVALUE>
+      <Receive_Phone_Blasts>false</Receive_Phone_Blasts>
+      <Phone/>
+      <Cell_Phone/>
+      <Phone_Provider/>
+      <Work_Phone/>
+      <Pager/>
+      <Home_Fax/>
+      <Work_Fax/>
+      <Street/>
+      <Street_2/>
+      <Street_3/>
+      <City/>
+      <State/>
+      <Zip/>
+      <PRIVATE_Zip_Plus_4>0000</PRIVATE_Zip_Plus_4>
+      <County/>
+      <District/>
+      <Country/>
+      <Latitude/>
+      <Longitude/>
+      <Organization>Velocity Strategies</Organization>
+      <Department/>
+      <Occupation/>
+      <Instant_Messenger_Service/>
+      <Instant_Messenger_Name/>
+      <Web_Page/>
+      <Alternative_Email/>
+      <Other_Data_1/>
+      <Other_Data_2/>
+      <Other_Data_3/>
+      <Notes/>
+      <Source>Web</Source>
+      <Source_Details>http://velocitystrategies.com/contact</Source_Details>
+      <Source_Tracking_Code>(No Original Source Available)</Source_Tracking_Code>
+      <Tracking_Code/>
+      <Status/>
+      <uid/>
+      <Timezone/>
+      <Language_Code/>
+      <BLOB0>This is a test of the email contact system.</BLOB0>
+      <key>31752865</key>
+      <object>supporter</object>
+    </item>
+  </supporter>
+</data>

data/spec/fixtures/getObjects.sjs_supporter_actions.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<data organization_KEY="6120">
+  <supporter_action>
+    <item>
+      <supporter_action_KEY>898207</supporter_action_KEY>
+      <organization_KEY>0</organization_KEY>
+      <chapter_KEY/>
+      <supporter_KEY>123</supporter_KEY>
+      <action_KEY>234</action_KEY>
+      <Last_Modified>Sat Mar 13 2010 03:10:05 GMT-0500 (EST)</Last_Modified>
+      <Date_Created>Sat Mar 13 2010 03:10:05 GMT-0500 (EST)</Date_Created>
+      <supporter_action_comment_KEY/>
+      <Anonymous/>
+      <tracking_code/>
+      <key>898207</key>
+      <object>supporter_action</object>
+    </item>
+  </supporter_action>
+</data>

data/spec/salsa_labs/action_spec.rb

@@ -51,17 +51,19 @@ describe SalsaLabs::Action do
   end
 
   describe ".fetch" do
-    let(:actions_fetcher) { double('ActionsFetcher', fetch: []) }
+    let(:objects_fetcher) { double('ObjectsFetcher', fetch: []) }
 
     before(:each) do
-      SalsaLabs::ActionsFetcher.stub(new: actions_fetcher)
+      SalsaLabs::ObjectsFetcher.stub(fetch: nil)
     end
 
-    it "calls .fetch on an SalsaLabs::ActionsFetcher object" do
-      SalsaLabs::Action.fetch
+    it "passes the credentials to actions fetcher" do
+      SalsaLabs::Action.fetch(email: 'foo@bar.com', password: 'pass')
 
-      expect(actions_fetcher).to have_received(:fetch)
+      expect(SalsaLabs::ObjectsFetcher).to have_received(:fetch).
+        with(credentials: {email: 'foo@bar.com', password: 'pass'},
+             type: 'Action',
+             item_class: SalsaLabs::Action)
     end
   end
-
 end

data/spec/salsa_labs/objects_fetcher_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+describe SalsaLabs::ObjectsFetcher do
+  let(:client) do
+    double(
+      'API client',
+      fetch: File.read('spec/fixtures/getObjects.sjs_action.xml')
+    )
+  end
+
+  describe "#fetch" do
+    before(:each) do
+      allow(SalsaLabs::ApiClient).to receive(:new) { client }
+    end
+
+    it "calls the getObjects API endpoint" do
+      SalsaLabs::ObjectsFetcher.fetch(type: 'Action')
+
+      expect(client).to have_received(:fetch).
+        with('/api/getObjects.sjs', {object: 'Action'})
+    end
+
+    it "returns an array of SalsaLabs::Action objects" do
+      results = SalsaLabs::ObjectsFetcher.fetch(type: 'Action', item_class: SalsaLabs::Action)
+
+      expect(results).to be_a(Array)
+      expect(results.first).to be_a(SalsaLabs::Action)
+    end
+  end
+
+  it "parses actions" do
+    client = double('API Client', fetch: File.read('spec/fixtures/getObjects.sjs_action.xml'))
+    action = SalsaLabs::ObjectsFetcher.new(type: 'Action',
+                                           item_class: SalsaLabs::Action,
+                                           filters: {},
+                                           client: client).fetch.first
+
+    expect(action.action_key).to eq(6656)
+    expect(action.description).to eq("<p>&#160;</p>")
+    expect(action.title).to eq("My Action Title")
+    expect(action.reference_name).to eq("My TItle")
+  end
+
+  it "parses supporters" do
+    client = double('API Client', fetch: File.read('spec/fixtures/getObjects.sjs_supporter.xml'))
+    supporter = SalsaLabs::ObjectsFetcher.new(type: 'supporter',
+                                              item_class: SalsaLabs::Supporter,
+                                              filters: {},
+                                              client: client).fetch.first
+
+    expect(supporter.supporter_key).to eq(31752865)
+    expect(supporter.email).to eq("chris@example.com")
+  end
+
+  it "parses supporter actions" do
+    client = double('API Client', fetch: File.read('spec/fixtures/getObjects.sjs_supporter_actions.xml'))
+    supporter_action = SalsaLabs::ObjectsFetcher.new(type: 'supporter_action',
+                                                     item_class: SalsaLabs::SupporterAction,
+                                                     filters: {},
+                                                     client: client).fetch.first
+
+    expect(supporter_action.supporter_action_key).to eq(898207)
+    expect(supporter_action.supporter_key).to eq(123)
+    expect(supporter_action.action_key).to eq(234)
+  end
+end

data/spec/salsa_labs/salsa_object_spec.rb

@@ -12,7 +12,7 @@ describe SalsaLabs::SalsaObject do
   let(:salsa_object) { SalsaLabs::SalsaObject.new(attributes) }
 
   describe "#attributes" do
-    it "returns the hash used to constuct the object" do
+    it "returns the hash used to construct the object" do
       expect(salsa_object.attributes).to eq(attributes)
     end
   end

data/spec/salsa_labs/supporter_action_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe SalsaLabs::SupporterAction do
+  it "returns action_key" do
+    supporter_action = SalsaLabs::SupporterAction.new('action_key' => '123')
+
+    expect(supporter_action.action_key).to eq(123)
+  end
+
+  it "returns nil for nil action_key" do
+    supporter_action = SalsaLabs::SupporterAction.new({})
+
+    expect(supporter_action.action_key).to be_nil
+  end
+
+  it "returns supporter_key" do
+    supporter_action = SalsaLabs::SupporterAction.new('supporter_key' => '123')
+
+    expect(supporter_action.supporter_key).to eq(123)
+  end
+
+  it "returns nil for nil supporter_key" do
+    supporter_action = SalsaLabs::SupporterAction.new({})
+
+    expect(supporter_action.supporter_key).to be_nil
+  end
+
+  it "returns supporter_action_key" do
+    supporter_action = SalsaLabs::SupporterAction.new('supporter_action_key' => '123')
+
+    expect(supporter_action.supporter_action_key).to eq(123)
+  end
+
+  it "returns nil for nil supporter_action_key" do
+    supporter_action = SalsaLabs::SupporterAction.new({})
+
+    expect(supporter_action.supporter_action_key).to be_nil
+  end
+
+  describe ".fetch" do
+    it "fetches the supporter actions" do
+      SalsaLabs::ObjectsFetcher.stub(:fetch)
+
+      SalsaLabs::SupporterAction.fetch(email: "foo@bar.com",
+                                       password: "pass")
+
+      expect(SalsaLabs::ObjectsFetcher).to have_received(:fetch).with(
+        credentials: {email: "foo@bar.com", password: "pass"},
+        type: "supporter_action",
+        item_class: SalsaLabs::SupporterAction)
+    end
+  end
+end

data/spec/salsa_labs/supporter_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe SalsaLabs::Supporter do
+  let(:supporter) { SalsaLabs::Supporter.new('email' => 'bob@example.com',
+                                             'supporter_key' => '123') }
+
+  it "returns supporter's key" do
+    expect(supporter.supporter_key).to eq(123)
+  end
+
+  it "returns supporter's email" do
+    expect(supporter.email).to eq('bob@example.com')
+  end
+
+  describe ".fetch" do
+    it "passes the credentials to object fetcher" do
+      SalsaLabs::ObjectsFetcher.stub(:fetch)
+
+      SalsaLabs::Supporter.fetch(email: 'foo@bar.com', password: 'pass')
+
+      expect(SalsaLabs::ObjectsFetcher).to have_received(:fetch).with(
+        type: 'supporter',
+        item_class: SalsaLabs::Supporter,
+        credentials: {
+          email: 'foo@bar.com',
+          password: 'pass'
+        })
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: salsa_labs
 version: !ruby/object:Gem::Version
-  version: 0.0.2.alpha
+  version: 0.0.3
 platform: ruby
 authors:
 - Geoff Harcourt
@@ -9,118 +9,160 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-29 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.12'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.1.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.8'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.16'
 description: A Ruby binding for the Salsa Labs (http://salsalabs.com) API.
@@ -130,25 +172,35 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .ruby-gemset
+- .ruby-version
+- .travis.yml
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
 - lib/salsa_labs.rb
 - lib/salsa_labs/action.rb
-- lib/salsa_labs/actions_fetcher.rb
 - lib/salsa_labs/api_client.rb
+- lib/salsa_labs/objects_fetcher.rb
 - lib/salsa_labs/salsa_object.rb
+- lib/salsa_labs/supporter.rb
+- lib/salsa_labs/supporter_action.rb
 - lib/salsa_labs/version.rb
 - salsa_labs.gemspec
 - spec/fixtures/getObjects.sjs_action.xml
+- spec/fixtures/getObjects.sjs_supporter.xml
+- spec/fixtures/getObjects.sjs_supporter_actions.xml
 - spec/salsa_labs/action_spec.rb
-- spec/salsa_labs/actions_fetcher_spec.rb
 - spec/salsa_labs/api_client_spec.rb
+- spec/salsa_labs/objects_fetcher_spec.rb
 - spec/salsa_labs/salsa_object_spec.rb
+- spec/salsa_labs/supporter_action_spec.rb
+- spec/salsa_labs/supporter_spec.rb
 - spec/spec_helper.rb
 - spec/vcr_cassettes/get_objects/action.yml
 - spec/vcr_cassettes/successful_authentication.yml
@@ -163,27 +215,31 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Salsa Labs' API contains information about supporters, donations, and actions.
   This gem faciliates pulling that information into a Ruby application.
 test_files:
 - spec/fixtures/getObjects.sjs_action.xml
+- spec/fixtures/getObjects.sjs_supporter.xml
+- spec/fixtures/getObjects.sjs_supporter_actions.xml
 - spec/salsa_labs/action_spec.rb
-- spec/salsa_labs/actions_fetcher_spec.rb
 - spec/salsa_labs/api_client_spec.rb
+- spec/salsa_labs/objects_fetcher_spec.rb
 - spec/salsa_labs/salsa_object_spec.rb
+- spec/salsa_labs/supporter_action_spec.rb
+- spec/salsa_labs/supporter_spec.rb
 - spec/spec_helper.rb
 - spec/vcr_cassettes/get_objects/action.yml
 - spec/vcr_cassettes/successful_authentication.yml

data/lib/salsa_labs/actions_fetcher.rb

@@ -1,61 +0,0 @@
-module SalsaLabs
-  ##
-  # Service object to pull back a collection of actions from the Salsa Labs API.
-  ##
-  class ActionsFetcher
-
-    def initialize(filter_parameters = {}, credentials = {})
-      @filter_parameters = filter_parameters
-      @client = SalsaLabs::ApiClient.new(credentials)
-    end
-
-    def fetch
-      item_nodes.map do |node|
-        SalsaLabs::Action.new(SalsaLabsApiObjectNode.new(node).attributes)
-      end
-    end
-
-    private
-
-    attr_reader :client, :filter_parameters
-
-    def api_call
-      client.fetch('/api/getObjects.sjs', api_parameters)
-    end
-
-    def api_parameters
-      filter_parameters.merge(object: 'Action')
-    end
-
-    def item_nodes
-      Nokogiri::XML(api_call).css('item')
-    end
-
-    ##
-    # Object used to translate API's XML node into a hash of attributes for
-    # SalsaLabs::Action creation.
-    ##
-    class SalsaLabsApiObjectNode
-
-      def initialize(xml_element)
-        @node = xml_element
-      end
-
-      def attributes
-        children.inject({}) do |memo, attribute|
-          memo[attribute.name.downcase] = attribute.text
-          attribute
-        end
-      end
-
-      private
-
-      attr_reader :node
-
-      def children
-        node.children
-      end
-
-    end
-  end
-end

data/spec/salsa_labs/actions_fetcher_spec.rb

@@ -1,32 +0,0 @@
-require "spec_helper"
-
-describe SalsaLabs::ActionsFetcher do
-
-  let(:client) do
-    double(
-      'API client',
-      fetch: File.read('spec/fixtures/getObjects.sjs_action.xml')
-    )
-  end
-
-  describe "#fetch" do
-    before(:each) do
-      allow(SalsaLabs::ApiClient).to receive(:new) { client }
-    end
-
-    it "calls the getObjects API endpoint" do
-      SalsaLabs::ActionsFetcher.new.fetch
-
-      expect(client).to have_received(:fetch).
-        with('/api/getObjects.sjs', {object: 'Action'})
-    end
-
-    it "returns an array of SalsaLabs::Action objects" do
-      results = SalsaLabs::ActionsFetcher.new.fetch
-
-      expect(results).to be_a(Array)
-      expect(results.first).to be_a(SalsaLabs::Action)
-    end
-  end
-
-end