Move dummy app to higer level

Exelord · Sep 10, 2016 · d9208e5 · d9208e5
1 parent a796d6a
commit d9208e5
Show file tree

Hide file tree

Showing 69 changed files with 13 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,12 +1,12 @@
 .bundle/
 log/*.log
 pkg/
-spec/dummy/log/*.log
-spec/dummy/db/*.sqlite3
-spec/dummy/db/*.sqlite3-journal
-spec/dummy/log/*.log
-spec/dummy/tmp/
-spec/dummy/.sass-cache
+dummy/log/*.log
+dummy/db/*.sqlite3
+dummy/db/*.sqlite3-journal
+dummy/log/*.log
+dummy/tmp/
+dummy/.sass-cache
 .DS_Store
 coverage/
 .lock-*

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,9 +1,9 @@
 AllCops:
   TargetRubyVersion: 2.3
   Exclude:
-   - 'spec/dummy/db/seeds.rb'
-   - 'spec/dummy/db/migrate/**'
-   - 'spec/dummy/db/schema.rb'
+   - 'dummy/db/seeds.rb'
+   - 'dummy/db/migrate/**'
+   - 'dummy/db/schema.rb'
    - 'lib/generators/templates/**/*'
 Documentation:
   Enabled: false

diff --git a/spec/dummy/.rspec → dummy/.rspec b/spec/dummy/.rspec → dummy/.rspec
diff --git a/spec/dummy/README.rdoc → dummy/README.rdoc b/spec/dummy/README.rdoc → dummy/README.rdoc
diff --git a/spec/dummy/Rakefile → dummy/Rakefile b/spec/dummy/Rakefile → dummy/Rakefile
diff --git a/spec/dummy/app/assets/images/.keep → dummy/app/assets/images/.keep b/spec/dummy/app/assets/images/.keep → dummy/app/assets/images/.keep
diff --git a/...mmy/app/assets/javascripts/application.js → dummy/app/assets/javascripts/application.js b/...mmy/app/assets/javascripts/application.js → dummy/app/assets/javascripts/application.js
diff --git a/...my/app/assets/stylesheets/application.css → dummy/app/assets/stylesheets/application.css b/...my/app/assets/stylesheets/application.css → dummy/app/assets/stylesheets/application.css
diff --git a/...app/controllers/application_controller.rb → ...app/controllers/application_controller.rb b/...app/controllers/application_controller.rb → ...app/controllers/application_controller.rb
diff --git a/spec/dummy/app/controllers/concerns/.keep → dummy/app/controllers/concerns/.keep b/spec/dummy/app/controllers/concerns/.keep → dummy/app/controllers/concerns/.keep
diff --git a/spec/dummy/app/helpers/application_helper.rb → dummy/app/helpers/application_helper.rb b/spec/dummy/app/helpers/application_helper.rb → dummy/app/helpers/application_helper.rb
diff --git a/spec/dummy/app/mailers/.keep → dummy/app/mailers/.keep b/spec/dummy/app/mailers/.keep → dummy/app/mailers/.keep
diff --git a/spec/dummy/app/models/.keep → dummy/app/models/.keep b/spec/dummy/app/models/.keep → dummy/app/models/.keep
diff --git a/spec/dummy/app/models/concerns/.keep → dummy/app/models/concerns/.keep b/spec/dummy/app/models/concerns/.keep → dummy/app/models/concerns/.keep
diff --git a/spec/dummy/app/models/member.rb → dummy/app/models/member.rb b/spec/dummy/app/models/member.rb → dummy/app/models/member.rb
diff --git a/spec/dummy/app/models/memo.rb → dummy/app/models/memo.rb b/spec/dummy/app/models/memo.rb → dummy/app/models/memo.rb
diff --git a/spec/dummy/app/models/project.rb → dummy/app/models/project.rb b/spec/dummy/app/models/project.rb → dummy/app/models/project.rb
diff --git a/spec/dummy/app/models/resource.rb → dummy/app/models/resource.rb b/spec/dummy/app/models/resource.rb → dummy/app/models/resource.rb
diff --git a/spec/dummy/app/models/role.rb → dummy/app/models/role.rb b/spec/dummy/app/models/role.rb → dummy/app/models/role.rb
diff --git a/spec/dummy/app/models/status.rb → dummy/app/models/status.rb b/spec/dummy/app/models/status.rb → dummy/app/models/status.rb
diff --git a/spec/dummy/app/models/task.rb → dummy/app/models/task.rb b/spec/dummy/app/models/task.rb → dummy/app/models/task.rb
diff --git a/spec/dummy/app/models/user.rb → dummy/app/models/user.rb b/spec/dummy/app/models/user.rb → dummy/app/models/user.rb
diff --git a/...my/app/views/layouts/application.html.erb → dummy/app/views/layouts/application.html.erb b/...my/app/views/layouts/application.html.erb → dummy/app/views/layouts/application.html.erb
diff --git a/spec/dummy/bin/bundle → dummy/bin/bundle b/spec/dummy/bin/bundle → dummy/bin/bundle
diff --git a/spec/dummy/bin/rails → dummy/bin/rails b/spec/dummy/bin/rails → dummy/bin/rails
diff --git a/spec/dummy/bin/rake → dummy/bin/rake b/spec/dummy/bin/rake → dummy/bin/rake
diff --git a/spec/dummy/bin/setup → dummy/bin/setup b/spec/dummy/bin/setup → dummy/bin/setup
diff --git a/spec/dummy/config.ru → dummy/config.ru b/spec/dummy/config.ru → dummy/config.ru
diff --git a/spec/dummy/config/application.rb → dummy/config/application.rb b/spec/dummy/config/application.rb → dummy/config/application.rb
diff --git a/spec/dummy/config/boot.rb → dummy/config/boot.rb b/spec/dummy/config/boot.rb → dummy/config/boot.rb
diff --git a/spec/dummy/config/database.yml → dummy/config/database.yml b/spec/dummy/config/database.yml → dummy/config/database.yml
diff --git a/spec/dummy/config/environment.rb → dummy/config/environment.rb b/spec/dummy/config/environment.rb → dummy/config/environment.rb
diff --git a/.../dummy/config/environments/development.rb → dummy/config/environments/development.rb b/.../dummy/config/environments/development.rb → dummy/config/environments/development.rb
diff --git a/spec/dummy/config/environments/production.rb → dummy/config/environments/production.rb b/spec/dummy/config/environments/production.rb → dummy/config/environments/production.rb
diff --git a/spec/dummy/config/environments/test.rb → dummy/config/environments/test.rb b/spec/dummy/config/environments/test.rb → dummy/config/environments/test.rb
diff --git a/spec/dummy/config/initializers/assets.rb → dummy/config/initializers/assets.rb b/spec/dummy/config/initializers/assets.rb → dummy/config/initializers/assets.rb
diff --git a/...onfig/initializers/backtrace_silencers.rb → ...onfig/initializers/backtrace_silencers.rb b/...onfig/initializers/backtrace_silencers.rb → ...onfig/initializers/backtrace_silencers.rb
diff --git a/...config/initializers/cookies_serializer.rb → ...config/initializers/cookies_serializer.rb b/...config/initializers/cookies_serializer.rb → ...config/initializers/cookies_serializer.rb
diff --git a/.../initializers/filter_parameter_logging.rb → .../initializers/filter_parameter_logging.rb b/.../initializers/filter_parameter_logging.rb → .../initializers/filter_parameter_logging.rb
diff --git a/.../dummy/config/initializers/inflections.rb → dummy/config/initializers/inflections.rb b/.../dummy/config/initializers/inflections.rb → dummy/config/initializers/inflections.rb
diff --git a/spec/dummy/config/initializers/mime_types.rb → dummy/config/initializers/mime_types.rb b/spec/dummy/config/initializers/mime_types.rb → dummy/config/initializers/mime_types.rb
diff --git a/spec/dummy/config/initializers/monarchy.rb → dummy/config/initializers/monarchy.rb b/spec/dummy/config/initializers/monarchy.rb → dummy/config/initializers/monarchy.rb
diff --git a/...ummy/config/initializers/session_store.rb → dummy/config/initializers/session_store.rb b/...ummy/config/initializers/session_store.rb → dummy/config/initializers/session_store.rb
diff --git a/...my/config/initializers/wrap_parameters.rb → dummy/config/initializers/wrap_parameters.rb b/...my/config/initializers/wrap_parameters.rb → dummy/config/initializers/wrap_parameters.rb
diff --git a/spec/dummy/config/locales/en.yml → dummy/config/locales/en.yml b/spec/dummy/config/locales/en.yml → dummy/config/locales/en.yml
diff --git a/spec/dummy/config/routes.rb → dummy/config/routes.rb b/spec/dummy/config/routes.rb → dummy/config/routes.rb
diff --git a/spec/dummy/config/secrets.yml → dummy/config/secrets.yml b/spec/dummy/config/secrets.yml → dummy/config/secrets.yml
diff --git a/...e/20160220215254_monarchy_create_users.rb → ...e/20160220215254_monarchy_create_users.rb b/...e/20160220215254_monarchy_create_users.rb → ...e/20160220215254_monarchy_create_users.rb
diff --git a/...0221132205_monarchy_create_hierarchies.rb → ...0221132205_monarchy_create_hierarchies.rb b/...0221132205_monarchy_create_hierarchies.rb → ...0221132205_monarchy_create_hierarchies.rb
diff --git a/...0221133215_monarchy_create_memberships.rb → ...0221133215_monarchy_create_memberships.rb b/...0221133215_monarchy_create_memberships.rb → ...0221133215_monarchy_create_memberships.rb
diff --git a/...te/20160221142305_create_memo_resource.rb → ...te/20160221142305_create_memo_resource.rb b/...te/20160221142305_create_memo_resource.rb → ...te/20160221142305_create_memo_resource.rb
diff --git a/...20160221142309_create_project_resource.rb → ...20160221142309_create_project_resource.rb b/...20160221142309_create_project_resource.rb → ...20160221142309_create_project_resource.rb
diff --git a/...0160221154113_create_resource_resource.rb → ...0160221154113_create_resource_resource.rb b/...0160221154113_create_resource_resource.rb → ...0160221154113_create_resource_resource.rb
diff --git a/...te/20160306124820_add_memo_to_resource.rb → ...te/20160306124820_add_memo_to_resource.rb b/...te/20160306124820_add_memo_to_resource.rb → ...te/20160306124820_add_memo_to_resource.rb
diff --git a/...migrate/20160502212213_parent_as_setup.rb → ...migrate/20160502212213_parent_as_setup.rb b/...migrate/20160502212213_parent_as_setup.rb → ...migrate/20160502212213_parent_as_setup.rb
diff --git a/...y/db/migrate/20160815163909_task_model.rb → ...y/db/migrate/20160815163909_task_model.rb b/...y/db/migrate/20160815163909_task_model.rb → ...y/db/migrate/20160815163909_task_model.rb
diff --git a/...dummy/db/migrate/20160818205534_status.rb → dummy/db/migrate/20160818205534_status.rb b/...dummy/db/migrate/20160818205534_status.rb → dummy/db/migrate/20160818205534_status.rb
diff --git a/spec/dummy/db/schema.rb → dummy/db/schema.rb b/spec/dummy/db/schema.rb → dummy/db/schema.rb
diff --git a/spec/dummy/lib/assets/.keep → dummy/lib/assets/.keep b/spec/dummy/lib/assets/.keep → dummy/lib/assets/.keep
diff --git a/spec/dummy/public/404.html → dummy/public/404.html b/spec/dummy/public/404.html → dummy/public/404.html
diff --git a/spec/dummy/public/422.html → dummy/public/422.html b/spec/dummy/public/422.html → dummy/public/422.html
diff --git a/spec/dummy/public/500.html → dummy/public/500.html b/spec/dummy/public/500.html → dummy/public/500.html
diff --git a/spec/dummy/public/favicon.ico → dummy/public/favicon.ico b/spec/dummy/public/favicon.ico → dummy/public/favicon.ico
diff --git a/dummy/spec b/dummy/spec
@@ -0,0 +1 @@
+../spec
diff --git a/lib/monarchy/exceptions.rb b/lib/monarchy/exceptions.rb
@@ -106,7 +106,7 @@ def message
 
     class ResourceNotPersist < Error
       def message
-        "Resource has to persisted!"
+        'Resource has to persisted!'
       end
     end
   end

diff --git a/lib/monarchy/validators.rb b/lib/monarchy/validators.rb
@@ -35,7 +35,7 @@ def resource(resource, allow_nil = false, persistance = true)
           resource.class.try(:acting_as_resource)
         end
 
-        (persistance && resource && !resource.persisted?) ? raise(Monarchy::Exceptions::ResourceNotPersist) : model
+        persistance && resource && !resource.persisted? ? raise(Monarchy::Exceptions::ResourceNotPersist) : model
       end
 
       def user(user, allow_nil = false)

diff --git a/spec/dummy/db/test.sqlite3 b/spec/dummy/db/test.sqlite3
diff --git a/spec/dummy/spec b/spec/dummy/spec
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV['RAILS_ENV'] ||= 'test'
-require File.expand_path('../dummy/config/environment', __FILE__)
+require File.expand_path('../../dummy/config/environment', __FILE__)
 # Prevent database truncation if the environment is production
 abort('The Rails environment is running in production mode!') if Rails.env.production?
 require 'monarchy'