Merge branch 'master' of http://github.com/jdpace/errbit

Pavel Forkert
2 parents a3fb360c ab3e8bb9
Showing 8 changed files with 36 additions and 69 deletions Show diff stats
Gemfile
Gemfile.lock
app/controllers/apps_controller.rb
app/models/app.rb
app/models/user.rb
app/models/watcher.rb
app/views/errs/redmine_body.txt.erb
spec/controllers/apps_controller_spec.rb
@@ -12,6 +12,7 @@ gem &#39;mongoid_rails_migrations&#39;
 gem 'useragent', '~> 0.3.1'
 gem 'pivotal-tracker'
 gem 'ruby-fogbugz', :require => 'fogbugz'
+gem 'inherited_resources'
 platform :ruby do
   gem 'bson_ext', '~> 1.3.1'
@@ -61,7 +61,11 @@ GEM
     haml (3.0.25)
     happymapper (0.3.2)
       libxml-ruby (~> 1.1.3)
+    has_scope (0.5.1)
     i18n (0.5.0)
+    inherited_resources (1.2.2)
+      has_scope (~> 0.5.0)
+      responders (~> 0.6.0)
     libxml-ruby (1.1.4)
     lighthouse-api (2.0)
       activeresource (>= 3.0.0)
@@ -110,6 +114,7 @@ GEM
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
+    responders (0.6.4)
     rest-client (1.5.1)
       mime-types (>= 1.16)
     rspec (2.5.0)
@@ -157,6 +162,7 @@ DEPENDENCIES
   email_spec
   factory_girl_rails
   haml
+  inherited_resources
   lighthouse-api
   mongoid (= 2.0.2)
   mongoid_rails_migrations
-class AppsController < ApplicationController
+class AppsController < InheritedResources::Base
   before_filter :require_admin!, :except => [:index, :show]
-  before_filter :find_app, :except => [:index, :new, :create]
   before_filter :parse_email_at_notices_or_set_default, :only => [:create, :update]
-  def index
-    @apps = current_user.admin? ? App.all : current_user.apps.all
-  end
-
   def show
     where_clause = {}
     respond_to do |format|
       format.html do
         where_clause[:environment] = params[:environment] if(params[:environment].present?)
         if(params[:all_errs])
-          @errs = @app.errs.where(where_clause).ordered.paginate(:page => params[:page], :per_page => current_user.per_page)
+          @errs = resource.errs.where(where_clause).ordered.paginate(:page => params[:page], :per_page => current_user.per_page)
           @all_errs = true
         else
-          @errs = @app.errs.unresolved.where(where_clause).ordered.paginate(:page => params[:page], :per_page => current_user.per_page)
+          @errs = resource.errs.unresolved.where(where_clause).ordered.paginate(:page => params[:page], :per_page => current_user.per_page)
           @all_errs = false
         end
         @deploys = @app.deploys.order_by(:created_at.desc).limit(5)
       end
       format.atom do
-        @errs = @app.errs.unresolved.ordered
+        @errs = resource.errs.unresolved.ordered
       end
     end
   end
   def new
-    @app = App.new
-    @app.watchers.build
+    build_resource.watchers.build
     @app.issue_tracker = IssueTracker.new
+    new!
   end
   def edit
-    @app.watchers.build if @app.watchers.none?
-    @app.issue_tracker = IssueTracker.new if @app.issue_tracker.nil?
+    resource.watchers.build if resource.watchers.none?
+    resource.issue_tracker = IssueTracker.new if resource.issue_tracker.nil?
+    edit!
   end
   def create
-    @app = App.new(params[:app])
-
-    if @app.save
-      flash[:success] = 'Great success! Configure your app with the API key below'
-      redirect_to app_path(@app)
-    else
-      render :new
-    end
+    create! :success => 'Great success! Configure your app with the API key below'
   end
   def update
-    if @app.update_attributes(params[:app])
-      flash[:success] = "Good news everyone! '#{@app.name}' was successfully updated."
-      redirect_to app_path(@app)
-    else
-      render :edit
-    end
+    update! :success => "Good news everyone! '#{resource.name}' was successfully updated."
   end
   def destroy
-    @app.destroy
-    flash[:success] = "'#{@app.name}' was successfully destroyed."
-    redirect_to apps_path
+    destroy! :success =>  "'#{resource.name}' was successfully destroyed."
   end
   protected
-
-    def find_app
-      @app = App.find(params[:id])
-
-      # Mongoid Bug: could not chain: current_user.apps.find_by_id!
-      # apparently finding by 'watchers.email' and 'id' is broken
-      raise(Mongoid::Errors::DocumentNotFound.new(App,@app.id)) unless current_user.admin? || current_user.watching?(@app)
+    def begin_of_association_chain
+      current_user unless current_user.admin?
     end
     # email_at_notices is edited as a string, and stored as an array.
@@ -39,9 +39,8 @@ class App
   accepts_nested_attributes_for :issue_tracker, :allow_destroy => true,
     :reject_if => proc { |attrs| !%w(none lighthouseapp redmine pivotal fogbugz mingle).include?(attrs[:issue_tracker_type]) }
-  # Mongoid Bug: find(id) on association proxies returns an Enumerator
   def self.find_by_id!(app_id)
-    where(:_id => app_id).first || raise(Mongoid::Errors::DocumentNotFound.new(self,app_id))
+    find app_id
   end
   def self.find_by_api_key!(key)
@@ -19,28 +19,21 @@ class User
   attr_protected :admin
+  has_many :apps, :foreign_key => 'watchers.user_id'
+
   if Errbit::Config.user_has_username
     field :username
     validates_presence_of :username
   end
-  # Mongoid doesn't seem to currently support
-  # referencing embedded documents
   def watchers
-    App.all.map(&:watchers).flatten.select {|w| w.user_id.to_s == id.to_s}
+    apps.map(&:watchers).flatten.select {|w| w.user_id.to_s == id.to_s}
   end
   def per_page
     self[:per_page] || PER_PAGE
   end
-  def apps
-    # This is completely wasteful but became necessary
-    # due to bugs in Mongoid
-    app_ids = watchers.map {|w| w.app.id}
-    App.any_in(:_id => app_ids)
-  end
-
   def watching?(app)
     apps.all.include?(app)
   end
@@ -5,7 +5,7 @@ class Watcher
   field :email
   embedded_in :app, :inverse_of => :watchers
-  referenced_in :user
+  belongs_to :user
   validate :ensure_user_or_email
-"See this exception on Errbit":<%= app_err_url err.app, err %>
 <% if notice = err.notices.first %>
 h1. <%= notice.message %>
+h3. "See this exception on Errbit":<%= app_err_url err.app, err %>
+
 h2. Summary
 <% if notice.request['url'].present? %>
 h3. URL
@@ -30,16 +31,14 @@ h2. Session
 h2. Backtrace
-<pre>
-<% for line in notice.backtrace %><%= line['number'] %>:  <%= line['file'].sub(/^\[PROJECT_ROOT\]/, '') %> -> *<%= line['method'] %>*
+| Line | File | Method |
+<% for line in notice.backtrace %>| <%= line['number'] %> | <%= line['file'].sub(/^\[PROJECT_ROOT\]/, '') %> | *<%= line['method'] %>* |
 <% end %>
-</pre>
 h2. Environment
-<pre>
-<% for key, val in notice.env_vars %>
-<%= key %>: <%= val %>
+<% for key, val in notice.env_vars %>| <%= key %> | <%= val %> |
 <% end %>
-</pre>
+
 <% end %>
+
@@ -201,15 +201,7 @@ describe AppsController do
         it "should display a message" do
           post :create, :app => {}
-          request.flash[:success].should match(/success/)
-        end
-      end
-
-      context "when the create is unsuccessful" do
-        it "should render the new page" do
-          @app.should_receive(:save).and_return(false)
-          post :create, :app => {}
-          response.should render_template(:new)
+          request.flash[:notice].should match(/success/)
         end
       end
     end
@@ -227,7 +219,7 @@ describe AppsController do
         it "should display a message" do
           put :update, :id => @app.id, :app => {}
-          request.flash[:success].should match(/success/)
+          request.flash[:notice].should match(/success/)
         end
       end
@@ -432,7 +424,7 @@ describe AppsController do
       it "should display a message" do
         delete :destroy, :id => @app.id
-        request.flash[:success].should match(/success/)
+        request.flash[:notice].should match(/success/)
       end
       it "should redirect to the apps page" do
	@@ -12,6 +12,7 @@ gem 'mongoid_rails_migrations'		@@ -12,6 +12,7 @@ gem 'mongoid_rails_migrations'
12	gem 'useragent', '~> 0.3.1'	12	gem 'useragent', '~> 0.3.1'
13	gem 'pivotal-tracker'	13	gem 'pivotal-tracker'
14	gem 'ruby-fogbugz', :require => 'fogbugz'	14	gem 'ruby-fogbugz', :require => 'fogbugz'
		15	+gem 'inherited_resources'
15		16
16	platform :ruby do	17	platform :ruby do
17	gem 'bson_ext', '~> 1.3.1'	18	gem 'bson_ext', '~> 1.3.1'
	@@ -61,7 +61,11 @@ GEM		@@ -61,7 +61,11 @@ GEM
61	haml (3.0.25)	61	haml (3.0.25)
62	happymapper (0.3.2)	62	happymapper (0.3.2)
63	libxml-ruby (~> 1.1.3)	63	libxml-ruby (~> 1.1.3)
		64	+ has_scope (0.5.1)
64	i18n (0.5.0)	65	i18n (0.5.0)
		66	+ inherited_resources (1.2.2)
		67	+ has_scope (~> 0.5.0)
		68	+ responders (~> 0.6.0)
65	libxml-ruby (1.1.4)	69	libxml-ruby (1.1.4)
66	lighthouse-api (2.0)	70	lighthouse-api (2.0)
67	activeresource (>= 3.0.0)	71	activeresource (>= 3.0.0)
	@@ -110,6 +114,7 @@ GEM		@@ -110,6 +114,7 @@ GEM
110	rake (>= 0.8.7)	114	rake (>= 0.8.7)
111	thor (~> 0.14.4)	115	thor (~> 0.14.4)
112	rake (0.8.7)	116	rake (0.8.7)
		117	+ responders (0.6.4)
113	rest-client (1.5.1)	118	rest-client (1.5.1)
114	mime-types (>= 1.16)	119	mime-types (>= 1.16)
115	rspec (2.5.0)	120	rspec (2.5.0)
	@@ -157,6 +162,7 @@ DEPENDENCIES		@@ -157,6 +162,7 @@ DEPENDENCIES
157	email_spec	162	email_spec
158	factory_girl_rails	163	factory_girl_rails
159	haml	164	haml
		165	+ inherited_resources
160	lighthouse-api	166	lighthouse-api
161	mongoid (= 2.0.2)	167	mongoid (= 2.0.2)
162	mongoid_rails_migrations	168	mongoid_rails_migrations
	@@ -5,7 +5,7 @@ class Watcher		@@ -5,7 +5,7 @@ class Watcher
5	field :email	5	field :email
6		6
7	embedded_in :app, :inverse_of => :watchers	7	embedded_in :app, :inverse_of => :watchers
8	- referenced_in :user	8	+ belongs_to :user
9		9
10	validate :ensure_user_or_email	10	validate :ensure_user_or_email
11		11