amrita2 2.0.0 → 2.0.1

data/sample/depot/config/environments/development.rb

@@ -1,6 +1,6 @@
 #---
 # Excerpted from "Agile Web Development with Rails, 2nd Ed."
-# We make no guarantees that this code is fit for any purpose. 
+# We make no guarantees that this code is fit for any purpose.
 # Visit http://www.pragmaticprogrammer.com/titles/rails2 for more book information.
 #---
 # Settings specified here will take precedence over those in config/environment.rb
@@ -14,7 +14,7 @@ config.cache_classes     = false
 config.whiny_nils        = true
 
 # Enable the breakpoint server that script/breakpointer connects to
-config.breakpoint_server = true
+#config.breakpoint_server = true
 
 # Show full error reports and disable caching
 config.action_controller.consider_all_requests_local = true

data/sample/depot/db/schema.rb

@@ -1,45 +1,52 @@
-# This file is autogenerated. Instead of editing this file, please use the
-# migrations feature of ActiveRecord to incrementally modify your database, and
+# This file is auto-generated from the current state of the database. Instead of editing this file, 
+# please use the migrations feature of ActiveRecord to incrementally modify your database, and
 # then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your database schema. If you need
+# to create the application database on another system, you should be using db:schema:load, not running
+# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
 
 ActiveRecord::Schema.define(:version => 7) do
 
   create_table "line_items", :force => true do |t|
-    t.column "product_id",  :integer,                               :null => false
-    t.column "order_id",    :integer,                               :null => false
-    t.column "quantity",    :integer,                               :null => false
-    t.column "total_price", :decimal, :precision => 8, :scale => 2, :null => false
+    t.integer "product_id",                                :null => false
+    t.integer "order_id",                                  :null => false
+    t.integer "quantity",                                  :null => false
+    t.decimal "total_price", :precision => 8, :scale => 2, :null => false
   end
 
   add_index "line_items", ["product_id"], :name => "fk_line_item_products"
   add_index "line_items", ["order_id"], :name => "fk_line_item_orders"
 
   create_table "orders", :force => true do |t|
-    t.column "name",     :string
-    t.column "address",  :text
-    t.column "email",    :string
-    t.column "pay_type", :string, :limit => 10
+    t.string "name"
+    t.text   "address"
+    t.string "email"
+    t.string "pay_type", :limit => 10
   end
 
   create_table "products", :force => true do |t|
-    t.column "title",       :string
-    t.column "description", :text
-    t.column "image_url",   :string
-    t.column "price",       :decimal, :precision => 8, :scale => 2, :default => 0.0
+    t.string  "title"
+    t.text    "description"
+    t.string  "image_url"
+    t.decimal "price",       :precision => 8, :scale => 2, :default => 0.0
   end
 
   create_table "sessions", :force => true do |t|
-    t.column "session_id", :string
-    t.column "data",       :text
-    t.column "updated_at", :datetime
+    t.string   "session_id"
+    t.text     "data"
+    t.datetime "updated_at"
   end
 
   add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
 
   create_table "users", :force => true do |t|
-    t.column "name",            :string
-    t.column "hashed_password", :string
-    t.column "salt",            :string
+    t.string "name"
+    t.string "hashed_password"
+    t.string "salt"
   end
 
 end

data/sample/depot/test/functional/admin_controller_test.rb

@@ -7,11 +7,34 @@ require File.dirname(__FILE__) + '/../test_helper'
 require 'admin_controller'
 require 'amrita2/testsupport'
 
-# Re-raise errors caught by the controller.
-class AdminController; def rescue_action(e) raise e end; end
+module AdminControllerMixinForTest
+  def new_erb
+    new
+    render :template=>"admin/new.html.erb"
+  end
+
+  def list_erb
+    list
+    render :template=>"admin/list.html.erb"
+  end
+
+  def show_erb
+    show
+    render :template=>"admin/show.html.erb"
+  end
+
+  def edit_erb
+    edit
+    render :template=>"admin/edit.html.erb"
+  end
+end
+
+class AdminController
+  include AdminControllerMixinForTest
+end
+
 
 class AdminControllerTest < Test::Unit::TestCase
-  include Amrita2::RailsTestHelper
   fixtures :products
 
   def setup
@@ -20,35 +43,53 @@ class AdminControllerTest < Test::Unit::TestCase
     @controller = AdminController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
+    ActionView::Base.register_template_handler(:a2, Amrita2View::Base)
   end
 
   def test_new
+    login
     get :new
-    session[:user_id] = User.find_by_name('u1').id
-    flash[:notice] = 'Please log in'
-    compare_result do
-      get :new
-      @response.body
-    end
+    amrita2_result = @response.body
+    get :new_erb
+    erb_result = @response.body
+    #puts amrita2_result
+    #puts erb_result
+    assert_equal_as_xml(erb_result, amrita2_result)
   end
 
   def test_list
-    get :new
-    session[:user_id] = User.find_by_name('u1').id
-    flash[:notice] = 'Please log in'
-    compare_result do
-      get :list
-      @response.body
-    end
+    login
+    get :list
+    amrita2_result = @response.body
+    get :list_erb
+    erb_result = @response.body
+    assert_equal_as_xml(erb_result, amrita2_result)
   end
 
   def test_show
-    get :new
+    login
+    get :show, :id=>1
+    amrita2_result = @response.body
+    get :show_erb, :id=>1
+    erb_result = @response.body
+    assert_equal_as_xml(erb_result, amrita2_result)
+  end
+
+  def test_edit
+    login
+    get :edit, :id=>1
+    amrita2_result = @response.body
+    get :edit_erb, :id=>1
+    erb_result = @response.body
+    #puts amrita2_result
+    #puts erb_result
+    assert_equal_as_xml(erb_result, amrita2_result)
+  end
+
+  private
+  def login
+    get :new # dummy
     session[:user_id] = User.find_by_name('u1').id
-    flash[:notice] = 'Please log in'
-    compare_result do
-      get :show, :id=>1
-      @response.body
-    end
+    flash[:notice] = nil
   end
 end

data/sample/depot/test/functional/store_controller_test.rb

@@ -7,25 +7,40 @@ require File.dirname(__FILE__) + '/../test_helper'
 require 'amrita2/testsupport'
 require 'store_controller'
 
-# Re-raise errors caught by the controller.
-class StoreController; def rescue_action(e) raise e end; end
+module StoreControllerMixinForTest
+  def index_erb
+    index
+    render :template=>'store/index.html.erb', :layout=>'store.rhtml'
+  end
+
+  def checkout_erb
+    checkout
+    render :template=>'store/checkout.html.erb', :layout=>'store.rhtml'
+  end
+end
+
+class StoreController
+  include StoreControllerMixinForTest
+end
 
 class StoreControllerTest < Test::Unit::TestCase
-  include Amrita2::RailsTestHelper
   fixtures :products
 
   def setup
     @controller = StoreController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
+    ActionView::Base.register_template_handler(:a2, Amrita2View::Base)
   end
 
   def test_index
-    compare_result do
-      get :index
-      assert_response(:success)
-      @response.body
-    end
+    get :index_erb
+    erb_result = @response.body
+    #puts erb_result
+    get :index
+    amrita2_result = @response.body
+    #puts amrita2_result
+    assert_equal_as_xml(erb_result, amrita2_result)
   end
 
   def test_post_to_add_to_cart
@@ -35,11 +50,7 @@ class StoreControllerTest < Test::Unit::TestCase
 
     post :add_to_cart, :id=>ruby_id
 
-    compare_result do
-      get :index
-      assert_response(:success)
-      @response.body
-    end
+    test_index
   end
 
   def test_checkout
@@ -47,11 +58,12 @@ class StoreControllerTest < Test::Unit::TestCase
     get :index
     post :add_to_cart, :id=>ruby_id
 
-    compare_result do
-      get :checkout
-      assert_response(:success)
-      @response.body
-    end
+    get :checkout
+    amrita2_result = @response.body
+    #puts amrita2_result
+    get :checkout_erb
+    erb_result = @response.body
+    assert_equal_as_xml(erb_result, amrita2_result)
   end
 
 end

data/sample/depot/vendor/plugins/will_paginate/init.rb

@@ -0,0 +1,4 @@
+unless ActiveRecord::Base.respond_to? :paginate
+  require 'will_paginate'
+  WillPaginate.enable
+end

data/sample/depot/vendor/plugins/will_paginate/lib/will_paginate.rb

@@ -0,0 +1,61 @@
+require 'active_support'
+
+# = You *will* paginate!
+#
+# First read about WillPaginate::Finder::ClassMethods, then see
+# WillPaginate::ViewHelpers. The magical array you're handling in-between is
+# WillPaginate::Collection.
+#
+# Happy paginating!
+module WillPaginate
+  class << self
+    # shortcut for <tt>enable_actionpack; enable_activerecord</tt>
+    def enable
+      enable_actionpack
+      enable_activerecord
+    end
+    
+    # mixes in WillPaginate::ViewHelpers in ActionView::Base
+    def enable_actionpack
+      return if ActionView::Base.instance_methods.include? 'will_paginate'
+      require 'will_paginate/view_helpers'
+      ActionView::Base.class_eval { include ViewHelpers }
+    end
+    
+    # mixes in WillPaginate::Finder in ActiveRecord::Base and classes that deal
+    # with associations
+    def enable_activerecord
+      return if ActiveRecord::Base.respond_to? :paginate
+      require 'will_paginate/finder'
+      ActiveRecord::Base.class_eval { include Finder }
+
+      associations = ActiveRecord::Associations
+      collection = associations::AssociationCollection
+      
+      # to support paginating finders on associations, we have to mix in the
+      # method_missing magic from WillPaginate::Finder::ClassMethods to AssociationProxy
+      # subclasses, but in a different way for Rails 1.2.x and 2.0
+      (collection.instance_methods.include?(:create!) ?
+        collection : collection.subclasses.map(&:constantize)
+      ).push(associations::HasManyThroughAssociation).each do |klass|
+        klass.class_eval do
+          include Finder::ClassMethods
+          alias_method_chain :method_missing, :paginate
+        end
+      end
+    end
+  end
+
+  module Deprecation #:nodoc:
+    extend ActiveSupport::Deprecation
+
+    def self.warn(message, callstack = caller)
+      message = 'WillPaginate: ' + message.strip.gsub(/ {3,}/, ' ')
+      behavior.call(message, callstack) if behavior && !silenced?
+    end
+
+    def self.silenced?
+      ActiveSupport::Deprecation.silenced?
+    end
+  end
+end

data/sample/depot/vendor/plugins/will_paginate/lib/will_paginate/collection.rb

@@ -0,0 +1,132 @@
+require 'will_paginate'
+
+module WillPaginate
+  # = OMG, invalid page number!
+  # This is an ArgumentError raised in case a page was requested that is either
+  # zero or negative number. You should decide how do deal with such errors in
+  # the controller.
+  #
+  # This error is *not* raised when a page further than the last page is
+  # requested. Use <tt>WillPaginate::Collection#out_of_bounds?</tt> method to
+  # check for those cases and manually deal with them as you see fit.
+  class InvalidPage < ArgumentError
+    def initialize(page, page_num)
+      super "#{page.inspect} given as value, which translates to '#{page_num}' as page number"
+    end
+  end
+  
+  # Arrays returned from paginating finds are, in fact, instances of this.
+  # You may think of WillPaginate::Collection as an ordinary array with some
+  # extra properties. Those properties are used by view helpers to generate
+  # correct page links.
+  #
+  # WillPaginate::Collection also assists in rolling out your own pagination
+  # solutions: see +create+.
+  #
+  class Collection < Array
+    attr_reader :current_page, :per_page, :total_entries
+
+    # Arguments to this constructor are the current page number, per-page limit
+    # and the total number of entries. The last argument is optional because it
+    # is best to do lazy counting; in other words, count *conditionally* after
+    # populating the collection using the +replace+ method.
+    #
+    def initialize(page, per_page, total = nil)
+      @current_page = page.to_i
+      raise InvalidPage.new(page, @current_page) if @current_page < 1
+      @per_page     = per_page.to_i
+      raise ArgumentError, "`per_page` setting cannot be less than 1 (#{@per_page} given)" if @per_page < 1
+      
+      self.total_entries = total if total
+    end
+
+    # Just like +new+, but yields the object after instantiation and returns it
+    # afterwards. This is very useful for manual pagination:
+    #
+    #   @entries = WillPaginate::Collection.create(1, 10) do |pager|
+    #     result = Post.find(:all, :limit => pager.per_page, :offset => pager.offset)
+    #     # inject the result array into the paginated collection:
+    #     pager.replace(result)
+    #
+    #     unless pager.total_entries
+    #       # the pager didn't manage to guess the total count, do it manually
+    #       pager.total_entries = Post.count
+    #     end
+    #   end
+    #
+    # The possibilities with this are endless. For another example, here is how
+    # WillPaginate used to define pagination for Array instances:
+    #
+    #   Array.class_eval do
+    #     def paginate(page = 1, per_page = 15)
+    #       WillPaginate::Collection.create(page, per_page, size) do |pager|
+    #         pager.replace self[pager.offset, pager.per_page].to_a
+    #       end
+    #     end
+    #   end
+    #
+    def self.create(page, per_page, total = nil, &block)
+      pager = new(page, per_page, total)
+      yield pager
+      pager
+    end
+
+    # The total number of pages.
+    def page_count
+      @total_pages
+    end
+
+    # Helper method that is true when someone tries to fetch a page with a
+    # larger number than the last page. Can be used in combination with flashes
+    # and redirecting.
+    def out_of_bounds?
+      current_page > page_count
+    end
+
+    # Current offset of the paginated collection. If we're on the first page,
+    # it is always 0. If we're on the 2nd page and there are 30 entries per page,
+    # the offset is 30. This property is useful if you want to render ordinals
+    # besides your records: simply start with offset + 1.
+    #
+    def offset
+      (current_page - 1) * per_page
+    end
+
+    # current_page - 1 or nil if there is no previous page
+    def previous_page
+      current_page > 1 ? (current_page - 1) : nil
+    end
+
+    # current_page + 1 or nil if there is no next page
+    def next_page
+      current_page < page_count ? (current_page + 1) : nil
+    end
+
+    def total_entries=(number)
+      @total_entries = number.to_i
+      @total_pages   = (@total_entries / per_page.to_f).ceil
+    end
+
+    # This is a magic wrapper for the original Array#replace method. It serves
+    # for populating the paginated collection after initialization.
+    #
+    # Why magic? Because it tries to guess the total number of entries judging
+    # by the size of given array. If it is shorter than +per_page+ limit, then we
+    # know we're on the last page. This trick is very useful for avoiding
+    # unnecessary hits to the database to do the counting after we fetched the
+    # data for the current page.
+    #
+    # However, after using +replace+ you should always test the value of
+    # +total_entries+ and set it to a proper value if it's +nil+. See the example
+    # in +create+.
+    def replace(array)
+      returning super do
+        # The collection is shorter then page limit? Rejoice, because
+        # then we know that we are on the last page!
+        if total_entries.nil? and length > 0 and length < per_page
+          self.total_entries = offset + length
+        end
+      end
+    end
+  end
+end