salsa_labs 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f959fc08bf03b183bc7192bfe57e88cd6000bea6
-  data.tar.gz: a16c2bf7e35a05622c185d1e96c758db622ed42c
+  metadata.gz: c6aa1c387f617c8241ea0e4878760b16f4955a8c
+  data.tar.gz: c49c445e9583d13c91f70dc9ac7ad3200d7e5121
 SHA512:
-  metadata.gz: d445949a492a7ab0ecb613973504c2be89720d823eb68ef358ba978040a8f8557a98a6694c410368d73526368f75ef86e266d29a091a70a679de73a91c62d9fa
-  data.tar.gz: cc0c9eed3af1871df89eaee964b23ec54881cd6a7b5f36de37a4a16d20754a2f1c9164ba40243ad70e181a9e62895836029efc8042a2ea0ad414137d06d878f0
+  metadata.gz: 023bbd1ddfb01954cf6fdf5180ed632bdb7ab605f4215c3937c6097906cccb52de73cacec68446500379f3fcdfc79445de1635620c46835a53a2e996e603d72d
+  data.tar.gz: 397308d3463fc11f12bdd9f4b98f603575b07851588d96ca4b530983d73b569ee3027693b051d864fb7e5ea1ef265e0455693882cde8518acd040146616a8794

data/.gitignore

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

data/.ruby-version

@@ -1 +1 @@
-2.0.0
+2.3.3

data/.travis.yml

@@ -3,4 +3,5 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.1.1
   - jruby-19mode

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    salsa_labs (0.0.2.alpha)
-      dotenv (~> 0.9)
+    salsa_labs (0.0.4)
+      dotenv
       faraday (~> 0.8)
       httparty (~> 0.12)
       nokogiri (~> 1.5)
@@ -11,55 +11,53 @@ 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)
+    coderay (1.1.1)
     crack (0.4.1)
       safe_yaml (~> 0.9.0)
     diff-lcs (1.2.5)
     docile (1.1.1)
-    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)
+    dotenv (2.1.2)
+    faraday (0.11.0)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.9.17)
+    formatador (0.2.5)
+    guard (2.14.0)
       formatador (>= 0.2.4)
-      listen (~> 2.6)
+      listen (>= 2.7, < 4.0)
       lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
       pry (>= 0.9.12)
+      shellany (~> 0.0)
       thor (>= 0.18.1)
-    guard-rspec (4.2.8)
+    guard-rspec (4.3.1)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
-    httparty (0.12.0)
-      json (~> 1.8)
+    httparty (0.14.0)
       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)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    lumberjack (1.0.11)
     method_source (0.8.2)
-    mini_portile (0.5.2)
+    mini_portile2 (2.1.0)
     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)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nenv (0.3.0)
+    nokogiri (1.7.0.1)
+      mini_portile2 (~> 2.1.0)
+    notiffany (0.1.1)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
     rake (10.1.1)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.3)
+    rb-fsevent (0.9.8)
+    rb-inotify (0.9.7)
       ffi (>= 0.5.0)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
@@ -69,15 +67,16 @@ GEM
     rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.4)
+    ruby_dep (1.5.0)
     safe_yaml (0.9.7)
+    shellany (0.0.1)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    slop (3.4.7)
-    thor (0.18.1)
-    timers (1.1.0)
+    slop (3.6.0)
+    thor (0.19.4)
     vcr (2.8.0)
     webmock (1.16.1)
       addressable (>= 2.2.7)
@@ -95,3 +94,6 @@ DEPENDENCIES
   simplecov (~> 0.8)
   vcr (~> 2.8)
   webmock (~> 1.16)
+
+BUNDLED WITH
+   1.14.2

data/lib/salsa_labs/action.rb

@@ -8,6 +8,10 @@ module SalsaLabs
       (attributes['action_key'] || 0).to_i
     end
 
+    def chapter_key
+      attributes['chapter_key'].to_i if attributes['chapter_key']
+    end
+
     def description
       attributes['description']
     end

data/lib/salsa_labs/api_client.rb

@@ -10,6 +10,7 @@ module SalsaLabs
     def initialize(credentials = {})
       @email = credentials[:email] || ENV['SALSA_LABS_API_EMAIL']
       @password = credentials[:password] || ENV['SALSA_LABS_API_PASSWORD']
+      @host = credentials[:host] || 'hq-salsa.wiredforchange.com'
 
       @authenticated = false
     end
@@ -37,7 +38,8 @@ module SalsaLabs
 
     attr_reader :authenticated,
       :email,
-      :password
+      :password,
+      :host
 
     def authenticate!
       perform_get_request(
@@ -52,7 +54,7 @@ module SalsaLabs
 
     def connection
       @connection ||= Faraday.
-        new(url: 'https://hq-salsa.wiredforchange.com') do |faraday|
+        new(url: "https://#{host}") do |faraday|
 
         faraday.use Faraday::Request::UrlEncoded
         faraday.adapter Faraday.default_adapter

data/lib/salsa_labs/version.rb

@@ -1,3 +1,3 @@
 module SalsaLabs
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/salsa_labs.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.licenses      = ['LICENSE']
 
-  gem.add_runtime_dependency 'dotenv', '~> 0.9'
+  gem.add_runtime_dependency 'dotenv'
   gem.add_runtime_dependency 'faraday', '~> 0.8'
   gem.add_runtime_dependency 'httparty', '~> 0.12'
   gem.add_runtime_dependency 'nokogiri', '~> 1.5'

data/spec/fixtures/successful_login.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+
+<data organization_KEY="6120">
+  <message>Successful Login</message>
+</data>

data/spec/salsa_labs/action_spec.rb

@@ -7,6 +7,7 @@ describe SalsaLabs::Action do
       'action_key' => '1234',
       'description' => 'Lengthy Description',
       'organization_key' => '90210',
+      'chapter_key' => '234',
       'reference_name' => 'A Good Reference',
       'title' => 'A Distinguished Title'
     }
@@ -20,6 +21,12 @@ describe SalsaLabs::Action do
     end
   end
 
+  describe "#chapter_key" do
+    it "returns the chapter_key attribute as an integer" do
+      expect(action.chapter_key).to eq(234)
+    end
+  end
+
   describe "#attributes" do
     it "returns the attributes hash passed in to initialize" do
       expect(action.attributes).to eq(attributes)

data/spec/salsa_labs/api_client_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 require 'vcr'
 
 describe SalsaLabs::ApiClient do
-
   let(:api_client) do
     SalsaLabs::ApiClient.new({
       email: 'allison@example.com', password: 'password'
@@ -12,7 +11,7 @@ describe SalsaLabs::ApiClient do
   describe "#authenticate" do
     it "stores the cookie from Salsa Labs" do
       VCR.use_cassette 'successful_authentication',
-        match_requests_on: [:path] do
+        match_requests_on: [:host, :path] do
 
         api_client.authenticate
 
@@ -28,7 +27,7 @@ describe SalsaLabs::ApiClient do
     context "with proper credentials" do
       it "sets authenticated to be true" do
         VCR.use_cassette 'successful_authentication',
-          match_requests_on: [:path] do
+          match_requests_on: [:host, :path] do
 
           api_client.authenticate
 
@@ -41,7 +40,7 @@ describe SalsaLabs::ApiClient do
     context "with improper credentials" do
       it "raises an exception" do
         VCR.use_cassette 'unsuccessful_authentication',
-          match_requests_on: [:path] do
+          match_requests_on: [:host, :path] do
 
           expect{
             api_client.authenticate
@@ -62,7 +61,7 @@ describe SalsaLabs::ApiClient do
   describe "#fetch" do
     it "returns the body of the response from Salsa Labs for that API call" do
       VCR.use_cassette 'get_objects/action',
-        match_requests_on: [:path] do
+        match_requests_on: [:host, :path] do
 
         data = api_client.fetch('/api/getObjects.sjs', object: 'Action')
 
@@ -72,6 +71,18 @@ describe SalsaLabs::ApiClient do
     end
   end
 
+  it "can be configured with Salsa API host" do
+    url = "https://example.com/api/authenticate.sjs?email=allison@example.com&password=password"
+    successful_login = File.read('spec/fixtures/successful_login.xml')
+    stub_request(:get, url).to_return(body: successful_login)
+
+    SalsaLabs::ApiClient.new(email: 'allison@example.com',
+                             password: 'password',
+                             host: 'example.com').authenticate
+
+    WebMock.should have_requested(:get, url)
+  end
+
   def salsa_get_objects_for_action_xml_response
     File.read('spec/fixtures/getObjects.sjs_action.xml').gsub(/\n|\s{2,}/, '')
   end

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ require 'salsa_labs'
 
 require 'rspec/autorun'
 require 'vcr'
-require 'webmock'
+require 'webmock/rspec'
 
 WebMock.disable_net_connect!
 
@@ -17,4 +17,5 @@ VCR.configure do |c|
   c.cassette_library_dir = 'spec/vcr_cassettes'
   c.hook_into :faraday
   c.hook_into :webmock
+  c.allow_http_connections_when_no_cassette = true
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: salsa_labs
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Geoff Harcourt
@@ -9,160 +9,160 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2017-01-24 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'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !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.
@@ -172,11 +172,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -195,6 +195,7 @@ files:
 - spec/fixtures/getObjects.sjs_action.xml
 - spec/fixtures/getObjects.sjs_supporter.xml
 - spec/fixtures/getObjects.sjs_supporter_actions.xml
+- spec/fixtures/successful_login.xml
 - spec/salsa_labs/action_spec.rb
 - spec/salsa_labs/api_client_spec.rb
 - spec/salsa_labs/objects_fetcher_spec.rb
@@ -215,17 +216,17 @@ 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: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Salsa Labs' API contains information about supporters, donations, and actions.
@@ -234,6 +235,7 @@ test_files:
 - spec/fixtures/getObjects.sjs_action.xml
 - spec/fixtures/getObjects.sjs_supporter.xml
 - spec/fixtures/getObjects.sjs_supporter_actions.xml
+- spec/fixtures/successful_login.xml
 - spec/salsa_labs/action_spec.rb
 - spec/salsa_labs/api_client_spec.rb
 - spec/salsa_labs/objects_fetcher_spec.rb