equipment 0.1.0 → 1.4.84

data/lib/ext/logging.rb

@@ -0,0 +1,61 @@
+require 'equipment'
+require 'logger'
+require 'ext/app_util'
+
+module Ext
+  # Adds loggins support to your app.
+  #
+  # == TODO
+  # * More doc
+  module Logging
+    extend Equipment
+    depends_on Ext::AppUtil
+
+    # restore ActiveSupport's changes
+    class Logger < ::Logger 
+      # restore format_message
+      def format_message(severity, datetime, progname, msg)
+        (@formatter || @default_formatter).call(severity, datetime, progname, msg)
+      end
+    end
+
+    def self.equip(app)
+      app.const_set(:C,app) unless app.const_defined?(:C)
+      super
+    end
+
+    module Helpers
+      # Logger method available for Controllers and View
+      def logger
+        app.logger
+      end
+      alias_method :log, :logger
+    end
+
+    module CClassMethods
+      # Ext::Settings usage advised : 
+      #
+      #  setting :logger, '-' do |val|
+      #    case val
+      #    when Logger
+      #      val
+      #    when String
+      #      Logger.new(val == '-' ? STDOUT : val)
+      #    else
+      #      raise ArgumentError, "unknown type"
+      #    end
+      #  end
+      #
+
+      attr_writer :logger
+      def logger
+        return @logger if @logger
+        @logger = ::Ext::Logging::Logger.new(STDOUT)
+        @logger.progname = self.name
+        @logger
+      end
+    end
+
+  end
+end
+

data/lib/ext/mount.rb

@@ -1,6 +1,5 @@
 require 'equipment'
 require 'ext/sendfile'
-require 'ext/patches'
 
 module Ext
   # That equipment allows you to mount whole directories as a camping
@@ -16,7 +15,7 @@ module Ext
   #
   # * Equipment
   # * Sendfile
-  # * Patches
+  # * View
   # * `mime-types` package
   #
   # == Example
@@ -63,9 +62,9 @@ module Ext
   #
   module Mount
     extend Equipment
-    depends_on Patches
     depends_on Sendfile
 
+
     module ControllersClassMethods
       # Mounts the path given by 'path'
       #
@@ -88,7 +87,7 @@ module Ext
         } 
         opts = defaults.merge(opts)
 
-        urls = ["#{opts[:url]}(|/.*)"]
+        urls = ["#{opts[:url].sub(/\/+$/,'')}(|/.*)"]
 
         klass = Class.new() do
           meta_def(:urls) { urls }
@@ -97,20 +96,33 @@ module Ext
         end
         klass.class_eval do
           def get(file='') # :nodoc:
-            @path = File.join(self.class.path, file)
-            if File.directory?(@path) and self.class.listing?
-              @files = Dir[File.join(@path, '*')].map{|f| File.basename(f)}
-              if has_view?("#{self.class.name.downcase}_listing")
-                render("#{self.class.name.downcase}_listing")
+            @private_path = File.join(self.class.path, file)
+            @rel_path = file
+            if File.directory?(@private_path)
+              if self.class.listing?
+                @public_path = @env.PATH_INFO.sub /\/$/, ''
+                @parent_path = @public_path.sub(/[^\/]*$/,'')
+                @files = Dir[File.join(@private_path, '*')].map{|f| File.basename(f)}
+                class_short = self.class.name.gsub(/^.*::/,'').downcase
+
+                view_name = "#{class_short}_listing"
+                if app::Views.instance_method(view_name)
+                  render view_name
+                else
+                  render(:mount_listing)
+                end
               else
-                render(:mount_listing)
+                # TODO : Look if that controller exists
+                forward(self::Unauthorized)
               end
             else
-              sendfile(@path)
+              sendfile(@private_path)
             end
           end
         end
-        const_set(opts[:name], klass) if opts[:name]
+
+        const_set(opts[:name], klass)
+        self::r << klass # register route
 
         if $DBG
           puts "** mounted #{path}"
@@ -120,18 +132,21 @@ module Ext
 
         klass
       end
-      alias :M :mount
     end
 
     module Views
-      # Default dir listing. @files contains all the files.
+      # Default dir listing. Available variables :
+      #  * @files : contains all the file's basenames.
+      #  * @rel_path     : relative path
+      #  * @public_path  : the actual public path
+      #  * @parent_path  : the public parent path
+      #  * @private_path : the actual private folder path
       def mount_listing
-        path_info = @env.PATH_INFO.sub /\/$/, ''
-        h1 "Dir listing of #{path_info}"
+        h1 "Dir listing of #{@public_path}"
         ul do
-          li { a '..', :href => path_info.sub(/\w*$/,'') }
+          li { a '..', :href => @parent_path } unless @rel_path == ''
           @files.each do |file|
-            li { a file, :href => "#{path_info}/#{file}" }
+            li { a file, :href => "#{@public_path}/#{file}" }
           end
           nil
         end
@@ -141,12 +156,3 @@ module Ext
   end
 end
 
-### Mime-types extensions
-
-js_type = MIME::Type.from_hash(
-  'Content-Type' => 'text/javascript',
-  'Extensions'   => ['js']
-)
-
-MIME::Types.add(js_type)
-

data/lib/ext/negociate_content.rb

@@ -0,0 +1,90 @@
+require 'equipment'
+require 'mimetype_ext' # requires that package
+
+module Ext
+  # Returns an available content-type depending on what the browser wants.
+  # 
+  # == Content-type negiciation stategy
+  #
+  # * Look for client's ACCEPT
+  # * If an extension is specifies, prioritize it's content-type (if available)
+  # * ...
+  #
+  # == Usage
+  #
+  # == TODO
+  #
+  # * Docs
+  # * Accept, Accept-Language, Accept-Charset et Accept-Encoding
+  # * q=0.000 #=> not selected
+  module NegociateContent
+    extend Equipment
+
+    # TODO : Set the Content-Type that was selected.
+    class ContentSelector
+      def initialize(env)
+        @accept = prioritize(env.HTTP_ACCEPT || '*/*').inject([]) do |arr, mime|
+          arr.push *MIME::Types[mime]
+          arr
+        end
+
+        # Prioritize according to the extension
+        if data = /\.(.+)$/.match(e['PATH_INFO']) and types = MIME::Types.of(data[1])
+          types.each do |type|
+            if @accept.include? type
+              @accept.delete(type)
+              @accept.unshift(type)
+            end
+          end
+        end
+      end
+
+      # TODO : Complete this
+      def method_missing(m)
+        yield 
+      end
+
+    private
+      def prioritize(str)
+        str.split(',').sort do |left, right|
+          get_priority(left) <=> get_priority(right)
+        end
+      end
+
+      def get_priority(item)
+        p item
+        if data = /;.*q=([0-9\.]+)$/.match(item)
+          p data[1].to_f
+          data[1].to_f
+        else
+          1.0
+        end
+      end
+    end
+
+    module Base
+      attr_accessor :accept
+
+      # TODO : Refine this method
+      def respond_to
+        selector = ContentSelector.new(env)
+        data = yield selector
+
+        unless data
+          @status = 406
+          @headers['Content-Type'] = 'text/html'
+          data = selector.available_content_types
+        end
+ 
+        data
+      end
+
+    end
+
+    module CClassMethods
+      attr_accessor :default_language, :default_charset,
+        :default_encoding, :default_content_type
+    end
+    
+  end
+end

data/lib/ext/og.rb

@@ -8,13 +8,17 @@ module Ext
   #
   # == BUGS
   #
-  # Does not work if app.create was defined before inclusion of that module
-  # and doesn't call `super`.
+  # The Camping::Reloader messes up that extension and creates a new OGTABLE 
+  # table. This is because of how Og works. Needs to be changed.
+  #
+  # In other news, Og is really buggs so this module will not be
+  # developped further.
   #
   # == TODO
   # 
-  # * Change table names
-  # * Add E as Entity in Models
+  # * Fix Og
+  # * Maybe change table names
+  # * Maybe add E as Entity in Models
   module Og
     extend Equipment
 
@@ -24,9 +28,9 @@ module Ext
 
       # Adds Og initialization when you start your app.
       def create
-        @og_manager = ::Equipment::Og.setup(self) if self::Models.og
+        puts "INFO: Og#create called" if $DBG
+        @og_manager = ::Ext::Og.setup(self) if self::Models.og
         super
-      rescue NoMethodError, ArgumentError
       end
     end
 
@@ -72,6 +76,8 @@ module Ext
   class << Og
     # Returns a manager for you app.
     def setup(app)
+
+      ::Og.raise_store_exceptions = $DBG if $DBG
       ::Og.thread_safe = false
       unless manager = managers[app.name]
         manager = ::Og::Manager.new(app::Models.og || {})
@@ -80,10 +86,12 @@ module Ext
 
       manager.unmanage_classes # needed ?
 
-      app::Models.constants.each do |model|
-        manager.manage_class(model) if manager.manageable?(model)
-      end
-      
+      classes = app::Models.constants.reject{|c|c=='Base'}.map{|c|app::Models.const_get(c)}
+
+      p "Manageable classes: " + classes.inspect if $DBG
+
+      manager.manage_classes classes #unless classes.empty?
+
       manager
     end
 

data/lib/ext/og_scaffold.rb

@@ -1,8 +1,7 @@
 require 'equipment'
 require 'ext/flash'
 require 'ext/og'
-require 'ext/ressource'
-require 'ext/forms'
+require 'ext/resource'
 
 module Ext
 
@@ -11,10 +10,9 @@ module Ext
   # == Dependencies
   #
   # * Equipment
-  # * Og
-  # * Ressources
   # * Flash
-  # * FormHelper
+  # * Og
+  # * Resource
   #
   # == TODO
   #
@@ -23,8 +21,7 @@ module Ext
     extend Equipment
     depends_on Flash
     depends_on Og
-    depends_on Ressource
-    depends_on Forms
+    depends_on Resource
 
     module ControllersClassMethods
       def scaffold(model, opts={})
@@ -44,7 +41,7 @@ module Ext
       alias :S :scaffold
     end
 
-    class OgScaffolder < Equipment::Ressource::RestController
+    class OgScaffolder < Equipment::Resource::RestController
       class << self
         attr_accessor :model
       end

data/lib/ext/resource.rb

@@ -0,0 +1,127 @@
+require 'equipment'
+require 'ext/forward'
+
+module Ext
+  # Unfinished work.
+  #
+  # I'm currently implementing a Controller that works like rail's
+  # ActiveResouce.
+  #
+  # == Dependencies
+  #
+  # * Equipment
+  # * Forward
+  #
+  module Resource
+    extend Equipment
+    depends_on Forward
+
+    module Controllers
+      class Rest
+        class << self
+          attr_accessor :model, :path
+
+          def urls
+            return [] unless @path
+            @__urls  ||= [
+              "#{path}", "#{path}/(\\d+)", "#{path}/(\\w+)",
+              "#{path}/(\\w+)/(\\d+)", "#{path}/(\d+)/(\\w+)"
+            ]
+          end
+
+          def inherited(c)
+            c.path = "/#{c.name.gsub(/^.*::/,'').downcase}"
+          end
+
+        end
+
+        # GET method dispatching
+        # TODO : Test this method
+        def get(action=nil, id=nil)
+          # corrections
+          if (new_id = action.to_i) > 0
+            action = id ? id : 'show'
+            id = new_id
+          elsif not action
+            action = 'index'
+          end
+
+          if respond_to?(action) and not ['create','update','delete'].include?(action)
+            if id and method(action).arity > 0
+              return send(action, id)
+            elsif method(action).arity < 1
+              return send(action)
+            end
+          end
+          puts "Action not found" if $DBG
+          forward NotFound, 'get', @env.SCRIPT_INFO
+        end
+
+        # POST method dispatching
+        # TODO : Update this method
+        def post(action=nil, id=nil)
+          # corrections
+          if (new_id = action.to_i) > 0
+            action = id ? id : 'update'
+            id = new_id
+          elsif not action
+            action = 'create'
+          end
+          
+          # prefix other actions
+          action = '_' + action unless ['create','update','delete'].include?(action)
+
+          if respond_to?(action)
+            if id and method(action).arity > 0
+              return send(action, id)
+            elsif method(action).arity < 1
+              return send(action)
+            end
+          end
+          puts "Action not found" if $DBG 
+          forward NotFound, 'get', @env.SCRIPT_INFO
+        end
+
+        def put(id); update(id); end
+        def delete(id); destroy(id); end
+
+        ### CRUD operations ###
+
+        def create # POST
+          render name + '_create'
+        end
+
+        def show(id) # GET
+          render name + '_show'
+        end
+
+        def update(id) # PUT
+          redirect R(self, :show, id)
+        end
+
+        def destroy(id) # DELETE
+          redirect R(self, :index)
+        end
+
+        ### Pages ###
+
+        def index
+          render name + '_index'
+        end
+
+        def new
+          render name + '_new'
+        end
+
+        def edit
+          render name + '_edit'
+        end
+
+      protected
+        def path; self.class.path; end
+        def name; path.sub(/^\//, '').gsub(/\//,'_'); end
+      end
+
+    end
+  end
+end