ixtlan-user-management 0.1.2 → 0.1.3

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec
-# needed for jruby 1.6.8 - inside Mavenfile it does not work
-gem 'jruby-openssl', :platform => :java
+
+gem 'copyright-header', '~>1.0', :platform => :mri

data/lib/ixtlan/user_management/authenticator.rb

@@ -34,7 +34,8 @@ module Ixtlan
 
       def login( username_or_email, password )
         user = nil
-        @restserver.create( Authentication.new(:login => username_or_email, :password => password) ) do |json, req|
+        @restserver.create( Authentication.new( :login => username_or_email,
+                                                :password => password) ) do |json, req|
           user = user_new( MultiJson.load( json ) ) unless json.strip == ''
           #tell restserver to ignore response
           nil

data/lib/ixtlan/user_management/session_cuba.rb

@@ -50,10 +50,10 @@ module Ixtlan
         on post, :reset_password do
           if msg = self.class.authenticator.reset_password( login_and_password[ 0 ] )
             log msg
-            head 200
+            no_body :ok
           else
             log "user/email not found"
-            head 404
+            no_body :not_found
           end
         end
 
@@ -67,7 +67,7 @@ module Ixtlan
             write self.class.sessions.create( user )
           else
             log "access denied"
-            head 403
+            head :forbidden # 403
           end
         end
         
@@ -89,19 +89,19 @@ module Ixtlan
 
           on get, 'ping' do
             self.class.authenticator.ping( current_user )
-            head 200
+            no_body :ok
           end
         end
 
         on get, /(me|ping)/ do
-          head :unauthorized
+          no_body :unauthorized # 401
         end
 
         on delete do
           self.class.authenticator.logout( current_user ) if current_user
           log "logout"
           reset_current_user
-          head 200
+          no_body :ok
         end
 
       end

data/lib/ixtlan/user_management/session_model.rb

@@ -29,7 +29,7 @@ module Ixtlan
       attribute :permissions, Array[Object]
 
       def to_s
-        "Session( #{user.name}<#{user.login}> groups[ #{user.groups.collect { |g| g.name }.join ',' } ] #{idle_session_timeout} )"
+        "Session( #{user.name}<#{user.login}> groups:[ #{user.groups.collect { |g| g.name }.join ',' } ] idle_timeout:#{idle_session_timeout} )"
       end
     end
   end

data/lib/ixtlan/user_management/session_plugin.rb

@@ -0,0 +1,53 @@
+#
+# Copyright (C) 2013 Christian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+require 'ixtlan/user_management/authenticator'
+
+module Ixtlan
+  module UserManagement
+    module SessionPlugin
+
+      module ClassMethods
+        def authenticator
+          self[ :authenticator ] ||= Authenticator.new( self[ :rest ] )
+        end
+      end
+
+      def log( msg )
+        if self.respond_to? :audit
+          audit( msg, { :username => login } )
+        else
+          warn( "[#{login}] #{msg}" )
+        end
+      end
+  
+      def login_and_password
+        source = parse_request_body
+        source = req if source && source.empty?
+        auth = source[ 'authentication' ] || source
+        [ auth[ 'login' ] || auth[ 'email' ], auth[ 'password' ] ]
+      end
+      
+      def login
+        login_and_password[ 0 ]
+      end
+    end
+  end
+end

data/lib/ixtlan/user_management/user_resource.rb

@@ -52,4 +52,4 @@ module Ixtlan
       end
     end
   end
-end
+end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: ixtlan-user-management
 version: !ruby/object:Gem::Version
+  version: 0.1.3
   prerelease:
-  version: 0.1.2
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
     none: false
@@ -31,15 +31,15 @@ dependencies:
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.2
+        version: '10.1'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.2
+        version: '10.1'
     none: false
   prerelease: false
   type: :development
@@ -47,15 +47,15 @@ dependencies:
   name: minitest
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: '5.0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: '5.0'
     none: false
   prerelease: false
   type: :development
@@ -92,34 +92,40 @@ dependencies:
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
-  name: copyright-header
+  name: json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.7'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.7'
     none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
-  name: json
+  name: cuba-api
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 0.5.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: 0.6.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 0.5.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: 0.6.0
     none: false
   prerelease: false
   type: :development
@@ -130,24 +136,25 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/ixtlan-user-management.rb
 - lib/ixtlan_user_management.rb
+- lib/ixtlan-user-management.rb
 - lib/ixtlan/passwords.rb
 - lib/ixtlan/user_management.rb
-- lib/ixtlan/user_management/user_serializer.rb
-- lib/ixtlan/user_management/authenticator.rb
+- lib/ixtlan/user_management/session_cuba.rb
+- lib/ixtlan/user_management/session_model.rb
 - lib/ixtlan/user_management/dummy_authentication.rb
-- lib/ixtlan/user_management/user_model.rb
-- lib/ixtlan/user_management/session_serializer.rb
-- lib/ixtlan/user_management/group_model.rb
-- lib/ixtlan/user_management/user_resource.rb
+- lib/ixtlan/user_management/session_plugin.rb
+- lib/ixtlan/user_management/authenticator.rb
+- lib/ixtlan/user_management/user_serializer.rb
 - lib/ixtlan/user_management/session_manager.rb
-- lib/ixtlan/user_management/application_resource.rb
-- lib/ixtlan/user_management/domain_resource.rb
+- lib/ixtlan/user_management/session_serializer.rb
 - lib/ixtlan/user_management/authentication_model.rb
-- lib/ixtlan/user_management/session_model.rb
 - lib/ixtlan/user_management/application_model.rb
-- lib/ixtlan/user_management/session_cuba.rb
+- lib/ixtlan/user_management/group_model.rb
+- lib/ixtlan/user_management/domain_resource.rb
+- lib/ixtlan/user_management/user_model.rb
+- lib/ixtlan/user_management/application_resource.rb
+- lib/ixtlan/user_management/user_resource.rb
 - MIT-LICENSE
 - README.md
 - Gemfile
@@ -160,17 +167,15 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 requirements: []
 rubyforge_project: