Pistos-ramaze 2009.01 → 2009.02

data/{README.markdown → README.md}

@@ -1,4 +1,4 @@
-          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
+          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
  All files in this distribution are subject to the terms of the Ruby license.
 
 # About Ramaze
@@ -401,7 +401,7 @@ For help you can:
 
 - Visit us in the channel #ramaze on irc.freenode.net
 
-- Join the Mailinglist at http://ramaze.rubyforge.org
+- Join the Mailinglist at http://groups.google.com/group/ramaze
 
 
 # Appendix

data/Rakefile

@@ -107,7 +107,7 @@ desc "create bzip2 and tarball"
 task :distribute => :gem do
   sh "rm -rf pkg/ramaze-#{VERS}"
   sh "mkdir -p pkg/ramaze-#{VERS}"
-  sh "cp -r {bin,doc,lib,examples,spec,Rakefile,README.markdown,rake_tasks} pkg/ramaze-#{VERS}/"
+  sh "cp -r {bin,doc,lib,examples,spec,Rakefile,README.md,rake_tasks} pkg/ramaze-#{VERS}/"
 
   Dir.chdir('pkg') do |pwd|
     sh "tar -zcvf ramaze-#{VERS}.tar.gz ramaze-#{VERS}"
@@ -226,3 +226,23 @@ task README do
     end
   end
 end
+
+desc 'Generate YARD documentation'
+task :ydoc do
+  sh('yardoc -o ydoc -r README.md')
+end
+
+task :publish => [:ydoc]
+
+begin
+  require 'grancher/task'
+
+  Grancher::Task.new do |g|
+    g.branch = 'gh-pages'
+#     g.push_to = 'origin'
+    g.message = 'Updated website'
+    g.directory 'ydoc', '.'
+  end
+rescue LoadError
+  # oh well :)
+end

data/doc/readme_chunks/getting_help.txt

@@ -2,4 +2,4 @@ For help you can:
 
 - Visit us in the channel #ramaze on irc.freenode.net
 
-- Join the Mailinglist at http://ramaze.rubyforge.org
+- Join the Mailinglist at http://groups.google.com/group/ramaze

data/doc/tutorial/todolist.html

@@ -92,7 +92,7 @@ pre.iplastic .RegularExpression {
 
 <p>Welcome to our official tutorial, the mandatory to-do list. I&#8217;m writing this while doing the steps to assure it will work for you.</p>
 
-<p>The tutorial assumes that you have Ramaze installed already. The easiest way to do that is <code>gem install ramaze</code>, for other ways of installation please see the documentation at http://ramaze.rubyforge.org</p>
+<p>The tutorial assumes that you have Ramaze installed already. The easiest way to do that is <code>gem install ramaze</code>, for other ways of installation please see the documentation at http://ramaze.net</p>
 
 <p>Should you encounter any problems while doing this tutorial, this might either be because Ramaze changed (which happens very often while it is still young) or I actually made some mistake while writing it.</p>
 

data/doc/tutorial/todolist.mkd

@@ -14,7 +14,7 @@ I'm writing this while doing the steps to assure it will work for you.
 
 The tutorial assumes that you have Ramaze installed already. The easiest way to
 do that is `gem install ramaze`, for other ways of installation please see the
-documentation at http://ramaze.rubyforge.org
+documentation at http://ramaze.net .
 
 Should you encounter any problems while doing this tutorial, this might either
 be because Ramaze changed (which happens very often while it is still young)
@@ -368,7 +368,7 @@ will translate into:
     open('Wash dishes')
 {:lang=ruby}
 
-Which in turn will call 
+Which in turn will call
 
     task_status('Wash dishes', false)
 {:lang=ruby}

data/examples/app/wiktacular/template/html_layout.xhtml

@@ -22,6 +22,6 @@
     <div id="content">
       #@content
     </div>
-    <div id="copyright">Wiktacular is powered by <a href="http://ramaze.rubyforge.org/">Ramaze</a></div>
+    <div id="copyright">Wiktacular is powered by <a href="http://ramaze.net">Ramaze</a></div>
   </body>
 </html>

data/lib/proto/view/index.xhtml

@@ -16,11 +16,11 @@ working.</p>
 </ol>
 </p>
 
-<p>For more documentation, check out <a href="http://ramaze.net">www.ramaze.net</a>, which includes:
+<p>For more documentation, check out <a href="http://ramaze.net">ramaze.net</a>, which includes:
 <ul>
   <li>a <a href="http://ramaze.net/getting-started">getting started</a> guide</li>
   <li>some <a href="http://ramaze.net/screencasts">screencasts</a></li>
-  <li>and an <a href="http://ramaze.rubyforge.org/tutorial/todolist.html">introductory tutorial</a></li>
+  <li>and <a href="http://wiki.ramaze.net/Tutorials">tutorials</a></li>
 </ul>
 </p>
 

data/lib/ramaze/controller/resolve.rb

@@ -244,7 +244,7 @@ module Ramaze
         t_extensions = Template::ENGINES
         all_extensions = t_extensions.values.flatten
 
-        if engine = trait[:engine]
+        if engine = ancestral_trait[:engine]
           c_extensions = t_extensions.select{|k,v| k == engine}.map{|k,v| v}.flatten
           return (c_extensions + all_extensions).uniq
         end

data/lib/ramaze/current.rb

@@ -49,62 +49,3 @@ module Ramaze
     end
   end
 end
-__END__
-
-  module Current
-    class << self
-      include Trinity
-
-      def call(env)
-        setup(env)
-        before_call
-
-        if filter = Global.record
-          request = Current.request
-          Record << request if filter[request]
-        end
-
-        Dispatcher.handle
-
-        finish
-      ensure
-        after_call
-      end
-
-      def setup(env)
-        self.request = Request.new(env)
-        self.response = Response.new
-        self.session = Session.new
-      end
-
-      def finish
-        session.finish if session
-        response.finish
-      end
-
-      def before(&block)
-        @before = block_given? ? block : @before
-      end
-
-      def before_call
-        return unless before
-        before.call
-      rescue Object => e
-        Ramaze::Log.error e
-        raise e
-      end
-
-      def after(&block)
-        @after = block_given? ? block : @after
-      end
-
-      def after_call
-        return unless after
-        after.call
-      rescue Object => e
-        Ramaze::Log.error e
-        raise e
-      end
-    end
-  end
-end

data/lib/ramaze/current/response.rb

@@ -15,10 +15,8 @@ module Ramaze
     end
 
     # Build/replace this responses data
-    def build(new_body = body, status = status, header = header)
-      header.each do |key, value|
-        self[key] = value
-      end
+    def build(new_body = body, status = status, new_header = {})
+      self.header.merge!(new_header)
 
       self.body, self.status = new_body, status
     end

data/lib/ramaze/current/session/flash.rb

@@ -58,6 +58,7 @@ module Ramaze
       # Delete a key
 
       def delete(key)
+        previous.delete(key)
         current.delete(key)
       end
 

data/lib/ramaze/helper/flash.rb

@@ -41,9 +41,24 @@ module Ramaze
     #   <div class='flash' id='flash_error'>Please enter your name</div>
     #   <div class='flash' id='flash_info'>Do you see the fnords?</div>
     #
-    # This is designed to be customized permanently or per usage:
     #
-    #   flashbox("<div class='flash_%key'>%value</div>")
+    # This can be customized permanently in your controller:
+    #
+    #   class MainController < Ramaze::Controller
+    #     trait :flashbox => "<div class='flash_%key'>%value</div>"
+    #
+    #     def show_flashbox
+    #       flashbox
+    #     end
+    #   end
+    #
+    # or on a per-usage basis in your action:
+    #
+    #   class MainController < Ramaze::Controller
+    #     def show_flashbox
+    #       flashbox("<div class='flash_%key'>%value</div>")
+    #     end
+    #   end
     #
     # Where any occurrence of %key and %value will be replaced by the actual
     # contents of each element of flash

data/lib/ramaze/helper/user.rb

@@ -16,7 +16,7 @@ module Ramaze
     #   end
     #
     #   def login
-    #     user_login if reuqest.post?
+    #     user_login if request.post?
     #   end
     # end
 

data/lib/ramaze/reloader.rb

@@ -56,7 +56,7 @@ module Ramaze
       Watcher = WatchStat
     end
 
-    def initialize(app)
+    def initialize(app = nil)
       @app = app
       @files = {}
       @watcher = Watcher.new
@@ -81,7 +81,7 @@ module Ramaze
         end
       end
 
-      @app.call(env)
+      @app.call(env) if @app
     end
 
     def cycle

data/lib/ramaze/snippets/ramaze/fiber.rb

@@ -1,10 +1,10 @@
 module Ramaze
   class Fiber < ::Fiber
-    # initialize isn't being called, so we have to hook into ::new
-    def self.new(*args)
-      instance = super
-      instance.state = {}
-      instance
+    attr_accessor :state
+
+    def initialize(*args)
+      super
+      @state = {}
     end
 
     attr_accessor :state

data/lib/ramaze/template/amrita2.rb

@@ -30,9 +30,13 @@ module Ramaze
 
         def transform(action)
           template = wrap_compile(action)
+
           data = action.instance.instance_variable_get("@data") || {}
-          action.instance.extend ::Amrita2::Runtime if data.kind_of? Binding
-          template.render_with(data)
+          binding = action.instance.instance_variable_get("@binding")
+
+          action.instance.extend(::Amrita2::Runtime)
+
+          template.render_with(data, binding)
         end
 
         # Compile a template, return instance of Amrita2::Template

data/lib/ramaze/tool/localize.rb

@@ -70,7 +70,7 @@ module Ramaze
             body << localize_body(chunk, options)
           end
 
-          response.body = body
+          response.body = body.join
         end
 
         # Localizes a response body.  It reacts to a regular expression as given

data/lib/ramaze/version.rb

@@ -1,6 +1,6 @@
-#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
+#          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
-  VERSION = "2009.01"
+  VERSION = "2009.02"
 end

data/rake_tasks/conf.rake

@@ -5,7 +5,7 @@ COPYRIGHT = [
   "#          Copyright (c) #{Time.now.year} Michael Fellinger m.fellinger@gmail.com",
   "# All files in this distribution are subject to the terms of the Ruby license."
 ]
-README = 'README.markdown'
+README = 'README.md'
 CLEAN.include %w[
   **/.*.sw?
   *.gem
@@ -36,12 +36,26 @@ RDOC_FILES = %W[
 POST_INSTALL_MESSAGE = %{
 #{'=' * 60}
 
+
 Thank you for installing Ramaze!
-You can now do following:
 
-* Create a new project using the `ramaze' command:
+At this point, you can learn how to use Ramaze at
+the main website, http://ramaze.net .
+
+Alternatively, you can work off a skeletal prototype project
+using the 'ramaze' command:
+
     ramaze --create yourproject
 
+Feel free to ask questions in our IRC channel:
+irc.freenode.net #ramaze
+http://mibbit.com/?server=irc.freenode.net&channel=%23ramaze
+
+Enjoy!  :)
+
+-- The Ramaze team
+
+
 #{'=' * 60}
 }.strip
 

data/rake_tasks/gem.rake

@@ -7,7 +7,7 @@ def generate_gemspec(version)
 
     s.author = "Michael 'manveru' Fellinger"
     s.email = "m.fellinger@gmail.com"
-    s.homepage = "http://ramaze.rubyforge.org"
+    s.homepage = "http://ramaze.net"
     s.rubyforge_project = "ramaze"
 
     s.bindir = "bin"

data/rake_tasks/metric.rake

@@ -8,7 +8,7 @@ namespace :metric do
     print 'churning '
 
     Dir['lib/**/*.rb'].each do |rb|
-      changes = `git-log --pretty=oneline '#{rb}'`.count("\n")
+      changes = `git log --pretty=oneline '#{rb}'`.count("\n")
       print '.'
       # out[changes, rb]
       churn[rb] = changes

data/ramaze.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "ramaze"
-  s.version = "2009.01"
+  s.version = "2009.02"
 
   s.summary = "Ramaze is a simple and modular web framework"
   s.description = "Ramaze is a simple and modular web framework"
@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.has_rdoc = true
   s.author = "Michael 'manveru' Fellinger"
   s.email = "m.fellinger@gmail.com"
-  s.homepage = "http://ramaze.rubyforge.org"
+  s.homepage = "http://ramaze.net"
   s.rubyforge_project = "ramaze"
   s.executables = ["ramaze"]
   s.bindir = "bin"
@@ -28,7 +28,7 @@ http://mibbit.com/?server=irc.freenode.net&channel=%23ramaze
   s.add_dependency('rack', '>= 0.3.0')
 
   s.files = [
-    "README.markdown",
+    "README.md",
     "Rakefile",
     "benchmark/results.txt",
     "benchmark/run.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Pistos-ramaze
 version: !ruby/object:Gem::Version 
-  version: "2009.01"
+  version: "2009.02"
 platform: ruby
 authors: 
 - Michael 'manveru' Fellinger
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-11 00:00:00 -08:00
+date: 2009-02-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -30,7 +31,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- README.markdown
+- README.md
 - Rakefile
 - benchmark/results.txt
 - benchmark/run.rb
@@ -622,7 +623,7 @@ files:
 - spec/snippets/string/unindent.rb
 - spec/snippets/thread/into.rb
 has_rdoc: true
-homepage: http://ramaze.rubyforge.org
+homepage: http://ramaze.net
 post_install_message: |-
   
   ============================================================