microengine 0.0.9 → 0.1.0

data/Rakefile

@@ -3,10 +3,9 @@ require 'rake/rdoctask'
 require 'rake/gempackagetask'
 
 PKG_NAME = "microengine"
-PKG_VERSION = "0.0.9"
+PKG_VERSION = "0.1.0"
 
 RUBY_FORGE_PROJECT = "microengine"
-RUBY_FORGE_USER = "iskin"
 
 # RDoc
 Rake::RDocTask.new do |rd|

data/bin/microengine

@@ -18,7 +18,7 @@ if '/' != path[-1..-1]
   path += '/'
 end
 
-if not File.directory? path
+unless File.directory? path
   begin
     FileUtils.mkdir path
   rescue
@@ -29,7 +29,7 @@ end
 
 distr = File.dirname(__FILE__) + '/../'
 
-if not File.exists? path + 'content/layout'
+unless File.exists? path + 'content/layout'
   files = [
     "config/*", 
     "content/**/*", 
@@ -43,14 +43,10 @@ if not File.exists? path + 'content/layout'
       Dir.glob(distr + pattern, File::FNM_DOTMATCH) do |file|
         filename = path + file[distr.length..-1]
         FileUtils.mkpath File.dirname(filename)
-        if not File.directory? file
-            FileUtils.install file, filename
-        end
+        FileUtils.install file, filename unless File.directory? file
       end
     end
-    if not File.directory? path + 'cache/'
-        FileUtils.mkdir path + 'cache/'
-    end
+    FileUtils.mkdir path + 'cache/' unless File.directory? path + 'cache/'
     
     FileUtils.chmod_R 0777, path + 'content/'
     FileUtils.chmod 0777, path + 'cache/'

data/lib/admin.rb

@@ -59,7 +59,7 @@ module Microengine
           end
           
           if not blocked? http.ip and right? password
-            if http.cookie['password'].nil?
+            unless http.cookie['password']
               http.set_cookie 'password', password
             end
             
@@ -81,7 +81,7 @@ module Microengine
               AdminPage.new(http, path, self).error(e.message)
             end
           else
-            #TODO delete cookie
+            http.set_cookie 'password', ''
             block http.ip, 5
             @access_logger.warn 'Wrong password from ' + http.ip
             http.status = '403 Forbidden'

data/lib/admin_page.rb

@@ -55,7 +55,7 @@ module Microengine
         return
       end
       
-      if not File.exists? MICROENGINE_ROOT + "/layouts/#{@layout}/#{@lang}.yaml"
+      unless File.exists? MICROENGINE_ROOT + "/layouts/#{@layout}/#{@lang}.yaml"
         @old_lang = @lang
         @lang = @admin.dispatcher.language(@http, @layout_langs)
         error 'untranslated_layout'
@@ -77,27 +77,17 @@ module Microengine
           layout_langs.push File.basename(lang, '.yaml')
         end
         untranslated = langs - layout_langs
-        if not untranslated.empty?
-          @untranslated_layouts[layout] = untranslated
-        end
+        @untranslated_layouts[layout] = untranslated unless untranslated.empty?
       end
       
       if @http.post['body'].nil?
-        begin
-          @body = IO.read MICROENGINE_ROOT + "/content#{@path}#{@lang}.body"
-        rescue
-          @body = ''
-        end
+        @body = IO.read MICROENGINE_ROOT + "/content#{@path}#{@lang}.body" rescue @body = ''
       else
         @body = @http.post['body']
       end
       
       if @http.post['header'].nil?
-        begin
-          @header = IO.read MICROENGINE_ROOT + "/content#{@path}#{@lang}.header"
-        rescue
-          @header = ''
-        end
+        @header = IO.read MICROENGINE_ROOT + "/content#{@path}#{@lang}.header" rescue @header = ''
       else
         @header = @http.post['header']
       end

data/lib/assambler.rb

@@ -32,7 +32,7 @@ module Microengine
       @layouts = {}
       
       begin
-        if not File.directory? MICROENGINE_ROOT + '/cache/'
+        unless File.directory? MICROENGINE_ROOT + '/cache/'
           FileUtils.mkdir MICROENGINE_ROOT + '/cache/'
         end
         FileUtils.rm_r Dir.glob(MICROENGINE_ROOT + '/cache/*')
@@ -108,7 +108,7 @@ module Microengine
     def cache_dir(dir)
       path = MICROENGINE_ROOT + '/content' + dir
       cache = MICROENGINE_ROOT + '/cache' + dir
-      if not File.directory? cache
+      unless File.directory? cache
         begin
           Dir.mkdir cache
         rescue
@@ -153,9 +153,8 @@ module Microengine
       # Check name and layout
       name = name.sub(/(^|\/)\.\.?/, '')
       dir = MICROENGINE_ROOT + '/layouts/' + name + '/';
-      if not File.directory?(dir) or not File.exists? dir + 'layout.rhtml'
-        raise "Can't find layout #{name} ."
-      end
+      
+      raise "Can't find layout #{name} ." unless File.directory?(dir) and File.exists? dir + 'layout.rhtml'
       
       # Load layout
       layout = {
@@ -165,9 +164,7 @@ module Microengine
       # Load translation
       Dir.glob(dir + '**.yaml') do |file|
         lang = File.basename file, '.yaml'
-        if 'layout' == lang
-          next
-        end
+        next if 'layout' == lang
         layout[lang] = load_translation(file)
       end
       layout

data/lib/dispatcher.rb

@@ -48,7 +48,7 @@ module Microengine
           
           if spider? http.agent
             # Search engine spiders (another i18n logic)
-            if not http.get['lang'].nil?
+            unless http.get['lang'].nil?
               if langs.include? http.get['lang']
                 http << @cache.get(http.url, http.get['lang'])
                 request.finish
@@ -60,7 +60,7 @@ module Microengine
             # Human visitor
             if http.get['lang']
               http.set_cookie 'lang', http.get['lang'], 30
-              if not langs.include? http.get['lang']
+              unless langs.include? http.get['lang']
                 http.redirect http.url
                 request.finish
                 next
@@ -84,21 +84,15 @@ module Microengine
     def language(http, available)
       # Language selected manually
       if not http.get['lang'].nil?
-        if available.include? http.get['lang']
-          return http.get['lang']
-        end
+        return http.get['lang'] if available.include? http.get['lang']
       elsif http.cookie['lang']
-        if available.include? http.cookie['lang']
-          return http.cookie['lang']
-        end
+        return http.cookie['lang'] if available.include? http.cookie['lang']
       end
       
       # Select user language
       http.langs.each do |lang|
         lang.downcase!
-        if available.include? lang
-          return lang
-        end
+        return lang if available.include? lang
       end
       
       # Select any language
@@ -114,9 +108,7 @@ module Microengine
     # Check HTTP_USER_AGENT value for search engine spiders
     def spider?(agent)
       @spiders.each do |spider|
-        if agent.include? spider
-          return true
-        end
+        return true if agent.include? spider
       end
       false
     end

data/lib/file_cache.rb

@@ -49,7 +49,7 @@ module Microengine
           langs.push entry[8..-6]
         end
       end
-      if not langs.empty?
+      unless langs.empty?
         cache_content dir, langs
       end
     end

data/lib/http.rb

@@ -48,9 +48,7 @@ module Microengine
     end
     
     def post
-      if @post.nil?
-        @post = format_post @request.in
-      end
+      @post = format_post @request.in if @post.nil?
       @post
     end
     
@@ -66,9 +64,7 @@ module Microengine
     
     # Send content to user
     def << (content)
-      if not header_sended?
-        send_headers
-      end
+      send_headers unless header_sended?
       @out.print content
     end
     
@@ -85,16 +81,13 @@ module Microengine
     
     # Set header
     def header(name, value)
-      if header_sended?
-        Initializer.logger.warning 'Header already sended'
-      end
       @headers << [name, value]
     end
     
     # Set cookie
     def set_cookie(name, value, days=nil)
       cookie = name + '=' + value + '; path=/'
-      if not days.nil?
+      unless days.nil?
         time = Time.now + (days * 86400)
         cookie += '; expires=' + time.gmtime.strftime('%a %d-%b-%Y %H:%M:S %Z')
       end
@@ -111,13 +104,11 @@ module Microengine
     
     # Format accept languages from string to array
     def format_langs(langs)
-      if langs.nil? or '' == langs
-        return []
-      end
+      return [] if langs.nil? or langs.empty?
       langs = langs.split(',')
       langs.map! do |lang|
         index = lang.index(';')
-        if not index.nil?
+        unless index.nil?
           lang[0...index]
         else
           lang
@@ -127,18 +118,12 @@ module Microengine
 
     # Format GET variables in URI as array
     def format_get(query)
-      if query.empty?
-        return {}
-      end
+      return {} if query.empty?
       
       vars = {}
       query = query.split('&').each do |var|
         var = var.split('=')
-        if 2 == var.length
-          vars[var[0]] = var[1]
-        else
-          vars[var[0]] = true
-        end
+        vars[var[0]] = var[1].nil? ? true : var[1]
       end
       vars
     end
@@ -155,9 +140,7 @@ module Microengine
 
     # Format cookies as array
     def format_cookie(string)
-      if string.nil? or string.empty?
-        return {}
-      end
+      return {} if string.nil? or string.empty?
       
       cookies = {}
       string = string.split(';')
@@ -170,21 +153,14 @@ module Microengine
     
     # Format POST variables
     def format_post(input)
-      if 'application/x-www-form-urlencoded' != @env['CONTENT_TYPE']
-        return {}
-      end
-      
+      return {} if 'application/x-www-form-urlencoded' != @env['CONTENT_TYPE']
       post = input.read
-      if post.nil?
-        return {}
-      end
+      return {} if post.nil?
       
       vars = {}
       post.split('&').each do |var|
         var = var.split '='
-        if var[1].nil?
-          var[1] = ''
-        end
+        var[1] = '' if var[1].nil?
         vars[var[0]] = CGI.unescape(var[1].nil? ? '' : var[1])
       end
       

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: microengine
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
-date: 2008-02-01 00:00:00 +03:00
+  version: 0.1.0
+date: 2008-02-05 00:00:00 +03:00
 summary: MicroEngine is a fast, simple and minimalistic site engine.
 require_paths: 
 - lib