ixtlan 0.4.0 → 0.4.1

data/lib/ixtlan/controllers/users_controller.rb

@@ -1,3 +1,4 @@
+require 'ixtlan/mailer'
 module Ixtlan
   module Controllers
     module UsersController
@@ -12,7 +13,7 @@ module Ixtlan
 
       USER = Object.full_const_get(::Ixtlan::Models::USER)
 
-      def adjust_params(user_params)
+      def adjust_params_and_return_groups(user_params)
         if user_params
           lang = user_params.delete(:preferred_language)
           user_params[:language] = lang[:code][0..1] if lang
@@ -64,7 +65,7 @@ module Ixtlan
       # POST /users.xml
       def create
         user_params = params[:user]
-        groups = adjust_params(user_params)
+        groups = adjust_params_and_return_groups(user_params)
         @user = USER.new(user_params)
         @user.current_user = current_user
         @user.reset_password
@@ -72,12 +73,14 @@ module Ixtlan
 
         respond_to do |format|
           if @user.save
-            flash[:notice] = 'User was successfully created.'
+            flash[:notice] = "User was successfully created: #{@user.password}"
             format.html { redirect_to(user_url(@user.id)) }
             format.xml  { render :xml => @user, :status => :created, :location => user_url(@user.id) + ".xml" }
 
-            ::Ixtlan::Mailer.deliver_new_user(@user.email, Configuration.instance.password_sender_email, @user.login, Configuration.instance.login_url)
-            ::Ixtlan::Mailer.deliver_password(@user.email, Configuration.instance.password_sender_email, @user.password)
+            if Configuration.instance.password_sender_email
+              ::Ixtlan::Mailer.deliver_new_user(@user.email, Configuration.instance.password_sender_email, @user.login, Configuration.instance.login_url)
+              ::Ixtlan::Mailer.deliver_password(@user.email, Configuration.instance.password_sender_email, @user.password)
+            end
           else
             format.html { render :action => "new" }
             format.xml  { render :xml => @user.errors, :status => :unprocessable_entity }
@@ -91,7 +94,7 @@ module Ixtlan
         @user = USER.first_or_get!(params[:id])
         @user.current_user = current_user
         user_params = params[:user]
-        @user.update_all_children(adjust_params(user_params))
+        @user.update_all_children(adjust_params_and_return_groups(user_params))
         @user.attributes = user_params
 
         respond_to do |format|

data/lib/ixtlan/models.rb

@@ -4,6 +4,7 @@ module Ixtlan
     AUDIT = "::Audit" unless const_defined? "AUDIT"
     USER = "::User" unless const_defined? "USER"
     GROUP = "::Group" unless const_defined? "GROUP"
+    GROUP_USER = "::Ixtlan::Models::GroupUser" unless const_defined? "GROUP_USER"
     ROLE = "::Role" unless const_defined? "ROLE"
     PERMISSION = "::Permission" unless const_defined? "PERMISSION"
     LOCALE = "::Locale" unless const_defined? "LOCALE"

data/lib/ixtlan/models/group.rb

@@ -16,9 +16,10 @@ module Ixtlan
 
         model.property :name, String, :required => true , :format => /^[^<'&">]*$/, :length => 32, :field => "cn", :unique_index => true
 
-        model.timestamps :created_at
-
-        model.modified_by Ixtlan::Models::USER, :created_by
+        if !model.const_defined?('LDAP') || !model.const_get('LDAP')
+          model.timestamps :created_at
+          model.modified_by Ixtlan::Models::USER, :created_by
+        end
 
         model.class_eval <<-EOS, __FILE__, __LINE__
       if protected_instance_methods.find {|m| m == 'to_x'}.nil?

data/lib/ixtlan/models/user.rb

@@ -5,11 +5,13 @@ require 'ixtlan/passwords'
 require 'ixtlan/digest'
 require 'dm-serializer'
 require 'ixtlan/models/update_children'
+require 'ixtlan/models/group_user'
 module Ixtlan
   module Models
     module User
 
       GROUP = Object.full_const_get(Models::GROUP)
+      GROUP_USER = Object.full_const_get(Models::GROUP_USER)
 
       def root?
         groups.detect { |g| g.root? } || false
@@ -41,7 +43,7 @@ module Ixtlan
           # TODO spec the empty array to make sure new relations are stored
           # in the database or the groups collection is empty before filling it
           @groups = ::DataMapper::Collection.new(::DataMapper::Query.new(self.repository, GROUP), [])
-          GroupUser.all(:memberuid => login).each do |gu|
+          GROUP_USER.all(:memberuid => login).each do |gu|
             @groups << gu.group
           end
           def @groups.user=(user)
@@ -52,7 +54,7 @@ module Ixtlan
             group.locales(@user)
             group.domains(@user)
             unless member? group
-              gu = GroupUser.create(:memberuid => @user.login, :gidnumber => group.id)
+              gu = GROUP_USER.create(:memberuid => @user.login, :gidnumber => group.id)
               super
             end
 
@@ -60,7 +62,7 @@ module Ixtlan
           end
 
           def @groups.delete(group)
-            gu = GroupUser.first(:memberuid => @user.login, :gidnumber => group.id)
+            gu = GROUP_USER.first(:memberuid => @user.login, :gidnumber => group.id)
             if gu
               gu.destroy
             end
@@ -94,7 +96,7 @@ module Ixtlan
       def update_locales_domains(new_groups)
         if(new_groups)
           # make sure we have an array
-          new_groups = new_groups[:group]
+          new_groups = new_groups.is_a?(Array) ? new_groups : new_groups[:group]
           new_groups = [new_groups] unless new_groups.is_a? Array
 
           # create a map group_id =>  group
@@ -152,9 +154,10 @@ module Ixtlan
 
         model.property :hashed_password, String, :required => false, :length => 128, :accessor => :private, :field => "userpassword"
 
-        model.timestamps :at
-
-        model.modified_by ::Ixtlan::Models::USER
+        if !model.const_defined?('LDAP') || !model.const_get('LDAP')
+          model.timestamps :at
+          model.modified_by ::Ixtlan::Models::USER
+        end
 
         #validates_is_unique  :login
         #validates_is_unique  :email

data/lib/ixtlan/version.rb

@@ -1,3 +1,3 @@
 module Ixtlan
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.1'.freeze
 end

data/spec/authentication_spec.rb

@@ -29,7 +29,7 @@ describe Ixtlan::Models::Authentication do
     Ixtlan::Guard.load( Slf4r::LoggerFacade.new(:root), :root, (Pathname(__FILE__).dirname + 'guards').expand_path )
   end
 
-  it "should" do
+  it "should generate the right xml" do
     xml = @authentication.to_xml
     xml.gsub!(/[0-9-]{10}T[0-9+-:]{14}/, "").gsub!(/<created_at><\/created_at>/, "<created_at/>").gsub!(/<locale><id>[0-9]*<\/id>/, "<locale>").gsub!(/<permission>.*<\/permission>/, '').gsub(/id>[0-9]+<\//,'id></').should == "<authentication><login>marvin2</login><user><id></id><login>marvin2</login><name>marvin the robot</name><email>marvin@universe.example.com</email><language>xx</language><created_at/><updated_at></updated_at><groups><group><id></id><name>marvin2_root</name><locales><locale><code>DEFAULT</code><created_by_id></created_by_id></locale><locale><code>en</code><created_by_id></created_by_id></locale></locales></group></groups><created_by><id></id><login>marvin2</login><name>marvin the robot</name><email>marvin@universe.example.com</email></created_by><updated_by><id></id><login>marvin2</login><name>marvin the robot</name><email>marvin@universe.example.com</email></updated_by></user><permissions></permissions></authentication>"
   end

data/spec/modified_by_spec.rb

@@ -21,7 +21,9 @@ end
 describe Ixtlan::ModifiedBy do
 
   before :each do
-    @user = Crew.create(:login => 'spock')
+    Crew.all.destroy!
+    AuditedName.all.destroy!
+    @user = Crew.create(:login => 'spocky')
     @second = Crew.create(:login => 'dr pille')
     @name = AuditedName.create(:name => 'kirk', :current_user => @user)
   end

data/spec/spec_helper.rb

@@ -9,6 +9,7 @@ require 'dm-serializer'
 require 'dm-timestamps'
 
 require 'slf4r'
+require 'slf4r/ruby_logger'
 
 require 'ixtlan/models'
 require 'ixtlan/modified_by'

data/spec/unrestful_authentication_spec.rb

@@ -36,6 +36,7 @@ end
 describe Ixtlan::Models::Authentication do
 
   before :all do
+    User.all.destroy!
     @controller = Controller.new
     @log = StringIO.new
     Slf4r::LoggerFacade4RubyLogger.file = @log

data/spec/user_logger_spec.rb

@@ -19,6 +19,7 @@ end
 describe Ixtlan::UserLogger do
 
   before :all do
+    User.all.destroy!
     @controller = Controller.new
   end
 
@@ -85,10 +86,10 @@ describe Ixtlan::UserLogger do
     @controller.params[:action] = "index"
     @controller.instance_variable_set(:@resource, @controller.current_user.groups[0])
     @logger.log_action(@controller)
-    @log.string.should =~ /\[marvin\] resources#index .*Group\([0-9]\)\s*$/
+    @log.string.should =~ /\[marvin\] resources#index .*Group\([0-9]+\)\s*$/
     @controller.response.content_type = "application/xml"
     @logger.log_action(@controller)
-    @log.string.should =~ /\[marvin\] resources#index .*Group\([0-9]\) - xml\s*$/
+    @log.string.should =~ /\[marvin\] resources#index .*Group\([0-9]+\) - xml\s*$/
   end
 
   it 'should log action - resources variable' do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 4
-    - 0
-  version: 0.4.0
+    - 1
+  version: 0.4.1
 platform: ruby
 authors: 
   - mkristian
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-02 00:00:00 +05:30
+date: 2011-01-28 00:00:00 +05:30
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -78,13 +78,20 @@ dependencies:
     prerelease: false
     requirement: &id005 !ruby/object:Gem::Requirement 
       requirements: 
-        - - ~>
+        - - ">="
           - !ruby/object:Gem::Version 
             segments: 
               - 0
               - 3
               - 0
             version: 0.3.0
+        - - <
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 3
+              - 3
+            version: 0.3.3
     type: :runtime
     version_requirements: *id005
   - !ruby/object:Gem::Dependency 
@@ -172,114 +179,114 @@ files:
   - History.txt
   - README.txt
   - Rakefile
+  - lib/dm-serializer.rb
   - lib/models.rb
   - lib/ixtlan.rb
-  - lib/dm-serializer.rb
+  - lib/dm-serializer/to_xml.rb
   - lib/dm-serializer/common.rb
   - lib/dm-serializer/xml_serializers.rb
-  - lib/dm-serializer/to_xml.rb
-  - lib/dm-serializer/xml_serializers/libxml.rb
   - lib/dm-serializer/xml_serializers/nokogiri.rb
+  - lib/dm-serializer/xml_serializers/libxml.rb
   - lib/dm-serializer/xml_serializers/rexml.rb
+  - lib/ixtlan/session.rb
+  - lib/ixtlan/version.rb
+  - lib/ixtlan/audit_config.rb
   - lib/ixtlan/rails.rb
+  - lib/ixtlan/digest.rb
+  - lib/ixtlan/version.rb.errors
+  - lib/ixtlan/mailer.rb
+  - lib/ixtlan/configurator.rb
+  - lib/ixtlan/modified_by.rb
+  - lib/ixtlan/optimistic_persistence_validation.rb
   - lib/ixtlan/child_path.rb
-  - lib/ixtlan/rolling_file.rb
-  - lib/ixtlan/cms_script.rb
-  - lib/ixtlan/simple_client.rb
   - lib/ixtlan/logger_config.rb
-  - lib/ixtlan/models.rb
-  - lib/ixtlan/audit_config.rb
+  - lib/ixtlan/rolling_file.rb
   - lib/ixtlan/session_with_cache.rb
-  - lib/ixtlan/configurator.rb
+  - lib/ixtlan/monkey_patches.rb
+  - lib/ixtlan/passwords.rb
   - lib/ixtlan/audit_rack.rb
-  - lib/ixtlan/session.rb
-  - lib/ixtlan/optimistic_persistence.rb
-  - lib/ixtlan/mailer.rb
-  - lib/ixtlan/modified_by.rb
+  - lib/ixtlan/models.rb
+  - lib/ixtlan/simple_client.rb
   - lib/ixtlan/optimistic_persistence_module.rb
-  - lib/ixtlan/optimistic_persistence_validation.rb
-  - lib/ixtlan/version.rb.errors
-  - lib/ixtlan/guard.rb
-  - lib/ixtlan/passwords.rb
-  - lib/ixtlan/monkey_patches.rb
-  - lib/ixtlan/digest.rb
-  - lib/ixtlan/version.rb
   - lib/ixtlan/user_logger.rb
-  - lib/ixtlan/models/domain.rb
-  - lib/ixtlan/models/group_locale_user.rb
-  - lib/ixtlan/models/role.rb
-  - lib/ixtlan/models/phrase.rb
-  - lib/ixtlan/models/update_children.rb
-  - lib/ixtlan/models/translation.rb
-  - lib/ixtlan/models/audit.rb
-  - lib/ixtlan/models/user.rb
-  - lib/ixtlan/models/permission.rb
-  - lib/ixtlan/models/locale.rb
-  - lib/ixtlan/models/i18n_text.rb
-  - lib/ixtlan/models/domain_group_user.rb
-  - lib/ixtlan/models/configuration_locale.rb
-  - lib/ixtlan/models/word.rb
-  - lib/ixtlan/models/configuration.rb
-  - lib/ixtlan/models/authentication.rb
-  - lib/ixtlan/models/group_user.rb
-  - lib/ixtlan/models/group.rb
-  - lib/ixtlan/controllers/groups_controller.rb
+  - lib/ixtlan/guard.rb
+  - lib/ixtlan/optimistic_persistence.rb
+  - lib/ixtlan/cms_script.rb
   - lib/ixtlan/controllers/permissions_controller.rb
+  - lib/ixtlan/controllers/authentications_controller.rb
+  - lib/ixtlan/controllers/texts_controller.rb
   - lib/ixtlan/controllers/phrases_controller.rb
+  - lib/ixtlan/controllers/word_bundles_controller.rb
   - lib/ixtlan/controllers/configurations_controller.rb
-  - lib/ixtlan/controllers/texts_controller.rb
+  - lib/ixtlan/controllers/users_controller.rb
   - lib/ixtlan/controllers/locales_controller.rb
-  - lib/ixtlan/controllers/word_bundles_controller.rb
   - lib/ixtlan/controllers/audits_controller.rb
   - lib/ixtlan/controllers/search_query.rb
-  - lib/ixtlan/controllers/authentications_controller.rb
+  - lib/ixtlan/controllers/groups_controller.rb
   - lib/ixtlan/controllers/domains_controller.rb
-  - lib/ixtlan/controllers/users_controller.rb
+  - lib/ixtlan/mailer/password.erb
   - lib/ixtlan/mailer/new_user.erb
   - lib/ixtlan/mailer/error_notification.erb
-  - lib/ixtlan/mailer/password.erb
-  - lib/ixtlan/rails/timestamps_modified_by_filter.rb
-  - lib/ixtlan/rails/rescue_module.rb
-  - lib/ixtlan/rails/cache_headers.rb
-  - lib/ixtlan/rails/audit.rb
-  - lib/ixtlan/rails/error_handling.rb
+  - lib/ixtlan/models/domain.rb
+  - lib/ixtlan/models/user.rb
+  - lib/ixtlan/models/role.rb
+  - lib/ixtlan/models/group_locale_user.rb
+  - lib/ixtlan/models/group.rb
+  - lib/ixtlan/models/audit.rb
+  - lib/ixtlan/models/authentication.rb
+  - lib/ixtlan/models/domain_group_user.rb
+  - lib/ixtlan/models/word.rb
+  - lib/ixtlan/models/locale.rb
+  - lib/ixtlan/models/update_children.rb
+  - lib/ixtlan/models/i18n_text.rb
+  - lib/ixtlan/models/translation.rb
+  - lib/ixtlan/models/configuration.rb
+  - lib/ixtlan/models/group_user.rb
+  - lib/ixtlan/models/configuration_locale.rb
+  - lib/ixtlan/models/permission.rb
+  - lib/ixtlan/models/phrase.rb
   - lib/ixtlan/rails/migrations.rb
-  - lib/ixtlan/rails/unrestful_authentication.rb
+  - lib/ixtlan/rails/error_handling.rb
   - lib/ixtlan/rails/session_timeout.rb
+  - lib/ixtlan/rails/audit.rb
+  - lib/ixtlan/rails/rescue_module.rb
+  - lib/ixtlan/rails/timestamps_modified_by_filter.rb
   - lib/ixtlan/rails/guard.rb
+  - lib/ixtlan/rails/cache_headers.rb
+  - lib/ixtlan/rails/unrestful_authentication.rb
   - generators/ixtlan_datamapper_rspec_model/ixtlan_datamapper_rspec_model_generator.rb
   - generators/ixtlan_datamapper_rspec_model/templates/model_spec.rb
   - generators/ixtlan_datamapper_model/ixtlan_datamapper_model_generator.rb
-  - generators/ixtlan_datamapper_model/templates/migration.rb
   - generators/ixtlan_datamapper_model/templates/model.rb
+  - generators/ixtlan_datamapper_model/templates/migration.rb
   - generators/ixtlan_datamapper_rspec_scaffold/ixtlan_datamapper_rspec_scaffold_generator.rb
+  - generators/ixtlan_datamapper_rspec_scaffold/templates/controller_spec.rb
   - generators/ixtlan_datamapper_rspec_scaffold/templates/layout.html.erb
   - generators/ixtlan_datamapper_rspec_scaffold/templates/controller.rb
-  - generators/ixtlan_datamapper_rspec_scaffold/templates/controller_spec.rb
-  - generators/ixtlan_datamapper_rspec_scaffold/templates/i18n.rb
   - generators/ixtlan_datamapper_rspec_scaffold/templates/guard.rb
+  - generators/ixtlan_datamapper_rspec_scaffold/templates/i18n.rb
   - generators/gwt_ixtlan_datamapper_rspec_scaffold/gwt_ixtlan_datamapper_rspec_scaffold_generator.rb
-  - generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/Fields.java
-  - generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/Model.java
-  - generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/TestGwt.java
+  - generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/ModelFactory.java
   - generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/AbstractApplicationResourceTestGwt.java
   - generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/Screen.java
+  - generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/Model.java
   - generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/GwtTestSuite.java
-  - generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/ModelFactory.java
-  - spec/text_collection_spec.rb
-  - spec/optimistic_persistence_spec.rb
+  - generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/TestGwt.java
+  - generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/Fields.java
+  - spec/user_spec.rb
   - spec/phrase_spec.rb
-  - spec/guard_spec.rb
+  - spec/spec_helper.rb
+  - spec/text_collection_spec.rb
   - spec/authentication_spec.rb
+  - spec/unrestful_authentication_spec.rb
+  - spec/user_logger_spec.rb
+  - spec/spec.opts
+  - spec/optimistic_persistence_spec.rb
   - spec/session_timeout_spec.rb
-  - spec/spec_helper.rb
+  - spec/passwords_spec.rb
   - spec/modified_by_spec.rb
-  - spec/user_spec.rb
-  - spec/spec.opts
   - spec/text_spec.rb
-  - spec/user_logger_spec.rb
-  - spec/unrestful_authentication_spec.rb
-  - spec/passwords_spec.rb
+  - spec/guard_spec.rb
   - spec/guards/samples.rb
 has_rdoc: true
 homepage: http://github.com/mkristian/ixtlan/ixtlan-core
@@ -313,15 +320,15 @@ signing_key:
 specification_version: 3
 summary: ixtlan plugins for rails and datamapper
 test_files: 
-  - spec/text_collection_spec.rb
-  - spec/optimistic_persistence_spec.rb
+  - spec/user_spec.rb
   - spec/phrase_spec.rb
-  - spec/guard_spec.rb
+  - spec/text_collection_spec.rb
   - spec/authentication_spec.rb
+  - spec/unrestful_authentication_spec.rb
+  - spec/user_logger_spec.rb
+  - spec/optimistic_persistence_spec.rb
   - spec/session_timeout_spec.rb
+  - spec/passwords_spec.rb
   - spec/modified_by_spec.rb
-  - spec/user_spec.rb
   - spec/text_spec.rb
-  - spec/user_logger_spec.rb
-  - spec/unrestful_authentication_spec.rb
-  - spec/passwords_spec.rb
+  - spec/guard_spec.rb