From 2c59bc60486fba7a15d0b7758dd6545480c14ad9 Mon Sep 17 00:00:00 2001 From: Grant Ammons Date: Thu, 13 Dec 2012 11:40:22 -0500 Subject: [PATCH 1/4] remove unused dependency on pg --- Gemfile | 1 - Gemfile.lock | 2 -- 2 files changed, 3 deletions(-) diff --git a/Gemfile b/Gemfile index 2f424ca..607c146 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,6 @@ gem 'sinatra' # from rails Gemfile # gem 'rails', '3.2.6' -gem 'pg' group :assets do gem 'sass-rails', '~> 3.2.3' gem 'coffee-rails', '~> 3.2.1' diff --git a/Gemfile.lock b/Gemfile.lock index 7a47799..4614136 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -61,7 +61,6 @@ GEM treetop (~> 1.4.8) mime-types (1.19) multi_json (1.3.6) - pg (0.14.0) polyglot (0.3.3) rack (1.4.1) rack-cache (1.2) @@ -128,7 +127,6 @@ DEPENDENCIES coffee-rails (~> 3.2.1) cucumber jquery-rails - pg rails (= 3.2.6) rspec sass-rails (~> 3.2.3) From dc9bcd05f16233d14ddefdafa0fdb6bfa8994b13 Mon Sep 17 00:00:00 2001 From: Grant Ammons Date: Thu, 13 Dec 2012 11:40:40 -0500 Subject: [PATCH 2/4] page inherites from entities --- entities/page.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entities/page.rb b/entities/page.rb index 07c4d48..9d298a5 100644 --- a/entities/page.rb +++ b/entities/page.rb @@ -1,2 +1,2 @@ require_relative '../lib/entity' -class Page < OpenStruct; end +class Page < Entity; end From d11d9924eecee38b27a7f961d9d7184113213270 Mon Sep 17 00:00:00 2001 From: Grant Ammons Date: Thu, 13 Dec 2012 11:41:05 -0500 Subject: [PATCH 3/4] fix require for pages_spec, so it can be run on its own --- spec/interactors/pages_spec.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/interactors/pages_spec.rb b/spec/interactors/pages_spec.rb index e6ab5fc..5bf2f38 100644 --- a/spec/interactors/pages_spec.rb +++ b/spec/interactors/pages_spec.rb @@ -1,6 +1,7 @@ require_relative '../boundaries/interactor_interface' require_relative '../../boundaries/repository' require_relative '../../interactors/pages' +require_relative '../../repositories/memory_repos' describe Page do From 7c182f9fab4f6e7a3ad235dc04110987592cd6c4 Mon Sep 17 00:00:00 2001 From: Grant Ammons Date: Thu, 13 Dec 2012 11:41:44 -0500 Subject: [PATCH 4/4] remove dependency on pg for the z_rails app --- z_rails/Gemfile | 2 +- z_rails/Gemfile.lock | 6 ++++-- z_rails/config/database.yml | 11 ++++------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/z_rails/Gemfile b/z_rails/Gemfile index c6cb2b1..516faee 100644 --- a/z_rails/Gemfile +++ b/z_rails/Gemfile @@ -5,7 +5,7 @@ gem 'rails', '3.2.6' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' -gem 'pg' +gem 'sqlite3-ruby' # Gems used only for assets and not required diff --git a/z_rails/Gemfile.lock b/z_rails/Gemfile.lock index b324d6f..d6cba32 100644 --- a/z_rails/Gemfile.lock +++ b/z_rails/Gemfile.lock @@ -79,7 +79,6 @@ GEM mime-types (1.19) multi_json (1.3.6) nokogiri (1.5.5) - pg (0.14.0) polyglot (0.3.3) rack (1.4.1) rack-cache (1.2) @@ -134,6 +133,9 @@ GEM hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) + sqlite3 (1.3.6) + sqlite3-ruby (1.3.3) + sqlite3 (>= 1.3.3) thor (0.15.4) tilt (1.3.3) treetop (1.4.10) @@ -153,8 +155,8 @@ DEPENDENCIES coffee-rails (~> 3.2.1) cucumber-rails jquery-rails - pg rails (= 3.2.6) rspec-rails sass-rails (~> 3.2.3) + sqlite3-ruby uglifier (>= 1.0.3) diff --git a/z_rails/config/database.yml b/z_rails/config/database.yml index 77b0b32..d18527d 100644 --- a/z_rails/config/database.yml +++ b/z_rails/config/database.yml @@ -13,12 +13,9 @@ # gem 'pg' # development: - adapter: postgresql - encoding: unicode + adapter: sqlite3 database: z_rails_development pool: 5 - username: werdna - password: # Connect on a TCP socket. Omitted by default since the client uses a # domain socket that doesn't need configuration. Windows does not have @@ -39,7 +36,7 @@ development: # re-generated from your development database when you run "rake". # Do not set this db to the same as development or production. test: &test - adapter: postgresql + adapter: sqlite3 encoding: unicode database: z_rails_test pool: 5 @@ -47,7 +44,7 @@ test: &test password: production: - adapter: postgresql + adapter: sqlite3 encoding: unicode database: z_rails_production pool: 5 @@ -55,4 +52,4 @@ production: password: cucumber: - <<: *test \ No newline at end of file + <<: *test