gollum-auth 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c48dfb142646b389d1c3f48b86669da0aefbb8a7
-  data.tar.gz: a1c0fad00212b93bea5c9f02da882f1328ab1814
+  metadata.gz: 21e3fcbf6ef454027dd8f5b99eda8fc9ff17305c
+  data.tar.gz: b21cfd50602573f4333f7943e8675a9b5a2b0b41
 SHA512:
-  metadata.gz: ad314b474affd015c15cd2f37d6abfeae2078f4cdd1226df18e91c731fff6ac9ae7488c68320ff1800f0362c4c10c82fd1515f84cfad2097cd57753ade246dbb
-  data.tar.gz: d5523c25c2c68d61f8496ad6970969add84a61e00b810abf6e1192493664ac7e56b1548394a86db6a1f9f15f34342d3d593817b51263862c6286f62e5c8c6621
+  metadata.gz: 6d6b2b231c7c448a1c4a72f24d329df4e5ae9ca1f28ab2873c50541425a33cd3f702251817a3acae66aa86d75f263cc43f5128101d33c73a11549cf05bcdbf09
+  data.tar.gz: 0837e90a2b85b1d04a769e05c6ebfadb47bbd0089bc83fdd8f58ccd21b83d01e1226b1cb891c8ee1b00aa2ce172517e100963f74309e270fb31a14c7f19e6920

data/README.md

@@ -39,18 +39,26 @@ Here is a sample `config.ru`:
 ```ruby
 #!/usr/bin/env ruby
 require 'rubygems'
-require 'gollum/auth' # Load the gem!
+require 'gollum/auth' # Don't forget to load the gem!
 require 'gollum/app'
 
-# Enable Authentication and define users *before* running Precious::App!
-use Gollum::Auth, users: YAML.load(%q{
+# Define list of authorized users where each must have a "name", "password"
+and "email":
+users = YAML.load %q{
 ---
-- user: admin
-  password: test
-- user: foo
-  password: bar
-})
-
+- name: Rick Sanchez
+  password: asdf754&1129-@lUZw
+  email: rick@example.com
+- name: Morty Smith
+  password: 12345
+  email: morty@example.com
+}
+
+# Allow only authenticated users to access and change the wiki.
+# (NOTE: This must be loaded *before* Precious::App!)
+use Gollum::Auth, users
+
+# That's it. The rest is for gollum only.
 gollum_path = File.expand_path(File.dirname(__FILE__)) # CHANGE THIS TO POINT TO YOUR OWN WIKI REPO
 wiki_options = {:universal_toc => false}
 Precious::App.set(:gollum_path, gollum_path)
@@ -65,12 +73,6 @@ After checking out the repo, run `bin/setup` to install dependencies.
 Then, run `rake spec` to run the tests. You can also run `bin/console` for an
 interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`.
-To release a new version, update the version number in `version.rb`, and then
-run `bundle exec rake release`, which will create a git tag for the version,
-push git commits and tags, and push the `.gem` file to
-[rubygems.org](https://rubygems.org).
-
 
 ## Contributing
 

data/gollum-auth.gemspec

@@ -28,4 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rack-test', '~> 0.6'
+  spec.add_development_dependency 'factory_girl', '~> 4.8'
+  spec.add_development_dependency 'faker', '~> 1.7'
 end

data/lib/gollum/auth.rb

@@ -10,9 +10,9 @@ module Gollum
     end
 
     class App
-      def initialize(app, opts = { })
+      def initialize(app, users)
         @app = app
-        opts.fetch(:users, [ ]).map { |args| User.new(args).save! }
+        users.each { |args| User.new(args).save! }
       end
 
       def call(env)
@@ -33,8 +33,8 @@ module Gollum
       private
 
       def valid?(credentials)
-        user, password = credentials
-        current_user = User.find(user)
+        username, password = credentials
+        current_user = User.find(username)
         current_user && current_user.valid_password?(password)
       end
 

data/lib/gollum/auth/user.rb

@@ -5,13 +5,13 @@ module Gollum::Auth
   class User
     include ActiveModel::Model
 
-    attr_accessor :user, :password
+    attr_accessor :name, :password, :email
 
-    validates_presence_of :user, :password
+    validates_presence_of :name, :password, :email
 
     class << self
-      def find(user)
-        all.select { |u| u.user == user }.first
+      def find(name)
+        all.select { |u| u.name == name }.first
       end
 
       def all

data/lib/gollum/auth/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gollum-auth
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Björn Albers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -94,6 +94,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: factory_girl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.8'
+- !ruby/object:Gem::Dependency
+  name: faker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
 description: Authentication Middleware for Gollum Wiki
 email:
 - bjoernalbers@gmail.com
@@ -139,5 +167,5 @@ rubyforge_project:
 rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
-summary: gollum-auth-0.1.2
+summary: gollum-auth-0.2.0
 test_files: []