lifen 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a67207628744fa9170010479e696b05545a73568
-  data.tar.gz: c88fc831f27439acd3df13d6eca873b159cf8d5d
+  metadata.gz: f43d79863f669ef8d3c3bd3bc020c906b70bba38
+  data.tar.gz: bd2d87955f148b20fbb9f2cfb242d4086f0face7
 SHA512:
-  metadata.gz: 7fbd97528d92d51504930198d3eee85e50b06c2ed530a7597458770a7fe874373d7359af64d032d72d386a983dde4632521a0ae642d7d1bf32813724f1f2c0b0
-  data.tar.gz: d4430833c1e7849de2446b6b38f14d99a33d5a0a27130a43676f9f8a05c2504e2690908f4bd86ed5d7df3ee0e1e4cdf19548cd2091458412c56f5ba7a7c9e923
+  metadata.gz: 30a1acc06def39ca6b5525215d0a7920cf9fed8118817bf8ea5793c45e0116d9a7f9cd9d586655233373fe958688f284a39459e652d76d1e84a6942575a5339a
+  data.tar.gz: 688364f874269d69368f788a5510a50274e9ad66d8c9958098a216e1c3ad15fdd9111448466d8595c5bf21dedbb47dc0ff502324a3de899af141f7a371ef0f98

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+1.0.1
+-----
+
+- Token validation is more strict
+- Added a Changelog :)
+
+
+1.0.0
+-----
+
+- Major refactoring
+- Added OAuth support

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lifen (1.0.0)
+    lifen (1.0.1)
       faraday (>= 0.9)
       inflecto
       virtus (>= 1.0)

data/lib/lifen/token.rb

@@ -1,8 +1,8 @@
 module Lifen
   class Token
-  	include Virtus.model(finalize: false)
+    include Virtus.model(finalize: false)
 
-  	attribute :user, "Lifen::User"
+    attribute :user, "Lifen::User"
 
     attribute :value, String
     attribute :expires_at, Integer
@@ -11,15 +11,21 @@ module Lifen
       value
     end
 
+    def active?
+      valid? and !has_expired?
+    end
+
+    def valid?
+      !value.nil? and value.length > 0 and !expires_at.nil?
+    end
+
     def has_expired?
-    	return true if expires_at.nil?
+      return true if expires_at.nil?
 
-    	return expires_at < Time.now.to_i
+      return expires_at < Time.now.to_i
     end
 
     def refresh
-    	# params = {accountUuid: user.uuid}
-
       json = client.post("/oauth/admin/third_party/access_token?accountUuid=#{user.uuid}")
 
       self.value = json["access_token"]
@@ -27,11 +33,11 @@ module Lifen
     end
 
     def refresh_once_if_needed
-    	return if !has_expired?
+      return if active?
 
-    	refresh
+      refresh
 
-    	raise Error, "Token can't be refreshed" if has_expired?
+      raise Error, "Token can't be refreshed" if !active?
     end
 
     private

data/lib/lifen/user.rb

@@ -10,13 +10,6 @@ module Lifen
     attribute :last_name, String
     attribute :first_name, String
 
-    # def initialize(*args)
-    #   self.token = Lifen::Token.new(user: self)
-    #   self.status = Lifen::Status.new(user: self)
-
-    #   super
-    # end
-
     def flows
       Lifen::Flows.new(user: self).all
     end

data/lib/lifen/version.rb

@@ -1,3 +1,3 @@
 module Lifen
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/flows_spec.rb

@@ -7,22 +7,22 @@ describe Lifen::Flow do
   let(:invalid_token)       { Lifen::Token.new(value: "invalid_token", expires_at: Time.now.to_i + 60) }
   let(:valid_token)         { Lifen::Token.new(value: valid_token_value, expires_at: Time.now.to_i + 60) }
 
-	let(:user) { Lifen::User.new(token: valid_token, uuid: "25588996-4ff1-2dbb-9643-eabb809fa654") }
+  let(:user) { Lifen::User.new(token: valid_token, uuid: "25588996-4ff1-2dbb-9643-eabb809fa654") }
 
   describe "index" do
 
-  	context "invalid token" do
-	    it 'raises an error' do
-	    	user = Lifen::User.new(token: invalid_token)
+    context "invalid token" do
+      it 'raises an error' do
+        user = Lifen::User.new(token: invalid_token)
 
-	    	expect{
-		    	VCR.use_cassette "flows/invalid_token" do
-		        user.flows
-		      end
-		      }.to raise_error(Lifen::UnauthorizedError)
-	    end
+        expect{
+          VCR.use_cassette "flows/invalid_token" do
+            user.flows
+          end
+        }.to raise_error(Lifen::UnauthorizedError)
+      end
 
-  	end
+    end
 
     context "valid token but internal error" do
       it 'raises an error' do
@@ -31,7 +31,7 @@ describe Lifen::Flow do
           VCR.use_cassette "flows/internal_error" do
             user.flows
           end
-          }.to raise_error(Lifen::Error, "Error 500, Internal server error (trace ID: 2e2eac3a7e3fa2)")
+        }.to raise_error(Lifen::Error, "Error 500, Internal server error (trace ID: 2e2eac3a7e3fa2)")
       end
 
       it 'raises an error (without trace ID)' do
@@ -39,32 +39,32 @@ describe Lifen::Flow do
           VCR.use_cassette "flows/internal_error_without_trace_id" do
             user.flows
           end
-          }.to raise_error(Lifen::Error, "Error 500, Internal server error (trace ID: unknown)")
+        }.to raise_error(Lifen::Error, "Error 500, Internal server error (trace ID: unknown)")
       end
 
     end
 
-  	context "valid token" do
+    context "valid token" do
 
       # let(:valid_token_value)     { "REPLACE_ME" }
 
-	    before(:each) do
-	      VCR.use_cassette "flows/valid_token" do
-	        @flows = user.flows
-	      end
+      before(:each) do
+        VCR.use_cassette "flows/valid_token" do
+          @flows = user.flows
+        end
 
-	      @flow = @flows.first
-	    end
+        @flow = @flows.first
+      end
 
-	    it { expect(@flows.size).to eq(1) }
+      it { expect(@flows.size).to eq(1) }
 
-	    it 'has valid attributes' do
-	    	expect(@flow.user).to eq(user)
-	    	expect(@flow.uuid).to eq("11e6be18-7a35-d759-9177-0242ac110002")
-	    	expect(@flow.title).to eq("Rspec Flow")
-	    end
+      it 'has valid attributes' do
+        expect(@flow.user).to eq(user)
+        expect(@flow.uuid).to eq("11e6be18-7a35-d759-9177-0242ac110002")
+        expect(@flow.title).to eq("Rspec Flow")
+      end
 
-  	end
+    end
 
   end
 
@@ -72,10 +72,10 @@ describe Lifen::Flow do
 
     # let(:valid_token_value)     { "REPLACE_ME" }
 
-  	let(:flow) { Lifen::Flow.new(user: user, title: "Rspec Flow") }
+    let(:flow) { Lifen::Flow.new(user: user, title: "Rspec Flow") }
 
-  	it 'creates a flow' do
-  	  VCR.use_cassette "flows/create" do
+    it 'creates a flow' do
+      VCR.use_cassette "flows/create" do
         @new_flow = flow.create
       end
 
@@ -83,7 +83,7 @@ describe Lifen::Flow do
       expect(@new_flow.user).to eq(user)
       expect(@new_flow.title).to eq("Rspec Flow")
 
-  	end
+    end
 
     context 'attaching users at the same time' do
 
@@ -114,48 +114,48 @@ describe Lifen::Flow do
 
     # let(:valid_token_value)     { "REPLACE_ME" }
 
-  	context 'invalid flow uuid' do
-  		let(:flow) { Lifen::Flow.new(uuid: "invalid-uuid", user: user) }
+    context 'invalid flow uuid' do
+      let(:flow) { Lifen::Flow.new(uuid: "invalid-uuid", user: user) }
 
-  		it 'raises an error' do
-  			expect{
-		    	VCR.use_cassette "flows/attach_users/invalid_flow_uuid" do
-		       	flow.attach_users(user)
-		      end
-		      }.to raise_error(Lifen::InvalidParamsError)
-  		end
+      it 'raises an error' do
+        expect{
+          VCR.use_cassette "flows/attach_users/invalid_flow_uuid" do
+            flow.attach_users(user)
+          end
+        }.to raise_error(Lifen::InvalidParamsError)
+      end
 
-  	end
+    end
 
-  	context 'valid flow uuid' do
+    context 'valid flow uuid' do
 
-  		let(:flow) { Lifen::Flow.new(uuid: "11e6be18-7a35-d759-9177-0242ac110002", user: user) }
+      let(:flow) { Lifen::Flow.new(uuid: "11e6be18-7a35-d759-9177-0242ac110002", user: user) }
       let(:other_user) { Lifen::User.new(uuid: "11e6be15-0fb1-0a21-a3bd-0242ac110002") }
 
-  		context 'invalid user params' do
+      context 'invalid user params' do
 
-  			it 'raises an error' do
-  				invalid_user = Lifen::User.new(uuid: "invalid-uuid")
+        it 'raises an error' do
+          invalid_user = Lifen::User.new(uuid: "invalid-uuid")
 
-	  			expect{
-			    	VCR.use_cassette "flows/attach_users/invalid_user_uuid" do
-			       	flow.attach_users(invalid_user)
-			      end
-			    }.to raise_error(Lifen::InvalidParamsError)
-	  		end
-  		end
+          expect{
+            VCR.use_cassette "flows/attach_users/invalid_user_uuid" do
+              flow.attach_users(invalid_user)
+            end
+          }.to raise_error(Lifen::InvalidParamsError)
+        end
+      end
 
-  		it 'attaches a user' do
-  			VCR.use_cassette "flows/attach_users/valid" do
-	       	flow.attach_users(other_user)
-	      end
+      it 'attaches a user' do
+        VCR.use_cassette "flows/attach_users/valid" do
+          flow.attach_users(other_user)
+        end
 
         expect(flow.users.size).to eq(2)
         expect(flow.users.first.uuid).to eq("11e6be14-8267-25ee-a3bd-0242ac110002")
         expect(flow.users.first.first_name).to eq("Existing")
-  		end
+      end
 
-  	end
+    end
 
   end
 
@@ -163,17 +163,17 @@ describe Lifen::Flow do
 
     # let(:valid_token_value)     { "REPLACE_ME" }
 
-  	context 'valid flow uuid' do
-  		let(:flow) { Lifen::Flow.new(uuid: "11e6be18-7a35-d759-9177-0242ac110002", user: user) }
+    context 'valid flow uuid' do
+      let(:flow) { Lifen::Flow.new(uuid: "11e6be18-7a35-d759-9177-0242ac110002", user: user) }
       let(:other_user) { Lifen::User.new(uuid: "11e6be15-0fb1-0a21-a3bd-0242ac110002") }
 
-  		it 'detaches a users' do
-  			VCR.use_cassette "flows/detach_users/valid" do
-	       	flow.detach_users(other_user)
-	      end
+      it 'detaches a users' do
+        VCR.use_cassette "flows/detach_users/valid" do
+          flow.detach_users(other_user)
+        end
 
         expect(flow.users.size).to eq(1)
-  		end
+      end
 
       # it 'raises an error if the error is not detached' do
       #   VCR.use_cassette "flows/detach_users/valid_again" do
@@ -181,7 +181,7 @@ describe Lifen::Flow do
       #   end
       # end
 
-  	end
+    end
 
   end
 

data/spec/messages_spec.rb

@@ -6,29 +6,29 @@ describe Lifen::Message do
   # let(:valid_token_value)   { "REPLACE_ME" }
 
   let(:valid_token)         { Lifen::Token.new(value: valid_token_value, expires_at: Time.now.to_i + 60) }
-	let(:user)                { Lifen::User.new(token: valid_token) }
+  let(:user)                { Lifen::User.new(token: valid_token) }
 
   let(:flow)                { Lifen::Flow.new(user: user, uuid: "11e6be18-7a35-d759-9177-0242ac110002") }
   let(:message)             { Lifen::Message.new(flow: flow, content: "Bonjour Lifen") }
 
   describe "create" do
 
-  	context "valid message" do
+    context "valid message" do
 
-	    it 'has valid attributes' do
+      it 'has valid attributes' do
 
         VCR.use_cassette "messages/valid_message" do
           message.create
         end
 
-	    	expect(message.uuid).to eq("11e6be20-5647-8f9b-9177-0242ac110002")
+        expect(message.uuid).to eq("11e6be20-5647-8f9b-9177-0242ac110002")
         expect(message.type).to eq("regular")
         expect(message.flow).to eq(flow)
         expect(message.sent_at.to_date).to eq Date.new(2016, 12, 9)
 
-	    end
+      end
 
-  	end
+    end
 
   end
 

data/spec/spec_helper.rb

@@ -16,9 +16,9 @@ end
 
 RSpec.configure do |c|
   c.before(:each) do
-  	Lifen.configure do |config|
-			config.site = "https://develop.lifen.fr/"
+    Lifen.configure do |config|
+      config.site = "https://develop.lifen.fr/"
       config.application_access_token = "valid_application_access_token"
-		end
+    end
   end
 end

data/spec/token_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Lifen::Token do
+
+  describe 'expired token' do
+
+    let(:expired_token)   { Lifen::Token.new(value: "valid_token", expires_at: Time.now.to_i - 60) }
+
+    it 'refreshs the token' do
+      expect(expired_token).to receive(:refresh) do
+        expired_token.expires_at = Time.now.to_i + 60
+      end
+
+      expired_token.refresh_once_if_needed
+    end
+
+  end
+
+  describe 'invalid token' do
+
+    let(:invalid_token)   { Lifen::Token.new(value: "", expires_at: Time.now.to_i + 60) }
+
+    it 'detects invalid tokens' do
+      expect(invalid_token).to_not be_valid
+    end
+
+  end
+
+end

data/spec/users_spec.rb

@@ -101,22 +101,6 @@ describe Lifen::User do
       end
     end
 
-    describe 'expired token' do
-
-      let(:expired_token)   { Lifen::Token.new(value: "valid_token", expires_at: Time.now.to_i - 60) }
-      let(:user)            { Lifen::User.new(token: expired_token) }
-
-
-      it 'refreshs the token' do
-        expect(expired_token).to receive(:refresh) do
-          expired_token.expires_at = Time.now.to_i + 60
-        end
-
-        expired_token.refresh_once_if_needed
-      end
-
-    end
-
   end
 
   describe ':status.refresh' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lifen
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Etienne Depaulis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2016-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -146,6 +146,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - License.txt
@@ -188,6 +189,7 @@ files:
 - spec/flows_spec.rb
 - spec/messages_spec.rb
 - spec/spec_helper.rb
+- spec/token_spec.rb
 - spec/users_spec.rb
 homepage: https://github.com/honestica/lifen
 licenses:
@@ -236,4 +238,5 @@ test_files:
 - spec/flows_spec.rb
 - spec/messages_spec.rb
 - spec/spec_helper.rb
+- spec/token_spec.rb
 - spec/users_spec.rb