Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 6 commits
  • 13 files changed
  • 0 commit comments
  • 1 contributor
Commits on Mar 08, 2012
Ben Holley [jruby] reorganize gemfile for jruby support 9042fbf
Ben Holley [jruby] separate cucumber steps for jruby 5dbc491
Ben Holley [jruby] use custom kramdown filter for haml
rdiscount and redcarpet both have C extensions that don't quite work
on jruby 1.6.7 so use pure-ruby library kramdown instead
59e8cc2
Ben Holley [jruby] remove escape_utils initializer 42941a4
Ben Holley [jruby] use bootstrap-sass to get rid of less dep 8fe1e05
Ben Holley [jruby] convert site settings args into bigdecimal 1e5c93f
View
22 Gemfile
@@ -5,10 +5,8 @@ gem 'capistrano', '~> 2.8.0'
gem 'devise', '~> 1.4.9'
gem 'gravtastic', '~> 3.2.6'
gem 'haml', '~> 3.1.3'
-gem 'mysql2', '~> 0.3.0'
gem 'paperclip', '~> 2.3'
gem 'rails', '~> 3.2.0'
-gem 'thin', '~> 1.2.7'
gem 'uuid', '~> 2.3.1'
gem 'jquery-rails', '~> 1.0.17'
gem 'rake', '0.9.2'
@@ -20,12 +18,12 @@ gem 'googlecharts', '~> 1.6.8'
gem 'github_concern', '~> 0.1'
gem 'css3-progress-bar-rails', '~> 0.2.2'
gem 'grit', '~> 2.4.0'
-gem 'rdiscount', '~>1.6.0'
gem 'paper_trail', '~> 2.6.0'
gem 'attr_encrypted', '~> 1.2.0'
gem 'acts-as-taggable-on', '~> 2.2.2'
gem 'acts_as_commentable', '~> 3.0.1'
gem 'dynamic_form', '~> 1.0.0'
+gem 'kramdown'
gem 'simple-navigation', '~> 3.5.0'
gem 'sass-rails', '~> 3.2.0'
@@ -38,11 +36,7 @@ group :assets do
gem 'coffee-rails', '~> 3.2.0'
gem 'uglifier', '>= 1.0.3'
gem 'compass', '0.12.alpha.0'
- gem 'twitter-bootstrap-rails', :git => 'git://github.com/isotope11/twitter-bootstrap-rails.git'
-end
-
-group :production do
- gem 'therubyracer', '~> 0.9.9'
+ gem 'bootstrap-sass'
end
group :development do
@@ -58,7 +52,6 @@ group :test do
gem 'cucumber', '~> 1.1.4'
gem 'cucumber-rails', '~> 1.2.1', :require => false
gem 'database_cleaner', '~> 0.7.1'
- gem 'escape_utils', '~> 0.1.9'
gem 'faker', '~> 0.9.5'
gem 'forgery', '= 0.3.10'
gem 'launchy', '~> 0.3.7'
@@ -73,3 +66,14 @@ group :test do
gem 'yajl-ruby', '~> 0.7.8'
gem 'ci_reporter'
end
+
+platforms :jruby do
+ gem 'activerecord-jdbc-adapter', :require => false
+ gem 'jdbc-mysql'
+ gem 'jruby-openssl'
+end
+
+platforms :ruby do
+ gem 'mysql2', '~> 0.3.0'
+end
+
View
53 Gemfile.lock
@@ -1,12 +1,3 @@
-GIT
- remote: git://github.com/isotope11/twitter-bootstrap-rails.git
- revision: 4ce76369dc51954de828d999aa38558975a77759
- specs:
- twitter-bootstrap-rails (2.0.1.0)
- actionpack (>= 3.1)
- less-rails (~> 2.1.6)
- railties (>= 3.1)
-
GEM
remote: http://rubygems.org/
specs:
@@ -32,6 +23,7 @@ GEM
activesupport (= 3.2.1)
arel (~> 3.0.0)
tzinfo (~> 0.3.29)
+ activerecord-jdbc-adapter (1.2.2)
activeresource (3.2.1)
activemodel (= 3.2.1)
activesupport (= 3.2.1)
@@ -47,6 +39,9 @@ GEM
encryptor (>= 1.1.1)
awesome_print (0.4.0)
bcrypt-ruby (3.0.1)
+ bcrypt-ruby (3.0.1-java)
+ bootstrap-sass (2.0.1)
+ bouncy-castle-java (1.5.0146.1)
builder (3.0.0)
capistrano (2.8.0)
highline
@@ -75,8 +70,6 @@ GEM
execjs
coffee-script-source (1.2.0)
columnize (0.3.6)
- commonjs (0.2.0)
- therubyracer (~> 0.9.9)
compass (0.12.alpha.0)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
@@ -94,7 +87,6 @@ GEM
capybara (>= 1.1.2)
cucumber (>= 1.1.3)
nokogiri (>= 1.5.0)
- daemons (1.1.8)
database_cleaner (0.7.1)
devise (1.4.9)
bcrypt-ruby (~> 3.0)
@@ -104,18 +96,19 @@ GEM
dynamic_form (1.0.0)
encryptor (1.1.3)
erubis (2.7.0)
- escape_utils (0.1.9)
- eventmachine (0.12.10)
execjs (1.3.0)
multi_json (~> 1.0)
faker (0.9.5)
i18n (~> 0.4)
ffi (1.0.11)
+ ffi (1.0.11-java)
forgery (0.3.10)
nokogiri (~> 1.4)
fssm (0.2.8.1)
gherkin (2.9.0)
json (>= 1.4.6)
+ gherkin (2.9.0-java)
+ json (>= 1.4.6)
github_concern (0.1.1)
rails (~> 3.0)
googlecharts (1.6.8)
@@ -127,21 +120,19 @@ GEM
highline (1.6.11)
hike (1.2.1)
i18n (0.6.0)
+ jdbc-mysql (5.1.13)
journey (1.0.3)
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
+ jruby-openssl (0.7.6.1)
+ bouncy-castle-java (>= 1.5.0146.1)
json (1.6.5)
+ json (1.6.5-java)
+ kramdown (0.13.5)
launchy (0.3.7)
configuration (>= 0.0.5)
rake (>= 0.8.1)
- less (2.0.9)
- commonjs (~> 0.2.0)
- therubyracer (~> 0.9.9)
- less-rails (2.1.6)
- actionpack (>= 3.1)
- less (~> 2.0.7)
- libv8 (3.3.10.4)
linecache19 (0.5.12)
ruby_core_source (>= 0.1.4)
macaddr (1.5.0)
@@ -162,6 +153,7 @@ GEM
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
nokogiri (1.5.0)
+ nokogiri (1.5.0-java)
orm_adapter (0.0.6)
paper_trail (2.6.0)
rails (~> 3)
@@ -200,7 +192,7 @@ GEM
thor (~> 0.14.6)
rake (0.9.2)
rcov (0.9.11)
- rdiscount (1.6.8)
+ rcov (0.9.11-java)
rdoc (3.12)
json (~> 1.4)
redis (2.2.2)
@@ -275,12 +267,6 @@ GEM
state_machine (1.0.3)
systemu (2.4.2)
term-ansicolor (1.0.7)
- therubyracer (0.9.10)
- libv8 (~> 3.3.10)
- thin (1.2.11)
- daemons (>= 1.0.9)
- eventmachine (>= 0.12.6)
- rack (>= 1.0.0)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
@@ -301,14 +287,17 @@ GEM
yajl-ruby (0.7.9)
PLATFORMS
+ java
ruby
DEPENDENCIES
acl9 (~> 0.12.0)
+ activerecord-jdbc-adapter
acts-as-taggable-on (~> 2.2.2)
acts_as_commentable (~> 3.0.1)
attr_encrypted (~> 1.2.0)
awesome_print (~> 0.4.0)
+ bootstrap-sass
capistrano (~> 2.8.0)
capybara (~> 1.1.1)
ci_reporter
@@ -320,7 +309,6 @@ DEPENDENCIES
database_cleaner (~> 0.7.1)
devise (~> 1.4.9)
dynamic_form (~> 1.0.0)
- escape_utils (~> 0.1.9)
faker (~> 0.9.5)
forgery (= 0.3.10)
github_concern (~> 0.1)
@@ -328,7 +316,10 @@ DEPENDENCIES
gravtastic (~> 3.2.6)
grit (~> 2.4.0)
haml (~> 3.1.3)
+ jdbc-mysql
jquery-rails (~> 1.0.17)
+ jruby-openssl
+ kramdown
launchy (~> 0.3.7)
machinist (~> 1.0.6)
mysql2 (~> 0.3.0)
@@ -338,7 +329,6 @@ DEPENDENCIES
rails (~> 3.2.0)
rake (= 0.9.2)
rcov (= 0.9.11)
- rdiscount (~> 1.6.0)
resque (~> 1.19.0)
resque-scheduler (~> 1.9.9)
resque_mailer (~> 2.0.2)
@@ -351,9 +341,6 @@ DEPENDENCIES
simplecov-rcov
spork (= 0.9.0.rc9)
state_machine (~> 1.0.2)
- therubyracer (~> 0.9.9)
- thin (~> 1.2.7)
- twitter-bootstrap-rails!
uglifier (>= 1.0.3)
uuid (~> 2.3.1)
yajl-ruby (~> 0.7.8)
View
2  app/assets/javascripts/application.js.erb
@@ -10,7 +10,7 @@
//= require schedule_modal
//= require chosen.jquery.js
//= require jquery.jeditable.js
-//= require twitter/bootstrap
+//= require bootstrap-tooltip
// Place your application-specific JavaScript functions and classes here
// This file is automatically included by javascript_include_tag :defaults
View
38 app/assets/stylesheets/bootstrap_and_overrides.css.less
@@ -1,38 +0,0 @@
-@import "twitter/bootstrap/bootstrap";
-
-// Set the correct sprite paths
-@iconSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings.png');
-@iconWhiteSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings-white.png');
-
-// Your custom LESS stylesheets goes here
-//
-// Since bootstrap was imported above you have access to its mixins which
-// you may use and inherit here
-//
-// If you'd like to override bootstrap's own variables, you can do so here as well
-// See http://twitter.github.com/bootstrap/less.html for their names and documentation
-//
-// Example:
-// @linkColor: #ff0000;
-@blue: #75959d;
-@blueDark: #5d7a82;
-@linkColor: @blue;
-
-.icon-edit, .icon-plus {
- padding: 0 4px 0 0;
-}
-
-.btn-group {
- margin-bottom: 15px;
-}
-
-footer.footer{
- text-shadow: 0 1px 0 #ffffff;
- width: auto;
- padding: 10px 0;
- .container-fluid p {
- margin: 10px 0 0 0;
- padding: 10px 0 0 0;
- border-top: 1px solid #e5e5e5;
- }
-}
View
24 app/assets/stylesheets/bootstrap_and_overrides.css.scss
@@ -0,0 +1,24 @@
+$blue: #75959d;
+$blueDark: #5d7a82;
+$linkColor: $blue;
+
+@import "bootstrap";
+
+.icon-edit, .icon-plus {
+ padding: 0 4px 0 0;
+}
+
+.btn-group {
+ margin-bottom: 15px;
+}
+
+footer.footer{
+ text-shadow: 0 1px 0 #ffffff;
+ width: auto;
+ padding: 10px 0;
+ .container-fluid p {
+ margin: 10px 0 0 0;
+ padding: 10px 0 0 0;
+ border-top: 1px solid #e5e5e5;
+ }
+}
View
2  app/controllers/application_controller.rb
@@ -77,7 +77,7 @@ def access_denied
end
def initialize_site_settings
- @site_settings = SiteSettings.first ? SiteSettings.first : SiteSettings.create(:total_yearly_pto_per_user => 40, :overtime_multiplier => 1.5)
+ @site_settings = SiteSettings.first ? SiteSettings.first : SiteSettings.create(:total_yearly_pto_per_user => BigDecimal('40'), :overtime_multiplier => BigDecimal('1.5'))
end
def redirect_clients
View
2  app/views/client_login/tickets/show.html.haml
@@ -7,7 +7,7 @@
%p.ticket_description
- if @ticket.description
%h3 Ticket Description
- :markdown
+ :kramdown
#{@ticket.description}
%p.ticket_metrics
View
4 app/views/projects/show.html.haml
@@ -25,11 +25,11 @@
.tab-content
-if !@project.xrono_notes.nil?
#project_notes.tab-pane.active
- :markdown
+ :kramdown
#{@project.xrono_notes}
-if !@project.release_notes.nil?
#release_notes.tab-pane{:class => "#{@project.xrono_notes.nil? ? "active" : ""}"}
- :markdown
+ :kramdown
#{@project.release_notes}
#incomplete_tickets.tab-pane{:class => "#{@project.xrono_notes.nil? && @project.release_notes.nil? ? "active" : ""}"}
- if project_completion_metric(@project) > 0
View
2  app/views/shared/_data_vault.html.haml
@@ -1,6 +1,6 @@
-if data_vault
.autogrow
- :markdown
+ :kramdown
#{data_vault.data}
-content_for :javascripts do
View
2  app/views/tickets/show.html.haml
@@ -8,7 +8,7 @@
- if @ticket.description
%p.ticket_description
%h3 Ticket Description
- :markdown
+ :kramdown
#{@ticket.description}
%br/
View
10 config/initializers/escape_utils_rack_fix.rb
@@ -1,10 +0,0 @@
-# There was a bug in rack that threw a warning when passed a UTF-8 string.
-# This block of code will patch it so it doesn't cause problems anymore and dirty
-# up the test output
-module Rack
- module Utils
- def escape(s)
- EscapeUtils.escape_url(s)
- end
- end
-end
View
13 config/initializers/haml.rb
@@ -0,0 +1,13 @@
+module Haml
+ module Filters
+ module Kramdown
+ include Base
+ lazy_require 'kramdown'
+
+ def render(text)
+ ::Kramdown::Document.new(text).to_html
+ end
+ end
+ end
+end
+
View
11 features/step_definitions/devise_steps.rb
@@ -1,4 +1,4 @@
-Given /^I am an authenticated user(?: with an? (\w+) role)?$/ do |role|
+Given /^I am an authenticated user with an? (\w+) role$/ do |role|
visit destroy_user_session_path
@current_user = User.make(:email => "current_user@example.com", :password => "password", :password_confirmation => "password")
@current_user.has_role!(role.to_sym) if role
@@ -12,6 +12,15 @@
step %{I press "Sign in"}
end
+Given /^I am an authenticated user$/ do
+ visit destroy_user_session_path
+ @current_user = User.make(:email => "current_user@example.com", :password => "password", :password_confirmation => "password")
+ visit new_user_session_path
+ step %{I fill in "user_email" with "current_user@example.com"}
+ step %{I fill in "user_password" with "password"}
+ step %{I press "Sign in"}
+end
+
Then /^I should see the following users:$/ do |expected_users_table|
expected_users_table.diff!(find('table').all('tr').map { |row| row.all('th, td').map { |cell| cell.text.strip } })
end

No commit comments for this range

Something went wrong with that request. Please try again.