equipment 1.4.96 → 1.5.103

data/CHANGES

@@ -1,5 +1,14 @@
 = Equipment Changelog
 
+== Version 1.5.103
+
+Cleanup and Camping 1.5 compatiblity release.
+
+* lib/ext/form_helper.rb : Removed dependency on Ext::ActiveRecord.
+* lib/ext/active_record.rb : Removed since Camping now has better AR integration.
+* lib/ext/forward.rb : Print the errors on STDERR instead of STDOUT.
+* examples/xulapp.rb : Testing XUL output for Camping. Not really functionnal.
+
 == Version 1.4.96
 
 This is a hotfix release. When using Ext::Forward, you could have infinite

data/README

@@ -10,7 +10,6 @@ tools.
 
 Working equipment :
 
-* Ext::ActiveRecord : Decoupled ActiveRecord. One database per app. Does not force SQLite.
 * Ext::AppUtil : Access to your app from a controller extension.
 * Ext::BasicAuth : Handles HttpBasic authentication.
 * Ext::ErubyView : Add Erb/Erubis template handling to your app.

data/Rakefile

@@ -28,7 +28,7 @@ PKG_NAME = "equipment"
 PKG_DESC = <<-EOF
     Equipment is a set of extensions you can use with your Camping apps.
   EOF
-PKG_VERSION = "1.4.96"
+PKG_VERSION = "1.5.103"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
   '[A-Z]*',
@@ -101,7 +101,7 @@ spec = Gem::Specification.new do |s|
 
   ### Dependencies
 
-  s.add_dependency("camping", "= 1.4.157")
+  s.add_dependency("camping", ">= 1.5")
 end
 
 desc "Build Gem"

data/TODO

@@ -1,14 +1,16 @@
 == The global TODO list for Equipment
 
 * More docs
-* Fix Og so that it works better with Camping
+* Change the extension mechanism
+
 * Finish NegociateContent
 * Finish View content-type negociation
 * Finish Resource and Scaffolding
 * Finish Controls
+
 * TemplateView is almost useless
+
 * Fix XmlView
-* Logging mechanism
-* Run mode like in Rails
+
 * Debug mode
 

data/lib/camping_ext.rb

@@ -32,7 +32,7 @@ module CampExt
   # This will allow you to chain create methods.
   # It also restores the the missing modules.
   #
-  # == Examplanation
+  # == Explanation
   #
   # When calling YourApp.create, the call order is :
   #  * YourApp.create

data/lib/equipment.rb

@@ -13,7 +13,12 @@ require 'camping_ext'
 # will make it ready to provide new functionnalities to Camping apps.
 module Equipment
   LIB_PATH = File.expand_path(File.dirname(__FILE__))
-  DATA_PATH = File.join(LIB_PATH, '..', 'share')
+
+  if File.exists?('/usr/share/equipment')
+    DATA_PATH = '/usr/share/equipment'
+  else
+    DATA_PATH = File.join(LIB_PATH, '..', 'data', 'equipment')
+  end
 
   attr_accessor :debug
 

data/lib/ext/flash.rb

@@ -59,7 +59,7 @@ module Ext
     # Only store Strings.
     class Flasher
       def initialize(cookies_in, cookies_out)
-        @in, @out, @tmp = cookies_in.dup, cookies_out
+        @in, @out = cookies_in.dup, cookies_out
         @in.each do |k,v|
           @in[k] = nil if v.empty?
         end

data/lib/ext/form_helpers.rb

@@ -1,5 +1,4 @@
 require 'equipment'
-require 'ext/active_record'
 
 module Ext
   # Hey a FormHelper.
@@ -21,7 +20,6 @@ module Ext
   #
   module FormHelpers
     extend Equipment
-    depends_on ActiveRecord
 
     module Helpers
       # No relations yet

data/lib/ext/forward.rb

@@ -59,8 +59,8 @@ module Ext
             
             retry
           rescue => x
-            pp x if $DBG
-            pp x.backtrace if $DBG
+            STDERR.puts x.inspect if $DBG
+            STDERR.puts x.backtrace.join("\n") if $DBG
             k, a, m = self::Controllers::ServerError, [k,m,x], 'GET'
             k.new(r,e,m).service(*a)
           end

data/lib/ext/og.rb

@@ -1,6 +1,8 @@
 require 'equipment'
 require 'og'
 
+puts "WARNING : #{__FILE__} unsupported"
+
 module Ext 
 
   # Add some facilities for using Og in Camping. Stores the manager outside of

data/lib/ext/og_scaffold.rb

@@ -3,6 +3,8 @@ require 'ext/flash'
 require 'ext/og'
 require 'ext/resource'
 
+puts "WARNING : #{__FILE__} unsupported"
+
 module Ext
 
   # Allows Og Entities scaffolding. Not working yet.

data/lib/ext/og_session.rb

@@ -2,6 +2,8 @@ require 'equipment'
 require 'ext/og'
 require 'glue/timestamped'
 
+puts "WARNING : #{__FILE__} unsupported"
+
 module Ext 
 
   # It's like Camping's Session but works with Og.

data/lib/ext/view.rb

@@ -28,7 +28,7 @@ module Ext
     module CClassMethods
       def create
         puts "INFO: View#create called" if $DBG
-        self::V.send :include, self::Helpers, self::Controllers
+        self::V.send :include, self::Helpers, self::Controllers, self::Views
         super
       end
     end
@@ -47,6 +47,8 @@ module Ext
       #
       # Layout was renamed to _layout because it is a partial. Also partials
       # don't use the layout feature (so layout doesn't have a layout)
+      #
+=begin
       def method_missing(*a,&b)
         a.shift if a[0]==:render
         m=app::Mab.new({},self)
@@ -54,8 +56,6 @@ module Ext
         s=m.layout{s} if m.respond_to?:layout and a[0].to_s[0] != ?_
         s
       end
-
-=begin
       def render(m, *a, &b)
         str = view(m, *a, &b)
         # allow content-negotiation

data/lib/ext/xul_view.rb

@@ -0,0 +1,17 @@
+
+module Ext
+  module XulView
+    extend Equipment
+    depends_on View
+
+    module Base
+      def render_xul(name)
+        @headers['Content-Type'] = 'application/vnd.mozilla.xul+xml'
+        view = app::V.new
+        view.instance_variables_send(self)
+        view.send(name)
+      end
+    end
+
+  end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: equipment
 version: !ruby/object:Gem::Version 
-  version: 1.4.96
-date: 2006-10-12 00:00:00 +02:00
+  version: 1.5.103
+date: 2006-10-25 00:00:00 +02:00
 summary: Equipment (for Camping)
 require_paths: 
 - lib
@@ -64,16 +64,10 @@ files:
 - lib/ext/og_scaffold.rb
 - lib/ext/security.rb
 - lib/ext/og_session.rb
-- lib/ext/active_record.rb
 - lib/ext/view.rb
 - lib/ext/view_slot.rb
 - lib/ext/command.rb
-- share/js
-- share/js/prototype.js
-- share/js/date_ext.js
-- share/js/event-selector.js
-- share/js/jquery.js
-- share/js/es-confirm.js
+- lib/ext/xul_view.rb
 test_files: []
 
 rdoc_options: 
@@ -98,7 +92,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.157
+        version: "1.5"
     version: 

data/lib/ext/active_record.rb

@@ -1,146 +0,0 @@
-# Override the camping's autoload
-#autoload :ActiveRecord,'camping_ext'
-
-require 'equipment'
-
-begin
-  ActiveRecord # loads 'camping/db' if camping is loaded.
-rescue NameError # camping not used
-  class MissingLibrary < Exception #:nodoc: all
-  end
-  begin
-    require 'active_record'
-  rescue LoadError => e
-    raise MissingLibrary, "ActiveRecord could not be loaded (is it installed?): #{e.message}"
-  end
-end
-
-# restoring some adapters
-#RAILS_CONNECTION_ADAPTERS.replace ["mysql", "postgresql", "sqlite", "firebird", "sqlserver", "db2", "oracle", "sybase", "openbase"]
-
-#RAILS_CONNECTION_ADAPTERS.each do |adapter|
-#  require "active_record/connection_adapters/" + adapter + "_adapter"
-#end
-
-
-module Ext
-  # ActiveRecord extension. Overrides Camping's behaviour.
-  #
-  # NOTE : This Equipment is usable without Camping.
-  # 
-  # == Dependencies
-  #
-  # * ActiveRecord
-  # * Equipment
-  #
-  module ActiveRecord
-    extend Equipment
-
-    def self.equip(app)
-      unless app.const_defined? :C
-        app.module_eval "C=self"
-      end
-      app.module_eval "module Models;end"
-      super
-    end
-
-    module Models
-      class AllYourBase < ::ActiveRecord::Base;end
-      class << AllYourBase
-        # This is a facility to create your schemas.
-        #
-        # == Example (in your models)
-        #
-        #  class Post < Base
-        #    self.schema do |c|
-        #      c.create_table table_name, :force=>true do |t|
-        #        t.column :title, :string, :limit => 255
-        #        t.column :body, :text
-        #      end
-        #    end
-        #  end
-        #
-        def schema(&block)
-          @schema = block if block_given?
-          @schema
-        end
-
-        # This method checks if your table exists, otherwise it calls
-        # the #schema with the model's connection.
-        def check_create
-          if schema and connection and not table_exists?
-            schema.call(connection)
-            reset_column_information
-          end
-        end
-
-        # The default prefix for Camping model classes is the topmost module name lowercase
-        # and followed with an underscore.
-        #
-        #   Tepee::Models::Page.table_name_prefix
-        #     #=> "tepee_pages"
-        #
-        def table_name_prefix
-          "#{name[/\w+/]}_".downcase.sub(/^(activerecord|camping)_/i,'')
-        end
-
-        # I has to override this method too to get the right table name
-        # working
-        def reset_table_name #:nodoc:
-          table_name = Inflector.underscore(Inflector.demodulize(self.name))
-          table_name = Inflector.pluralize(table_name) if pluralize_table_names
-          name = "#{table_name_prefix}#{table_name}#{table_name_suffix}"
-          set_table_name(name)
-          name
-        end
-
-      end
-    end
-
-    # Class methods for you app
-    module CClassMethods
-      # If set, #create will launch your database with those params.
-      attr_accessor :database
-
-      # Set if #create initialized your database.
-      attr_reader :manager
-
-      # Tries to connect and create the databases.
-      def create
-        puts "INFO: ActiveRecord#create called" if $DBG
-
-        if self.database and not @manager
-
-          # Loads the adapter dynamically
-          adapter = self.database[:adapter] || self.database['adapter']
-          unless adapter.nil? or RAILS_CONNECTION_ADAPTERS.include? adapter
-            require "active_record/connection_adapters/" + adapter + "_adapter"
-            RAILS_CONNECTION_ADAPTERS << adapter
-          end
-
-          @manager = self::Models::AllYourBase.establish_connection self.database
-          puts "INFO: ActiveRecord connection established : #{@manager.inspect}" if $DBG
-          case @logger
-          when Logger
-            self::Models::AllYourBase.logger = @logger
-          when String
-            self::Models::AllYourBase.logger = Logger.new(@logger == "-" ? STDOUT : @logger)
-          else
-            self::Models::AllYourBase.logger = Logger.new(STDOUT)
-          end
-        end
-
-        # run check_create on models
-        self::Models.constants.each do |c|
-          if c != 'Base'
-            c = self::Models.const_get(c)
-            c.check_create if c.respond_to? :check_create
-          end
-        end
-
-        super
-      end
-    end
-  end
-end
-

data/share/js/date_ext.js

@@ -1,234 +0,0 @@
-
-// BEGIN: DATE OBJECT PATCHES
-
-/** Adds the number of days array to the Date object. */
-Date._MD = new Array(31,28,31,30,31,30,31,31,30,31,30,31);
-
-/** Constants used for time computations */
-Date.SECOND = 1000 /* milliseconds */;
-Date.MINUTE = 60 * Date.SECOND;
-Date.HOUR   = 60 * Date.MINUTE;
-Date.DAY    = 24 * Date.HOUR;
-Date.WEEK   =  7 * Date.DAY;
-
-Date.parseDate = function(str, fmt) {
-	var today = new Date();
-	var y = 0;
-	var m = -1;
-	var d = 0;
-	var a = str.split(/\W+/);
-	var b = fmt.match(/%./g);
-	var i = 0, j = 0;
-	var hr = 0;
-	var min = 0;
-	for (i = 0; i < a.length; ++i) {
-		if (!a[i])
-			continue;
-		switch (b[i]) {
-		    case "%d":
-		    case "%e":
-			d = parseInt(a[i], 10);
-			break;
-
-		    case "%m":
-			m = parseInt(a[i], 10) - 1;
-			break;
-
-		    case "%Y":
-		    case "%y":
-			y = parseInt(a[i], 10);
-			(y < 100) && (y += (y > 29) ? 1900 : 2000);
-			break;
-
-		    case "%b":
-		    case "%B":
-			for (j = 0; j < 12; ++j) {
-				if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { m = j; break; }
-			}
-			break;
-
-		    case "%H":
-		    case "%I":
-		    case "%k":
-		    case "%l":
-			hr = parseInt(a[i], 10);
-			break;
-
-		    case "%P":
-		    case "%p":
-			if (/pm/i.test(a[i]) && hr < 12)
-				hr += 12;
-			else if (/am/i.test(a[i]) && hr >= 12)
-				hr -= 12;
-			break;
-
-		    case "%M":
-			min = parseInt(a[i], 10);
-			break;
-		}
-	}
-	if (isNaN(y)) y = today.getFullYear();
-	if (isNaN(m)) m = today.getMonth();
-	if (isNaN(d)) d = today.getDate();
-	if (isNaN(hr)) hr = today.getHours();
-	if (isNaN(min)) min = today.getMinutes();
-	if (y != 0 && m != -1 && d != 0)
-		return new Date(y, m, d, hr, min, 0);
-	y = 0; m = -1; d = 0;
-	for (i = 0; i < a.length; ++i) {
-		if (a[i].search(/[a-zA-Z]+/) != -1) {
-			var t = -1;
-			for (j = 0; j < 12; ++j) {
-				if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { t = j; break; }
-			}
-			if (t != -1) {
-				if (m != -1) {
-					d = m+1;
-				}
-				m = t;
-			}
-		} else if (parseInt(a[i], 10) <= 12 && m == -1) {
-			m = a[i]-1;
-		} else if (parseInt(a[i], 10) > 31 && y == 0) {
-			y = parseInt(a[i], 10);
-			(y < 100) && (y += (y > 29) ? 1900 : 2000);
-		} else if (d == 0) {
-			d = a[i];
-		}
-	}
-	if (y == 0)
-		y = today.getFullYear();
-	if (m != -1 && d != 0)
-		return new Date(y, m, d, hr, min, 0);
-	return today;
-};
-
-/** Returns the number of days in the current month */
-Date.prototype.getMonthDays = function(month) {
-	var year = this.getFullYear();
-	if (typeof month == "undefined") {
-		month = this.getMonth();
-	}
-	if (((0 == (year%4)) && ( (0 != (year%100)) || (0 == (year%400)))) && month == 1) {
-		return 29;
-	} else {
-		return Date._MD[month];
-	}
-};
-
-/** Returns the number of day in the year. */
-Date.prototype.getDayOfYear = function() {
-	var now = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
-	var then = new Date(this.getFullYear(), 0, 0, 0, 0, 0);
-	var time = now - then;
-	return Math.floor(time / Date.DAY);
-};
-
-/** Returns the number of the week in year, as defined in ISO 8601. */
-Date.prototype.getWeekNumber = function() {
-	var d = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
-	var DoW = d.getDay();
-	d.setDate(d.getDate() - (DoW + 6) % 7 + 3); // Nearest Thu
-	var ms = d.valueOf(); // GMT
-	d.setMonth(0);
-	d.setDate(4); // Thu in Week 1
-	return Math.round((ms - d.valueOf()) / (7 * 864e5)) + 1;
-};
-
-/** Checks date and time equality */
-Date.prototype.equalsTo = function(date) {
-	return ((this.getFullYear() == date.getFullYear()) &&
-		(this.getMonth() == date.getMonth()) &&
-		(this.getDate() == date.getDate()) &&
-		(this.getHours() == date.getHours()) &&
-		(this.getMinutes() == date.getMinutes()));
-};
-
-/** Set only the year, month, date parts (keep existing time) */
-Date.prototype.setDateOnly = function(date) {
-	var tmp = new Date(date);
-	this.setDate(1);
-	this.setFullYear(tmp.getFullYear());
-	this.setMonth(tmp.getMonth());
-	this.setDate(tmp.getDate());
-};
-
-/** Prints the date in a string according to the given format. */
-Date.prototype.print = function (str) {
-	var m = this.getMonth();
-	var d = this.getDate();
-	var y = this.getFullYear();
-	var wn = this.getWeekNumber();
-	var w = this.getDay();
-	var s = {};
-	var hr = this.getHours();
-	var pm = (hr >= 12);
-	var ir = (pm) ? (hr - 12) : hr;
-	var dy = this.getDayOfYear();
-	if (ir == 0)
-		ir = 12;
-	var min = this.getMinutes();
-	var sec = this.getSeconds();
-//	s["%a"] = Calendar._SDN[w]; // abbreviated weekday name [FIXME: I18N]
-//	s["%A"] = Calendar._DN[w]; // full weekday name
-//	s["%b"] = Calendar._SMN[m]; // abbreviated month name [FIXME: I18N]
-//	s["%B"] = Calendar._MN[m]; // full month name
-	// FIXME: %c : preferred date and time representation for the current locale
-	s["%C"] = 1 + Math.floor(y / 100); // the century number
-	s["%d"] = (d < 10) ? ("0" + d) : d; // the day of the month (range 01 to 31)
-	s["%e"] = d; // the day of the month (range 1 to 31)
-	// FIXME: %D : american date style: %m/%d/%y
-	// FIXME: %E, %F, %G, %g, %h (man strftime)
-	s["%H"] = (hr < 10) ? ("0" + hr) : hr; // hour, range 00 to 23 (24h format)
-	s["%I"] = (ir < 10) ? ("0" + ir) : ir; // hour, range 01 to 12 (12h format)
-	s["%j"] = (dy < 100) ? ((dy < 10) ? ("00" + dy) : ("0" + dy)) : dy; // day of the year (range 001 to 366)
-	s["%k"] = hr;		// hour, range 0 to 23 (24h format)
-	s["%l"] = ir;		// hour, range 1 to 12 (12h format)
-	s["%m"] = (m < 9) ? ("0" + (1+m)) : (1+m); // month, range 01 to 12
-	s["%M"] = (min < 10) ? ("0" + min) : min; // minute, range 00 to 59
-	s["%n"] = "\n";		// a newline character
-	s["%p"] = pm ? "PM" : "AM";
-	s["%P"] = pm ? "pm" : "am";
-	// FIXME: %r : the time in am/pm notation %I:%M:%S %p
-	// FIXME: %R : the time in 24-hour notation %H:%M
-	s["%s"] = Math.floor(this.getTime() / 1000);
-	s["%S"] = (sec < 10) ? ("0" + sec) : sec; // seconds, range 00 to 59
-	s["%t"] = "\t";		// a tab character
-	// FIXME: %T : the time in 24-hour notation (%H:%M:%S)
-	s["%U"] = s["%W"] = s["%V"] = (wn < 10) ? ("0" + wn) : wn;
-	s["%u"] = w + 1;	// the day of the week (range 1 to 7, 1 = MON)
-	s["%w"] = w;		// the day of the week (range 0 to 6, 0 = SUN)
-	// FIXME: %x : preferred date representation for the current locale without the time
-	// FIXME: %X : preferred time representation for the current locale without the date
-	s["%y"] = ('' + y).substr(2, 2); // year without the century (range 00 to 99)
-	s["%Y"] = y;		// year with the century
-	s["%%"] = "%";		// a literal '%' character
-
-	var re = /%./g;
-//	if (!Calendar.is_ie5 && !Calendar.is_khtml)
-//		return str.replace(re, function (par) { return s[par] || par; });
-
-	var a = str.match(re);
-	for (var i = 0; i < a.length; i++) {
-		var tmp = s[a[i]];
-		if (tmp) {
-			re = new RegExp(a[i], 'g');
-			str = str.replace(re, tmp);
-		}
-	}
-
-	return str;
-};
-
-Date.prototype.__msh_oldSetFullYear = Date.prototype.setFullYear;
-Date.prototype.setFullYear = function(y) {
-	var d = new Date(this);
-	d.__msh_oldSetFullYear(y);
-	if (d.getMonth() != this.getMonth())
-		this.setDate(28);
-	this.__msh_oldSetFullYear(y);
-};
-
-// END: DATE OBJECT PATCHES
-
-