merb 0.5.3 → 0.9.2

data/lib/merb/upload_progress.rb

@@ -1,48 +0,0 @@
-module Merb
-  # Keeps track of the status of all currently processing uploads
-  class UploadProgress
-    include DRbUndumped if defined?(DRbUndumped)
-    attr_accessor :debug
-    def initialize
-      @guard    = Mutex.new
-      @counters = {}
-    end
-  
-    def check(upid)
-      @counters[upid].last rescue nil
-    end
-  
-    def last_checked(upid)
-      @counters[upid].first rescue nil
-    end
-  
-    def update_checked_time(upid)
-      @guard.synchronize { @counters[upid][0] = Time.now }
-    end
-  
-    def add(upid, size)
-      @guard.synchronize do
-        @counters[upid] = [Time.now, {:size => size, :received => 0}]
-        puts "#{upid}: Added" if @debug
-      end
-    end
-  
-    def mark(upid, len)
-      return unless status = check(upid)
-      puts "#{upid}: Marking" if @debug
-      @guard.synchronize { status[:received] = status[:size] - len }
-    end
-  
-    def finish(upid)
-      @guard.synchronize do
-        puts "#{upid}: Finished" if @debug
-        @counters.delete(upid)
-      end
-    end
-  
-    def list
-      @counters.keys.sort
-    end
-  end
-  
-end

data/lib/merb/version.rb

@@ -1,49 +0,0 @@
-module Merb
-  VERSION = '0.5.3' unless defined?(::Merb::VERSION)
-  
-  class << self
-    def svn_revision
-      rev = if File.directory?('.git')
-        `git svn log --limit 1`[/r(\d+)/, 1]
-      elsif File.directory?('.svn')
-        `svn info`[/Revision: (\d+)/, 1]
-      end
-      rev = rev.to_i if rev
-    end
-    
-    def svn_revision_filename
-      'SVN_REVISION'
-    end
-    
-    def svn_revision_from_file
-      begin
-        File.open svn_revision_file_path, 'w' do |f|
-          f.print svn_revision
-        end
-      # catch permissions error when packaged as gem
-      rescue Errno::EACCES
-      # ... or packaged as gem, mounted on a Read-Only filesystem
-      rescue Errno::EROFS
-      end
-      
-      unless (rev = File.read(svn_revision_file_path).strip).empty?
-        rev.to_i
-      end
-    end
-    
-    def svn_revision_file_path
-      File.expand_path File.join(File.dirname(__FILE__), '..', '..', svn_revision_filename)
-    end
-  end
-  
-  # Merb::RELEASE meanings:
-  # 'svn'   : unreleased
-  # 'pre'   : pre-release Gem candidates
-  #  nil    : released
-  # You should never check in to trunk with this changed.  It should
-  # stay 'svn'.  Change it to nil in release tags.
-  RELEASE=nil
-  # unless defined?(::Merb::RELEASE)
-  #   RELEASE = "svn#{" r#{svn_revision_from_file}" if svn_revision_from_file}"
-  # end
-end

data/lib/merb/view_context.rb

@@ -1,79 +0,0 @@
-
-
-module Merb
-  PROTECTED_IVARS = %w[@_new_cookie
-                       @method
-                       @env
-                       @web_controller
-                       @_body
-                       @_fingerprint_before
-                       @_session
-                       @_headers
-                       @_cookies
-                       @_request
-                       @_status
-                       @_view_context_cache
-                       @_response
-                       @_params
-                       @thrown_content
-                       @_route
-                       @_benchmarks
-                       @_provided_formats
-                       @_format_value
-                       @_content_type
-                       @_merb_unmatched
-                       @_provided_formats
-                       @template]
-
-                       
-  module GlobalHelper
-  end    
-  # The ViewContext is really just an empty container for us to fill with
-  # instance variables from the controller, include helpers into and then use as
-  # the context object passed to Erubis when evaluating the templates.
-  class ViewContext
-    include Merb::ViewContextMixin
-    include Merb::WebControllerMixin
-    
-    def initialize(controller)
-      @web_controller = controller
-      @_merb_partial_locals = {}
-      (@web_controller.instance_variables - PROTECTED_IVARS).each do |ivar|
-        self.instance_variable_set(ivar, @web_controller.instance_variable_get(ivar))
-      end
-      begin
-        self.class.class_eval(" include Merb::GlobalHelper; include Merb::#{@web_controller.class.name}Helper") 
-      rescue NameError
-        Merb.logger. debug("Missing Helper: Merb::#{@web_controller.class.name}Helper")
-      end  
-    end
-    
-    # hack so markaby doesn't dup us and lose ivars.
-    def dup
-      self
-    end
-      
-    # accessor for the view. refers to the current @web_controller object
-    def controller
-      @web_controller
-    end
-  
-    alias_method :old_respond_to?, :respond_to?
-    
-    def respond_to?(sym, include_private=false)
-      old_respond_to?(sym, include_private) || @web_controller.respond_to?(sym, include_private) || @_merb_partial_locals.key?(sym)
-    end
-    
-    # catch any method calls that the controller responds to
-    # and delegate them back to the controller.
-    def method_missing(sym, *args, &blk)
-      if @_merb_partial_locals.key?(sym)
-        @_merb_partial_locals[sym]
-      else
-        @web_controller.send(sym, *args, &blk)
-      end
-    end
-    
-  end
-  
-end

data/lib/tasks.rb

@@ -1,7 +0,0 @@
-$VERBOSE = nil
-
-# Load Merb rakefile extensions
-Dir["#{File.dirname(__FILE__)}/tasks/**/*.rake"].each { |ext| load ext }
-
-# Load any custom rakefile extensions
-Dir["./lib/tasks/**/*.rake"].sort.each { |ext| load ext }

data/lib/tasks/merb.rake

@@ -1,54 +0,0 @@
-def install_merb_script
-  script_filepath = Merb.root / 'script/merb'
-  FileUtils.rm script_filepath if File.exist? script_filepath
-  tmpl = "#!/usr/bin/env ruby\nrequire File.expand_path(File.dirname(__FILE__)+'/../config/boot')\nrequire File.expand_path(File.dirname(__FILE__)+'/../framework/merb/server')\nMerb::Server.run\n"
-  File.open(script_filepath, 'wb') {|f|
-    f.write tmpl 
-    f.chmod(0744)
-  }
-end
-
-namespace :merb do
-  desc "freeze the merb framework into merb for portability"
-  task :freeze do
-    FileUtils.rm_rf Merb.root / 'framework'
-    FileUtils.cp_r Merb::framework_root, (Merb.root / 'framework')
-    install_merb_script
-    
-    puts "  Freezing Merb Framework into framework"
-    puts "  Use script/merb to start instead of plain merb"
-  end
-  desc "unfreeze this app from the framework and use system gem."
-  task :unfreeze do
-    FileUtils.rm_rf Merb.root / 'framework'
-    FileUtils.rm Merb.root / 'script/merb'
-    
-    puts "  Removed: "
-    puts "   - #{Merb.root / 'framework'} (recursive) "
-    puts "   - #{Merb.root / 'script/merb'}"
-  end
-  
-  desc "freeze the merb framework from svn, use REVISION=# to freeze a specific revision"
-  task :freeze_from_svn do
-    install_path = Merb.root / 'framework'
-    revision = ENV['REVISION'] || 'HEAD'
-    puts "  Removing old framework" if File.exist? install_path
-    FileUtils.rm_rf install_path
-
-    puts "  Freezing Merb Framework from svn, revision #{revision}"
-    system "svn export -r #{revision} http://svn.devjavu.com/merb/trunk/lib #{install_path}"
-    install_merb_script
-    
-    puts "  Use script/merb to start instead of plain merb"
-  end
-  
-end
-
-desc "Setup the Merb Environment by requiring merb and loading your merb_init.rb" 
-task :merb_env do 
-  require 'rubygems' 
-  require 'merb' 
-  Merb::Config[:environment] = ENV['MERB_ENV'] if ENV['MERB_ENV'] 
-  Merb.environment = Merb::Config[:environment].nil? ? 'development' : Merb::Config[:environment] 
-  load Merb.root+'/config/merb_init.rb' 
-end

data/merb_default_generators/model/model_generator.rb

@@ -1,16 +0,0 @@
-require 'merb/generators/merb_generator_helpers'
-
-class ModelGenerator < Merb::GeneratorHelpers::ModelGeneratorBase
-  
-  def initialize( *args )
-    super( *args )
-    options[:skip_migration] = true
-    @model_template_name = "new_model_template.erb"
-    @model_test_generator_name = "merb_model_test"
-  end
-  
-  def self.superclass
-    RubiGen::Base
-  end
-    
-end

data/merb_default_generators/model/templates/new_model_template.erb

@@ -1,5 +0,0 @@
-class <%= class_name %>
-<% unless table_attributes.empty? -%>
-  attr_accessor <%= table_attributes.map{|a| ":#{a.name}" }.compact.uniq.join(", ") %>
-<% end -%>
-end

data/merb_default_generators/resource_controller/resource_controller_generator.rb

@@ -1,26 +0,0 @@
-require 'merb/generators/merb_generator_helpers'
-
-class ResourceControllerGenerator < Merb::GeneratorHelpers::ControllerGeneratorBase
-
-  def initialize(*args)
-    runtime_options = args.last.is_a?(Hash) ? args.pop : {}
-    name, *actions = args.flatten
-    runtime_options[:actions] = %w[index show new edit]
-    runtime_options[:test_stub_generator] = "merb_controller_test"
-    super( [name], runtime_options )
-  end
-
-  def self.superclass
-    RubiGen::Base
-  end
-  
-  protected
-  def banner
-        <<-EOS
-  Creates a Merb controller, views and specs using Active Record Models
-
-  USAGE: #{$0} #{spec.name} resource_name"
-  EOS
-  end
-  
-end

data/merb_default_generators/resource_controller/templates/controller.rb

@@ -1,30 +0,0 @@
-<% klass = class_name.singularize -%>
-<% ivar = class_name.snake_case.singularize -%>
-class <%= class_name %> < Application
-  provides :xml, :js, :yaml
-
-  def index
-    render
-  end
-  
-  def show
-    render
-  end
-  
-  def new
-    render
-  end
-  
-  def edit
-    render
-  end
-  
-  def create
-  end
-  
-  def update
-  end
-  
-  def destroy
-  end
-end

data/merb_default_generators/resource_controller/templates/edit.html.erb

@@ -1 +0,0 @@
-Edit Action for <%= class_name %>

data/merb_default_generators/resource_controller/templates/helper.rb

@@ -1,5 +0,0 @@
-module Merb
-  module <%= class_name %>Helper
-  
-  end
-end

data/merb_default_generators/resource_controller/templates/index.html.erb

@@ -1 +0,0 @@
-Index Action for <%= class_name %>

data/merb_default_generators/resource_controller/templates/new.html.erb

@@ -1 +0,0 @@
-New Action for <%= class_name %>

data/merb_default_generators/resource_controller/templates/show.html.erb

@@ -1 +0,0 @@
-Show Action for <%= class_name %>

data/merb_generators/controller/USAGE

@@ -1,5 +0,0 @@
-Description:
-  
-  
-Usage:
-  

data/merb_generators/controller/controller_generator.rb

@@ -1,16 +0,0 @@
-require 'merb/generators/merb_generator_helpers'
-
-class ControllerGenerator < Merb::GeneratorHelpers::ControllerGeneratorBase
-
-  def initialize(*args)
-    runtime_options = args.last.is_a?(Hash) ? args.pop : {}
-    name, *actions = args.flatten
-    runtime_options[:actions] = actions.empty? ? %w[index] : actions
-    super( [name], runtime_options  )
-  end
-  
-  def self.superclass
-    RubiGen::Base
-  end
-    
-end

data/merb_generators/controller/templates/controller.rb

@@ -1,8 +0,0 @@
-class <%= class_name %> < Application
-<% actions.each do |action| -%>
-  
-  def <%= action %>
-    render
-  end
-<% end -%>
-end

data/merb_generators/controller/templates/helper.rb

@@ -1,5 +0,0 @@
-module Merb
-module <%= class_name %>Helper
-  
-  end
-end

data/merb_generators/controller/templates/index.html.erb

@@ -1,3 +0,0 @@
-<h1><%= class_name %> controller, index action</h1>
-
-<p>Edit this file in <tt>app/views/<%= file_name %>/index.html.erb</tt></p>

data/merb_generators/part_controller/USAGE

@@ -1,5 +0,0 @@
-Description:
-  Generates a PartController
-  
-Usage:
-  script/generate part_controller name

data/merb_generators/part_controller/part_controller_generator.rb

@@ -1,27 +0,0 @@
-require 'merb/generators/merb_generator_helpers'
-
-class PartControllerGenerator < Merb::GeneratorHelpers::ControllerGeneratorBase
-
-  def initialize(*args)
-    runtime_options = args.last.is_a?(Hash) ? args.pop : {}
-    name, *actions = args.flatten
-    name += "_part"
-    
-    runtime_options[:actions]           = actions.empty? ? %w[index] : actions
-    runtime_options[:base_dest_folder]  = "app/parts"
-    super( [name], runtime_options  )
-  end
-
-  def self.superclass
-    RubiGen::Base
-  end
-    
-  protected
-    def banner
-      <<-EOS
-Creates a Merb part_controller
-
-USAGE: #{$0} #{spec.name} name"
-EOS
-    end
-end

data/merb_generators/part_controller/templates/controller.rb

@@ -1,8 +0,0 @@
-class <%= class_name %>Part < Merb::PartController
-<% actions.each do |action| -%>
-  
-  def <%= action %>
-    render
-  end
-<% end -%>
-end