trogdir_api 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e718e085c241224b67d4ae83d769990fbcd0aa88
-  data.tar.gz: 9090142fec71fdb63f4f4665d74168186f5ee2e4
+  metadata.gz: 7f1efaf73b978fcaa10879ec8bf5819bbd7fdc5d
+  data.tar.gz: 15040349ac03960710fc11bca26f4477adb8865a
 SHA512:
-  metadata.gz: 159c788383717a4f237283af435d7edd8bac9b9bfa65c4e98779a35321f789d3fc57c3c58a16661639e2f3af6c96f37f225e61afe9eb8ce970f97d87d4120c33
-  data.tar.gz: 7b38b14abb64e92dd9ff357421993d8c82c015912a5999d0352cacdee4b3aeb6bccad18a52b4d760071968f99283a81a14f65f135c7f5bb20b4cca3d86c86ed7
+  metadata.gz: 3033a7cc53172214060b2da6b5a6d89beb72934775eac9cf42ce8080d077ae20ae9bd11fbdd4012c0f9f061e5864dc4c5c3bac46d4ae26f8ae2c200cba76f6f2
+  data.tar.gz: 08ce75be68dac0fd356f888d1596fbbef3e4caf1523b06cb581a4cee5168857a85bf27a17ee7db64a9ef32a0dcd6801c7c2be2dd532d7adcdf33224f162a84ed

data/config/blazing.rb

@@ -0,0 +1,7 @@
+target :'ruby2.staging', 'adamc7@ruby2.staging.biola.edu:/srv/rack/trogdir-api', rails_env: 'staging'
+target :'ruby5a.prod',   'adamc7@ruby5a.prod.biola.edu:/srv/rack/trogdir-api',   rails_env: 'production'
+target :'ruby5b.prod',   'adamc7@ruby5b.prod.biola.edu:/srv/rack/trogdir-api',   rails_env: 'production'
+
+env_scripts '/etc/profile'
+
+rake :post_deploy

data/config/blazing.rb.example

@@ -0,0 +1,7 @@
+target :'ruby2.staging', 'johnd0@ruby1.staging.biola.edu:/srv/rack/trogdir-api',  rails_env: 'staging'
+target :'ruby3a.prod',   'johnd0@ruby3a.prod.biola.edu:/srv/rack/trodgir-api',    rails_env: 'production'
+target :'ruby3b.prod',   'johnd0@ruby3b.prod.biola.edu:/srv/rack/trogdir-api',    rails_env: 'production'
+
+env_scripts '/etc/profile'
+
+rake :post_deploy

data/config/environment.rb

@@ -1,5 +1,5 @@
 require 'bundler'
-Bundler.setup :default, ENV['RACK_ENV'] || ENV['RAILS_ENV'] || :developement
+Bundler.setup :default, ENV['RACK_ENV'] || ENV['RAILS_ENV'] || :development
 
 require_relative '../lib/trogdir_api'
-TrogdirAPI.initialize!
+TrogdirAPI.initialize!

data/config/newrelic.yml

@@ -0,0 +1,227 @@
+#
+# 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/config/newrelic.yml.example

@@ -0,0 +1,227 @@
+#
+# 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/config.ru

@@ -1,8 +1,14 @@
 require ::File.expand_path('../config/environment',  __FILE__)
 
 if ENV['RACK_ENV'] == 'development'
+  require 'newrelic_rpm'
+  require 'new_relic/rack/developer_mode'
+  use NewRelic::Rack::DeveloperMode
+
   require 'better_errors'
   use BetterErrors::Middleware
 end
 
+use Pinglish, &TrogdirAPI.pinglish_block
+
 run Trogdir::API

data/lib/trogdir/api.rb

@@ -1,5 +1,19 @@
+require 'new_relic/agent/instrumentation/rack'
+require 'rack/turnout'
+
 module Trogdir
   class API < Grape::API
+    helpers ResponseHelpers
+    format :json
+    rescue_from :all
+
+    use Rack::Turnout
+
     mount Trogdir::V1::API
+
+    route(:any, '*path') { raise_404 }
+    route(:any, '/') { raise_404 }
+
+    include ::NewRelic::Agent::Instrumentation::Rack
   end
-end
+end

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

@@ -1,20 +1,21 @@
 module Trogdir
   module V1
     class API < Grape::API
+      use ApiNewRelicInstrumenter
+
       version 'v1', using: :path
 
-      format :json
       helpers RequestHelpers
-      helpers ResponseHelpers
       helpers AuthenticationHelpers
 
       before { authenticate! }
 
       rescue_from Mongoid::Errors::DocumentNotFound do |e|
-        error! "404 Not Found", 404
+        Rack::Response.new([{error: '404 Not Found'}.to_json], 404, {'Content-type' => 'application/json'})
       end
 
       mount PeopleAPI
+      mount GroupsAPI
       mount ChangeSyncsAPI
 
       resource 'people/:person_id' do
@@ -26,4 +27,4 @@ module Trogdir
       end
     end
   end
-end
+end

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

@@ -11,9 +11,12 @@ module Trogdir
         end
 
         desc "Return and starts change_syncs that haven't been started"
+        params do
+          optional :limit, type: Integer, default: 100
+        end
         put :start do
           syncinator = current_syncinator
-          changesets = syncinator.startable_changesets
+          changesets = syncinator.startable_changesets.limit params[:limit]
 
           sync_logs = changesets.map do |changeset|
             syncinator.start! changeset

data/lib/trogdir/versions/v1/entities/person.rb

@@ -1,52 +1,108 @@
 module Trogdir
   module V1
     class PersonEntity < Grape::Entity
-      expose :ids, using: IDEntity, as: :ids
-      expose :emails, using: EmailEntity, as: :emails
-      expose :photos, using: PhotoEntity, as: :photos
-      expose :phones, using: PhoneEntity, as: :phones
-      expose :addresses, using: AddressEntity, as: :addresses
-
-      expose :uuid
-
-      # Names
-      expose :first_name
-      expose :preferred_name
-      expose :middle_name
-      expose :last_name
-      expose :display_name
-
-      # Demographic
-      expose :gender
-      expose :partial_ssn
-      expose :birth_date
-
-      # Groups and permissions
-      expose :entitlements
-      expose :affiliations
-
-      # Options
-      expose :enabled
-
-      # STUDENT INFO #
-
-      # On-Campus Residence
-      expose :residence
-      expose :floor
-      expose :wing
-
-      # Academic
-      expose :majors
-
-      # FERPA
-      expose :privacy
-
-      # EMPLOYEE INFO #
-      expose :department
-      expose :title
-      expose :employee_type
-      expose :full_time
-      expose :pay_type
+      FIELDS = [
+        :uuid,
+
+        # Names
+        :first_name,
+        :preferred_name,
+        :middle_name,
+        :last_name,
+        :display_name,
+
+        # Demographic
+        :gender,
+        :partial_ssn,
+        :birth_date,
+
+        # Groups and permissions
+        :entitlements,
+        :affiliations,
+        :groups,
+
+        # Options
+        :enabled,
+
+        # STUDENT INFO #
+
+        # On-Campus Residence
+        :residence,
+        :floor,
+        :wing,
+
+        # Academic
+        :majors,
+
+        # FERPA
+        :privacy,
+
+        # EMPLOYEE INFO #
+        :department,
+        :title,
+        :employee_type,
+        :full_time,
+        :pay_type,
+
+        ids: [
+          :id,
+          :type,
+          :identifier
+        ],
+
+        emails: [
+          :id,
+          :type,
+          :address,
+          :primary
+        ],
+
+        photos: [
+          :id,
+          :type,
+          :url,
+          :height,
+          :width
+        ],
+
+        phones: [
+          :id,
+          :type,
+          :number,
+          :primary
+        ],
+
+        addresses: [
+          :id,
+          :type,
+          :street_1,
+          :street_2,
+          :city,
+          :state,
+          :zip,
+          :country
+        ]
+      ]
+
+      def serializable_hash(runtime_options = {})
+        build_hash(object, FIELDS)
+      end
+
+      private
+
+      def build_hash(object, fields)
+        fields.each_with_object({}) do |field, hash|
+          if field.is_a? Hash
+            field.each do |association, embed_fields|
+              hash[association] = object.send(association).map do |embed|
+                build_hash(embed, embed_fields)
+              end
+            end
+          else
+            hash[field] = object.send(field)
+          end
+        end
+      end
     end
   end
 end

data/lib/trogdir/versions/v1/entities/sync_log_with_changeset.rb

@@ -4,6 +4,7 @@ module Trogdir
       expose(:sync_log_id) { |sync_log| sync_log.id }
       expose(:action) { |sync_log| sync_log.changeset.action }
       expose(:person_id) { |sync_log| sync_log.changeset.person.uuid }
+      expose(:affiliations) { |sync_log| sync_log.changeset.person.affiliations }
       expose(:scope) { |sync_log| sync_log.changeset.scope }
       expose(:original) { |sync_log| sync_log.changeset.original }
       expose(:modified) { |sync_log| sync_log.changeset.modified }

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

@@ -0,0 +1,51 @@
+module Trogdir
+  module V1
+    class GroupsAPI < Grape::API
+      resource :groups do
+        before do
+          if params[:identifier]
+            @person = if params[:type]
+              elem_match_or_404 Person, ids: {type: params[:type], identifier: params[:identifier]}
+            else
+              Person.find_by uuid: params[:identifier]
+            end
+            @groups = Array(@person.groups)
+          end
+        end
+
+        desc 'Get the people in a group'
+        params do
+          requires :group, type: String
+        end
+        get ':group/people' do
+          people = Person.where(groups: params[:group])
+          present people, with: PersonEntity, serializable: true
+        end
+
+        desc 'Add a person to a group'
+        params do
+          requires :group, type: String
+          requires :identifier, type: String, desc: 'Person identifier'
+          optional :type, type: Symbol, values: ID::TYPES, desc: 'Person identifier type'
+        end
+        put ':group/add' do
+          @person.groups = (@groups + [params[:group]]).uniq
+
+          {result: @person.save && @person.groups.length == @groups.length + 1}
+        end
+
+        desc 'Remove a person from a group'
+        params do
+          requires :group, type: String
+          requires :identifier, type: String, desc: 'Person identifier'
+          optional :type, type: Symbol, values: ID::TYPES, desc: 'Person identifier type'
+        end
+        put ':group/remove' do
+          @person.groups = (@groups - [params[:group]]).uniq
+
+          {result: @person.save && @person.groups.length == @groups.length - 1}
+        end
+      end
+    end
+  end
+end

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

@@ -17,7 +17,7 @@ module Trogdir
 
           conditions[:affiliations] = params[:affiliation].to_s if params[:affiliation]
 
-          present Person.where(conditions), with: PersonEntity
+          present Person.where(conditions), with: PersonEntity, serializable: true
         end
 
         desc 'Return a person by associated id', {params: PersonEntity.documentation.except(:enabled)}
@@ -56,6 +56,7 @@ module Trogdir
           # Groups and permissions
           optional :entitlements, type: Array
           optional :affiliations, type: Array
+          optional :groups, type: Array
 
           # STUDENT INFO #
 
@@ -98,6 +99,7 @@ module Trogdir
           # Groups and permissions
           optional :entitlements, type: Array
           optional :affiliations, type: Array
+          optional :groups, type: Array
 
           # STUDENT INFO #
 
@@ -127,4 +129,4 @@ module Trogdir
       end
     end
   end
-end
+end

data/lib/trogdir/versions/v1.rb

@@ -2,6 +2,7 @@ module Trogdir
   module V1
     autoload :API, File.expand_path('../v1/api', __FILE__)
     autoload :ChangeSyncsAPI, File.expand_path('../v1/change_syncs_api', __FILE__)
+    autoload :GroupsAPI, File.expand_path('../v1/groups_api', __FILE__)
     autoload :PeopleAPI, File.expand_path('../v1/people_api', __FILE__)
     autoload :IDsAPI, File.expand_path('../v1/ids_api', __FILE__)
     autoload :EmailsAPI, File.expand_path('../v1/emails_api', __FILE__)
@@ -17,4 +18,4 @@ module Trogdir
     autoload :PhoneEntity, File.expand_path('../v1/entities/phone', __FILE__)
     autoload :AddressEntity, File.expand_path('../v1/entities/address', __FILE__)
   end
-end
+end

data/lib/trogdir_api/newrelic.rb

@@ -0,0 +1,44 @@
+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

data/lib/trogdir_api/pinglish.rb

@@ -0,0 +1,11 @@
+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'
+      end
+    end
+  end
+end

data/lib/trogdir_api/version.rb

@@ -1,3 +1,3 @@
 module TrogdirAPI
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/lib/trogdir_api.rb

@@ -1,15 +1,27 @@
 require 'grape'
 require 'grape-entity'
+require 'oj'
 require 'api_auth'
 require 'trogdir_models'
+require 'turnout'
 
 module TrogdirAPI
   def self.initialize!
     ENV['RACK_ENV'] ||= 'development'
 
+    MultiJson.use :oj
+
     mongoid_yml_path = File.expand_path('../../config/mongoid.yml',  __FILE__)
     mongoid_yml_path = "#{mongoid_yml_path}.example" if !File.exists? mongoid_yml_path
     Mongoid.load! mongoid_yml_path
+
+    Turnout.configure do |config|
+      config.named_maintenance_file_paths.merge! server: '/tmp/turnout.yml'
+      config.default_maintenance_page = Turnout::MaintenancePage::JSON
+    end
+
+    require File.expand_path('../trogdir_api/pinglish', __FILE__)
+    require File.expand_path('../trogdir_api/newrelic', __FILE__)
   end
 end
 
@@ -19,4 +31,4 @@ module Trogdir
   autoload :RequestHelpers, File.expand_path('../trogdir/helpers/request_helpers', __FILE__)
   autoload :API, File.expand_path('../trogdir/api', __FILE__)
   autoload :V1, File.expand_path('../trogdir/versions/v1', __FILE__)
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trogdir_api
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Adam Crownoble
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: api-auth
@@ -75,9 +75,13 @@ files:
 - MIT-LICENSE
 - README.md
 - config.ru
+- config/blazing.rb
+- config/blazing.rb.example
 - config/environment.rb
 - config/mongoid.yml
 - config/mongoid.yml.example
+- config/newrelic.yml
+- config/newrelic.yml.example
 - lib/trogdir/api.rb
 - lib/trogdir/helpers/authentication_helpers.rb
 - lib/trogdir/helpers/request_helpers.rb
@@ -95,11 +99,14 @@ files:
 - lib/trogdir/versions/v1/entities/photo.rb
 - lib/trogdir/versions/v1/entities/sync_log.rb
 - lib/trogdir/versions/v1/entities/sync_log_with_changeset.rb
+- lib/trogdir/versions/v1/groups_api.rb
 - lib/trogdir/versions/v1/ids_api.rb
 - lib/trogdir/versions/v1/people_api.rb
 - 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
 licenses:
@@ -126,3 +133,4 @@ signing_key:
 specification_version: 4
 summary: Trogdir directory API
 test_files: []
+has_rdoc: