vidibus-pureftpd 1.0.2 → 1.0.3

data/README.md

@@ -167,45 +167,44 @@ dscacheutil -q user
 dscacheutil -q group
 ```
 
+#### Debugging
 
-Not needed for testing, but to start the server, type:
+To start the server, e.g. for debugging the users you've created, type `sudo /usr/local/sbin/pure-ftpd &`
 
-```
-sudo /usr/local/sbin/pure-ftpd &
-```
+You should now be able to connect via ftp by entering `ftp localhost`. To shut it down, call `sudo pkill pure-ftpd`
 
-You should now be able to connect via ftp:
+In order to check which users have been created, call `pure-pw list`.
 
-```
-ftp localhost
-```
+If you really want to use Pure-FTPd as FTP server on OSX, you should consider installing [PureFTPd Manager](http://jeanmatthieu.free.fr/pureftpd/).
 
-Shut it down with:
 
-```
-sudo pkill pure-ftpd
-```
+#### Troubleshooting
 
-If you really want to use Pure-FTPd as FTP server on OSX, you should consider installing [PureFTPd Manager](http://jeanmatthieu.free.fr/pureftpd/).
+When using this gem in a web application, it may happen that the execution of the `pure-ftp` command fails. A reason for that may be that your webserver is not able access the command.
+
+I solved this issue by adding a symlink:
 
+```
+sudo ln -s /usr/local/bin/pure-pw /usr/bin/pure-pw
+```
 
 ## TODO
 
 Implement all user options offered by Pure-FTPd:
 
 ```
-  -t <download bandwidth>
-  -T <upload bandwidth>
-  -n <max number of files>
-  -N <max Mbytes>
-  -q <upload ratio>
-  -Q <download ratio>
-  -r <allow client host>
-  -R <deny client host>
-  -i <allow local host>
-  -I <deny local host>
-  -y <max number of concurrent sessions>
-  -z <hhmm>-<hhmm>
+-t <download bandwidth>
+-T <upload bandwidth>
+-n <max number of files>
+-N <max Mbytes>
+-q <upload ratio>
+-Q <download ratio>
+-r <allow client host>
+-R <deny client host>
+-i <allow local host>
+-I <deny local host>
+-y <max number of concurrent sessions>
+-z <hhmm>-<hhmm>
 ```
 
 

data/config/locales/de.yml

@@ -6,6 +6,8 @@ de:
           attributes:
             login:
               taken: 'ist bereits vergeben'
+            password:
+              reenter: 'bitte nochmals eingeben'
             directory:
               not_existent: 'gibt es nicht'
               not_a_directory: 'muss ein Verzeichnis sein'

data/config/locales/en.yml

@@ -6,6 +6,8 @@ en:
           attributes:
             login:
               taken: 'has already been taken'
+            password:
+              reenter: 'please re-enter'
             directory:
               not_existent: 'does not exist'
               not_a_directory: 'must be a directory'

data/lib/vidibus/pureftpd/user.rb

@@ -28,7 +28,7 @@ module Vidibus
 
       validates :password, :directory, :presence => true
       validates :login, :format => { :with => /^[a-z_0-9\-]+$/ }
-      validate :unique_login?, :if => :login_changed?
+      validate :valid_login?, :if => :login_changed?
       validate :valid_directory?, :if => :directory_changed?
 
       def initialize(values = {})
@@ -73,6 +73,7 @@ module Vidibus
       def reload
         if persisted? && login_was && (user = User.find_by_login(login_was))
           self.attributes = user.attributes
+          @changed_attributes.clear
           self
         else
           raise DocumentNotFound
@@ -118,11 +119,20 @@ module Vidibus
         attributes.merge(Vidibus::Pureftpd.settings)
       end
 
-      def unique_login?
+      def valid_login?
         return unless login.present?
         if User.find_by_login(login)
           self.errors.add(:login, :taken)
         end
+        unless password_changed?
+          # Double check that password has not been changed
+          if existing = User.find_by_login(login_was)
+            if password == existing.password
+              self.password = nil
+              self.errors.add(:password, :reenter)
+            end
+          end
+        end
       end
 
       def valid_directory?

data/lib/vidibus/pureftpd/version.rb

@@ -1,5 +1,5 @@
 module Vidibus
   module Pureftpd
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vidibus-pureftpd
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-22 00:00:00.000000000 Z
+date: 2012-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: posix-spawn
@@ -184,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2950673401498761053
+      hash: -2523392839063022724
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: