introspective_grape 0.5.7 → 0.6.1

data/spec/dummy/app/models/user/chatter.rb

@@ -1,79 +1,79 @@
-module User::Chatter
-
-  def message_query(chat_id, new = true)
-    messages.joins(:chat_message_users)
-            .where('chat_message_users.user_id'=> id)
-            .where(new ? {'chat_message_users.read_at'=>nil} : '')
-            .where(chat_id ? {'chat_messages.chat_id'=> chat_id} : '')
-            .order('') # or it will add an order by id clause that breaks the count query.
-  end
-
-  def new_messages?(chat=nil) # returns a hash of chat_ids with new message counts
-    chat_id = chat.kind_of?(Chat) ? chat.id : chat
-    new = message_query(chat_id)
-          .select("chat_messages.chat_id, count(chat_messages.id) as count")
-          .group('chat_id')
-
-    chat ? { chat_id => new.first.try(:count)||0 } : Hash[new.map {|c| [c.chat_id, c.count]} ]
-  end
-
-  def read_messages(chat= nil, mark_as_read= false, new= true)
-    chat_id = chat.kind_of?(Chat) ? chat.id : chat
-    new = message_query(chat_id, new).order('chat_messages.created_at').includes(:author) # :chat?
-    new.map(&:chat).uniq.each {|c| mark_as_read(c) } if mark_as_read
-    new
-  end
-
-  def chat(users, message)
-    users = [users].flatten
-    users = users.first.kind_of?(User) ? users : User.where(id: users)
-    chat  = Chat.create(creator: self)
-    chat.users.push users
-    chat.messages.build(message: message, author: self)
-    chat.save!
-    chat
-  end
-
-  def reply(chat, message)
-    chat = chat.kind_of?(Chat) ? chat : Chat.find(chat)
-    mark_as_read(chat) # a reply implies that the thread has been read
-    chat.messages.build(message: message, author: self)
-    chat.save!
-    chat
-  end
-
-  def add_chatters(chat, users)
-    users = [users].flatten
-    users = users.first.kind_of?(User) ? users : User.where(id: users)
-    chat  = chat.kind_of?(Chat) ? chat : Chat.find(chat)
-
-    if chat.active_users.include?(self) # only current participants can add new users
-      chat.users.push users
-      chat.messages.build(chat: chat, author: self, message: "#{self.name} [[ADDED_USER_MESSAGE]] #{users.map(&:name).join(',')}")
-      chat.save!
-    else
-      chat.errors[:base] << "Only current chat participants can add users."
-      raise ActiveRecord::RecordInvalid.new(chat)
-    end
-  end
-
-  def leave_chat(chat)
-    chat = chat.kind_of?(Chat) ? chat : Chat.find(chat)
-
-    if chat.active_users.include?(self)
-      reply(chat, "#{name} [[DEPARTS_MESSAGE]]")
-      chat.chat_users.detect {|cu| cu.user_id == self.id}.update_attributes(departed_at: Time.now)
-    else
-      true
-    end
-  end
-
-  def mark_as_read(chat)
-    ChatMessageUser.joins(:chat_message).where('read_at IS NULL AND chat_messages.chat_id = ? AND user_id = ?', chat.id, id).update_all(read_at: Time.now)
-  end
-
-  def mark_messages_as_read(messages)
-    chat_message_users.where("chat_message_id in (?) and read_at IS NULL", messages.map(&:id)).update_all(read_at: Time.now)
-  end
-
-end
+module User::Chatter
+
+  def message_query(chat_id, new = true)
+    messages.joins(:chat_message_users)
+            .where('chat_message_users.user_id'=> id)
+            .where(new ? {'chat_message_users.read_at'=>nil} : '')
+            .where(chat_id ? {'chat_messages.chat_id'=> chat_id} : '')
+            .order('') # or it will add an order by id clause that breaks the count query.
+  end
+
+  def new_messages?(chat=nil) # returns a hash of chat_ids with new message counts
+    chat_id = chat.kind_of?(Chat) ? chat.id : chat
+    new = message_query(chat_id)
+          .select("chat_messages.chat_id, count(chat_messages.id) as count")
+          .group('chat_id')
+
+    chat ? { chat_id => new.first.try(:count)||0 } : Hash[new.map {|c| [c.chat_id, c.count]} ]
+  end
+
+  def read_messages(chat= nil, mark_as_read= false, new= true)
+    chat_id = chat.kind_of?(Chat) ? chat.id : chat
+    new = message_query(chat_id, new).order('chat_messages.created_at').includes(:author) # :chat?
+    new.map(&:chat).uniq.each {|c| mark_as_read(c) } if mark_as_read
+    new
+  end
+
+  def chat(users, message)
+    users = [users].flatten
+    users = users.first.kind_of?(User) ? users : User.where(id: users)
+    chat  = Chat.create(creator: self)
+    chat.users.push users
+    chat.messages.build(message: message, author: self)
+    chat.save!
+    chat
+  end
+
+  def reply(chat, message)
+    chat = chat.kind_of?(Chat) ? chat : Chat.find(chat)
+    mark_as_read(chat) # a reply implies that the thread has been read
+    chat.messages.build(message: message, author: self)
+    chat.save!
+    chat
+  end
+
+  def add_chatters(chat, users)
+    users = [users].flatten
+    users = users.first.kind_of?(User) ? users : User.where(id: users)
+    chat  = chat.kind_of?(Chat) ? chat : Chat.find(chat)
+
+    if chat.active_users.include?(self) # only current participants can add new users
+      chat.users.push users
+      chat.messages.build(chat: chat, author: self, message: "#{self.name} [[ADDED_USER_MESSAGE]] #{users.map(&:name).join(',')}")
+      chat.save!
+    else
+      chat.errors.add(:base, "Only current chat participants can add users.")
+      raise ActiveRecord::RecordInvalid.new(chat)
+    end
+  end
+
+  def leave_chat(chat)
+    chat = chat.kind_of?(Chat) ? chat : Chat.find(chat)
+
+    if chat.active_users.include?(self)
+      reply(chat, "#{name} [[DEPARTS_MESSAGE]]")
+      chat.chat_users.detect {|cu| cu.user_id == self.id}.update(departed_at: Time.now)
+    else
+      true
+    end
+  end
+
+  def mark_as_read(chat)
+    ChatMessageUser.joins(:chat_message).where('read_at IS NULL AND chat_messages.chat_id = ? AND user_id = ?', chat.id, id).update_all(read_at: Time.now)
+  end
+
+  def mark_messages_as_read(messages)
+    chat_message_users.where("chat_message_id in (?) and read_at IS NULL", messages.map(&:id)).update_all(read_at: Time.now)
+  end
+
+end

data/spec/dummy/bin/bundle

@@ -1,3 +1,3 @@
-#!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-load Gem.bin_path('bundler', 'bundle')
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+load Gem.bin_path('bundler', 'bundle')

data/spec/dummy/bin/rails

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application', __FILE__)
-require_relative '../config/boot'
-require 'rails/commands'
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../config/application', __dir__)
+require_relative '../config/boot'
+require 'rails/commands'

data/spec/dummy/bin/setup

@@ -1,29 +1,36 @@
-#!/usr/bin/env ruby
-require 'pathname'
-
-# path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
-
-Dir.chdir APP_ROOT do
-  # This script is a starting point to setup your application.
-  # Add necessary setup steps to this file:
-
-  puts "== Installing dependencies =="
-  system "gem install bundler --conservative"
-  system "bundle check || bundle install"
-
-  # puts "\n== Copying sample files =="
-  # unless File.exist?("config/database.yml")
-  #   system "cp config/database.yml.sample config/database.yml"
-  # end
-
-  puts "\n== Preparing database =="
-  system "bin/rake db:setup"
-
-  puts "\n== Removing old logs and tempfiles =="
-  system "rm -f log/*"
-  system "rm -rf tmp/cache"
-
-  puts "\n== Restarting application server =="
-  system "touch tmp/restart.txt"
-end
+#!/usr/bin/env ruby
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = File.expand_path('..', __dir__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?('config/database.yml')
+  #   cp 'config/database.yml.sample', 'config/database.yml'
+  # end
+
+  puts "\n== Preparing database =="
+  system! 'bin/rails db:setup'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end

data/spec/dummy/bin/update

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = File.expand_path('..', __dir__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a way to update your development environment automatically.
+  # Add necessary update steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
+
+  puts "\n== Updating database =="
+  system! 'bin/rails db:migrate'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end

data/spec/dummy/bin/yarn

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.expand_path('..', __dir__)
+Dir.chdir(APP_ROOT) do
+  begin
+    exec "yarnpkg", *ARGV
+  rescue Errno::ENOENT
+    $stderr.puts "Yarn executable was not detected in the system."
+    $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
+    exit 1
+  end
+end

data/spec/dummy/config/application.rb

@@ -1,37 +1,30 @@
-require File.expand_path('../boot', __FILE__)
-
-# Pick the frameworks you want:
-require "active_record/railtie"
-require "action_controller/railtie"
-require "action_mailer/railtie"
-require "action_view/railtie"
-require "sprockets/railtie"
-require 'devise'
-#require 'devise/async'
-require 'grape-swagger'
-require 'grape-entity'
-# require "rails/test_unit/railtie"
-
-#Bundler.require(*Rails.groups)
-require "introspective_grape"
-require 'introspective_grape/camel_snake'
-
-module Dummy
-  class Application < Rails::Application
-    # 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.
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    #config.active_record.raise_in_transactional_callbacks = true
-
-  end
-end
+require_relative 'boot'
+
+require "rails"
+# Pick the frameworks you want:
+require "active_model/railtie"
+require "active_job/railtie"
+require "active_record/railtie"
+require "active_storage/engine"
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "action_view/railtie"
+# require "action_cable/engine"
+# require "sprockets/railtie"
+require "rails/test_unit/railtie"
+
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
+
+module Dummy
+  class Application < Rails::Application
+    # Initialize configuration defaults for originally generated Rails version.
+    #config.load_defaults 7.0
+
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration can go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded after loading
+    # the framework and any gems in your application.
+  end
+end

data/spec/dummy/config/boot.rb

@@ -1,6 +1,3 @@
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
-
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)
-
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+
+require 'bundler/setup' # Set up gems listed in the Gemfile.

data/spec/dummy/config/environment.rb

@@ -1,11 +1,5 @@
-# Load the Rails application.
-require File.expand_path('../application', __FILE__)
-
-# Initialize the Rails application.
-Rails.application.initialize!
-#load "#{Rails.root}/db/schema.rb"
-
-
-#Dir[Rails.root.join("app/api/**/*.rb")].each { |f| require f }
-Rails.application.reload_routes!
-
+# Load the Rails application.
+require_relative 'application'
+
+# Initialize the Rails application.
+Rails.application.initialize!

data/spec/dummy/config/environments/development.rb

@@ -1,42 +1,54 @@
-Rails.application.configure do
-  # Settings specified here will take precedence over those in config/application.rb.
-
-  # In the development environment your application's code is reloaded on
-  # every request. This slows down response time but is perfect for development
-  # since you don't have to restart the web server when you make code changes.
-  config.cache_classes = false
-
-  # Do not eager load code on boot.
-  config.eager_load = false
-
-  # Show full error reports and disable caching.
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
-
-  # Don't care if the mailer can't send.
-  config.action_mailer.raise_delivery_errors = false
-  config.action_mailer.default_url_options = { :host => 'localhost:3000' }
-
-  # Print deprecation notices to the Rails logger.
-  config.active_support.deprecation = :log
-
-  # Raise an error on page load if there are pending migrations.
-  config.active_record.migration_error = :page_load
-
-  # Debug mode disables concatenation and preprocessing of assets.
-  # This option may cause significant delays in view rendering with a large
-  # number of complex assets.
-  #config.assets.debug = true
-
-  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
-  # yet still be able to expire them through the digest params.
-  #config.assets.digest = true
-
-  # Adds additional error checking when serving assets at runtime.
-  # Checks for improperly declared sprockets dependencies.
-  # Raises helpful error messages.
-  #config.assets.raise_runtime_errors = true
-
-  # Raises error for missing translations
-  # config.action_view.raise_on_missing_translations = true
-end
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # In the development environment your application's code is reloaded on
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
+  config.cache_classes = false
+
+  # Do not eager load code on boot.
+  config.eager_load = false
+
+  # Show full error reports.
+  config.consider_all_requests_local = true
+
+  # Enable/disable caching. By default caching is disabled.
+  # Run rails dev:cache to toggle caching.
+  if Rails.root.join('tmp', 'caching-dev.txt').exist?
+    config.action_controller.perform_caching = true
+
+    config.cache_store = :memory_store
+    config.public_file_server.headers = {
+      'Cache-Control' => "public, max-age=#{2.days.to_i}"
+    }
+  else
+    config.action_controller.perform_caching = false
+
+    config.cache_store = :null_store
+  end
+
+  # Store uploaded files on the local file system (see config/storage.yml for options)
+  config.active_storage.service = :local
+
+  # Don't care if the mailer can't send.
+  config.action_mailer.raise_delivery_errors = false
+  config.action_mailer.default_url_options = { :host => "yourhost.com" }
+  config.action_mailer.perform_caching = false
+
+  # Print deprecation notices to the Rails logger.
+  config.active_support.deprecation = :log
+
+  # Raise an error on page load if there are pending migrations.
+  config.active_record.migration_error = :page_load
+
+  # Highlight code that triggered database queries in logs.
+  config.active_record.verbose_query_logs = true
+
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+
+  # Use an evented file watcher to asynchronously detect changes in source code,
+  # routes, locales, etc. This feature depends on the listen gem.
+  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+end