trogdir_api 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6747aa49dbca2d58802537c5a03a95d849c1f403
-  data.tar.gz: 50353a13d624313d3ce5444769045ac10ab44f4f
+  metadata.gz: fa354b0a9be8229e46f22496967be07d4fa106f9
+  data.tar.gz: 9ec3fc1078b827dd3987ac01df784e6bc7d979c6
 SHA512:
-  metadata.gz: 9f5ab9c8990169bc31e37fe69418cc20ed5b3055429c33575e2b59eb3ec400640e2ef5258c1ddef02fa3b2f9aad8bbcc9feb8573812a89b2f60a262ba2306e9f
-  data.tar.gz: 2fb23b084aac4ccfbc006fff404d5aeb4172782059d1c5ac1e8346d9821150af1bab0d7ed323654b522e6518a08cbbc3d659232ce1ad8412bb3aeabadaf575de
+  metadata.gz: ce6b94b61bb78cb579d5aedfb725055674fde6d53bc0c479914f7aa7730e4c6307cec61f3bebafcf5eb06325b6b88b49a4642a504b816e93b7eb102606529d09
+  data.tar.gz: 276f15973b60ab55e4f28dd9b838777165f4647bb7bdc4b97aa2df4e1f84423be7e52829f1e0d5764d7803a9311dcff0a477d06e87cd8c9b0022aed53768a2ec

data/README.md

@@ -15,23 +15,14 @@ git clone git@github.com:biola/trogdir-api.git
 cd trogdir-api
 bundle install
 cp config/mongoid.yml.example config/mongoid.yml
-cp config/blazing.rb.example config/blazing.rb
 cp config/newrelic.yml.example config/newrelic.yml
 ```
 
 Configuration
 -------------
 - Edit `config/mongoid.yml` accordingly.
-- Edit `config/blazing.rb` accordingly.
 - Edit `config/newrelic.yml` accordingly.
 
-Deployment
-----------
-```bash
-blazing setup [target name in blazing.rb]
-git push [target name in blazing.rb]
-```
-
 Console
 -------
 To launch a console, `cd` into the app directory and run `irb -r ./config/environment.rb`

data/config/mongoid.yml

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

data/config/mongoid.yml.example

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

data/config/settings.local.yml

@@ -0,0 +1,3 @@
+sentry:
+  url:
+    

data/config/settings.local.yml.example

@@ -0,0 +1,2 @@
+sentry:
+  url:

data/config/settings.yml

@@ -0,0 +1,2 @@
+sentry:
+  url: # set in settings.local.yml

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

@@ -58,4 +58,4 @@ module Trogdir
       end
     end
   end
-end
+end

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

@@ -9,7 +9,12 @@ module Trogdir
       helpers AuthenticationHelpers
 
       before do
+        # Verify HMAC signiture for the given request
         authenticate!
+
+        # Mongoid::Userstamp::User gets mixed into the Syncinator class
+        # which provides methods for setting the current syncinator for
+        # the each request
         Syncinator.current = current_syncinator
       end
 

data/lib/trogdir_api.rb

@@ -3,12 +3,19 @@ require 'grape-entity'
 require 'hashie-forbidden_attributes'
 require 'oj'
 require 'api_auth'
+require 'config'
 require 'trogdir_models'
 require 'turnout'
 
 module TrogdirAPI
+  def self.environment
+    (ENV['RACK_ENV'] || ENV['RAILS_ENV'] || :development).to_sym
+  end
+
   def self.initialize!
-    ENV['RACK_ENV'] ||= 'development'
+    ENV['RACK_ENV'] ||= environment.to_s
+
+    Config.load_and_set_settings('./config/settings.yml', "./config/settings.#{environment}.yml", './config/settings.local.yml')
 
     MultiJson.use :oj
 
@@ -16,6 +23,12 @@ module TrogdirAPI
     mongoid_yml_path = "#{mongoid_yml_path}.example" if !File.exists? mongoid_yml_path
     Mongoid.load! mongoid_yml_path
 
+    if defined? Raven
+      Raven.configure do |config|
+        config.dsn = Settings.sentry.url
+      end
+    end
+
     Turnout.configure do |config|
       config.named_maintenance_file_paths.merge! server: '/tmp/turnout.yml'
       config.default_maintenance_page = Turnout::MaintenancePage::JSON

data/lib/trogdir_api/newrelic.rb

@@ -41,4 +41,4 @@ class ApiNewRelicInstrumenter < Grape::Middleware::Base
     path = route.route_path.gsub(/^.+:version\/|^\/|:|\(.+\)/, '').tr('/', '-')
     "api.#{route.route_version}.#{path}"
   end
-end
+end

data/lib/trogdir_api/version.rb

@@ -1,3 +1,3 @@
 module TrogdirAPI
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trogdir_api
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Adam Crownoble
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: api-auth
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
@@ -145,12 +159,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.example
+- config/settings.local.yml
+- config/settings.local.yml.example
+- config/settings.yml
 - lib/trogdir/api.rb
 - lib/trogdir/helpers/authentication_helpers.rb
 - lib/trogdir/helpers/request_helpers.rb

data/config/blazing.rb

@@ -1,6 +0,0 @@
-target :'proda',   'devinh1@ruby5a.prod.biola.edu:/srv/rack/trogdir-api',    rails_env: 'production'
-target :'prodb',   'devinh1@ruby5b.prod.biola.edu:/srv/rack/trogdir-api',    rails_env: 'production'
-
-env_script '/etc/profile'
-
-rake :post_deploy

data/config/blazing.rb.example

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