ixtlan 0.2.0 → 0.2.1

data/Manifest.txt

@@ -43,6 +43,10 @@ lib/ixtlan/optimistic_persistence_module.rb
 lib/ixtlan/optimistic_persistence_validation.rb
 lib/ixtlan/error_notifier/error_notification.rhtml
 lib/ixtlan/controllers/texts_controller.rb
+lib/ixtlan/controllers/permissions_controller.rb
+lib/ixtlan/controllers/authentications_controller.rb
+lib/ixtlan/controllers/configurations_controller.rb
+lib/ixtlan/controllers/word_bundles_controller.rb
 lib/ixtlan/guard.rb
 lib/ixtlan/rails/audit.rb
 lib/ixtlan/rails/error_handling.rb

data/Rakefile

@@ -11,7 +11,7 @@ require 'yard'
 
 Hoe.spec('ixtlan') do |p|
   p.developer('mkristian', 'm.kristian@web.de')
-  p.extra_deps = [['dm-core', '~>0.10.1'], ['dm-validations', '~>0.10.1'], ['dm-timestamps', '~>0.10.1'], ['dm-migrations', '~>0.10.1'], ['slf4r', '~>0.2.0'], ['datamapper4rails', '~>0.3.2'],['rack-datamapper', '~>0.2.5'], ['logging', '~>1.2.3']]
+  p.extra_deps = [['dm-core', '~>0.10.1'], ['dm-validations', '~>0.10.1'], ['dm-timestamps', '~>0.10.1'], ['dm-migrations', '~>0.10.1'], ['slf4r', '~>0.2.0'], ['datamapper4rails', '~>0.4.0'],['rack-datamapper', '~>0.2.5'], ['logging', '~>1.2.3']]
   p.rspec_options << '--options' << 'spec/spec.opts'
 end
 

data/lib/ixtlan/audit_config.rb

@@ -1,5 +1,3 @@
-require 'ixtlan/audit'
-
 Logging.init :debug, :info, :warn, :error, :fatal unless Logging.const_defined? 'MAX_LEVEL_LENGTH'
 
 module Ixtlan

data/lib/ixtlan/controllers/authentications_controller.rb

@@ -0,0 +1,24 @@
+module Ixtlan
+  module Controllers
+    module AuthenticationsController
+
+      protected
+      def login_from_params
+        auth = params[:authentication]
+        User.authenticate(auth[:login], auth[:password])
+      end
+      
+      public
+      def create
+        render_successful_login
+      end
+      
+      def destroy
+        authentication_logger.log_user(current_user.nil? ? nil : current_user.login, "already logged out")
+        session.clear
+        head :ok
+      end
+
+    end
+  end
+end

data/lib/ixtlan/controllers/configurations_controller.rb

@@ -0,0 +1,41 @@
+module Ixtlan
+  module Controllers
+    module ConfigurationsController
+
+      # GET /configuration
+      # GET /configuration.xml
+      def show
+        @configuration = Configuration.instance
+
+        respond_to do |format|
+          format.html # show.html.erb
+          format.xml  { render :xml => @configuration }
+        end
+      end
+
+      # GET /configuration/edit
+      def edit
+        @configuration = Configuration.instance
+      end
+
+      # PUT /configuration
+      # PUT /configuration.xml
+      def update
+        @configuration = Configuration.instance
+        @configuration.current_user = current_user
+
+        locales =  params[:configuration].delete(:locales)
+        respond_to do |format|
+          if @configuration.update(params[:configuration]) or not @configuration.dirty?
+            flash[:notice] = 'Configuration was successfully updated.'
+            format.html { redirect_to(configuration_url) }
+            format.xml  { render :xml => @configuration }
+          else
+            format.html { render :action => "edit" }
+            format.xml  { render :xml => @configuration.errors, :status => :unprocessable_entity }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ixtlan/controllers/permissions_controller.rb

@@ -0,0 +1,11 @@
+module Ixtlan
+  module Controllers
+    module PermissionsController
+
+      def index
+        render :xml => Ixtlan::Guard.export_xml
+      end
+
+    end
+  end
+end

data/lib/ixtlan/controllers/texts_controller.rb

@@ -8,7 +8,7 @@ module Ixtlan
       private
       
       def locale_guard
-
+        # TODO
       end
 
       public
@@ -22,17 +22,24 @@ module Ixtlan
       def create
         phrase = params[:phrase]
 
-        locale = LOCALE.get!(phrase.delete(:locale))
+        # load the locale and delete the locale parameter array
+        locale = LOCALE.get!(phrase.delete(:locale)[:code])
 
         if(TEXT.count(:version => nil, :code => phrase[:code], :locale => locale) == 1)
-          raise "TODO precondition failed"
+          logger.warn "precondition failed: " + phrase.inspect
+          # mimic created action
+          render :xml => TEXT.first(:version => nil, :code => phrase[:code], :locale => locale).to_xml, :status => :created
+          return
         end
 
         phrase[:text] ||= phrase.delete(:current_text)
-        phrase[:locale] = locale
 
         @text = TEXT.new(phrase)
 
+        # set the missing attributes
+        @text.locale = locale
+        @text.current_user = current_user
+
         respond_to do |format|
           if @text.save
             flash[:notice] = 'Text was successfully created.'

data/lib/ixtlan/controllers/word_bundles_controller.rb

@@ -0,0 +1,26 @@
+module Ixtlan
+  module Controllers
+    module WordBundlesController
+
+      def show
+        locale = params[:id]
+        # TODO load in following order and allow to replace findings in the
+        # intermediate result set
+        # * DEFAULT not_approved
+        # * DEFAULT latest_approved
+        # * locale-parent latest_approved
+        # * locale latest_approved
+        l = Locale.get!(locale)
+        wordMap = {}
+        Ixtlan::Models::Word.not_approved(:locale => Locale.default).each do |word|
+          wordMap[word.code] = word
+        end
+        Ixtlan::Models::Word.approved(:locale => Locale.default).each do |word|
+          wordMap[word.code] = word
+        end
+        
+        render :xml => "<word_bundle><locale>#{locale}</locale><words>" + wordMap.values.collect { |w| w.to_xml }.join + "</words></word_bundle>"
+      end
+    end
+  end
+end

data/lib/ixtlan/models/locale.rb

@@ -16,6 +16,18 @@ module Ixtlan
       
       timestamps :created_at
 
+      def parent
+        c = attribute_get(:code)
+        case c.size
+        when 2
+          self.model.default
+        when 5
+          self.model.get!(code[0,2])
+        else
+          nil
+        end
+      end
+
       def self.default
         get(DEFAULT) || create(:code => DEFAULT)
       end

data/lib/ixtlan/models/user.rb

@@ -94,7 +94,7 @@ module Ixtlan
 
       # make sure login is immutable
       def login=(new_login)
-        attribute_set(:login, new_login) if (login.nil? or login == "'NULL'" or login == "NULL")
+        attribute_set(:login, new_login) if login.nil?
       end
 
       if protected_instance_methods.find {|m| m == 'to_x'}.nil?

data/lib/ixtlan/rails/unrestful_authentication.rb

@@ -78,7 +78,7 @@ module Rails
     end
 
     def logout
-      if(params[:login] == current_user.login or request.content_type == 'application/xml')
+      if(params[:login] == current_user.login && request.content_type != 'application/xml')
         authentication_logger.log_user(current_user.login, "logged out")
         current_user = nil
         session.clear

data/lib/ixtlan/version.rb

@@ -1,3 +1,3 @@
 class Ixtlan
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ixtlan
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - mkristian
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-07 00:00:00 +05:30
+date: 2009-12-18 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,7 +70,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.3.2
+        version: 0.4.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: rack-datamapper
@@ -158,6 +158,10 @@ files:
 - lib/ixtlan/optimistic_persistence_validation.rb
 - lib/ixtlan/error_notifier/error_notification.rhtml
 - lib/ixtlan/controllers/texts_controller.rb
+- lib/ixtlan/controllers/permissions_controller.rb
+- lib/ixtlan/controllers/authentications_controller.rb
+- lib/ixtlan/controllers/configurations_controller.rb
+- lib/ixtlan/controllers/word_bundles_controller.rb
 - lib/ixtlan/guard.rb
 - lib/ixtlan/rails/audit.rb
 - lib/ixtlan/rails/error_handling.rb