gris 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7903911cba8da7b598dd6b4917a79a47b636b7b5
-  data.tar.gz: 8d7cb5ded5b95afd3a0862688c5a002feeb32d40
+  metadata.gz: d9a3d232cdfdbe4192901e7b09af1be47d757fa6
+  data.tar.gz: 9cba6a4558f7c4af0948c9282a81e1e98aa9e621
 SHA512:
-  metadata.gz: 3c04c1f98d3e9c1467507e182d317c89a7456a27f2f542d8a0f297ccd30d45bfa5090e5dfa3cfa14796a4693dc526cedc284c21982ec39d12bc6ca39797a9c67
-  data.tar.gz: ef360e0a06a2b4ece6de403e17640e3fd641a676221512597d67418e1233db6d3608d1b848d28d5a197e76dcfa75fe50b611f8a5145df1fd6af60cd5a13dd2fe
+  metadata.gz: 174a24dab870ccb72d89d50bbb12542d5816a173cf408127999c52b0f2853bf364908df77df78bc5ce48b220ef5d03b9c63ad17e5d7ed5f21a19b907ff2f973a
+  data.tar.gz: 99c07b949ff431a604bf688da3bc83386d65c4490d08634d3bcba8446d2000f3aaae19f1aedf446305242cc219990213e1ad0868d09f7d240e247b220f95424c

data/Gemfile.lock

@@ -1,11 +1,10 @@
 PATH
   remote: .
   specs:
-    gris (0.2.4)
+    gris (0.3.0)
       activesupport (~> 4.2, >= 4.2.0)
       chronic (~> 0.10.0)
       dalli (~> 2.7)
-      dotenv (~> 2.0, >= 2.0)
       git (~> 1.2, >= 1.2.8)
       grape (~> 0.11.0, >= 0.11.0)
       grape-roar (~> 0.3.0, >= 0.3.0)
@@ -58,7 +57,6 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
-    dotenv (2.0.1)
     equalizer (0.0.11)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
@@ -94,7 +92,7 @@ GEM
     grape-swagger (0.10.1)
       grape (>= 0.8.0)
       grape-entity
-    hashie (3.4.1)
+    hashie (3.4.2)
     hashie-forbidden_attributes (0.1.1)
       hashie (>= 3.0)
     hyperclient (0.7.0)
@@ -107,20 +105,20 @@ GEM
       uri_template (~> 0.5)
     i18n (0.7.0)
     ice_nine (0.11.1)
-    json (1.8.2)
+    json (1.8.3)
     little-plugger (1.1.3)
     logging (2.0.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     mini_portile (0.6.2)
-    minitest (5.6.1)
+    minitest (5.7.0)
     multi_json (1.11.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     net-http-digest_auth (1.4)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    parser (2.2.2.3)
+    parser (2.2.2.5)
       ast (>= 1.1, < 3.0)
     powerpack (0.1.1)
     rack (1.6.1)
@@ -135,7 +133,7 @@ GEM
       rack-test (>= 0.5)
     rainbow (2.0.0)
     rake (10.4.2)
-    representable (2.2.1)
+    representable (2.2.2)
       multi_json
       nokogiri
       uber (~> 0.0.7)
@@ -161,9 +159,9 @@ GEM
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
     ruby-progressbar (1.7.5)
-    ruby_parser (3.6.6)
+    ruby_parser (3.7.0)
       sexp_processor (~> 4.1)
-    sexp_processor (4.5.1)
+    sexp_processor (4.6.0)
     sqlite3 (1.3.10)
     thor (0.19.1)
     thread_safe (0.3.5)

data/gris.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'activesupport', '~> 4.2', '>= 4.2.0'
   s.add_runtime_dependency 'rake', '~> 10.4', '>= 10.4.2'
   s.add_runtime_dependency 'git', '~> 1.2', '>= 1.2.8'
-  s.add_runtime_dependency 'dotenv', '~> 2.0', '>= 2.0'
   s.add_runtime_dependency 'logging', '~> 2.0'
   s.add_runtime_dependency 'grape', '~> 0.11.0', '>= 0.11.0'
   s.add_runtime_dependency 'grape-roar', '~> 0.3.0', '>= 0.3.0'

data/lib/gris.rb

@@ -1,6 +1,5 @@
 # require external libraries
 require 'rake'
-require 'dotenv'
 require 'yaml'
 require 'grape'
 require 'json'

data/lib/gris/cli.rb

@@ -2,8 +2,6 @@ require 'thor'
 require 'gris/generators'
 require 'gris/version'
 
-Gris.load_environment if defined?(Dotenv)
-
 module Gris
   class CLI
     class Generate < Thor

data/lib/gris/generators/templates/scaffold/.gitignore.tt

@@ -3,7 +3,6 @@
 .rspec
 .env
 .env.*
-!.env.example
 !log/.keep
 log/*
 tmp/*

data/lib/gris/generators/templates/scaffold/config/boot.rb

@@ -3,5 +3,3 @@ require 'bundler/setup'
 require 'gris/setup'
 
 Bundler.require(:default, Gris.env.to_sym)
-
-Gris.load_environment

data/lib/gris/generators/templates/scaffold/config/database.yml.tt

@@ -1,20 +1,16 @@
-defaults: &defaults
-  encoding: unicode
+default: &default
   adapter: postgresql
-  host: <%%= ENV['DATABASE_HOST'] %>
-  username: <%%= ENV['DATABASE_USER'] %>
-  password: <%%= ENV['DATABASE_PASSWORD'] %>
-  database: <%%= ENV['DATABASE_NAME'] %>
-  pool: <%= ENV["DB_POOL"] || ENV['MAX_THREADS'] || 5 %>
-
-production:
-  <<: *defaults
+  encoding: unicode
+  host: localhost
+  username: <%%= ENV['DB_USER'] %>
+  password: <%%= ENV['DB_PASS'] %>
+  pool: 5
 
 development:
-  <<: *defaults
+  <<: *default
+  database: <%= app_name %>_development
 
 test:
-  <<: *defaults
+  <<: *default
+  database: <%= app_name %>_test
 
-staging:
-  <<: *defaults

data/lib/gris/generators/templates/scaffold/config/secrets.yml.tt

@@ -0,0 +1,15 @@
+default: &:default
+  service_name: <%= app_name %>
+  permitted_tokens: replace-me
+  base_url: <%%= ENV['BASE_URL'] || 'http://localhost:9292' %>
+
+development:
+  <<: *default
+
+test:
+  <<: *default
+
+production:
+  <<: *default
+  permitted_tokens: <%%= ENV['PERMITTED_TOKENS'] %>
+

data/lib/gris/generators/templates/scaffold/spec/support/app_helper.rb

@@ -3,11 +3,10 @@ shared_context 'with a running app' do
 end
 
 shared_context 'with token authorization' do
+  let(:permitted_token) { Gris.secrets.permitted_tokens }
   before(:each) do
-    permitted_token = ENV['PERMITTED_TOKENS'].split(',').first if ENV['PERMITTED_TOKENS']
     header 'Http-Authorization', permitted_token
   end
-  let(:permitted_token) { ENV['PERMITTED_TOKENS'].split(',').first }
 end
 
 shared_context 'with a running app and client' do

data/lib/gris/grape_extensions/authentication_helpers.rb

@@ -15,7 +15,7 @@ module Gris
     end
 
     def permitted_tokens
-      ENV['PERMITTED_TOKENS'].split(',')
+      Gris.secrets.permitted_tokens.split(',')
     end
   end
 end

data/lib/gris/identity.rb

@@ -13,11 +13,11 @@ module Gris
     end
 
     def self.name
-      ENV['SERVICE_NAME'] || 'api-service'
+      Gris.secrets.service_name
     end
 
     def self.base_url
-      ENV['BASE_URL'] || 'http://localhost:9292'
+      Gris.secrets.base_url
     end
 
     def self.hostname

data/lib/gris/setup.rb

@@ -1,13 +1,7 @@
 require 'active_support'
-require 'dotenv'
 
 module Gris
   class << self
-    def load_environment
-      env_file = Gris.env.test? ? '.env.test' : '.env'
-      Dotenv.overload env_file
-    end
-
     def env
       @_env ||= ActiveSupport::StringInquirer.new(ENV['RACK_ENV'] || 'development')
     end
@@ -16,6 +10,22 @@ module Gris
       @_env = ActiveSupport::StringInquirer.new(environment)
     end
 
+    # adapted from https://github.com/rails/rails/blob/master/railties/lib/rails/application.rb
+    # Returns secrets added to config/secrets.yml.
+    def secrets
+      @secrets ||= begin
+        secrets = ActiveSupport::OrderedOptions.new
+        yaml = 'config/secrets.yml'
+        if File.exist?(yaml)
+          require 'erb'
+          all_secrets = YAML.load(ERB.new(IO.read(yaml)).result) || {}
+          env_secrets = all_secrets[Gris.env]
+          secrets.merge!(env_secrets.symbolize_keys) if env_secrets
+        end
+        secrets
+      end
+    end
+
     def db_connection_details
       YAML.load(ERB.new(File.read('./config/database.yml')).result)[Gris.env]
     end

data/lib/gris/version.rb

@@ -1,5 +1,5 @@
 module Gris
-  VERSION = '0.2.4'
+  VERSION = '0.3.0'
 
   class Version
     class << self

data/spec/generators/scaffold_generator_spec.rb

@@ -33,24 +33,12 @@ describe Gris::Generators::ScaffoldGenerator do
       expect(Dir).to exist(app_path)
     end
 
-    it 'creates a .env.example file with with a development database name' do
-      expect(File).to exist("#{app_path}/.env.example")
-      env_file = File.read("#{app_path}/.env.example")
-      expect(env_file).to match(/#{app_name}_development/)
-    end
-
     it 'creates a Procfile file with puma ' do
       expect(File).to exist("#{app_path}/Procfile")
       env_file = File.read("#{app_path}/Procfile")
       expect(env_file).to match(/web: bundle exec puma/)
     end
 
-    it 'creates a .env.example file with a development database name' do
-      expect(File).to exist("#{app_path}/.env.example")
-      env_test_file = File.read("#{app_path}/.env.example")
-      expect(env_test_file).to match(/#{app_name}_development/)
-    end
-
     it 'selects postgresql as the default database adapter' do
       database_config_file = File.read("#{app_path}/config/database.yml")
       expect(database_config_file).to match(/adapter: postgresql/)

data/spec/grape_extensions/authentication_helpers_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Gris::AuthenticationHelpers do
   context 'without permitted token' do
     before(:each) do
-      stub_const 'ENV', 'PERMITTED_TOKENS' => 'my-token,another-token'
+      Gris.secrets.permitted_tokens = 'my-token,another-token'
       @helper = SpecApiAuthHelper.new
     end
 

data/spec/identity_spec.rb

@@ -33,14 +33,8 @@ describe Gris::Identity do
   end
 
   context '#name' do
-    it "returns 'api-service' if no ENV['SERVICE_NAME'] is set" do
-      ENV['SERVICE_NAME'] = nil
-      expect(Gris::Identity.name).to eq('api-service')
-    end
-
-    it "returns the ENV['SERVICE_NAME'] when specified" do
-      ENV['SERVICE_NAME'] = nil
-      ENV['SERVICE_NAME'] = 'my-service'
+    it 'returns the Gris.secrets.service_name when specified' do
+      Gris.secrets.service_name = 'my-service'
       expect(Gris::Identity.name).to eq('my-service')
     end
   end
@@ -72,14 +66,8 @@ describe Gris::Identity do
   end
 
   context '#base_url' do
-    it 'returns http://localhost:9292 by default' do
-      ENV['BASE_URL'] = nil
-      expect(Gris::Identity.base_url).to eq('http://localhost:9292')
-    end
-
-    it "returns the env['BASE_URL'] when specied" do
-      ENV['BASE_URL'] = nil
-      ENV['BASE_URL'] = 'my-base-url'
+    it 'returns the Gris.secrets.base_url when specied' do
+      Gris.secrets.base_url = 'my-base-url'
       expect(Gris::Identity.base_url).to eq('my-base-url')
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gris
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Dylan Fareed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -90,26 +90,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.8
-- !ruby/object:Gem::Dependency
-  name: dotenv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement
@@ -358,7 +338,6 @@ files:
 - lib/gris/generators/templates/api/spec/models/%name_underscore%_spec.rb.tt
 - lib/gris/generators/templates/create_table_migration/%migration_filename%.rb.tt
 - lib/gris/generators/templates/migration/%migration_filename%.rb.tt
-- lib/gris/generators/templates/scaffold/.env.example.tt
 - lib/gris/generators/templates/scaffold/.gitignore.tt
 - lib/gris/generators/templates/scaffold/.rspec.tt
 - lib/gris/generators/templates/scaffold/.rubocop.yml
@@ -376,6 +355,7 @@ files:
 - lib/gris/generators/templates/scaffold/config/database.yml.tt
 - lib/gris/generators/templates/scaffold/config/initializers/active_record.rb
 - lib/gris/generators/templates/scaffold/config/puma.rb
+- lib/gris/generators/templates/scaffold/config/secrets.yml.tt
 - lib/gris/generators/templates/scaffold/db/schema.rb
 - lib/gris/generators/templates/scaffold/spec/endpoints/cors_spec.rb.tt
 - lib/gris/generators/templates/scaffold/spec/spec_helper.rb

data/lib/gris/generators/templates/scaffold/.env.example.tt

@@ -1,11 +0,0 @@
-# Uncomment when using Gris::Middleware::Authentication
-# HEADER_PASSWORD=''
-
-SERVICE_NAME=<%= app_name %>
-
-DATABASE_USER='postgres'
-DATABASE_PASSWORD=''
-DATABASE_HOST=localhost
-DATABASE_NAME=<%= app_name.underscore %>_development
-BASE_URL=http://127.0.0.1:9393
-PERMITTED_TOKENS=replace-me