From f3622d7b06fcaa8f4752a11f8ba529780353fe7e Mon Sep 17 00:00:00 2001 From: Samruddhi Date: Sat, 17 Dec 2022 20:31:04 +0530 Subject: [PATCH] Added pg gem and removed mongo db related all changes. added migrations for User and Content models --- Gemfile | 65 +++-- app/controllers/contents_controller.rb | 112 ++++++++ app/models/screamout/content.rb | 26 +- app/models/screamout/user.rb | 8 + config/initializers/devise.rb | 257 ++++++++++++++++++ config/locales/devise.en.yml | 59 ++++ config/routes.rb | 1 + ...217131155_devise_create_screamout_users.rb | 42 +++ lib/screamout/engine.rb | 2 +- spec/dummy/config/application.rb | 3 +- spec/dummy/config/environments/development.rb | 1 + spec/dummy/config/mongoid.yml.ci | 13 - spec/spec_helper.rb | 4 +- 13 files changed, 544 insertions(+), 49 deletions(-) create mode 100644 app/controllers/contents_controller.rb create mode 100644 app/models/screamout/user.rb create mode 100644 config/initializers/devise.rb create mode 100644 config/locales/devise.en.yml create mode 100644 db/migrate/20221217131155_devise_create_screamout_users.rb delete mode 100644 spec/dummy/config/mongoid.yml.ci diff --git a/Gemfile b/Gemfile index b5a1708..74f7207 100644 --- a/Gemfile +++ b/Gemfile @@ -1,26 +1,53 @@ -source "https://rubygems.org" - -# Declare your gem's dependencies in screamout.gemspec. -# Bundler will treat runtime dependencies like base dependencies, and -# development dependencies will be added by default to the :development group. -gemspec - -# Declare any dependencies that are still in development here instead of in -# your gemspec. These might include edge Rails or gems from your path or -# Git. Remember to move these dependencies to your gemspec before releasing -# your gem to rubygems.org. - -# To use debugger -# gem 'debugger' -gem 'mongoid' -gem 'jquery-ui-rails', '~> 5.0.5' -gem 'sass-rails', '4.0.3' -gem 'twitter-bootstrap-rails', '2.2.8' -gem 'simple_form', :git => 'git://github.com/plataformatec/simple_form.git' +source 'https://rubygems.org' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '4.1.1' +gem 'mongoid', github:'mongoid/mongoid' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 4.0.3' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# Use CoffeeScript for .js.coffee assets and views +gem 'coffee-rails', '~> 4.0.0' +# See https://github.com/sstephenson/execjs#readme for more supported runtimes +gem 'therubyracer', platforms: :ruby +gem 'devise' +gem 'omniauth-google-oauth2' +gem 'omniauth' +gem 'simple_form' +gem 'mimemagic', github: 'mimemagicrb/mimemagic', ref: '01f92d86d15d85cfd0f20dabd025dcbd36a8a60f' +# Use jquery as the JavaScript library +# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks gem 'turbolinks' gem 'twitter-typeahead-rails' gem 'imgkit' gem "jquery-rails" +gem 'pg', '~> 0.18' +gem 'activerecord' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use unicorn as the app server +# gem 'unicorn' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Use debugger +# gem 'debugger', group: [:development, :test] + +gem 'execjs' #for executing javascript from ruby + +group :development, :test do #overrite existing..generate spec directory,,include the gem in multiple rails env + #gem 'debugger' + gem 'rspec-rails' , '2.14.2' + gem 'factory_girl_rails' + gem 'faker' + gem 'database_cleaner' + gem 'simplecov', '~> 0.7.1' + gem 'guard-rspec', require: false +end +gem 'mongoid-rspec' #tests beginning with 'should' gem 'mongoid_taggable' gem 'mongoid_rateable', :git => 'git://github.com/PerfectMemory/mongoid_rateable.git' gem "bson" diff --git a/app/controllers/contents_controller.rb b/app/controllers/contents_controller.rb new file mode 100644 index 0000000..b20afe9 --- /dev/null +++ b/app/controllers/contents_controller.rb @@ -0,0 +1,112 @@ +class ContentsController < ApplicationController + + def index + #binding.pry + @contents = Content.all.desc(:created_at) + @con = Content.new + @c = [] + #@contents = Content.tagged_with_all(/#{params[:q]}/) + #@conc = content_to_hash(@content_selected) + end + + + def show + @content = Content.find(params[:id]) + end + + def new + @content = Content.new + @con = [] + end + + def details + @content = Content.find(params[:id]) + respond_to do |format| + format.js {} + end + end + + def create + @content = Content.new(content_params_input) + @content.image_file_name = @content.title + + if @content.save + ImageWorker.perform_async(@content.id.to_s) + respond_to do |format| + format.html {redirect_to contents_path} + end + else + respond_to do |format| + format.html { render action: 'new' } + + end + end + end + + def edit + @content = Content.find(params[:id]) + end + + def destroy + @content = Content.where(id: params[:id]).first + + if @content.destroy + redirect_to contents_path + else + #flash[:notice] = ' not deleted' + flash.now[:error] = @content.errors.messages + render action: 'index' + end + end + + + def update + @content = Content.find(params[:id]) + @con = @content.tags.split(",") + @con = tags_to_hash(@con) + if @content.update_attributes(content_params_input) + redirect_to contents_path + else + render action: 'edit' + end + end + + def tags + @contents = Content.tagged_with_all(/#{params[:q]}/) + @tags = @contents.collect(&:tag_map).flatten.select{|t| t[:name] =~ /#{params[:q]}/} + + respond_to do |format| + format.html {render html: @tags} + format.json { render json: @tags} + end + end + + def content_ids + @tags_selected = Content.tags.select{|e| e =~ /#{params[:q]}/} + @content_selected = Content.where(:tags_array.in => @tags_selected).to_a + + respond_to do |format| + format.html + format.json {render json: @content_selected} + end + end + + private + def content_params_input + params.require(:content).permit(:url,:photo, :title, :tags, :rates, :user_id) + end + + def tags_to_hash(cons) + cons.map do |con| + {id: con, name: con} + end + end +#not required************************************ + + def content_to_hash(cons) + cons.map do |cons| + {id: cons[:_id].to_s, url: cons.url, title: cons.title, photo_url:cons.photo.url} + end + #binding.pry + end +end diff --git a/app/models/screamout/content.rb b/app/models/screamout/content.rb index e0de8bd..89a864c 100644 --- a/app/models/screamout/content.rb +++ b/app/models/screamout/content.rb @@ -1,25 +1,25 @@ -module Screamout +module Screamout < ActiveRecord::Base class Content - include Mongoid::Document - include Mongoid::Timestamps - include Mongoid::Taggable - include Mongoid::Paperclip + # include Mongoid::Document + # include Mongoid::Timestamps + # include Mongoid::Taggable + # include Mongoid::Paperclip IMAGE_PATH = "#{Rails.root}/public/snapshots/" #IMAGE_WIDTH = 100 IMAGE_HEIGHT = 600 - field :title, type: String - field :url, type: String - field :image_file_name, type:String - has_mongoid_attached_file :photo,:styles => {:original => ['1920x1680>', :jpg],:small => ['220x180!', :jpg]} + # field :title, type: String + # field :url, type: String + # field :image_file_name, type:String + # has_mongoid_attached_file :photo,:styles => {:original => ['1920x1680>', :jpg],:small => ['220x180!', :jpg]} rateable range: (0..5) belongs_to :user #validates :title, presence: true validates :url, presence: true, uniqueness: true, format: { with: /(^$)|(^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}[:]?(([0-9]{1,5})?\/?.*)$)/i} validates :image_file_name, presence: true - validates_attachment_content_type :photo, :content_type => ["image/jpg", "image/jpeg", "image/png", "application/pdf"] + # validates_attachment_content_type :photo, :content_type => ["image/jpg", "image/jpeg", "image/png", "application/pdf"] def image_file_name=(title) @@ -32,17 +32,17 @@ def name def tag_map tags.split(",").collect{|t| {id: t, name: t}} - end + end def as_json(options ={}) options = {only: [:_id,:title, :url, :tags_array], methods: [:id, :photo_url, :name, :user_id, :user_photo_url]} super end - + def id self._id.to_s end - + def photo_url self.photo.url(:small) end diff --git a/app/models/screamout/user.rb b/app/models/screamout/user.rb new file mode 100644 index 0000000..c5b35a8 --- /dev/null +++ b/app/models/screamout/user.rb @@ -0,0 +1,8 @@ +module Screamout + class User < ActiveRecord::Base + # Include default devise modules. Others available are: + # :confirmable, :lockable, :timeoutable and :omniauthable + devise :database_authenticatable, :registerable, + :recoverable, :rememberable, :trackable, :validatable + end +end diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb new file mode 100644 index 0000000..871ac9f --- /dev/null +++ b/config/initializers/devise.rb @@ -0,0 +1,257 @@ +# Use this hook to configure devise mailer, warden hooks and so forth. +# Many of these configuration options can be set straight in your model. +Devise.setup do |config| + # The secret key used by Devise. Devise uses this key to generate + # random tokens. Changing this key will render invalid all existing + # confirmation, reset password and unlock tokens in the database. + # config.secret_key = '4ae75eaf81fdc454a6235478a54f8a8140e6e9147685d99cda5d7e971289f6f2638582d0396409bac288e0c24d862d49ebcf1a592d7bd82d5fa9994b92feddb6' + + # ==> Mailer Configuration + # Configure the e-mail address which will be shown in Devise::Mailer, + # note that it will be overwritten if you use your own mailer class + # with default "from" parameter. + config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' + + # Configure the class responsible to send e-mails. + # config.mailer = 'Devise::Mailer' + + # ==> ORM configuration + # Load and configure the ORM. Supports :active_record (default) and + # :mongoid (bson_ext recommended) by default. Other ORMs may be + # available as additional gems. + # require 'devise/orm/mongoid' + require 'devise/orm/active_record' + + # ==> Configuration for any authentication mechanism + # Configure which keys are used when authenticating a user. The default is + # just :email. You can configure it to use [:username, :subdomain], so for + # authenticating a user, both parameters are required. Remember that those + # parameters are used only when authenticating and not when retrieving from + # session. If you need permissions, you should implement that in a before filter. + # You can also supply a hash where the value is a boolean determining whether + # or not authentication should be aborted when the value is not present. + # config.authentication_keys = [ :email ] + + # Configure parameters from the request object used for authentication. Each entry + # given should be a request method and it will automatically be passed to the + # find_for_authentication method and considered in your model lookup. For instance, + # if you set :request_keys to [:subdomain], :subdomain will be used on authentication. + # The same considerations mentioned for authentication_keys also apply to request_keys. + # config.request_keys = [] + + # Configure which authentication keys should be case-insensitive. + # These keys will be downcased upon creating or modifying a user and when used + # to authenticate or find a user. Default is :email. + config.case_insensitive_keys = [ :email ] + + # Configure which authentication keys should have whitespace stripped. + # These keys will have whitespace before and after removed upon creating or + # modifying a user and when used to authenticate or find a user. Default is :email. + config.strip_whitespace_keys = [ :email ] + + # Tell if authentication through request.params is enabled. True by default. + # It can be set to an array that will enable params authentication only for the + # given strategies, for example, `config.params_authenticatable = [:database]` will + # enable it only for database (email + password) authentication. + # config.params_authenticatable = true + + # Tell if authentication through HTTP Auth is enabled. False by default. + # It can be set to an array that will enable http authentication only for the + # given strategies, for example, `config.http_authenticatable = [:database]` will + # enable it only for database authentication. The supported strategies are: + # :database = Support basic authentication with authentication key + password + # config.http_authenticatable = false + + # If http headers should be returned for AJAX requests. True by default. + # config.http_authenticatable_on_xhr = true + + # The realm used in Http Basic Authentication. 'Application' by default. + # config.http_authentication_realm = 'Application' + + # It will change confirmation, password recovery and other workflows + # to behave the same regardless if the e-mail provided was right or wrong. + # Does not affect registerable. + # config.paranoid = true + + # By default Devise will store the user in session. You can skip storage for + # particular strategies by setting this option. + # Notice that if you are skipping storage for all authentication paths, you + # may want to disable generating routes to Devise's sessions controller by + # passing skip: :sessions to `devise_for` in your config/routes.rb + config.skip_session_storage = [:http_auth] + + # By default, Devise cleans up the CSRF token on authentication to + # avoid CSRF token fixation attacks. This means that, when using AJAX + # requests for sign in and sign up, you need to get a new CSRF token + # from the server. You can disable this option at your own risk. + # config.clean_up_csrf_token_on_authentication = true + + # ==> Configuration for :database_authenticatable + # For bcrypt, this is the cost for hashing the password and defaults to 10. If + # using other encryptors, it sets how many times you want the password re-encrypted. + # + # Limiting the stretches to just one in testing will increase the performance of + # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use + # a value less than 10 in other environments. Note that, for bcrypt (the default + # encryptor), the cost increases exponentially with the number of stretches (e.g. + # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation). + config.stretches = Rails.env.test? ? 1 : 10 + + # Setup a pepper to generate the encrypted password. + # config.pepper = '5ada81a749818e12709df876d53fce45d1ea53f56ad05019ffc158b94e6916195f067e74a5a275dc65c09dfcfd385926d20bded52f32f50f8ff0a61b42b21182' + + # ==> Configuration for :confirmable + # A period that the user is allowed to access the website even without + # confirming their account. For instance, if set to 2.days, the user will be + # able to access the website for two days without confirming their account, + # access will be blocked just in the third day. Default is 0.days, meaning + # the user cannot access the website without confirming their account. + # config.allow_unconfirmed_access_for = 2.days + + # A period that the user is allowed to confirm their account before their + # token becomes invalid. For example, if set to 3.days, the user can confirm + # their account within 3 days after the mail was sent, but on the fourth day + # their account can't be confirmed with the token any more. + # Default is nil, meaning there is no restriction on how long a user can take + # before confirming their account. + # config.confirm_within = 3.days + + # If true, requires any email changes to be confirmed (exactly the same way as + # initial account confirmation) to be applied. Requires additional unconfirmed_email + # db field (see migrations). Until confirmed, new email is stored in + # unconfirmed_email column, and copied to email column on successful confirmation. + config.reconfirmable = true + + # Defines which key will be used when confirming an account + # config.confirmation_keys = [ :email ] + + # ==> Configuration for :rememberable + # The time the user will be remembered without asking for credentials again. + # config.remember_for = 2.weeks + + # If true, extends the user's remember period when remembered via cookie. + # config.extend_remember_period = false + + # Options to be passed to the created cookie. For instance, you can set + # secure: true in order to force SSL only cookies. + # config.rememberable_options = {} + + # ==> Configuration for :validatable + # Range for password length. + config.password_length = 8..128 + + # Email regex used to validate email formats. It simply asserts that + # one (and only one) @ exists in the given string. This is mainly + # to give user feedback and not to assert the e-mail validity. + # config.email_regexp = /\A[^@]+@[^@]+\z/ + + # ==> Configuration for :timeoutable + # The time you want to timeout the user session without activity. After this + # time the user will be asked for credentials again. Default is 30 minutes. + # config.timeout_in = 30.minutes + + # If true, expires auth token on session timeout. + # config.expire_auth_token_on_timeout = false + + # ==> Configuration for :lockable + # Defines which strategy will be used to lock an account. + # :failed_attempts = Locks an account after a number of failed attempts to sign in. + # :none = No lock strategy. You should handle locking by yourself. + # config.lock_strategy = :failed_attempts + + # Defines which key will be used when locking and unlocking an account + # config.unlock_keys = [ :email ] + + # Defines which strategy will be used to unlock an account. + # :email = Sends an unlock link to the user email + # :time = Re-enables login after a certain amount of time (see :unlock_in below) + # :both = Enables both strategies + # :none = No unlock strategy. You should handle unlocking by yourself. + # config.unlock_strategy = :both + + # Number of authentication tries before locking an account if lock_strategy + # is failed attempts. + # config.maximum_attempts = 20 + + # Time interval to unlock the account if :time is enabled as unlock_strategy. + # config.unlock_in = 1.hour + + # Warn on the last attempt before the account is locked. + # config.last_attempt_warning = false + + # ==> Configuration for :recoverable + # + # Defines which key will be used when recovering the password for an account + # config.reset_password_keys = [ :email ] + + # Time interval you can reset your password with a reset password key. + # Don't put a too small interval or your users won't have the time to + # change their passwords. + config.reset_password_within = 6.hours + + # ==> Configuration for :encryptable + # Allow you to use another encryption algorithm besides bcrypt (default). You can use + # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1, + # :authlogic_sha512 (then you should set stretches above to 20 for default behavior) + # and :restful_authentication_sha1 (then you should set stretches to 10, and copy + # REST_AUTH_SITE_KEY to pepper). + # + # Require the `devise-encryptable` gem when using anything other than bcrypt + # config.encryptor = :sha512 + + # ==> Scopes configuration + # Turn scoped views on. Before rendering "sessions/new", it will first check for + # "users/sessions/new". It's turned off by default because it's slower if you + # are using only default views. + # config.scoped_views = false + + # Configure the default scope given to Warden. By default it's the first + # devise role declared in your routes (usually :user). + # config.default_scope = :user + + # Set this configuration to false if you want /users/sign_out to sign out + # only the current scope. By default, Devise signs out all scopes. + # config.sign_out_all_scopes = true + + # ==> Navigation configuration + # Lists the formats that should be treated as navigational. Formats like + # :html, should redirect to the sign in page when the user does not have + # access, but formats like :xml or :json, should return 401. + # + # If you have any extra navigational formats, like :iphone or :mobile, you + # should add them to the navigational formats lists. + # + # The "*/*" below is required to match Internet Explorer requests. + # config.navigational_formats = ['*/*', :html] + + # The default HTTP method used to sign out a resource. Default is :delete. + config.sign_out_via = :delete + + # ==> OmniAuth + # Add a new OmniAuth provider. Check the wiki for more information on setting + # up on your models and hooks. + # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo' + + # ==> Warden configuration + # If you want to use other strategies, that are not supported by Devise, or + # change the failure app, you can configure them inside the config.warden block. + # + # config.warden do |manager| + # manager.intercept_401 = false + # manager.default_strategies(scope: :user).unshift :some_external_strategy + # end + + # ==> Mountable engine configurations + # When using Devise inside an engine, let's call it `MyEngine`, and this engine + # is mountable, there are some extra configurations to be taken into account. + # The following options are available, assuming the engine is mounted as: + # + # mount MyEngine, at: '/my_engine' + # + # The router that invoked `devise_for`, in the example above, would be: + # config.router_name = :my_engine + # + # When using omniauth, Devise cannot automatically set Omniauth path, + # so you need to do it manually. For the users scope, it would be: + # config.omniauth_path_prefix = '/my_engine/users/auth' +end diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml new file mode 100644 index 0000000..abccdb0 --- /dev/null +++ b/config/locales/devise.en.yml @@ -0,0 +1,59 @@ +# Additional translations at https://github.com/plataformatec/devise/wiki/I18n + +en: + devise: + confirmations: + confirmed: "Your account was successfully confirmed." + send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes." + send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes." + failure: + already_authenticated: "You are already signed in." + inactive: "Your account is not activated yet." + invalid: "Invalid email or password." + locked: "Your account is locked." + last_attempt: "You have one more attempt before your account will be locked." + not_found_in_database: "Invalid email or password." + timeout: "Your session expired. Please sign in again to continue." + unauthenticated: "You need to sign in or sign up before continuing." + unconfirmed: "You have to confirm your account before continuing." + mailer: + confirmation_instructions: + subject: "Confirmation instructions" + reset_password_instructions: + subject: "Reset password instructions" + unlock_instructions: + subject: "Unlock Instructions" + omniauth_callbacks: + failure: "Could not authenticate you from %{kind} because \"%{reason}\"." + success: "Successfully authenticated from %{kind} account." + passwords: + no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided." + send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes." + send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes." + updated: "Your password was changed successfully. You are now signed in." + updated_not_active: "Your password was changed successfully." + registrations: + destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon." + signed_up: "Welcome! You have signed up successfully." + signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated." + signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked." + signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please open the link to activate your account." + update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address." + updated: "You updated your account successfully." + sessions: + signed_in: "Signed in successfully." + signed_out: "Signed out successfully." + unlocks: + send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes." + send_paranoid_instructions: "If your account exists, you will receive an email with instructions about how to unlock it in a few minutes." + unlocked: "Your account has been unlocked successfully. Please sign in to continue." + errors: + messages: + already_confirmed: "was already confirmed, please try signing in" + confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one" + expired: "has expired, please request a new one" + not_found: "not found" + not_locked: "was not locked" + not_saved: + one: "1 error prohibited this %{resource} from being saved:" + other: "%{count} errors prohibited this %{resource} from being saved:" diff --git a/config/routes.rb b/config/routes.rb index ae6093d..e881abf 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,7 @@ require 'sidekiq/web' Screamout::Engine.routes.draw do + devise_for :users, class_name: "Screamout::User" resources :iframe_contents resources :contents do member do diff --git a/db/migrate/20221217131155_devise_create_screamout_users.rb b/db/migrate/20221217131155_devise_create_screamout_users.rb new file mode 100644 index 0000000..cf625fd --- /dev/null +++ b/db/migrate/20221217131155_devise_create_screamout_users.rb @@ -0,0 +1,42 @@ +class DeviseCreateScreamoutUsers < ActiveRecord::Migration + def change + create_table(:screamout_users) do |t| + ## Database authenticatable + t.string :email, null: false, default: "" + t.string :encrypted_password, null: false, default: "" + + ## Recoverable + t.string :reset_password_token + t.datetime :reset_password_sent_at + + ## Rememberable + t.datetime :remember_created_at + + ## Trackable + t.integer :sign_in_count, default: 0, null: false + t.datetime :current_sign_in_at + t.datetime :last_sign_in_at + t.string :current_sign_in_ip + t.string :last_sign_in_ip + + ## Confirmable + # t.string :confirmation_token + # t.datetime :confirmed_at + # t.datetime :confirmation_sent_at + # t.string :unconfirmed_email # Only if using reconfirmable + + ## Lockable + # t.integer :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts + # t.string :unlock_token # Only if unlock strategy is :email or :both + # t.datetime :locked_at + + + t.timestamps + end + + add_index :screamout_users, :email, unique: true + add_index :screamout_users, :reset_password_token, unique: true + # add_index :screamout_users, :confirmation_token, unique: true + # add_index :screamout_users, :unlock_token, unique: true + end +end diff --git a/lib/screamout/engine.rb b/lib/screamout/engine.rb index 9b798c7..42f081a 100644 --- a/lib/screamout/engine.rb +++ b/lib/screamout/engine.rb @@ -2,7 +2,7 @@ module Screamout class Engine < ::Rails::Engine isolate_namespace Screamout config.generators do |g| - g.orm :mongoid + g.orm :active_record end end end diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb index 07fb10d..cf9d4ba 100644 --- a/spec/dummy/config/application.rb +++ b/spec/dummy/config/application.rb @@ -10,9 +10,11 @@ Bundler.require(*Rails.groups) require "screamout" +require 'rails/all' module Dummy class Application < Rails::Application + config.generators.orm = :active_record # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers # -- all .rb files in that directory are automatically loaded. @@ -26,4 +28,3 @@ class Application < Rails::Application # config.i18n.default_locale = :de end end - diff --git a/spec/dummy/config/environments/development.rb b/spec/dummy/config/environments/development.rb index a384d95..90d9143 100644 --- a/spec/dummy/config/environments/development.rb +++ b/spec/dummy/config/environments/development.rb @@ -8,6 +8,7 @@ # Do not eager load code on boot. config.eager_load = false + config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } # Show full error reports and disable caching. config.consider_all_requests_local = true diff --git a/spec/dummy/config/mongoid.yml.ci b/spec/dummy/config/mongoid.yml.ci deleted file mode 100644 index bab4346..0000000 --- a/spec/dummy/config/mongoid.yml.ci +++ /dev/null @@ -1,13 +0,0 @@ -test: - sessions: - default: - database: dummy_test - hosts: - - localhost:27017 - options: - read: primary - # In the test environment we lower the retries and retry interval to - # low amounts for fast failures. - max_retries: 1 - retry_interval: 0 - diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index f253569..7b76f5a 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -47,7 +47,7 @@ config.after(:each) do DatabaseCleaner.clean end - #config.before(:each) { @routes = UserManager::Engine.routes } + #config.before(:each) { @routes = UserManager::Engine.routes } # If true, the base class of anonymous controllers will be inferred # automatically. This will be the default behavior in future versions of # rspec-rails. @@ -63,7 +63,7 @@ I18n.enforce_available_locales = false - config.include Mongoid::Matchers + # config.include Mongoid::Matchers config.extend ControllerHelper, type: :controller end