diff --git a/demo/demo_app/.gitignore b/demo/.gitignore similarity index 100% rename from demo/demo_app/.gitignore rename to demo/.gitignore diff --git a/demo/demo_app/Gemfile b/demo/Gemfile similarity index 94% rename from demo/demo_app/Gemfile rename to demo/Gemfile index 424f6e2..fb30ab6 100644 --- a/demo/demo_app/Gemfile +++ b/demo/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' gem 'rails', '~> 3.2.1' -gem 'socialization', :path => '../../' +gem 'socialization', :path => '../' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' diff --git a/demo/demo_app/README.rdoc b/demo/README.rdoc similarity index 100% rename from demo/demo_app/README.rdoc rename to demo/README.rdoc diff --git a/demo/demo_app/Rakefile b/demo/Rakefile similarity index 100% rename from demo/demo_app/Rakefile rename to demo/Rakefile diff --git a/demo/demo_app/app/assets/images/rails.png b/demo/app/assets/images/rails.png similarity index 100% rename from demo/demo_app/app/assets/images/rails.png rename to demo/app/assets/images/rails.png diff --git a/demo/demo_app/app/assets/javascripts/application.js b/demo/app/assets/javascripts/application.js similarity index 100% rename from demo/demo_app/app/assets/javascripts/application.js rename to demo/app/assets/javascripts/application.js diff --git a/demo/demo_app/app/assets/stylesheets/application.css b/demo/app/assets/stylesheets/application.css similarity index 100% rename from demo/demo_app/app/assets/stylesheets/application.css rename to demo/app/assets/stylesheets/application.css diff --git a/demo/demo_app/app/controllers/application_controller.rb b/demo/app/controllers/application_controller.rb similarity index 100% rename from demo/demo_app/app/controllers/application_controller.rb rename to demo/app/controllers/application_controller.rb diff --git a/demo/demo_app/app/helpers/application_helper.rb b/demo/app/helpers/application_helper.rb similarity index 100% rename from demo/demo_app/app/helpers/application_helper.rb rename to demo/app/helpers/application_helper.rb diff --git a/demo/demo_app/app/mailers/.gitkeep b/demo/app/mailers/.gitkeep similarity index 100% rename from demo/demo_app/app/mailers/.gitkeep rename to demo/app/mailers/.gitkeep diff --git a/demo/demo_app/app/models/.gitkeep b/demo/app/models/.gitkeep similarity index 100% rename from demo/demo_app/app/models/.gitkeep rename to demo/app/models/.gitkeep diff --git a/demo/demo_app/app/models/celebrity.rb b/demo/app/models/celebrity.rb similarity index 100% rename from demo/demo_app/app/models/celebrity.rb rename to demo/app/models/celebrity.rb diff --git a/demo/demo_app/app/models/comment.rb b/demo/app/models/comment.rb similarity index 100% rename from demo/demo_app/app/models/comment.rb rename to demo/app/models/comment.rb diff --git a/demo/demo_app/app/models/follow.rb b/demo/app/models/follow.rb similarity index 100% rename from demo/demo_app/app/models/follow.rb rename to demo/app/models/follow.rb diff --git a/demo/demo_app/app/models/like.rb b/demo/app/models/like.rb similarity index 100% rename from demo/demo_app/app/models/like.rb rename to demo/app/models/like.rb diff --git a/demo/demo_app/app/models/mention.rb b/demo/app/models/mention.rb similarity index 100% rename from demo/demo_app/app/models/mention.rb rename to demo/app/models/mention.rb diff --git a/demo/demo_app/app/models/movie.rb b/demo/app/models/movie.rb similarity index 100% rename from demo/demo_app/app/models/movie.rb rename to demo/app/models/movie.rb diff --git a/demo/demo_app/app/models/user.rb b/demo/app/models/user.rb similarity index 100% rename from demo/demo_app/app/models/user.rb rename to demo/app/models/user.rb diff --git a/demo/demo_app/app/views/layouts/application.html.erb b/demo/app/views/layouts/application.html.erb similarity index 100% rename from demo/demo_app/app/views/layouts/application.html.erb rename to demo/app/views/layouts/application.html.erb diff --git a/demo/demo_app/config.ru b/demo/config.ru similarity index 100% rename from demo/demo_app/config.ru rename to demo/config.ru diff --git a/demo/demo_app/config/application.rb b/demo/config/application.rb similarity index 100% rename from demo/demo_app/config/application.rb rename to demo/config/application.rb diff --git a/demo/demo_app/config/boot.rb b/demo/config/boot.rb similarity index 100% rename from demo/demo_app/config/boot.rb rename to demo/config/boot.rb diff --git a/demo/demo_app/config/database.yml b/demo/config/database.yml similarity index 100% rename from demo/demo_app/config/database.yml rename to demo/config/database.yml diff --git a/demo/demo_app/config/environment.rb b/demo/config/environment.rb similarity index 100% rename from demo/demo_app/config/environment.rb rename to demo/config/environment.rb diff --git a/demo/demo_app/config/environments/development.rb b/demo/config/environments/development.rb similarity index 100% rename from demo/demo_app/config/environments/development.rb rename to demo/config/environments/development.rb diff --git a/demo/demo_app/config/environments/production.rb b/demo/config/environments/production.rb similarity index 100% rename from demo/demo_app/config/environments/production.rb rename to demo/config/environments/production.rb diff --git a/demo/demo_app/config/environments/test.rb b/demo/config/environments/test.rb similarity index 100% rename from demo/demo_app/config/environments/test.rb rename to demo/config/environments/test.rb diff --git a/demo/demo_app/config/initializers/backtrace_silencers.rb b/demo/config/initializers/backtrace_silencers.rb similarity index 100% rename from demo/demo_app/config/initializers/backtrace_silencers.rb rename to demo/config/initializers/backtrace_silencers.rb diff --git a/demo/demo_app/config/initializers/inflections.rb b/demo/config/initializers/inflections.rb similarity index 100% rename from demo/demo_app/config/initializers/inflections.rb rename to demo/config/initializers/inflections.rb diff --git a/demo/demo_app/config/initializers/mime_types.rb b/demo/config/initializers/mime_types.rb similarity index 100% rename from demo/demo_app/config/initializers/mime_types.rb rename to demo/config/initializers/mime_types.rb diff --git a/demo/demo_app/config/initializers/secret_token.rb b/demo/config/initializers/secret_token.rb similarity index 100% rename from demo/demo_app/config/initializers/secret_token.rb rename to demo/config/initializers/secret_token.rb diff --git a/demo/demo_app/config/initializers/session_store.rb b/demo/config/initializers/session_store.rb similarity index 100% rename from demo/demo_app/config/initializers/session_store.rb rename to demo/config/initializers/session_store.rb diff --git a/demo/demo_app/config/initializers/wrap_parameters.rb b/demo/config/initializers/wrap_parameters.rb similarity index 100% rename from demo/demo_app/config/initializers/wrap_parameters.rb rename to demo/config/initializers/wrap_parameters.rb diff --git a/demo/demo_app/config/locales/en.yml b/demo/config/locales/en.yml similarity index 100% rename from demo/demo_app/config/locales/en.yml rename to demo/config/locales/en.yml diff --git a/demo/demo_app/config/routes.rb b/demo/config/routes.rb similarity index 100% rename from demo/demo_app/config/routes.rb rename to demo/config/routes.rb diff --git a/demo/demo_app/db/migrate/20120115051222_create_users.rb b/demo/db/migrate/20120115051222_create_users.rb similarity index 100% rename from demo/demo_app/db/migrate/20120115051222_create_users.rb rename to demo/db/migrate/20120115051222_create_users.rb diff --git a/demo/demo_app/db/migrate/20120115051234_create_movies.rb b/demo/db/migrate/20120115051234_create_movies.rb similarity index 100% rename from demo/demo_app/db/migrate/20120115051234_create_movies.rb rename to demo/db/migrate/20120115051234_create_movies.rb diff --git a/demo/demo_app/db/migrate/20120115051255_create_celebrities.rb b/demo/db/migrate/20120115051255_create_celebrities.rb similarity index 100% rename from demo/demo_app/db/migrate/20120115051255_create_celebrities.rb rename to demo/db/migrate/20120115051255_create_celebrities.rb diff --git a/demo/demo_app/db/migrate/20120115054646_create_follows.rb b/demo/db/migrate/20120115054646_create_follows.rb similarity index 100% rename from demo/demo_app/db/migrate/20120115054646_create_follows.rb rename to demo/db/migrate/20120115054646_create_follows.rb diff --git a/demo/demo_app/db/migrate/20120115054647_create_likes.rb b/demo/db/migrate/20120115054647_create_likes.rb similarity index 100% rename from demo/demo_app/db/migrate/20120115054647_create_likes.rb rename to demo/db/migrate/20120115054647_create_likes.rb diff --git a/demo/demo_app/db/migrate/20120221200644_create_mentions.rb b/demo/db/migrate/20120221200644_create_mentions.rb similarity index 100% rename from demo/demo_app/db/migrate/20120221200644_create_mentions.rb rename to demo/db/migrate/20120221200644_create_mentions.rb diff --git a/demo/demo_app/db/migrate/20120221202703_create_comments.rb b/demo/db/migrate/20120221202703_create_comments.rb similarity index 100% rename from demo/demo_app/db/migrate/20120221202703_create_comments.rb rename to demo/db/migrate/20120221202703_create_comments.rb diff --git a/demo/demo_app/db/schema.rb b/demo/db/schema.rb similarity index 100% rename from demo/demo_app/db/schema.rb rename to demo/db/schema.rb diff --git a/demo/demo_app/db/seeds.rb b/demo/db/seeds.rb similarity index 100% rename from demo/demo_app/db/seeds.rb rename to demo/db/seeds.rb diff --git a/demo/demo_app/doc/README_FOR_APP b/demo/demo_app/doc/README_FOR_APP deleted file mode 100644 index fe41f5c..0000000 --- a/demo/demo_app/doc/README_FOR_APP +++ /dev/null @@ -1,2 +0,0 @@ -Use this README file to introduce your application and point to useful places in the API for learning more. -Run "rake doc:app" to generate API documentation for your models, controllers, helpers, and libraries. diff --git a/demo/demo_app/lib/assets/.gitkeep b/demo/lib/assets/.gitkeep similarity index 100% rename from demo/demo_app/lib/assets/.gitkeep rename to demo/lib/assets/.gitkeep diff --git a/demo/demo_app/lib/tasks/.gitkeep b/demo/lib/tasks/.gitkeep similarity index 100% rename from demo/demo_app/lib/tasks/.gitkeep rename to demo/lib/tasks/.gitkeep diff --git a/demo/demo_app/public/404.html b/demo/public/404.html similarity index 100% rename from demo/demo_app/public/404.html rename to demo/public/404.html diff --git a/demo/demo_app/public/422.html b/demo/public/422.html similarity index 100% rename from demo/demo_app/public/422.html rename to demo/public/422.html diff --git a/demo/demo_app/public/500.html b/demo/public/500.html similarity index 100% rename from demo/demo_app/public/500.html rename to demo/public/500.html diff --git a/demo/demo_app/public/favicon.ico b/demo/public/favicon.ico similarity index 100% rename from demo/demo_app/public/favicon.ico rename to demo/public/favicon.ico diff --git a/demo/demo_app/public/index.html b/demo/public/index.html similarity index 100% rename from demo/demo_app/public/index.html rename to demo/public/index.html diff --git a/demo/demo_app/public/robots.txt b/demo/public/robots.txt similarity index 100% rename from demo/demo_app/public/robots.txt rename to demo/public/robots.txt diff --git a/demo/demo_app/script/rails b/demo/script/rails similarity index 100% rename from demo/demo_app/script/rails rename to demo/script/rails diff --git a/demo/demo_app/test/fixtures/.gitkeep b/demo/test/fixtures/.gitkeep similarity index 100% rename from demo/demo_app/test/fixtures/.gitkeep rename to demo/test/fixtures/.gitkeep diff --git a/demo/demo_app/test/fixtures/celebrities.yml b/demo/test/fixtures/celebrities.yml similarity index 100% rename from demo/demo_app/test/fixtures/celebrities.yml rename to demo/test/fixtures/celebrities.yml diff --git a/demo/demo_app/test/fixtures/movies.yml b/demo/test/fixtures/movies.yml similarity index 100% rename from demo/demo_app/test/fixtures/movies.yml rename to demo/test/fixtures/movies.yml diff --git a/demo/demo_app/test/fixtures/users.yml b/demo/test/fixtures/users.yml similarity index 100% rename from demo/demo_app/test/fixtures/users.yml rename to demo/test/fixtures/users.yml diff --git a/demo/demo_app/test/functional/.gitkeep b/demo/test/functional/.gitkeep similarity index 100% rename from demo/demo_app/test/functional/.gitkeep rename to demo/test/functional/.gitkeep diff --git a/demo/demo_app/test/integration/.gitkeep b/demo/test/integration/.gitkeep similarity index 100% rename from demo/demo_app/test/integration/.gitkeep rename to demo/test/integration/.gitkeep diff --git a/demo/demo_app/test/performance/browsing_test.rb b/demo/test/performance/browsing_test.rb similarity index 100% rename from demo/demo_app/test/performance/browsing_test.rb rename to demo/test/performance/browsing_test.rb diff --git a/demo/demo_app/test/test_helper.rb b/demo/test/test_helper.rb similarity index 100% rename from demo/demo_app/test/test_helper.rb rename to demo/test/test_helper.rb diff --git a/demo/demo_app/test/unit/.gitkeep b/demo/test/unit/.gitkeep similarity index 100% rename from demo/demo_app/test/unit/.gitkeep rename to demo/test/unit/.gitkeep diff --git a/demo/demo_app/test/unit/celebrity_test.rb b/demo/test/unit/celebrity_test.rb similarity index 100% rename from demo/demo_app/test/unit/celebrity_test.rb rename to demo/test/unit/celebrity_test.rb diff --git a/demo/demo_app/test/unit/movie_test.rb b/demo/test/unit/movie_test.rb similarity index 100% rename from demo/demo_app/test/unit/movie_test.rb rename to demo/test/unit/movie_test.rb diff --git a/demo/demo_app/test/unit/user_test.rb b/demo/test/unit/user_test.rb similarity index 100% rename from demo/demo_app/test/unit/user_test.rb rename to demo/test/unit/user_test.rb diff --git a/demo/demo_app/vendor/assets/javascripts/.gitkeep b/demo/vendor/assets/javascripts/.gitkeep similarity index 100% rename from demo/demo_app/vendor/assets/javascripts/.gitkeep rename to demo/vendor/assets/javascripts/.gitkeep diff --git a/demo/demo_app/vendor/assets/stylesheets/.gitkeep b/demo/vendor/assets/stylesheets/.gitkeep similarity index 100% rename from demo/demo_app/vendor/assets/stylesheets/.gitkeep rename to demo/vendor/assets/stylesheets/.gitkeep diff --git a/demo/demo_app/vendor/plugins/.gitkeep b/demo/vendor/plugins/.gitkeep similarity index 100% rename from demo/demo_app/vendor/plugins/.gitkeep rename to demo/vendor/plugins/.gitkeep