nitro 0.26.0 → 0.27.0

data/Rakefile

@@ -32,7 +32,11 @@ $NITRO_NO_ENVIRONMENT = true
 # Run the tests.
 
 Rake::TestTask.new do |t|
+  cwd = File.expand_path(File.join(File.dirname(__FILE__) + '.'))
   t.libs << 'test'
+  %w[glue nitro og].each do |dir|
+    t.libs << File.join(cwd, dir, 'lib')
+  end
   t.test_files = FileList['test/**/tc*.rb']
   t.verbose = true
 end
@@ -69,7 +73,7 @@ spec = Gem::Specification.new do |s|
   s.required_ruby_version = '= 1.8.3'
 
   s.files = FileList[
-    '[A-Z]*', 'install.rb', '{bin,benchmark,examples,doc,proto,lib,test,vendor}/**/*' 
+    '[A-Z]*', 'setup.rb', '{bin,benchmark,examples,doc,proto,lib,test,vendor}/**/*' 
   ].exclude("_darcs").exclude("_darcs/**/*").exclude('*.og').exclude('**/*.log').to_a
 
   s.require_path = 'lib'

data/bin/nitrogen

@@ -1,62 +1,5 @@
-#!/usr/bin/env ruby
+puts <<-MSG
 
-$NITRO_NO_ENVIRONMENT = true
+This script is deprecated. Use 'gen app my_app' instead.
 
-require 'nitro'
-require 'ftools'
-
-require 'nano/dir/%3A%3Arecurse'
-
-PROTO_DIR = File.join(Nitro::LibPath, '..', 'proto')
-
-def usage
-  puts <<-USAGE
-
-NAME
-     nitrogen - frontend for the Nitro generator mechanism.
-
-SYNOPSIS
-     nitrogen app [full path]
-
-DESCRIPTION
-     This is a frontend to the Nitro generator mechanism. Nitro 
-     generators are used to 'bootstrap' development by creating 
-     a standard directory structure and files for common tasks.
-     
-     app: This will create some basic files to get you 
-     started fleshing out your Nitro web application.
-
-EXAMPLE
-     nitrogen app ~/my_application
-
-     This will generate a new Nitro application in the 
-     ~/my_application folder.
-USAGE
-  exit 1  
-end
-
-def run
-  case command = ARGV[0] || usage()
-  when 'app'
-    path = ARGV[1] || usage()
-    path = File.expand_path(path)
-
-    if File.exists?(path)
-      STDERR.puts "ERROR: Path #{path} already exists! Aborting!"
-      exit 1
-    end
-
-    FileUtils.cp_r(PROTO_DIR, path)
-    
-    Dir.recurse(path) do |f| 
-      FileUtils.rm_rf(f) if /\.svn$/ =~ f 
-    end 
-    
-  else
-    usage()
-  end
-end
-
-run
-
-# This script is based on Michael Neumann's Wee creator script.  
+MSG

data/doc/MIGRATION

@@ -10,6 +10,30 @@ For more help, send your question to the mailing list:
 http://rubyforge.org/mailman/listinfo/nitro-general
 
 
+== 0.27.0 <- 0.26.0
+
+1. If you use a custom compiler pipeline, notice that the interface
+has changes slightly:
+
+  def transform_template(template)
+    template = StaticInclude.transform(template)
+    template = Morphing.transform(template, self)
+#   template = LayoutCompiler.transform(template, self)
+    template = Elements.transform(template, self)
+    template = Markup.transform(template)
+    template = ScriptCompiler.transform(template, self)
+    template = Cleanup.transform(template)
+    template = Template.transform(template)
+  end
+
+you need to pass 'self' for some compilers.
+
+2. The helper script 'nitrogen' is removed. Use gen instead
+
+3. There is a new system for prototype/scriptaculous integration.
+Have a look at the flickr example for more details.
+
+
 == 0.21.2 <- 0.21.0
 
 1. The new 'nice' dispatching alogirthm is enabled by default. If

data/doc/RELEASES

@@ -1,3 +1,144 @@
+== Version 0.27.0
+
+Once again we have a great mix of cool new features, along
+with bugfixes and a myriad of smaller improvements. Go and
+download the most advanced Ruby Web/ORM Framework you can find.
+
+Most notable changes:
+
+* Added groundbreaking client side action/scripting support:
+
+  class FlickrDemo < Nitro::Controller
+    helper :javascript
+
+    class Client
+      # Actions defined here are executed as javescript in the 
+      # browser.
+      def clear_me
+        hide :hide_me
+      end
+      
+      def grab
+        ajax_upadate ...
+      end
+    end
+  end
+      
+  in the template:
+  
+  <div id="hide_me">...</div>
+  <a client="clear_me">clear</a>    
+  
+  the client element is converted to a javascript call that
+  executes the code in the client action. A domain specific
+  language is provided for the client action to implement stuff
+  like ajax async updates, scriptaculous visual fx and more.
+    
+* A collection of morphers to work along with client actions.
+  Here are some examples:
+
+  <!-- make a div draggable -->  
+  <div id="hello" draggable="true">Drag me</div>
+  
+  <!-- autocomplete a text field -->
+  <input type="text" name="tags" auto_complete="true" /> 
+  
+  in the controller:
+  
+  def tags_auto_complete
+    %{
+    <ul>
+      <li>navel</li>
+      <li>nitro</li>
+      <li>sexy</li>
+    </ul>
+    }
+  end
+
+  More stuff is coming in future versions.
+
+* Greatly imporoved the Elements system. The ElementMixin module
+  is auto-injected if missing. Nitro automatically transforms
+  xhtml template files in the Element.template_root into 
+  Element classes for even better separation of code and design.
+  A simple Rails style layout helper is implememnted on top of 
+  the general and powerful Elements mechanism for people familiar
+  with Rails.
+
+* New WebFile system. Uploading files and handling photos was
+  never easier:
+  
+  class Photo
+    is Timestamped
+    is Taggable
+    property :title, String
+    property :file, WebFile, :magick => { :small => '64x64', :medium => '128x128' }
+  end
+
+  # the upload action
+  
+  def upload
+    photo = Photo.assign(request)
+    photo.save  
+  end
+  
+  This saves the photo, and creates 2 thumbnails. You can easily 
+  access the photo and thumbnails like this:
+  
+  <img src="#{photo.file_medium_thumbnail}" />
+  <img src="#{photo.file_small_thumbnail}" />
+  
+  ie obj.{propertyname}_#{thumbname}_thumbnail
+  
+* Og live collections support accumulation. Here is an example:
+
+  class Category
+    has_many :projects
+  end
+  
+  class Project
+    has_many :clients
+  end
+  
+  class Client
+  end
+  
+  clients = category.projects.clients 
+  
+  # => returns all clients for this category!
+
+* Improved TableHelper, better configurability, more skinnable,
+  sorting support and more.
+
+* Added some intelligent auto-discovery features to minimize the 
+  setup code. For example helpers are automatically loaded, and
+  the template_root is auto-discovered.
+
+* Optimized the autoreloading system to only reload the dirty 
+  files. In fact the new autoreloading system is so efficient
+  that it is enables by default even in live/production mode.
+
+* Add Flickr, a great new example that shows off the new 
+  javascript integration and AJAX features of Nitro.
+
+* Added Gallery example to demonstrate the new WebFile 
+  functionality.
+   
+* Improved the generated RDOC comments.
+
+* Fixes in CGI adapter.
+
+* Added evolution support to the KirbyBase adapter.
+
+* Updated to scriptaculous 1.5.1
+
+* Scaffolding - auto admin interface improvements.
+
+* Added setup.rb for non-gem installation (experimental). 
+
+* Added ACGI adapter (experimental). 
+
+
 == Version 0.26.0
 
 Another step closer to web programming nirvana. This release

data/doc/lhttpd.txt

@@ -2,3 +2,6 @@
 = Installation
 
 ./configure --enable-rewrite
+
+The libpcre library is needed to enable mod_rewrite.
+

data/lib/glue/magick.rb

@@ -0,0 +1,38 @@
+require 'RMagick'
+
+module Glue
+
+# Magick transformation.
+#--
+# TODO: pass generalized RMagick command.
+#++
+
+module Thumbnails
+
+  # Default thumbnail width.
+  
+  setting :width, :default => 128, :doc => 'Default thumbnail width'
+
+  # Default thumbnail height.
+  
+  setting :height, :default => 128, :doc => 'Default thumbnail height'
+
+  def self.generate_thumbnail(src, tname, geostring)
+    ext = File.extname(src)
+    dst = "#{File.join(File.dirname(src), File.basename(src, ext))}_#{tname}#{ext}"
+
+    thumb = Magick::Image.read(File.join(Nitro::Server.public_root, src)).first
+    thumb.change_geometry!(geostring) do |cols, rows, thumb|
+      thumb.resize!(cols, rows)
+    end
+    thumb.write(File.join(Nitro::Server.public_root, dst))
+    
+    return dst
+  end
+
+end
+
+end
+
+# * George Moschovitis <gm@navel.gr>
+# * Michael Fellinger <m.fellinger@gmail.com>

data/lib/glue/thumbnails.rb

@@ -0,0 +1,3 @@
+require 'glue/magick'
+
+# * George Moschovitis <gm@navel.gr>

data/lib/glue/webfile.rb

@@ -0,0 +1,137 @@
+require 'fileutils'
+
+require 'mega/inheritor'
+
+module Glue
+
+# A Web File.
+
+class WebFile
+
+  # The directory where uploaded files are stored. Typically 
+  # this is a symlink to another directory outside of the 
+  # webapp dir for easier updates.
+  
+  setting :upload_root, :default => 'upload', :doc => 'The directory where upload files are stored'
+
+  # Modify the base class when this class is included as 
+  # property
+  
+  def self.included_as_property(base, names, options)
+    if thumbnails = (options[:thumbnail] || options[:thumbnails] || options[:magick]) or self.name == 'WebImage'
+      require 'glue/thumbnails'
+      base.send :include, Thumbnails
+      thumbnails = { :small => :thumbnails } if thumbnails.is_a?(String) 
+    end
+    
+    for name in names
+      base.module_eval do
+        # The 'web' path to the file (relative to the public
+        # root directory. Uses the original property name
+        # or the #{name}_path alias.
+                 
+        property name.to_sym, String
+        alias_method "#{name}_path".to_sym, name.to_sym
+        
+        # The file size.
+        
+        property "#{name}_size".to_sym, Fixnum
+        
+        # The mime type
+
+        property "#{name}_mime_type".to_sym, String        
+     
+        # Assignment callbacks.        
+        #--
+        # gmosx, FIXME: this is a hack!! better implementation
+        # is needed (generalized property assigners).
+       
+        inheritor(:assign_callbacks, [], :merge) unless @assign_callbacks        
+      end
+      
+      if thumbnails
+        for tname in thumbnails.keys
+          base.module_eval do
+            property "#{name}_#{tname}_thumbnail".to_sym, String
+          end        
+        end
+      end
+
+      code = %{
+        def #{name}_real_path
+          File.join(Nitro::Server.public_root, @#{name})
+        end
+
+        def #{name}_from_request(request)
+          param = request['#{name}']
+      }
+      
+      if base.respond_to? :webfile_path
+        code << %{
+          path = #{base}.webfile_path(request, '#{name}')
+        }
+      else
+        code << %{
+          path = File.join(WebFile.upload_root, param.original_filename)
+        }
+      end
+      
+      code << %{ 
+          @#{name} = WebFile.sanitize(path)
+          @#{name}_size = param.size
+          
+          real_path = #{name}_real_path
+          FileUtils.mkdir_p(File.dirname(real_path))
+          if param.path
+            FileUtils.cp(param.path, real_path)
+          else
+            # gmosx FIXME: this is a hack!!
+            param.rewind
+            File.open(real_path, 'wb') { |f| f << param.read }
+          end
+          FileUtils.chmod(0777, real_path)
+      }
+
+      if thumbnails
+        for tname, geostring in thumbnails
+          code << %{
+            @#{name}_#{tname}_thumbnail = Thumbnails.generate_thumbnail(path, '#{tname}', '#{geostring}') 
+          }
+        end
+      end
+            
+      code << %{          
+        end
+        
+        def delete_#{name}
+          FileUtils.rm(#{name}_real_path)
+        end
+
+        assign_callbacks! << proc { |obj, values, options| 
+          obj.#{name}_from_request(values)
+        }
+      }
+      
+      base.module_eval(code)
+    end
+  end
+  
+  # Sanitize a filename.
+  #--
+  # TODO: implement me!
+  #++
+  
+  def self.sanitize(filename)
+    filename
+  end
+
+end
+
+# An alias, implies thumbnailing.
+
+WebImage = WebFile
+
+end
+
+# * George Moschovitis <gm@navel.gr>
+# * Michael Fellinger <m.fellinger@gmail.com>