gris 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e442419cb2acf2a727b4479cf0dd96abc9b67c11
-  data.tar.gz: 1cdc3caa247d14bf57458283400ab2ac87a7b7d9
+  metadata.gz: 2c3e460b2255bedab70d43a4195880d153eb9a1b
+  data.tar.gz: 3300bcd6acfded8f5077b3410164b55fd972926b
 SHA512:
-  metadata.gz: 9ac390a50ec60b1370637cbb419fd232beffc316a540e1af715bf824c0a8543609ef822b2e7ee4be035ace1f1e3ce027bc2af823158be546c3d5e6f4ab4d23ce
-  data.tar.gz: 8dc4b7dede9f6e13508d041ec84bcd2599253880c4fe0cae266729c299e7a966b53985daad5c145a2bd65aacdb197834d349c2369b18832b1b1bc88724414d59
+  metadata.gz: b9d8bab341a841ff7aa718b55622c7f7f273ba0292711e2137991bf5df54c50d3b8c7176e613c3f7bc5616e3ade7a3d5d527da87fae1fc3edb4baf8597a0a624
+  data.tar.gz: 904ed6613b34f26ce6ad527a903bba7345f7415bdecdda154b90da5ffd5287dfeca5d59f35e1d3250293fd59e015205c24c71e379361eda7d529a2eec5e649aa

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2015-12-28 10:08:44 -0500 using RuboCop version 0.34.2.
+# on 2016-01-23 12:59:28 -0500 using RuboCop version 0.34.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -30,7 +30,7 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 11
 
-# Offense count: 80
+# Offense count: 81
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Max: 159

data/.ruby-version

@@ -1 +1 @@
-ruby-2.2.4
+ruby-2.3.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gris (0.6.0)
+    gris (0.6.1)
       activesupport (~> 4.2, >= 4.2.0)
       chronic (~> 0.10.0)
       dalli (~> 2.7)
@@ -131,7 +131,7 @@ GEM
       rack (>= 1.0)
       rack-test (>= 0.5)
     rainbow (2.0.0)
-    rake (10.4.2)
+    rake (10.5.0)
     representable (2.3.0)
       uber (~> 0.0.7)
     roar (1.0.4)

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

@@ -1,6 +1,5 @@
 .DS_Store
 .env
-.rspec
 .env.*
 !log/.keep
 log/*

data/lib/gris/generators/templates/scaffold/.ruby-version.tt

@@ -1 +1 @@
-2.2.4
+2.3.0

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

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-ruby '2.2.4'
+ruby '2.3.0'
 
 gem 'rack-cors'
 gem 'pg'

data/lib/gris/middleware/error_handlers.rb

@@ -15,10 +15,13 @@ module Gris
         end
       rescue RuntimeError => e
         error = { status: 500, message: e.message }
-        error_response(error.to_json, 500)
+        error_response error.to_json, 500
       rescue ::ActiveRecord::RecordNotFound => e
         error = { status: 404, message: e.message }
-        error_response(error.to_json, 404)
+        error_response error.to_json, 404
+      rescue ::ActiveRecord::RecordInvalid => e
+        error = { status: 409, message: e.message }
+        error_response error.to_json, 409
       end
 
       private

data/lib/gris/version.rb

@@ -1,5 +1,5 @@
 module Gris
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 
   class Version
     class << self

data/spec/generators/scaffold_generator_spec.rb

@@ -49,9 +49,9 @@ describe Gris::Generators::ScaffoldGenerator do
       expect(seed_file).to match(/all the record creation needed to seed the database/)
     end
 
-    it 'adds ruby 2.2.4 to Gemfile' do
+    it 'adds ruby 2.3.0 to Gemfile' do
       gemfile = File.read("#{app_path}/Gemfile")
-      expect(gemfile).to match(/ruby '2.2.4'/)
+      expect(gemfile).to match(/ruby '2.3.0'/)
     end
 
     it 'adds the puma gem in the Gemfile' do

data/spec/middleware/error_handlers_spec.rb

@@ -7,13 +7,20 @@ describe Gris::Middleware::ErrorHandlers do
 
     let(:app) { subject }
 
-    let(:fake_active_record) do
+    let(:fake_active_record_record_not_found) do
       module ActiveRecord
         class RecordNotFound < StandardError
         end
       end
     end
 
+    let(:fake_active_record_record_invalid) do
+      module ActiveRecord
+        class RecordInvalid < StandardError
+        end
+      end
+    end
+
     before do
       subject.format :json
       subject.use Gris::Middleware::ErrorHandlers
@@ -30,9 +37,13 @@ describe Gris::Middleware::ErrorHandlers do
         error! 'Forbidden', 401
       end
 
-      subject.get :activerecord_error do
+      subject.get :record_not_found do
         fail ActiveRecord::RecordNotFound
       end
+
+      subject.get :record_invalid do
+        fail ActiveRecord::RecordInvalid
+      end
     end
 
     it 'retuns a Not Found error for missing routes' do
@@ -55,13 +66,21 @@ describe Gris::Middleware::ErrorHandlers do
     end
 
     it 'returns a formatted message for ActiveRecord::RecordNotFound' do
-      fake_active_record
-      get '/activerecord_error'
+      fake_active_record_record_not_found
+      get '/record_not_found'
       expect(response_code).to eq 404
       expect(parsed_response_body['status']).to eq 404
       expect(parsed_response_body['message']).to eq 'ActiveRecord::RecordNotFound'
     end
 
+    it 'returns a formatted message for ActiveRecord::RecordNotFound' do
+      fake_active_record_record_invalid
+      get '/record_invalid'
+      expect(response_code).to eq 409
+      expect(parsed_response_body['status']).to eq 409
+      expect(parsed_response_body['message']).to eq 'ActiveRecord::RecordInvalid'
+    end
+
     it 'returns a formatted message when an exception is raised' do
       get '/generic_error'
       expect(response_code).to eq 500

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gris
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Dylan Fareed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-28 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -426,7 +426,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A simple api microservice generator framework.