gris 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 384f461e4fb5637d285e821164485bd0208e190e
-  data.tar.gz: 9378c46ca28ee796eb63f5d99efa00278d597f3a
+  metadata.gz: 4ef5f60c714ffb37c1cee757a9f948a7be8cc565
+  data.tar.gz: aa30d373204592b972d76be94ecd3d5bb6026c96
 SHA512:
-  metadata.gz: 9c03f1888efe805675bc8d75a919e28ef246db23ad3d68896e81fcb6dcb5b766eeb24aa1e4d4a91da9a5322ccca1a4ff595b287ee8a4b1503f6098752f83e41b
-  data.tar.gz: 615f3ed39a0067a40db7e447083ecc917f111e2cbd404d1b8b42de51a4c494f096671ec0e9e221c77bf7d8b1bca7d66ca75eeda7dafab1722a0c2337817a8c69
+  metadata.gz: ed7f285cd67b0465818cd73d56777c824ffa8715d9461f337e17ce7df8d5d6c52207874e1aa740c6b3692ce5ad6cf0a6d0d4af692383d5697ca90c7d99d1918e
+  data.tar.gz: b5637b878507394ec58524598ca861be1fb92d991ab30ffb482a4f25c18a0b4037cd6be329fa9a274a92343c686b12beb913b3b9f920dd4690701539f463222e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gris (0.1.3)
+    gris (0.1.4)
       activesupport (~> 4.2, >= 4.2.0)
       dotenv (~> 1.0.2, >= 1.0.2)
       git (~> 1.2, >= 1.2.8)

data/README.md

@@ -2,6 +2,8 @@
 
 Gris is a framework for building Rack-based hypermedia APIs using Grape, Roar and ActiveRecord.
 
+[![Build Status](https://semaphoreci.com/api/v1/projects/37371083-45b6-4c6f-a887-b631ca0fbe5c/381675/badge.png)](https://semaphoreci.com/dylanfareed/gris)
+
 It is derived from/inspired by the stellar and more sophisticated [Napa framework by Bellycard Inc.](https://github.com/bellycard/napa).
 
 Gris aims to provide generators and middleware common to API microservices. For the moment, however, it is in development and primarily exploratory. Note that the ground may shift.

data/Rakefile

@@ -1,11 +1,14 @@
 # encoding: utf-8
 
-require 'rake/testtask'
 require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
-Rake::TestTask.new(:spec) do |test|
-  test.libs << 'lib' << 'spec'
-  test.pattern = 'spec/**/*_spec.rb'
+RSpec::Core::RakeTask.new
+
+desc 'Run RuboCop'
+RuboCop::RakeTask.new(:rubocop) do |task|
+  task.fail_on_error = true
 end
 
-task default: :spec
+task default: [:rubocop, :spec]

data/gris.gemspec

@@ -22,9 +22,9 @@ 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', '~> 1.0.2', '>= 1.0.2'
 
   s.add_dependency 'logging'
-  s.add_dependency 'dotenv', '~> 1.0.2', '>= 1.0.2'
   s.add_dependency 'grape', '~> 0.11.0', '>= 0.11.0'
   s.add_dependency 'grape-roar', '~> 0.3.0', '>= 0.3.0'
 

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

@@ -9,4 +9,4 @@ DATABASE_PASSWORD=''
 DATABASE_HOST=localhost
 DATABASE_NAME=<%= app_name.underscore %>_test
 BASE_URL=http://127.0.0.1:9393
-PERMITTED_TOKENS=["replace-me"]
+PERMITTED_TOKENS=replace-me

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

@@ -8,4 +8,4 @@ DATABASE_PASSWORD=''
 DATABASE_HOST=localhost
 DATABASE_NAME=<%= app_name.underscore %>_development
 BASE_URL=http://127.0.0.1:9292
-PERMITTED_TOKENS=["replace-me"]
+PERMITTED_TOKENS=replace-me

data/lib/gris/generators/templates/scaffold/Rakefile

@@ -1,6 +1,5 @@
 #!/usr/bin/env rake
 require 'gris/setup'
-require 'dotenv'
 Gris.load_environment
 
 require File.expand_path('../config/application.rb', __FILE__)

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

@@ -4,7 +4,7 @@ end
 
 shared_context 'with token authorization' do
   before(:each) do
-    permitted_token = ENV['PERMITTED_TOKENS'].dup.gsub!(/[\[\]]/, '').split(/\s*,\s*/).first if ENV['PERMITTED_TOKENS']
+    permitted_token = ENV['PERMITTED_TOKENS'].split(',').first if ENV['PERMITTED_TOKENS']
     header 'Http-Authorization', permitted_token
   end
 end

data/lib/gris/grape_extensions/authentication_helpers.rb

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

data/lib/gris/setup.rb

@@ -1,9 +1,10 @@
 require 'active_support'
+require 'dotenv'
 
 module Gris
   class << self
     def load_environment
-      Dotenv.load(Gris.env.test? ? '.env.test' : '.env')
+      Dotenv.load
     end
 
     def env

data/lib/gris/version.rb

@@ -1,5 +1,5 @@
 module Gris
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 
   class Version
     class << self

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' => %w(my-token another-token)
+      stub_const 'ENV', 'PERMITTED_TOKENS' => 'my-token,another-token'
       @helper = SpecApiAuthHelper.new
     end
 
@@ -23,6 +23,14 @@ describe Gris::AuthenticationHelpers do
           expect(@helper.token_authentication!).to be_nil
         end
       end
+      context 'with blank params token' do
+        it 'returns a 401 Forbidden error' do
+          allow(@helper).to receive(:params).and_return(token: '')
+          allow(@helper).to receive_message_chain(:request, :headers).and_return('Http-Authorization' => nil)
+          @helper.token_authentication!
+          expect(@helper.message).to eq(message: 'Forbidden', status: 401)
+        end
+      end
       context 'with included request header token' do
         it 'returns nil' do
           allow(@helper).to receive(:params).and_return(token: nil)
@@ -30,6 +38,14 @@ describe Gris::AuthenticationHelpers do
           expect(@helper.token_authentication!).to be_nil
         end
       end
+      context 'with blank header token' do
+        it 'returns a 401 Forbidden error' do
+          allow(@helper).to receive(:params).and_return(token: nil)
+          allow(@helper).to receive_message_chain(:request, :headers).and_return('Http-Authorization' => '')
+          @helper.token_authentication!
+          expect(@helper.message).to eq(message: 'Forbidden', status: 401)
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gris
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Dylan Fareed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -91,39 +91,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.8
 - !ruby/object:Gem::Dependency
-  name: logging
+  name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.2
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.2
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
-  name: dotenv
+  name: logging
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.2
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.2
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
@@ -303,7 +303,6 @@ files:
 - ".rubocop_todo.yml"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - Guardfile

data/.travis.yml

@@ -1,12 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.1.5
-
-before_install: gem install bundler
-
-bundler_args: --no-deployment
-
-script:
-  - "bundle exec rspec"
-  - "bundle exec rubocop"