Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 0 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -128,7 +127,6 @@ DEPENDENCIES
coffee-rails (~> 3.2.1)
cucumber
jquery-rails
pg
rails (= 3.2.6)
rspec
sass-rails (~> 3.2.3)
Expand Down
2 changes: 1 addition & 1 deletion entities/page.rb
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
require_relative '../lib/entity'
class Page < OpenStruct; end
class Page < Entity; end
1 change: 1 addition & 0 deletions spec/interactors/pages_spec.rb
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion z_rails/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions z_rails/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
11 changes: 4 additions & 7 deletions z_rails/config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -39,20 +36,20 @@ 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
username: werdna
password:

production:
adapter: postgresql
adapter: sqlite3
encoding: unicode
database: z_rails_production
pool: 5
username: werdna
password:

cucumber:
<<: *test
<<: *test