integritray 0.3.0 → 0.3.1

data/README.rdoc

@@ -12,14 +12,14 @@ Require in your Integrity application's config.ru:
 
 Add rack end point in your config.ru
 
-  map "/" do
+  map "/tray" do
     run Integrity::Integritray::App
   end
   
 Point CCMenu or your tray item of choice to the feed URL:
-  http://my.integration.server/projects.xml
+  http://my.integration.server/tray/projects.xml
   to view private projects
-  http://user:password@my.integration.server/projects.xml?private=true
+  http://user:password@my.integration.server/tray/projects.xml?private=true
   
 You may have to manually specify that this is a CruiseControl.rb-type server;
 CCMenu has trouble determining which type of server to treat this as.

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/integritray.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{integritray}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh French", "Justin Smestad", "Gabe Varela"]

data/lib/integrity/integritray.rb

@@ -1,15 +1,19 @@
 require 'integrity'
+require "integrity/helpers/urls"
+require "integrity/helpers/authorization"
+require "integrity/helpers/rendering"
 
 module Integrity
   module Integritray
     module Helpers
+      include Integrity::Helpers
 
       def xml_opts_for_project(project)
         opts = {}
         opts['name']     = project.name
         opts['category'] = project.branch
         opts['activity'] = activity(project.last_build.status) if project.last_build
-        opts['webUrl']   = project_url(project)
+        opts['webUrl']   = project_url(project).to_s.gsub(request.script_name, '')
         if project.last_build
           opts['lastBuildStatus'] = build_status(project.last_build.status)
           opts['lastBuildLabel']  = project.last_build.commit.short_identifier
@@ -40,6 +44,15 @@ module Integrity
         end
       end
 
+      def authorize(user, password)
+        return true unless protect?
+        Integrity.app.user == user && Integrity.app.pass == password
+      end
+
+      def protect?
+       Integrity.app.respond_to?(:user) && Integrity.app.respond_to?(:pass)
+      end
+
     end
 
     class App < Sinatra::Base
@@ -47,7 +60,14 @@ module Integrity
       set     :raise_errors, true
       enable  :methodoverride, :static, :sessions
 
-      helpers Sinatra::UrlForHelper, Integrity::Helpers, Integritray::Helpers
+      helpers Sinatra::UrlForHelper, Integritray::Helpers
+
+      before do
+        # The browser only sends http auth data for requests that are explicitly
+        # required to do so. This way we get the real values of +#logged_in?+ and
+        # +#current_user+
+        login_required if session[:user]
+      end
 
       get '/projects.xml' do
         login_required if params["private"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: integritray
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Josh French