Skip to content

Commit

Permalink
updated handlebars_assets gem
Browse files Browse the repository at this point in the history
  • Loading branch information
becarella committed May 20, 2012
1 parent 3e1f86c commit 8abf6d7
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 10 deletions.
5 changes: 4 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ source "http://rubygems.org"
# development dependencies will be added by default to the :development group.
gemspec

gem 'pg'

# jquery-rails is used by the dummy application
gem "jquery-rails"

Expand All @@ -14,7 +16,8 @@ gem 'omniauth-twitter', '0.0.8'
gem 'omniauth-banters', :git => "git://github.com/becarella/omniauth-banters.git"

gem 'hbs'
gem 'handlebars_assets'
gem 'handlebars_assets', :git => 'git://github.com/goggin13/handlebars_assets.git'

group :assets do
gem 'sass-rails', '~> 3.1.4'
gem 'coffee-rails', '~> 3.1.1'
Expand Down
17 changes: 12 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@ GIT
render_or_redirect (0.0.1)
rails

GIT
remote: git://github.com/goggin13/handlebars_assets.git
revision: d6a500a6c80cda4f990df68cc41d0298f8ebfa61
specs:
handlebars_assets (0.4.1)
execjs (>= 1.2.9)
sprockets (>= 2.0.3)
tilt

PATH
remote: .
specs:
Expand Down Expand Up @@ -83,10 +92,6 @@ GEM
faraday (0.8.0)
multipart-post (~> 1.1)
ffi (1.0.11)
handlebars_assets (0.4.4)
execjs (>= 1.2.9)
sprockets (>= 2.0.3)
tilt
hashie (1.2.0)
hbs (0.1.2)
therubyracer (~> 0.9.4)
Expand Down Expand Up @@ -129,6 +134,7 @@ GEM
omniauth (~> 1.0)
omniauth-twitter (0.0.8)
omniauth-oauth (~> 1.0)
pg (0.13.2)
polyglot (0.3.3)
rack (1.3.6)
rack-cache (1.2)
Expand Down Expand Up @@ -213,14 +219,15 @@ DEPENDENCIES
capybara
coffee-rails (~> 3.1.1)
factory_girl_rails
handlebars_assets
handlebars_assets!
hbs
jquery-rails
let_me_in!
omniauth-banters!
omniauth-identity
omniauth-instagram
omniauth-twitter (= 0.0.8)
pg
render_or_redirect!
rspec-rails
sass-rails (~> 3.1.4)
Expand Down
1 change: 1 addition & 0 deletions config/initializers/handlebars_template_handler.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ def self.call(template)

# Register HBS template handler to render Handlebars templates
ActionView::Template.register_template_handler(:hbs, HandlebarsTemplateHandler)
puts "registered template handler"
9 changes: 5 additions & 4 deletions spec/dummy/config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
# Ensure the SQLite 3 gem is defined in your Gemfile
# gem 'sqlite3'
development:
adapter: sqlite3
database: db/development.sqlite3
pool: 5
timeout: 5000
adapter: postgresql
database: lifelogline
username: postgres
password: postgres
host: localhost

# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
Expand Down

0 comments on commit 8abf6d7

Please sign in to comment.