diff --git a/Gemfile b/Gemfile index 4edf084..3dc8fe5 100644 --- a/Gemfile +++ b/Gemfile @@ -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" @@ -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' diff --git a/Gemfile.lock b/Gemfile.lock index b417733..f254982 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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: @@ -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) @@ -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) @@ -213,7 +219,7 @@ DEPENDENCIES capybara coffee-rails (~> 3.1.1) factory_girl_rails - handlebars_assets + handlebars_assets! hbs jquery-rails let_me_in! @@ -221,6 +227,7 @@ DEPENDENCIES omniauth-identity omniauth-instagram omniauth-twitter (= 0.0.8) + pg render_or_redirect! rspec-rails sass-rails (~> 3.1.4) diff --git a/config/initializers/handlebars_template_handler.rb b/config/initializers/handlebars_template_handler.rb index d52d685..6d72eba 100644 --- a/config/initializers/handlebars_template_handler.rb +++ b/config/initializers/handlebars_template_handler.rb @@ -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" \ No newline at end of file diff --git a/spec/dummy/config/database.yml b/spec/dummy/config/database.yml index 51a4dd4..50df099 100644 --- a/spec/dummy/config/database.yml +++ b/spec/dummy/config/database.yml @@ -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".