freckle_io 0.1.2 → 1.0.0

data/spec/freckle_io/client/entries_spec.rb

@@ -73,25 +73,23 @@ describe FreckleIO::Client::Entries do
         {
           invalid_params: "oh! oh!",
           updated_from: "2018-01-15T00:00:00Z",
-          updated_to: "2018-01-16T00:00:00Z"
+          updated_to: "2018-01-15T00:00:00Z"
         }
       end
 
       let(:results) { subject.all(params) }
 
-      it "raises a invalid params error" do
-        expect do
-          results
-        end.to raise_error(FreckleIO::Errors::Params::InvalidParams)
+      it "doesn't raise a invalid params error" do
+        expect { results }.not_to raise_error
       end
     end
 
     describe "with wrong user ids" do
       let(:params) do
         {
-          user_id: 1234,
+          user_ids: 1234,
           updated_from: "2018-01-15T00:00:00Z",
-          updated_to: "2018-01-16T00:00:00Z"
+          updated_to: "2018-01-15T00:00:00Z"
         }
       end
 
@@ -109,7 +107,7 @@ describe FreckleIO::Client::Entries do
         {
           description: 1234,
           updated_from: "2018-01-15T00:00:00Z",
-          updated_to: "2018-01-16T00:00:00Z"
+          updated_to: "2018-01-15T00:00:00Z"
         }
       end
 
@@ -127,7 +125,7 @@ describe FreckleIO::Client::Entries do
         {
           project_ids: 123,
           updated_from: "2018-01-15T00:00:00Z",
-          updated_to: "2018-01-16T00:00:00Z"
+          updated_to: "2018-01-15T00:00:00Z"
         }
       end
 
@@ -145,7 +143,7 @@ describe FreckleIO::Client::Entries do
         {
           tag_ids: 12,
           updated_from: "2018-01-15T00:00:00Z",
-          updated_to: "2018-01-16T00:00:00Z"
+          updated_to: "2018-01-15T00:00:00Z"
         }
       end
 
@@ -163,7 +161,7 @@ describe FreckleIO::Client::Entries do
         {
           tag_filter_type: "or",
           updated_from: "2018-01-15T00:00:00Z",
-          updated_to: "2018-01-16T00:00:00Z"
+          updated_to: "2018-01-15T00:00:00Z"
         }
       end
 
@@ -199,7 +197,7 @@ describe FreckleIO::Client::Entries do
         {
           to: 123,
           updated_from: "2018-01-15T00:00:00Z",
-          updated_to: "2018-01-16T00:00:00Z"
+          updated_to: "2018-01-15T00:00:00Z"
         }
       end
 
@@ -247,9 +245,9 @@ describe FreckleIO::Client::Entries do
     describe "with wrong billable" do
       let(:params) do
         {
-          tag_filter_type: 123,
+          billable: 123,
           updated_from: "2018-01-15T00:00:00Z",
-          updated_to: "2018-01-16T00:00:00Z"
+          updated_to: "2018-01-15T00:00:00Z"
         }
       end
 
@@ -267,7 +265,7 @@ describe FreckleIO::Client::Entries do
         {
           approved_at_from: 123,
           updated_from: "2018-01-15T00:00:00Z",
-          updated_to: "2018-01-16T00:00:00Z"
+          updated_to: "2018-01-15T00:00:00Z"
         }
       end
 
@@ -285,7 +283,7 @@ describe FreckleIO::Client::Entries do
         {
           approved_at_to: 123,
           updated_from: "2018-01-15T00:00:00Z",
-          updated_to: "2018-01-16T00:00:00Z"
+          updated_to: "2018-01-15T00:00:00Z"
         }
       end
 
@@ -303,7 +301,7 @@ describe FreckleIO::Client::Entries do
         {
           approved_by_ids: 123,
           updated_from: "2018-01-15T00:00:00Z",
-          updated_to: "2018-01-16T00:00:00Z"
+          updated_to: "2018-01-15T00:00:00Z"
         }
       end
 
@@ -318,17 +316,16 @@ describe FreckleIO::Client::Entries do
 
     describe "with validator" do
       let(:entry_validator) do
-        class_double(
-          FreckleIO::Validator::Entry,
-          errors: {},
-          output: params
-        )
+        instance_double(FreckleIO::Validator::Entry)
+      end
+      let(:validation_result) do
+        instance_double(Dry::Validation::Result, errors: {}, to_h: params)
       end
 
       let(:params) do
         {
           updated_from: "2018-01-15T00:00:00Z",
-          updated_to: "2018-01-16T00:00:00Z"
+          updated_to: "2018-01-15T00:00:00Z"
         }
       end
 
@@ -337,22 +334,16 @@ describe FreckleIO::Client::Entries do
       end
 
       before do
-        allow(FreckleIO::Validator::Entry).to receive(
-          :validation
-        ).with(params, FreckleIO::Client::Entries::ALLOWED_KEYS) do
+        allow(FreckleIO::Validator::Entry).to receive(:new) do
           entry_validator
         end
-
-        allow(FreckleIO::Validator::Entry).to receive(:errors)
-        allow(FreckleIO::Validator::Entry).to receive(:output)
+        allow(entry_validator).to receive(:call) { validation_result }
 
         result
       end
 
       it "call entry's validator" do
-        expect(FreckleIO::Validator::Entry).to have_received(
-          :validation
-        )
+        expect(entry_validator).to have_received(:call)
       end
     end
   end

data/spec/freckle_io/client/project_groups_spec.rb

@@ -57,10 +57,8 @@ describe FreckleIO::Client::ProjectGroups do
 
       let(:results) { subject.all(params) }
 
-      it "raises a invalid params error" do
-        expect do
-          results
-        end.to raise_error(FreckleIO::Errors::Params::InvalidParams)
+      it "doesn't raises a invalid params error" do
+        expect { results }.not_to raise_error
       end
     end
 
@@ -80,10 +78,10 @@ describe FreckleIO::Client::ProjectGroups do
       end
     end
 
-    describe "with project ids" do
+    describe "with wrong project ids" do
       let(:params) do
         {
-          state: 123
+          project_ids: 123
         }
       end
 
@@ -98,11 +96,10 @@ describe FreckleIO::Client::ProjectGroups do
 
     describe "with validator" do
       let(:project_group_validator) do
-        class_double(
-          FreckleIO::Validator::ProjectGroup,
-          errors: {},
-          output: {}
-        )
+        instance_double(FreckleIO::Validator::ProjectGroup)
+      end
+      let(:validation_result) do
+        instance_double(Dry::Validation::Result, errors: {}, to_h: {})
       end
 
       let(:result) do
@@ -110,22 +107,16 @@ describe FreckleIO::Client::ProjectGroups do
       end
 
       before do
-        allow(FreckleIO::Validator::ProjectGroup).to receive(
-          :validation
-        ).with({}, FreckleIO::Client::ProjectGroups::ALLOWED_KEYS) do
+        allow(FreckleIO::Validator::ProjectGroup).to receive(:new) do
           project_group_validator
         end
-
-        allow(FreckleIO::Validator::ProjectGroup).to receive(:errors)
-        allow(FreckleIO::Validator::ProjectGroup).to receive(:output)
+        allow(project_group_validator).to receive(:call) { validation_result }
 
         result
       end
 
       it "call project group's validator" do
-        expect(FreckleIO::Validator::ProjectGroup).to have_received(
-          :validation
-        )
+        expect(project_group_validator).to have_received(:call)
       end
     end
   end

data/spec/freckle_io/client/projects_spec.rb

@@ -18,7 +18,10 @@ describe FreckleIO::Client::Projects do
     end
 
     describe "#show" do
-      let(:result) { subject.show(ENV["REAL_FRECKLE_PROJECT_ID"]) }
+      let(:real_freckle_project_id) do
+        ENV.fetch("REAL_FRECKLE_PROJECT_ID", nil)
+      end
+      let(:result) { subject.show(real_freckle_project_id) }
       let(:response) { result.last_response }
 
       it "get a spacific project" do
@@ -60,17 +63,15 @@ describe FreckleIO::Client::Projects do
 
       let(:results) { subject.all(params) }
 
-      it "raises a invalid params error" do
-        expect do
-          results
-        end.to raise_error(FreckleIO::Errors::Params::InvalidParams)
+      it "doesn't raises a invalid params error" do
+        expect { results }.not_to raise_error
       end
     end
 
     describe "with wrong name" do
       let(:params) do
         {
-          email: 1234
+          name: ""
         }
       end
 
@@ -102,7 +103,7 @@ describe FreckleIO::Client::Projects do
     describe "with wrong billing increment" do
       let(:params) do
         {
-          billing_increment: "1,3,7"
+          billing_increment: "3"
         }
       end
 
@@ -149,11 +150,10 @@ describe FreckleIO::Client::Projects do
 
     describe "with validator" do
       let(:project_validator) do
-        class_double(
-          FreckleIO::Validator::Project,
-          errors: {},
-          output: {}
-        )
+        instance_double(FreckleIO::Validator::Project)
+      end
+      let(:validation_result) do
+        instance_double(Dry::Validation::Result, errors: {}, to_h: {})
       end
 
       let(:result) do
@@ -161,22 +161,16 @@ describe FreckleIO::Client::Projects do
       end
 
       before do
-        allow(FreckleIO::Validator::Project).to receive(
-          :validation
-        ).with({}, FreckleIO::Client::Projects::ALLOWED_KEYS) do
+        allow(FreckleIO::Validator::Project).to receive(:new) do
           project_validator
         end
-
-        allow(FreckleIO::Validator::Project).to receive(:errors)
-        allow(FreckleIO::Validator::Project).to receive(:output)
+        allow(project_validator).to receive(:call) { validation_result }
 
         result
       end
 
       it "call project's validator" do
-        expect(FreckleIO::Validator::Project).to have_received(
-          :validation
-        )
+        expect(project_validator).to have_received(:call)
       end
     end
   end

data/spec/freckle_io/client/tags_spec.rb

@@ -57,10 +57,8 @@ describe FreckleIO::Client::Tags do
 
       let(:results) { subject.all(params) }
 
-      it "raises a invalid params error" do
-        expect do
-          results
-        end.to raise_error(FreckleIO::Errors::Params::InvalidParams)
+      it "doesn't raise a invalid params error" do
+        expect { results }.not_to raise_error
       end
     end
 
@@ -83,7 +81,7 @@ describe FreckleIO::Client::Tags do
     describe "with billable" do
       let(:params) do
         {
-          state: 123
+          billable: 123
         }
       end
 
@@ -98,11 +96,10 @@ describe FreckleIO::Client::Tags do
 
     describe "with validator" do
       let(:tag_validator) do
-        class_double(
-          FreckleIO::Validator::Tag,
-          errors: {},
-          output: {}
-        )
+        instance_double(FreckleIO::Validator::Tag)
+      end
+      let(:validation_result) do
+        instance_double(Dry::Validation::Result, errors: {}, to_h: {})
       end
 
       let(:result) do
@@ -110,22 +107,16 @@ describe FreckleIO::Client::Tags do
       end
 
       before do
-        allow(FreckleIO::Validator::Tag).to receive(
-          :validation
-        ).with({}, FreckleIO::Client::Tags::ALLOWED_KEYS) do
+        allow(FreckleIO::Validator::Tag).to receive(:new) do
           tag_validator
         end
-
-        allow(FreckleIO::Validator::Tag).to receive(:errors)
-        allow(FreckleIO::Validator::Tag).to receive(:output)
+        allow(tag_validator).to receive(:call) { validation_result }
 
         result
       end
 
       it "call tag's validator" do
-        expect(FreckleIO::Validator::Tag).to have_received(
-          :validation
-        )
+        expect(tag_validator).to have_received(:call)
       end
     end
   end

data/spec/freckle_io/client/users_spec.rb

@@ -18,7 +18,10 @@ describe FreckleIO::Client::Users do
     end
 
     describe "#show" do
-      let(:result) { subject.show(ENV["REAL_FRECKLE_USER_ID"]) }
+      let(:real_freckle_user_id) do
+        ENV.fetch("REAL_FRECKLE_USER_ID", nil)
+      end
+      let(:result) { subject.show(real_freckle_user_id) }
       let(:response) { result.last_response }
 
       it "get a spacific user" do
@@ -59,10 +62,8 @@ describe FreckleIO::Client::Users do
 
       let(:results) { subject.all(params) }
 
-      it "raises a invalid params error" do
-        expect do
-          results
-        end.to raise_error(FreckleIO::Errors::Params::InvalidParams)
+      it "doesn't raise a invalid params error" do
+        expect { results }.not_to raise_error
       end
     end
 
@@ -116,11 +117,10 @@ describe FreckleIO::Client::Users do
 
     describe "with validator" do
       let(:user_validator) do
-        class_double(
-          FreckleIO::Validator::User,
-          errors: {},
-          output: {}
-        )
+        instance_double(FreckleIO::Validator::User)
+      end
+      let(:validation_result) do
+        instance_double(Dry::Validation::Result, errors: {}, to_h: {})
       end
 
       let(:result) do
@@ -128,22 +128,14 @@ describe FreckleIO::Client::Users do
       end
 
       before do
-        allow(FreckleIO::Validator::User).to receive(
-          :validation
-        ).with({}, FreckleIO::Client::Users::ALLOWED_KEYS) do
-          user_validator
-        end
-
-        allow(FreckleIO::Validator::User).to receive(:errors)
-        allow(FreckleIO::Validator::User).to receive(:output)
+        allow(FreckleIO::Validator::User).to receive(:new) { user_validator }
+        allow(user_validator).to receive(:call) { validation_result }
 
         result
       end
 
       it "call user's validator" do
-        expect(FreckleIO::Validator::User).to have_received(
-          :validation
-        )
+        expect(user_validator).to have_received(:call)
       end
     end
   end

data/spec/freckle_io/configuration_spec.rb

@@ -1,25 +1,28 @@
 require_relative "../spec_helper"
 
 describe FreckleIO::Configuration do
+  let(:freckle_token) { ENV.fetch("FRECKLE_TOKEN", nil) }
+  let(:freckle_url) { ENV.fetch("FRECKLE_URL", nil) }
+
   context "with right configuration" do
     before do
       FreckleIO.reset
       FreckleIO.configure do |config|
-        config.token = ENV["FRECKLE_TOKEN"]
-        config.url = ENV["FRECKLE_URL"]
+        config.token = freckle_token
+        config.url = freckle_url
       end
     end
 
     it "return the correct token" do
       expect(
         FreckleIO.configuration.token
-      ).to eq ENV["FRECKLE_TOKEN"]
+      ).to eq freckle_token
     end
 
     it "return the correct url" do
       expect(
         FreckleIO.configuration.url
-      ).to eq ENV["FRECKLE_URL"]
+      ).to eq freckle_url
     end
   end
 

data/spec/freckle_io/connection_spec.rb

@@ -16,7 +16,7 @@ describe FreckleIO::Connection do
       let(:header_token) { result.env.request_headers["X-FreckleToken"] }
 
       it "set X-FreckleToken" do
-        expect(header_token).not_to be nil
+        expect(header_token).not_to be_nil
       end
     end
 

data/spec/freckle_io/paginator_spec.rb

@@ -52,25 +52,25 @@ describe FreckleIO::Paginator do
 
     describe "#next" do
       it "return nil" do
-        expect(result.next).to eq(nil)
+        expect(result.next).to be_nil
       end
     end
 
     describe "#prev" do
       it "return nil" do
-        expect(result.prev).to eq(nil)
+        expect(result.prev).to be_nil
       end
     end
 
     describe "#last" do
       it "return nil" do
-        expect(result.last).to eq(nil)
+        expect(result.last).to be_nil
       end
     end
 
     describe "#first" do
       it "return nil" do
-        expect(result.first).to eq(nil)
+        expect(result.first).to be_nil
       end
     end
   end
@@ -80,25 +80,25 @@ describe FreckleIO::Paginator do
 
     describe "#next" do
       it "return nil" do
-        expect(result.next).to eq(nil)
+        expect(result.next).to be_nil
       end
     end
 
     describe "#prev" do
       it "return nil" do
-        expect(result.prev).to eq(nil)
+        expect(result.prev).to be_nil
       end
     end
 
     describe "#last" do
       it "return nil" do
-        expect(result.last).to eq(nil)
+        expect(result.last).to be_nil
       end
     end
 
     describe "#first" do
       it "return nil" do
-        expect(result.first).to eq(nil)
+        expect(result.first).to be_nil
       end
     end
   end

data/spec/freckle_io/params_spec.rb

@@ -3,7 +3,7 @@ require_relative "../spec_helper"
 describe FreckleIO::Params do
   context "when invalid module" do
     subject do
-      described_class.new({}, nil, "invalid_module").call
+      described_class.new({}, "invalid_module").call
     end
 
     it "raises a invalid module error" do

data/spec/freckle_io/request/single_page_spec.rb

@@ -17,7 +17,7 @@ describe FreckleIO::Request::SinglePage do
       let(:body_response) { next_users.last_response.body }
 
       it "previous page should be not nil" do
-        expect(next_users.prev).to_not be nil
+        expect(next_users.prev).to_not be_nil
       end
 
       it "previous page is a SinglePage" do
@@ -39,7 +39,7 @@ describe FreckleIO::Request::SinglePage do
 
       context "when get prev page from the first page" do
         it "prev should be nil" do
-          expect(prev_users.prev).to be nil
+          expect(prev_users.prev).to be_nil
         end
       end
     end
@@ -53,7 +53,7 @@ describe FreckleIO::Request::SinglePage do
       let(:body_response) { last_users.last_response.body }
 
       it "next page should be nil" do
-        expect(last_users.next).to be nil
+        expect(last_users.next).to be_nil
       end
 
       it "returns correct raw links for the last page" do
@@ -62,7 +62,7 @@ describe FreckleIO::Request::SinglePage do
 
       context "when get prev page from the last page" do
         it "prev should be nil" do
-          expect(last_users.first.prev).to be nil
+          expect(last_users.first.prev).to be_nil
         end
       end
     end
@@ -72,7 +72,7 @@ describe FreckleIO::Request::SinglePage do
       let(:body_response) { first_users.last_response.body }
 
       it "prev page should be nil" do
-        expect(first_users.prev).to be nil
+        expect(first_users.prev).to be_nil
       end
 
       it "next page should be a SinglePage" do
@@ -81,7 +81,7 @@ describe FreckleIO::Request::SinglePage do
 
       context "when get last page from the first page" do
         it "next should be nil" do
-          expect(first_users.last.next).to be nil
+          expect(first_users.last.next).to be_nil
         end
       end
     end

data/spec/spec_helper.rb

@@ -29,16 +29,16 @@ require "dotenv"
 Dotenv.load(".env.test")
 
 RSpec.configure do |config|
-  config.before(:each) do
+  config.before do
     FreckleIO.configure do |c|
-      c.token = ENV["FRECKLE_TOKEN"]
+      c.token = ENV.fetch("FRECKLE_TOKEN", nil)
       c.auth_type = :freckle_token
       c.max_concurrency = 5
       c.url = "https://api.nokotime.com"
     end
   end
 
-  config.after(:each) do
+  config.after do
     FreckleIO.reset
   end
 

data/spec/support/anonymize/entries.rb

@@ -1,15 +1,16 @@
 module Anonymize
   class Entries
     attr_accessor :interaction
+
     ENTRY_API_REPLACE_VALUES = {
-      id: /\"id\":(.*?),/i,
-      description: /\"description\":\"(.*?)\"/i,
-      name: /\"name\":\"(.*?)\"/i,
-      email: /\"email\":\"(.*?)\",/i,
-      first_name: /\"first_name\":\"(.*?)\"/i,
-      last_name: /\"last_name\":\"(.*?)\"/i,
-      profile_image_url: /\"profile_image_url\":\"(.*?)\"/i,
-      url: /\"url\":\"(.*?)\"/i
+      id: /"id":(.*?),/i,
+      description: /"description":"(.*?)"/i,
+      name: /"name":"(.*?)"/i,
+      email: /"email":"(.*?)",/i,
+      first_name: /"first_name":"(.*?)"/i,
+      last_name: /"last_name":"(.*?)"/i,
+      profile_image_url: /"profile_image_url":"(.*?)"/i,
+      url: /"url":"(.*?)"/i
     }.freeze
 
     def initialize(interaction:)

data/spec/support/anonymize/project_groups.rb

@@ -1,10 +1,11 @@
 module Anonymize
   class ProjectGroups
     attr_accessor :interaction
+
     PROJECT_GROUP_API_REPLACE_VALUES = {
-      id: /\"id\":(.*?),/mi,
-      name: /\"name\":\"(.*?)\"/mi,
-      url: /\"url\":\"(.*?)\"/mi
+      id: /"id":(.*?),/mi,
+      name: /"name":"(.*?)"/mi,
+      url: /"url":"(.*?)"/mi
     }.freeze
 
     def initialize(interaction:)