trogdir_api 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa354b0a9be8229e46f22496967be07d4fa106f9
-  data.tar.gz: 9ec3fc1078b827dd3987ac01df784e6bc7d979c6
+  metadata.gz: 2607438e5dd0fa7f2cdea97665e149d141f4725d
+  data.tar.gz: e1bda9d84c9a77a6379a312a580621b148301bd0
 SHA512:
-  metadata.gz: ce6b94b61bb78cb579d5aedfb725055674fde6d53bc0c479914f7aa7730e4c6307cec61f3bebafcf5eb06325b6b88b49a4642a504b816e93b7eb102606529d09
-  data.tar.gz: 276f15973b60ab55e4f28dd9b838777165f4647bb7bdc4b97aa2df4e1f84423be7e52829f1e0d5764d7803a9311dcff0a477d06e87cd8c9b0022aed53768a2ec
+  metadata.gz: 97c1a400287dcd49c8983bb12e646582e23941153e9e7710be1d6a7bef91d8220f24947ace28279177abe6a31b7091b3a051a3f261c35b234203b796041aa0de
+  data.tar.gz: 16f405e2a307a2f33f9425f57f5a258e3de3ecd9ab0f5d1d82f2bd2e83b7024ea415106eb17db95ada31072a876194b9dec4a978139653e88a289fac4eb0f1af

data/README.md

@@ -15,13 +15,11 @@ git clone git@github.com:biola/trogdir-api.git
 cd trogdir-api
 bundle install
 cp config/mongoid.yml.example config/mongoid.yml
-cp config/newrelic.yml.example config/newrelic.yml
 ```
 
 Configuration
 -------------
 - Edit `config/mongoid.yml` accordingly.
-- Edit `config/newrelic.yml` accordingly.
 
 Console
 -------

data/config.ru

@@ -1,12 +1,8 @@
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 
 env = ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development'
 
 if env == 'development'
-  require 'newrelic_rpm'
-  require 'new_relic/rack/developer_mode'
-  use NewRelic::Rack::DeveloperMode
-
   require 'better_errors'
   use BetterErrors::Middleware
 end
@@ -15,7 +11,9 @@ file = File.new("./log/#{env}.log", 'a+')
 file.sync = true
 use Rack::CommonLogger, file
 
-use Pinglish, &TrogdirAPI.pinglish_block
+require 'pinglish'
+pinglish_path = "#{ENV['PUMA_RELATIVE_URL_ROOT']}/_ping"
+use Pinglish, { path: pinglish_path }, &TrogdirAPI.pinglish_block
 
 map ENV['PUMA_RELATIVE_URL_ROOT'] || '/' do
   run Trogdir::API

data/lib/trogdir/api.rb

@@ -1,4 +1,3 @@
-require 'new_relic/agent/instrumentation/rack'
 require 'rack/turnout'
 
 module Trogdir
@@ -13,7 +12,5 @@ module Trogdir
 
     route(:any, '*path') { raise_404 }
     route(:any, '/') { raise_404 }
-
-    include ::NewRelic::Agent::Instrumentation::Rack
   end
 end

data/lib/trogdir/helpers/response_helpers.rb

@@ -8,4 +8,4 @@ module Trogdir
       klass.elem_match(conditions).first or raise_404
     end
   end
-end
+end

data/lib/trogdir/versions/v1/api.rb

@@ -1,8 +1,6 @@
 module Trogdir
   module V1
     class API < Grape::API
-      use ApiNewRelicInstrumenter
-
       version 'v1', using: :path
 
       helpers RequestHelpers

data/lib/trogdir/versions/v1/people_api.rb

@@ -11,13 +11,21 @@ module Trogdir
         desc 'Get a list of people'
         params do
           optional :affiliation, type: String
+          optional :page, type: Integer
+          optional :per_page, type: Integer, default: 100
         end
         get do
           conditions = {}
 
           conditions[:affiliations] = params[:affiliation].to_s if params[:affiliation]
 
-          present Person.where(conditions), with: PersonEntity, serializable: true
+          people = Person.where(conditions)
+          if params[:page] && params[:per_page] && params[:page] > 0
+            skip_count = params[:page] * params[:per_page] - params[:per_page]
+            people = people.skip(skip_count).limit(params[:per_page])
+          end
+
+          present people, with: PersonEntity, serializable: true
         end
 
         desc 'Return a person by associated id', {params: PersonEntity.documentation.except(:enabled)}

data/lib/trogdir_api/pinglish.rb

@@ -1,11 +1,9 @@
-require 'pinglish'
-
 module TrogdirAPI
   def self.pinglish_block
     Proc.new do |ping|
       ping.check :mongodb do
-        Mongoid.default_session.command(ping: 1).has_key? 'ok'
+        Mongoid.default_client.command(ping: 1).documents.any?{|d| d == {'ok' => 1}}
       end
     end
   end
-end
+end

data/lib/trogdir_api/version.rb

@@ -1,3 +1,3 @@
 module TrogdirAPI
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'.freeze
 end

data/lib/trogdir_api.rb

@@ -35,7 +35,6 @@ module TrogdirAPI
     end
 
     require File.expand_path('../trogdir_api/pinglish', __FILE__)
-    require File.expand_path('../trogdir_api/newrelic', __FILE__)
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trogdir_api
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Adam Crownoble
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-08 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: api-auth
@@ -136,20 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: newrelic_rpm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: API for the Trogdir directory project
 email: adam.crownoble@biola.edu
 executables: []
@@ -160,9 +146,7 @@ files:
 - README.md
 - config.ru
 - config/environment.rb
-- config/mongoid.yml
 - config/mongoid.yml.example
-- config/newrelic.yml.example
 - config/settings.local.yml
 - config/settings.local.yml.example
 - config/settings.yml
@@ -189,7 +173,6 @@ files:
 - lib/trogdir/versions/v1/phones_api.rb
 - lib/trogdir/versions/v1/photos_api.rb
 - lib/trogdir_api.rb
-- lib/trogdir_api/newrelic.rb
 - lib/trogdir_api/pinglish.rb
 - lib/trogdir_api/version.rb
 homepage: https://github.com/biola/trogdir-api
@@ -212,9 +195,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Trogdir directory API
 test_files: []
-has_rdoc: 

data/config/mongoid.yml

@@ -1,37 +0,0 @@
-development:
-  clients:
-    default:
-      database: trogdir_development
-      hosts:
-        - localhost:27017
-
-test:
-  clients:
-    default:
-      database: trogdir_test
-      hosts:
-        - localhost:27017
-
-staging:
-  clients:
-    default:
-      database: trogdir
-      hosts:
-        - mongo1.staging.biola.edu:27017
-        - mongo2.staging.biola.edu:27017
-        - mongo3.staging.biola.edu:27017
-    options:
-      user: trogdir
-      password: "*************"
-
-production:
-  clients:
-    default:
-      database: trogdir
-      hosts:
-        - mongo1.prod.biola.edu:27017
-        - mongo2.prod.biola.edu:27017
-        - mongo3.prod.biola.edu:27017
-    options:
-      user: trogdir
-      password: "*************"

data/config/newrelic.yml.example

@@ -1,227 +0,0 @@
-#
-# This file configures the New Relic Agent.  New Relic monitors
-# Ruby, Java, .NET, PHP, and Python applications with deep visibility and low overhead.
-# For more information, visit www.newrelic.com.
-#
-# Generated May 01, 2014
-#
-# This configuration file is custom generated for Biola University
-
-
-# Here are the settings that are common to all environments
-common: &default_settings
-  # ============================== LICENSE KEY ===============================
-
-  # You must specify the license key associated with your New Relic
-  # account.  This key binds your Agent's data to your account in the
-  # New Relic service.
-  license_key: # set in newrelic.yml
-
-  # Agent Enabled (Ruby/Rails Only)
-  # Use this setting to force the agent to run or not run.
-  # Default is 'auto' which means the agent will install and run only
-  # if a valid dispatcher such as Mongrel is running.  This prevents
-  # it from running with Rake or the console.  Set to false to
-  # completely turn the agent off regardless of the other settings.
-  # Valid values are true, false and auto.
-  #
-  # agent_enabled: auto
-
-  # Application Name Set this to be the name of your application as
-  # you'd like it show up in New Relic. The service will then auto-map
-  # instances of your application into an "application" on your
-  # dashboard page. If you want to map this instance into multiple
-  # apps, like "AJAX Requests" and "All UI" then specify a semicolon
-  # separated list of up to three distinct names, or a yaml list.
-  # Defaults to the capitalized RAILS_ENV or RACK_ENV (i.e.,
-  # Production, Staging, etc)
-  #
-  # Example:
-  #
-  #   app_name:
-  #       - Ajax Service
-  #       - All Services
-  #
-  app_name: trogdir-api
-
-  # When "true", the agent collects performance data about your
-  # application and reports this data to the New Relic service at
-  # newrelic.com. This global switch is normally overridden for each
-  # environment below. (formerly called 'enabled')
-  monitor_mode: true
-
-  # Developer mode should be off in every environment but
-  # development as it has very high overhead in memory.
-  developer_mode: false
-
-  # The newrelic agent generates its own log file to keep its logging
-  # information separate from that of your application. Specify its
-  # log level here.
-  log_level: info
-
-  # Optionally set the path to the log file This is expanded from the
-  # root directory (may be relative or absolute, e.g. 'log/' or
-  # '/var/log/') The agent will attempt to create this directory if it
-  # does not exist.
-  # log_file_path: 'log'
-
-  # Optionally set the name of the log file, defaults to 'newrelic_agent.log'
-  # log_file_name: 'newrelic_agent.log'
-
-  # The newrelic agent communicates with the service via https by default.  This
-  # prevents eavesdropping on the performance metrics transmitted by the agent.
-  # The encryption required by SSL introduces a nominal amount of CPU overhead,
-  # which is performed asynchronously in a background thread.  If you'd prefer
-  # to send your metrics over http uncomment the following line.
-  # ssl: false
-
-  #============================== Browser Monitoring ===============================
-  # New Relic Real User Monitoring gives you insight into the performance real users are
-  # experiencing with your website. This is accomplished by measuring the time it takes for
-  # your users' browsers to download and render your web pages by injecting a small amount
-  # of JavaScript code into the header and footer of each page.
-  browser_monitoring:
-      # By default the agent automatically injects the monitoring JavaScript
-      # into web pages. Set this attribute to false to turn off this behavior.
-      auto_instrument: true
-
-  # Proxy settings for connecting to the New Relic server.
-  #
-  # If a proxy is used, the host setting is required.  Other settings
-  # are optional. Default port is 8080.
-  #
-  # proxy_host: hostname
-  # proxy_port: 8080
-  # proxy_user:
-  # proxy_pass:
-
-  # The agent can optionally log all data it sends to New Relic servers to a
-  # separate log file for human inspection and auditing purposes. To enable this
-  # feature, change 'enabled' below to true.
-  # See: https://newrelic.com/docs/ruby/audit-log
-  audit_log:
-    enabled: false
-
-  # Tells transaction tracer and error collector (when enabled)
-  # whether or not to capture HTTP params.  When true, frameworks can
-  # exclude HTTP parameters from being captured.
-  # Rails: the RoR filter_parameter_logging excludes parameters
-  # Java: create a config setting called "ignored_params" and set it to
-  #     a comma separated list of HTTP parameter names.
-  #     ex: ignored_params: credit_card, ssn, password
-  capture_params: false
-
-  # Transaction tracer captures deep information about slow
-  # transactions and sends this to the New Relic service once a
-  # minute. Included in the transaction is the exact call sequence of
-  # the transactions including any SQL statements issued.
-  transaction_tracer:
-
-    # Transaction tracer is enabled by default. Set this to false to
-    # turn it off. This feature is only available at the Professional
-    # and above product levels.
-    enabled: true
-
-    # Threshold in seconds for when to collect a transaction
-    # trace. When the response time of a controller action exceeds
-    # this threshold, a transaction trace will be recorded and sent to
-    # New Relic. Valid values are any float value, or (default) "apdex_f",
-    # which will use the threshold for an dissatisfying Apdex
-    # controller action - four times the Apdex T value.
-    transaction_threshold: apdex_f
-
-    # When transaction tracer is on, SQL statements can optionally be
-    # recorded. The recorder has three modes, "off" which sends no
-    # SQL, "raw" which sends the SQL statement in its original form,
-    # and "obfuscated", which strips out numeric and string literals.
-    record_sql: obfuscated
-
-    # Threshold in seconds for when to collect stack trace for a SQL
-    # call. In other words, when SQL statements exceed this threshold,
-    # then capture and send to New Relic the current stack trace. This is
-    # helpful for pinpointing where long SQL calls originate from.
-    stack_trace_threshold: 0.500
-
-    # Determines whether the agent will capture query plans for slow
-    # SQL queries.  Only supported in mysql and postgres.  Should be
-    # set to false when using other adapters.
-    # explain_enabled: true
-
-    # Threshold for query execution time below which query plans will
-    # not be captured.  Relevant only when `explain_enabled` is true.
-    # explain_threshold: 0.5
-
-  # Error collector captures information about uncaught exceptions and
-  # sends them to New Relic for viewing
-  error_collector:
-
-    # Error collector is enabled by default. Set this to false to turn
-    # it off. This feature is only available at the Professional and above
-    # product levels.
-    enabled: true
-
-    # Rails Only - tells error collector whether or not to capture a
-    # source snippet around the place of the error when errors are View
-    # related.
-    capture_source: true
-
-    # To stop specific errors from reporting to New Relic, set this property
-    # to comma-separated values.  Default is to ignore routing errors,
-    # which are how 404's get triggered.
-    ignore_errors: "ActionController::RoutingError,Sinatra::NotFound"
-
-  # If you're interested in capturing memcache keys as though they
-  # were SQL uncomment this flag. Note that this does increase
-  # overhead slightly on every memcached call, and can have security
-  # implications if your memcached keys are sensitive
-  # capture_memcache_keys: true
-
-# Application Environments
-# ------------------------------------------
-# Environment-specific settings are in this section.
-# For Rails applications, RAILS_ENV is used to determine the environment.
-# For Java applications, pass -Dnewrelic.environment <environment> to set
-# the environment.
-
-# NOTE if your application has other named environments, you should
-# provide newrelic configuration settings for these environments here.
-
-development:
-  <<: *default_settings
-  # Turn off communication to New Relic service in development mode (also
-  # 'enabled').
-  # NOTE: for initial evaluation purposes, you may want to temporarily
-  # turn the agent on in development mode.
-  monitor_mode: false
-
-  # Rails Only - when running in Developer Mode, the New Relic Agent will
-  # present performance information on the last 100 transactions you have
-  # executed since starting the mongrel.
-  # NOTE: There is substantial overhead when running in developer mode.
-  # Do not use for production or load testing.
-  developer_mode: true
-
-  # Enable textmate links
-  # textmate: true
-
-test:
-  <<: *default_settings
-  # It almost never makes sense to turn on the agent when running
-  # unit, functional or integration tests or the like.
-  monitor_mode: false
-
-# Turn on the agent in production for 24x7 monitoring. NewRelic
-# testing shows an average performance impact of < 5 ms per
-# transaction, you can leave this on all the time without
-# incurring any user-visible performance degradation.
-production:
-  <<: *default_settings
-  monitor_mode: true
-
-# Many applications have a staging environment which behaves
-# identically to production. Support for that environment is provided
-# here.  By default, the staging environment has the agent turned on.
-staging:
-  <<: *default_settings
-  monitor_mode: true
-  # app_name: My Application (Staging)

data/lib/trogdir_api/newrelic.rb

@@ -1,44 +0,0 @@
-require 'newrelic_rpm'
-
-# Taken from https://gist.github.com/dblock/4170469
-class ApiNewRelicInstrumenter < Grape::Middleware::Base
-  include NewRelic::Agent::Instrumentation::ControllerInstrumentation
-
-  def call_with_newrelic(&block)
-    trace_options = {
-      :category => :rack,
-      :path => "#{route_path}\##{route_method}",
-      :request => Rack::Request.new(env)
-    }
-
-    perform_action_with_newrelic_trace(trace_options) do
-      result = yield
-      MetricFrame.abort_transaction! if result.first == 404 # ignore cascaded calls
-      result
-    end
-  end
-
-  def call(env)
-    @env = env
-    call_with_newrelic do
-      super
-    end
-  end
-
-  def env
-    @env
-  end
-
-  def route
-    env['api.endpoint'].routes.first
-  end
-
-  def route_method
-    route.route_method.downcase
-  end
-
-  def route_path
-    path = route.route_path.gsub(/^.+:version\/|^\/|:|\(.+\)/, '').tr('/', '-')
-    "api.#{route.route_version}.#{path}"
-  end
-end