gollum-auth 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5db91789f3867f6d9e396ff5f39c8ce4204c4891
-  data.tar.gz: b583804ff7ea81318a1c962f4d34c5110a4cc84c
+  metadata.gz: c48dfb142646b389d1c3f48b86669da0aefbb8a7
+  data.tar.gz: a1c0fad00212b93bea5c9f02da882f1328ab1814
 SHA512:
-  metadata.gz: 0573f9e23ffc083b45050070cc228c08f29d5d679ee34f80872bfa783f024c254d417ebbb0198a48409c8ec40136fb5a007d534bf6ab284872628440df7a24ec
-  data.tar.gz: 1a7c66737bd962cf6c6fc85ad7377debae626be910976b402f5047c7c76e4faefc42b0246083e341fbe6da9301136919722051ea3839692e85fa2a9807772262
+  metadata.gz: ad314b474affd015c15cd2f37d6abfeae2078f4cdd1226df18e91c731fff6ac9ae7488c68320ff1800f0362c4c10c82fd1515f84cfad2097cd57753ade246dbb
+  data.tar.gz: d5523c25c2c68d61f8496ad6970969add84a61e00b810abf6e1192493664ac7e56b1548394a86db6a1f9f15f34342d3d593817b51263862c6286f62e5c8c6621

data/gollum-auth.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'rack', '~> 1.6'
+  spec.add_dependency 'activemodel', '~> 4.2'
 
   spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/gollum/auth.rb

@@ -1,5 +1,7 @@
 require 'rack'
+require 'active_model'
 require 'gollum/auth/version'
+require 'gollum/auth/user'
 
 module Gollum
   module Auth
@@ -10,7 +12,7 @@ module Gollum
     class App
       def initialize(app, opts = { })
         @app = app
-        @users = opts.fetch(:users, [ ])
+        opts.fetch(:users, [ ]).map { |args| User.new(args).save! }
       end
 
       def call(env)
@@ -31,7 +33,13 @@ module Gollum
       private
 
       def valid?(credentials)
-        @users.any? { |u| [ u['user'], u['password'] ] == credentials }
+        user, password = credentials
+        current_user = User.find(user)
+        current_user && current_user.valid_password?(password)
+      end
+
+      def users
+        User.all
       end
     end
   end

data/lib/gollum/auth/user.rb

@@ -0,0 +1,40 @@
+module Gollum::Auth
+  class InvalidUserError < StandardError
+  end
+
+  class User
+    include ActiveModel::Model
+
+    attr_accessor :user, :password
+
+    validates_presence_of :user, :password
+
+    class << self
+      def find(user)
+        all.select { |u| u.user == user }.first
+      end
+
+      def all
+        @all ||= []
+      end
+    end
+
+    def save!
+      save ? self : raise(InvalidUserError, error_message)
+    end
+
+    def save
+      (self.class.all << self; self) if valid?
+    end
+
+    def valid_password?(other)
+      password == other
+    end
+
+    private
+
+    def error_message
+      errors.full_messages.join(', ')
+    end
+  end
+end

data/lib/gollum/auth/version.rb

@@ -1,5 +1,5 @@
 module Gollum
   module Auth
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gollum-auth
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Björn Albers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +114,7 @@ files:
 - bin/setup
 - gollum-auth.gemspec
 - lib/gollum/auth.rb
+- lib/gollum/auth/user.rb
 - lib/gollum/auth/version.rb
 homepage: https://github.com/bjoernalbers/gollum-auth
 licenses:
@@ -124,5 +139,5 @@ rubyforge_project:
 rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
-summary: gollum-auth-0.1.1
+summary: gollum-auth-0.1.2
 test_files: []