emarsys 0.2.3 → 0.3.0

data/spec/emarsys/data_objects/field_spec.rb

@@ -10,7 +10,7 @@ describe Emarsys::Field do
 
     it "requests all fields with translate parameter" do
       expect(
-        stub_get("field/translate/en") { Emarsys::Field.collection('translate' => 'en') }
+        stub_get("field/translate/en") { Emarsys::Field.collection(translate: 'en') }
       ).to have_been_requested.once
     end
   end

data/spec/emarsys/data_objects/file_spec.rb

@@ -10,23 +10,23 @@ describe Emarsys::File do
 
     it "requests all files with parameter" do
       expect(
-        stub_get("file/?folder=3") { Emarsys::File.collection(:folder => 3) }
+        stub_get("file/?folder=3") { Emarsys::File.collection(folder: 3) }
       ).to have_been_requested.once
     end
   end
 
   describe ".create" do
     it "requests file creation with parameters" do
-      stub_params = {:filename => 'my_file.jpg', :file => 'base_64_encoded_string'}
+      stub_params = {filename: 'my_file.jpg', file: 'base_64_encoded_string'}
       stub = stub_request(:post, "https://api.emarsys.net/api/v2/file").with(:body => stub_params.to_json).to_return(standard_return_body)
-      Emarsys::File.create('my_file.jpg', 'base_64_encoded_string')
+      Emarsys::File.create(filename: 'my_file.jpg', file: 'base_64_encoded_string')
       expect(stub).to have_been_requested.once
     end
 
     it "requests file creation with optional folder parameter" do
-      stub_params = {:filename => 'my_file.jpg', :file => 'base_64_encoded_string', :folder => 3}
+      stub_params = {filename: 'my_file.jpg', file: 'base_64_encoded_string', folder: 3}
       stub = stub_request(:post, "https://api.emarsys.net/api/v2/file").with(:body => stub_params.to_json).to_return(standard_return_body)
-      Emarsys::File.create('my_file.jpg', 'base_64_encoded_string', 3)
+      Emarsys::File.create(filename: 'my_file.jpg', file: 'base_64_encoded_string', folder: 3)
       expect(stub).to have_been_requested.once
     end
   end

data/spec/emarsys/data_objects/folder_spec.rb

@@ -10,7 +10,7 @@ describe Emarsys::Folder do
 
     it "requests all folders with parameters" do
       expect(
-        stub_get("folder/?folder=3") { Emarsys::Folder.collection(:folder => 3) }
+        stub_get("folder/?folder=3") { Emarsys::Folder.collection(folder: 3) }
       ).to have_been_requested.once
     end
   end

data/spec/emarsys/data_objects/source_spec.rb

@@ -12,7 +12,7 @@ describe Emarsys::Source do
   describe ".create" do
     it "requests source creation with parameters" do
       stub = stub_request(:post, "https://api.emarsys.net/api/v2/source/create").with(:body => {:name => 'test_source'}.to_json).to_return(standard_return_body)
-      Emarsys::Source.create('test_source')
+      Emarsys::Source.create(name: 'test_source')
       expect(stub).to have_been_requested.once
     end
   end

data/spec/emarsys/request_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Emarsys::Request do
   let(:client) { Emarsys::Client.new }
-  let(:request) { Emarsys::Request.new('get', 'some-path', {:a => 1}) }
+  let(:request) { Emarsys::Request.new(nil, 'get', 'some-path', {:a => 1}) }
 
   describe '#initialize' do
     it 'sets client, path, http_verb and params attributes on initialize' do

data/spec/emarsys/response_spec.rb

@@ -47,30 +47,35 @@ describe Emarsys::Response do
     end
   end
 
-  describe '#result' do
+  describe '#data' do
     let(:response_string) { "{\"replyCode\":0,\"replyText\":\"Something\",\"data\":1}" }
-    let(:response) { Emarsys::Response.new(FakeResponse.new(response_string).extend(FakeResponse::JSON)) }
+    let(:fake_response) { FakeResponse.new(response_string).extend(FakeResponse::JSON) }
+    let(:response) { Emarsys::Response.new(fake_response) }
 
     it "returns data if code is 0" do
-      allow(response).to receive(:code).and_return(0)
-      expect(response.result).to eq(1)
+      allow(fake_response).to receive(:code).and_return(0)
+      expect(response.data).to eq(1)
     end
+  end
+
+  describe 'error response' do
+    let(:response_string) { "{\"replyCode\":1,\"replyText\":\"Something\",\"data\":1}" }
+    let(:fake_response) { FakeResponse.new(response_string).extend(FakeResponse::JSON) }
+    let(:response) { Emarsys::Response.new(fake_response) }
 
     it "raises BadRequest error if code is not 0" do
-      allow(response).to receive(:code).and_return(1)
-      expect{response.result}.to raise_error(Emarsys::BadRequest)
+      allow(fake_response).to receive(:code).and_return(500)
+      expect{response}.to raise_error(Emarsys::BadRequest)
     end
 
     it "raises Unauthorized error if http-status is 401" do
-      allow(response).to receive(:code).and_return(1)
-      allow(response).to receive(:status).and_return(401)
-      expect{response.result}.to raise_error(Emarsys::Unauthorized)
+      allow(fake_response).to receive(:code).and_return(401)
+      expect{response}.to raise_error(Emarsys::Unauthorized)
     end
 
     it "raises TooManyRequests error if http-status is 429" do
-      allow(response).to receive(:code).and_return(1)
-      allow(response).to receive(:status).and_return(429)
-      expect{response.result}.to raise_error(Emarsys::TooManyRequests)
+      allow(fake_response).to receive(:code).and_return(429)
+      expect{response}.to raise_error(Emarsys::TooManyRequests)
     end
   end
 

data/spec/emarsys_spec.rb

@@ -8,15 +8,9 @@ describe Emarsys do
         Emarsys.configure do |config|
           config.send("#{key}=", key)
         end
-        expect(Emarsys.instance_variable_get(:"@#{key}")).to eq key
+        expect(Emarsys::Configuration.for(nil).__send__(key)).to eq key
       end
     end
   end
 
-  describe ".api_endpoint getter" do
-    it "returns specific url as default value" do
-      Emarsys.api_endpoint = nil
-      expect(Emarsys.api_endpoint).to eq('https://api.emarsys.net/api/v2')
-    end
-  end
 end

data/spec/spec_helper.rb

@@ -13,6 +13,7 @@ def stub_emarsys_authentication!
     config.api_username = "my_username"
     config.api_password = "my_password"
   end
+  Emarsys.allow_default_configuration = true
 end
 
 def standard_return_body

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emarsys
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Daniel Schoppmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -90,6 +90,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -97,6 +98,7 @@ files:
 - emarsys.gemspec
 - lib/emarsys.rb
 - lib/emarsys/client.rb
+- lib/emarsys/configuration.rb
 - lib/emarsys/country.rb
 - lib/emarsys/data_object.rb
 - lib/emarsys/data_objects/condition.rb
@@ -123,6 +125,7 @@ files:
 - lib/emarsys/response.rb
 - lib/emarsys/version.rb
 - spec/emarsys/client_spec.rb
+- spec/emarsys/configuration_spec.rb
 - spec/emarsys/country_spec.rb
 - spec/emarsys/data_object_spec.rb
 - spec/emarsys/data_objects/condition_spec.rb
@@ -174,6 +177,7 @@ specification_version: 4
 summary: Easy to use ruby library for Emarsys Marketing Suite.
 test_files:
 - spec/emarsys/client_spec.rb
+- spec/emarsys/configuration_spec.rb
 - spec/emarsys/country_spec.rb
 - spec/emarsys/data_object_spec.rb
 - spec/emarsys/data_objects/condition_spec.rb