RubyGems - ramaze - Versions diffs - 2010.06.18 → 2011.01 - Mend

ramaze 2010.06.18 → 2011.01

Files changed (95) hide show

data/.gitignore +1 -0
data/MANIFEST +9 -16
data/README.md +37 -30
data/Rakefile +5 -1
data/TODO.md +19 -0
data/doc/AUTHORS +5 -1
data/doc/CHANGELOG +3553 -3272
data/doc/tutorial/todolist.html +1512 -1512
data/examples/app/blog/app.rb +2 -0
data/examples/app/todolist/controller/init.rb +1 -2
data/examples/app/wiktacular/mkd/main/2007-07-20_19-21-12.mkd +1 -1
data/examples/app/wiktacular/mkd/main/2007-07-20_19-23-10.mkd +1 -1
data/examples/app/wiktacular/mkd/main/2007-07-20_19-45-07.mkd +1 -1
data/examples/app/wiktacular/mkd/main/current.mkd +1 -1
data/examples/app/wiktacular/mkd/testing/2007-07-20_16-43-46.mkd +1 -1
data/examples/app/wiktacular/mkd/testing/2007-07-20_19-43-50.mkd +2 -2
data/examples/app/wiktacular/mkd/testing/2007-07-21_18-47-08.mkd +16 -16
data/examples/app/wiktacular/mkd/testing/2007-07-21_18-47-54.mkd +16 -16
data/examples/app/wiktacular/mkd/testing/current.mkd +16 -16
data/lib/proto/model/init.rb +1 -1
data/lib/proto/public/js/jquery.js +2034 -1095
data/lib/proto/start.rb +2 -0
data/lib/proto/view/index.xhtml +3 -3
data/lib/ramaze.rb +1 -2
data/lib/ramaze/cache.rb +1 -0
data/lib/ramaze/cache/sequel.rb +131 -37
data/lib/ramaze/controller.rb +1 -0
data/lib/ramaze/gestalt.rb +75 -46
data/lib/ramaze/helper.rb +1 -0
data/lib/ramaze/helper/auth.rb +38 -4
data/lib/ramaze/helper/blue_form.rb +498 -78
data/lib/ramaze/helper/cache.rb +2 -2
data/lib/ramaze/helper/csrf.rb +225 -0
data/lib/ramaze/helper/erector.rb +67 -9
data/lib/ramaze/helper/flash.rb +4 -2
data/lib/ramaze/helper/gestalt.rb +2 -0
data/lib/ramaze/helper/gravatar.rb +1 -1
data/lib/ramaze/helper/localize.rb +4 -0
data/lib/ramaze/helper/send_file.rb +30 -0
data/lib/ramaze/helper/thread.rb +5 -0
data/lib/ramaze/helper/user.rb +4 -3
data/lib/ramaze/helper/xhtml.rb +87 -8
data/lib/ramaze/log.rb +13 -0
data/lib/ramaze/log/analogger.rb +15 -5
data/lib/ramaze/log/growl.rb +28 -13
data/lib/ramaze/log/hub.rb +12 -4
data/lib/ramaze/log/informer.rb +28 -11
data/lib/ramaze/log/knotify.rb +7 -2
data/lib/ramaze/log/logger.rb +12 -4
data/lib/ramaze/log/logging.rb +40 -14
data/lib/ramaze/log/rotatinginformer.rb +47 -23
data/lib/ramaze/log/syslog.rb +37 -31
data/lib/ramaze/log/xosd.rb +7 -4
data/lib/ramaze/middleware_compiler.rb +2 -2
data/lib/ramaze/snippets/fiber.rb +63 -63
data/lib/ramaze/snippets/ramaze/lru_hash.rb +1 -1
data/lib/ramaze/tool/bin.rb +1 -1
data/lib/ramaze/version.rb +1 -1
data/lib/ramaze/view.rb +4 -4
data/lib/ramaze/view/erector.rb +88 -13
data/ramaze.gemspec +65 -65
data/spec/ramaze/bin/ramaze.rb +1 -1
data/spec/ramaze/cache/localmemcache.rb +20 -12
data/spec/ramaze/cache/sequel.rb +19 -19
data/spec/ramaze/helper/blue_form.rb +549 -257
data/spec/ramaze/helper/csrf.rb +109 -0
data/spec/ramaze/helper/httpdigest.rb +31 -29
data/spec/ramaze/helper/user.rb +1 -1
data/spec/ramaze/helper/xhtml.rb +17 -0
data/spec/ramaze/log/growl.rb +34 -0
data/spec/ramaze/log/informer.rb +1 -0
data/spec/ramaze/view/erector.rb +49 -71
data/spec/ramaze/view/erector/external_view.erector +5 -0
data/spec/ramaze/view/erector/index.erector +5 -0
data/spec/ramaze/view/erector/layout.erector +13 -3
data/spec/ramaze/view/erector/tables.erector +23 -0
data/spec/ramaze/view/erector/view.erector +6 -0
data/tasks/git.rake +2 -2
metadata +133 -176
data/examples/helpers/form_with_sequel.rb +0 -24
data/examples/helpers/nitro_form.rb +0 -23
data/lib/ramaze/helper/form.rb +0 -133
data/lib/ramaze/helper/nitroform.rb +0 -14
data/lib/ramaze/helper/pager.rb +0 -367
data/lib/ramaze/helper/partial.rb +0 -100
data/lib/ramaze/helper/sequel.rb +0 -55
data/lib/ramaze/helper/sequel_form.rb +0 -284
data/lib/vendor/etag.rb +0 -22
data/spec/ramaze/helper/form.rb +0 -360
data/spec/ramaze/helper/pager.rb +0 -96
data/spec/ramaze/helper/sequel_form.rb +0 -94
data/spec/ramaze/view/erector/external.erector +0 -1
data/spec/ramaze/view/erector/invoke_helper_method.erector +0 -1
data/spec/ramaze/view/erector/strict_xhtml.erector +0 -3
data/spec/ramaze/view/erector/sum.erector +0 -1

data/lib/ramaze/helper/partial.rb DELETED Viewed

@@ -1,100 +0,0 @@
-#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
-# All files in this distribution are subject to the terms of the Ruby license.
-module Ramaze
-  module Helper
-    # = Helper::Partial
-    #
-    # Please note that this helper is deprecated in favor of # Helper::Render,
-    # it has been removed from Innate and remains in Ramaze until 2009.05.
-    #
-    # === Example Usage
-    #
-    #   class MyController
-    #     def index
-    #     end
-    #
-    #     def list
-    #       plain = request['plain']
-    #       "Hello World from List!  Plain List == #{plain}"
-    #     end
-    #   end
-    #
-    #
-    #   <html>
-    #     <head><title>Partial Render Index</title></head>
-    #     <body>
-    #       #{render_partial(Rs(:list), 'plain' => true)}
-    #     </body>
-    #   </html>
-    module Partial
-      module_function
-      # Renders a url 'inline'.
-      #
-      # +url+      normal URL, like you'd use for redirecting.
-      # +options+  optional, will be used as request parameters.
-      #
-      # Issues a mock request to the given +url+ with +options+ turned into
-      # query arguments.
-      def render_partial(url, options = {})
-        Ramaze.deprecated('Helper::Partial#render_partial', 'Helper::Render#render_full')
-        uri = URI(url)
-        query = options # Innate::Current.request.params.merge(options)
-        uri.query = Rack::Utils.build_query(query)
-        body = nil
-        Innate::Mock.session do |session|
-          cookie = Innate::Current.session.cookie
-          session.cookie = cookie
-          body = session.get(uri.to_s, options).body
-        end
-        body
-      end
-      # Render the template file in view_root of the
-      # current controller.
-      #
-      # TODO:
-      # * Doesn't work for absolute paths, but there are no specs for that yet.
-      # * the local variable hack isn't working because innate allocates a new
-      #   binding.
-      #   For now one can simply use instance variables, which I prefer anyway.
-      #
-      # the local binding hack:
-      #
-      #   variables.each do |key, value|
-      #     value = "ObjectSpace._id2ref(#{value.object_id})"
-      #     eval "#{key} = #{value}", action.binding
-      #   end
-      def render_template(path, variables = {})
-        Ramaze.deprecated('Helper::Partial#render_template')
-        path = path.to_s
-        ext = File.extname(path)
-        basename = File.basename(path, ext)
-        action = Innate::Current.action.dup
-        action.layout    = nil
-        action.view      = action.node.find_view(basename, 'html')
-        action.method    = action.node.find_method(basename, action.params)
-        action.variables = action.variables.merge(variables)
-        action.sync_variables(action)
-        return action.call if action.valid?
-        raise(ArgumentError, "cannot render %p" % path)
-      end
-      def render_action(method, *params)
-        Ramaze.deprecated('Helper::Partial#render_action', 'Helper::Render#render_full')
-        render_partial(r(method), *params)
-      end
-    end
-  end
-end

data/lib/ramaze/helper/sequel.rb DELETED Viewed

@@ -1,55 +0,0 @@
-#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
-# All files in this distribution are subject to the terms of the Ruby license.
-module Ramaze
-  module Helper::Sequel
-    # Very crude paginator, may contain serious bugs, please fix :)
-    # pass it the result of YourModel.paginate, target is where links point to.
-    def paginator(paginated, target)
-      page_count = paginated.page_count
-      prev_page = paginated.prev_page
-      current_page = paginated.current_page
-      next_page = paginated.next_page
-      lower = (current_page - 3).abs
-      lower = lower == 0 ? 1 : lower
-      out = ['<div class="paginator">']
-      if prev_page
-        out << %(<a class="paginator_prev" href="#{Rs(target, prev_page)}">&lt;&nbsp;Prev</a>)
-      else
-        out << %(<span class="paginator_prev">&lt;&nbsp;Prev</span>)
-      end
-      if current_page > 3
-        out << %(<a class="paginator_page" href="#{Rs(target, 1)}">#{1}</a> ... )
-      end
-      lower.upto(current_page) do |pc|
-        next if pc == current_page
-        out << %(<a class="paginator_page" href="#{Rs(target, pc)}">#{pc}</a>)
-      end
-      out << %(<span class="paginator_current">#{current_page}</span>)
-      current_page.upto([page_count, current_page + 3].min) do |pc|
-        next if pc == current_page
-        out << %(<a class="paginator_page" href="#{Rs(target, pc)}">#{pc}</a>)
-      end
-      if current_page < (page_count - 3)
-        out << %(.. <a class="paginator_page" href="#{Rs(target, page_count)}">#{page_count}</a>)
-      end
-      if next_page
-        out << %(<a class="paginator_next" href="#{Rs(target, next_page)}">Next&nbsp;&gt;</a>)
-      else
-        out << %(<span class="paginator_next">Next&nbsp;&gt;</span>)
-      end
-      out << '</div>'
-      out.join(" ")
-    end
-  end
-end

data/lib/ramaze/helper/sequel_form.rb DELETED Viewed

@@ -1,284 +0,0 @@
-module Ramaze
-  module Helper
-    module SequelForm
-      # Pass it an object for your ORM and options for the <form> tag
-      # Usage:
-      #   sequel_form(User, :action => '/create')
-      #   sequel_form(Tag, :action => '/find', :method => 'post')
-      def sequel_form(object, options = {})
-        Ramaze::Form.pick(object, options)
-      end
-    end
-  end
-  class Form
-    attr_accessor :object, :options
-    YEARS, MONTHS, DAYS, HOURS, MINUTES, SECONDS =
-      (1900..2100), (1..12), (1..31), (0..23), (0..59), (0..59)
-    DATE_GENERIC = [
-      [ :day,   DAYS ],
-      [ :month, MONTHS ],
-      [ :year,  YEARS ] ]
-    TIME_GENERIC = [
-      [ :day,   DAYS ],
-      [ :month, MONTHS ],
-      [ :year,  YEARS ],
-      [ :hour,  HOURS ],
-      [ :min,   MINUTES ],
-      [ :sec,   SECONDS ] ]
-    # TODO:
-    #   How _elegant_ ...
-    #   Tries to find the right module for extending the Form instance.
-    #   It's problematic since the boundaries of what an model instance or model
-    #   class looks like is very fuzzy, also a problem is that the ORM may not be
-    #   available/required.
-    #
-    #   Maybe we can abstract that a bit by going through an array of procs for
-    #   testing?
-    def self.pick(object, options = {})
-      if defined?(Sequel::Model)
-        if object.is_a?(Sequel::Model)
-          options[:layer] ||= Layer::Sequel
-          InstanceForm.new(object, options)
-        elsif object.ancestors.include?(Sequel::Model)
-          options[:layer] ||= Layer::Sequel
-          ClassForm.new(object, options)
-        end
-      else
-        raise "Unknown ORM for: %p" % object
-      end
-    end
-    # Create new instance of Form plus the layer for the ORM
-    def initialize(object, options = {})
-      @object, @options = object, options
-      if layer = options.delete(:layer)
-        extend layer
-      end
-    end
-    # Generate and return the final form
-    def to_s
-      out = "<form #{form_attributes}>"
-      out << "<fieldset>"
-      out << generate
-      out << "</fieldset>"
-      out << '<input type="submit" />'
-      out << '<input type="reset" />'
-      out << "</form>"
-    end
-    # Decide on the strucuture of the tag based on the hash
-    def field_for(hash)
-      return if hash[:primary_key]
-      args = args_for(hash)
-      inner =
-        case type = hash[:type]
-        when :integer
-          field_integer(*args)
-        when :boolean
-          field_boolean(*args)
-        when :text
-          field_textarea(*args)
-        when :varchar
-          field_input(*args)
-        when :date
-          field_date(*args)
-        when :time
-          field_time(*args)
-        else
-          Log.warn "Unknown field: %p" % hash
-          field_input(*args)
-        end
-      "<label>#{args.first}: </label>\n#{inner}"
-    end
-    private
-    # inject to attributes for the <form>
-    def form_attributes
-      options.inject([]){|s,(k,v)| s << "#{k}='#{v}'" }.join(' ')
-    end
-    # Start tag with name and attributes
-    def start_tag(name, hash)
-      hash.inject("<#{name}"){|s,(k,v)| s << " #{k}='#{v}'" }
-    end
-    # Make a closed tag with name and attributes
-    def closed_tag(name, hash)
-      start_tag(name, hash) << ' />'
-    end
-    # Textarea with attributes from hash and the value from @object
-    def textarea(value, hash = {})
-      start_tag(:textarea, hash) << ">#{value}</textarea>"
-    end
-    # <input> with optional attributes from hash
-    def input(hash = {})
-      closed_tag(:input, hash)
-    end
-    # <input type="checkbox" with optional attributes from hash.
-    def checkbox(hash = {})
-      hash[:type] = :checkbox
-      input(hash)
-    end
-    # <option value="value"> with optional attributes from hash
-    def option(value, hash = {})
-      start_tag(:option, hash) << ">#{value}</option>"
-    end
-    # Yield method names and values for the Date instance
-    def field_date_generic
-      DATE_GENERIC.map{|(sel, range)|
-        yield(sel, range).join
-      }.join("\n")
-    end
-    # Yield method names and values for the Time/DateTime instance
-    def field_time_generic
-      TIME_GENERIC.map{|(sel, range)|
-        yield(sel, range).join
-      }.join("\n")
-    end
-    # Here go all the layers that are extended for specific ORMs
-    module Layer
-      # Layer for Sequel, only generate needs to be implemented, may change in
-      # future if we abstract more for different ORMs
-      module Sequel
-        # A bit nasty, get the @columns of the object and generate its
-        # field_for
-        def generate
-          columns = object_class.schema.instance_variable_get('@columns')
-          columns.map{|hash| field_for(hash) }.flatten.join("<br />\n")
-        end
-      end
-    end
-  end
-  # Form for the model class itself, very similar to an empty instance.
-  class ClassForm < Form
-    # <input name="name" />
-    def field_input(name)
-      input :name => name
-    end
-    # <textarea name="name"></textarea>
-    def field_textarea(name)
-      textarea '', :name => name
-    end
-    # <input name="name" />
-    def field_integer(name)
-      input :name => name
-    end
-    # <input type="checkbox" name="name" />
-    def field_boolean(name)
-      checkbox :name => name
-    end
-    # <select> with lots of <option>s
-    def field_date(name)
-      field_date_generic{|sel, range|
-        [ "<select name='#{name}[#{sel}]'>",
-          range.map{|d| option(d, :value => d) },
-          "</select>" ]
-      }
-    end
-    # <select> with lots of <option>s
-    def field_time(name)
-      field_time_generic{|sel, range|
-        [ "<select name='#{name}[#{sel}]'>",
-          range.map{|d| option(d, :value => d) },
-          "</select>" ]
-      }
-    end
-    # picks the :name
-    def args_for(hash)
-      [ hash[:name] ]
-    end
-    # Should be that way, at least for Sequel
-    def object_class
-      @object
-    end
-  end
-  # Form for instances of the model class
-  class InstanceForm < Form
-    # returns <input type='text' name='name' value='value' />
-    def field_input(name, value)
-      "<input type='text' name='#{name}' value='#{value}'/>"
-    end
-    # returns <textarea name='name'>#{value}</textarea>
-    def field_textarea(name, value)
-      "<textarea name='#{name}'>#{value}</textarea>"
-    end
-    # returns <input type="text" name="name" value="value" />
-    def field_integer(name, value)
-      field_input(name, value)
-    end
-    # <input type="checkbox" ...
-    def field_boolean(name, value)
-      if value
-        checkbox :name => name, :value => value, :checked => :checked
-      else
-        checkbox :name => name, :value => value
-      end
-    end
-    def field_date(name, value)
-      field_date_generic do |sel, range|
-        [ "<select name='#{name}[#{sel}]'>",
-          option_range_selected(range, value.send(sel)),
-          "</select>" ]
-      end
-    end
-    def field_time(name, value)
-      field_time_generic do |sel, range|
-        [ "<select name='#{name}[#{sel}]'>",
-          option_range_selected(range, value.send(sel)),
-          "</select>" ]
-      end
-    end
-    def option_range_selected(range, value)
-      range.map do |r|
-        if r == value
-          option(r, :value => r, :selected => :selected)
-        else
-          option(r, :value => r)
-        end
-      end
-    end
-    def args_for(hash)
-      name = hash[:name]
-      [ name, @object.send(name) ]
-    end
-    # Class for @object, atm Sequel specific?
-    def object_class
-      @object.class
-    end
-  end
-end

data/lib/vendor/etag.rb DELETED Viewed

@@ -1,22 +0,0 @@
-require 'digest/md5'
-module Rack
-  # Automatically sets the ETag header on all String bodies
-  class ETag
-    def initialize(app)
-      @app = app
-    end
-    def call(env)
-      status, headers, body = @app.call(env)
-      unless headers.key?('Etag')
-        hashes = []
-        body.each{|chunk| hashes << chunk.hash }
-        headers['Etag'] = %("#{Digest::MD5.hexdigest(hashes.join)}")
-      end
-      [status, headers, body]
-    end
-  end
-end