gris 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4098bdc1e372dca7d74e81b22f6ecc30c29983c
-  data.tar.gz: efddb7d75fc120b81c95eada659121ebb0a8ddf4
+  metadata.gz: 7903911cba8da7b598dd6b4917a79a47b636b7b5
+  data.tar.gz: 8d7cb5ded5b95afd3a0862688c5a002feeb32d40
 SHA512:
-  metadata.gz: d0f9914e1967856aec2e8033ebca2e4c41bd3c8d9a74f704f14d63320bdae1a0fbaf43b0f8a7e92cafa7aec5a7ffe92cc7553430993ab94ae1c0cc8086ad8b9e
-  data.tar.gz: 6ab40f2d5bc61ba52138002f2f694159e0e223c6f06abc1861c1ea2379b5f70aa67442c01bde92e81061d83a691ea1216192070a946f58f23324394f612526d2
+  metadata.gz: 3c04c1f98d3e9c1467507e182d317c89a7456a27f2f542d8a0f297ccd30d45bfa5090e5dfa3cfa14796a4693dc526cedc284c21982ec39d12bc6ca39797a9c67
+  data.tar.gz: ef360e0a06a2b4ece6de403e17640e3fd641a676221512597d67418e1233db6d3608d1b848d28d5a197e76dcfa75fe50b611f8a5145df1fd6af60cd5a13dd2fe

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gris (0.2.3)
+    gris (0.2.4)
       activesupport (~> 4.2, >= 4.2.0)
       chronic (~> 0.10.0)
       dalli (~> 2.7)

data/lib/gris/generators/templates/api/spec/endpoints/%name_tableize%_endpoint_spec.rb.tt

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe <%= name.classify.pluralize %>Endpoint do
   include Rack::Test::Methods
-  include_context 'with a running app'
+  include_context 'with a running app and client'
 
   context '<%= name.tableize %>' do
     before(:each) do
@@ -12,59 +12,54 @@ describe <%= name.classify.pluralize %>Endpoint do
     end
 
     it 'returns 10 <%= name.tableize %> by default' do
-      get '/<%= name.tableize %>'
-      expect(response_code).to eq 200
-      expect_embedded_results_count_of 10, <%= name.classify %>
+      expect(client.<%= name.tableize %>.count).to eq 10
     end
 
     it 'returns 2 <%= name.tableize %>' do
-      get '/<%= name.tableize %>?size=2'
-      expect(response_code).to eq 200
-      expect_embedded_results_count_of 2, <%= name.classify %>
+      expect(client.<%= name.tableize %>(size: 2).count).to eq 2
     end
 
     it 'returns pagination' do
-      get '/<%= name.tableize %>?size=2&page=2'
-      expect(response_code).to eq 200
-      expect(link_to_next[:href]).to eq 'http://example.org/<%= name.tableize %>?page=3&size=2'
-      expect(link_to_previous[:href]).to eq 'http://example.org/<%= name.tableize %>?page=1&size=2'
-      expect(link_to_self[:href]).to eq 'http://example.org/<%= name.tableize %>?page=2&size=2'
+      response = client.<%= name.tableize %>(size: 2, page: 2)
+      expect(response._links.next._url).to eq 'http://example.org/<%= name.tableize %>?page=3&size=2'
+      expect(response._links.prev._url).to eq 'http://example.org/<%= name.tableize %>?page=1&size=2'
+      expect(response._links.self._url).to eq 'http://example.org/<%= name.tableize %>?page=2&size=2'
     end
 
     it 'returns all unique ids' do
-      get '/<%= name.tableize %>'
-      expect(response_code).to eq 200
-      expect(embedded_results(<%= name.classify %>).map { |s| s[:id] }.uniq.count).to eq 10
+      <%= name.tableize %> = client.<%= name.tableize %>
+      expect(<%= name.tableize %>.map(&:id).uniq.count).to eq 10
     end
   end
 
   context '<%= name.underscore %>' do
-    let(:<%= name.underscore %>1) { Fabricate(:<%= name.underscore %>) }
+    let(:<%= name.underscore %>_details) do
+      {
+        replace_me: 'braque is not a talented artist'
+      }
+    end
+    let(:<%= name.underscore %>1) { Fabricate(:<%= name.underscore %>, attributes: <%= name.underscore %>_details) }
 
     it 'creates a <%= name.underscore %>' do
-      post '/<%= name.tableize %>', <%= name.underscore %>: { replace: 'REPLACE ME' }
-      expect(response_code).to eq 201
-      expect(result[:id]).to_not be_blank
+      <%= name.underscore %> = client.<%= name.tableize %>._post(<%= name.underscore %>: <%= name.underscore %>_details)
+      expect(<%= name.underscore %>.replace_me).to eq <%= name.underscore %>_details[:replace_me]
     end
 
     it 'returns a <%= name.underscore %>' do
-      get "/<%= name.tableize %>/#{<%= name.underscore %>1.id}"
-      expect(response_code).to eq 200
-      expect(result[:id]).to eq <%= name.underscore %>1.id
-      expect(link_to_self[:href]).to eq "http://example.org/<%= name.tableize %>/#{<%= name.underscore %>1.id}"
+      <%= name.underscore %> = client.<%= name.underscore %>(id: <%= name.underscore %>1.id)
+      expect(<%= name.underscore %>.id).to eq <%= name.underscore %>1.id
+      expect(<%= name.underscore %>.replace_me).to eq <%= name.underscore %>_details[:replace_me]
     end
 
     it 'updates a <%= name.underscore %>' do
-      patch "/<%= name.tableize %>/#{<%= name.underscore %>1.id}", <%= name.underscore %>: { replace: 'REPLACE ME' }
-      expect(response_code).to eq 200
-      expect(result[:id]).to eq <%= name.underscore %>1.id
+      <%= name.underscore %> = client.<%= name.underscore %>(id: <%= name.underscore %>1.id)._patch(<%= name.underscore %>: { replace_me: 'braque is a talented artist' })
+      expect(<%= name.underscore %>.id).to eq <%= name.underscore %>1.id
+      expect(<%= name.underscore %>.replace_me).to eq 'braque is a talented artist'
     end
 
     it 'deletes a <%= name.underscore %>' do
-      expect_any_instance_of(<%= name.classify %>).to receive(:destroy)
-      delete "/<%= name.tableize %>/#{<%= name.underscore %>1.id}"
-      expect(response_code).to eq 200
-      expect(result[:id]).to eq <%= name.underscore %>1.id
+      <%= name.underscore %> = client.<%= name.underscore %>(id: <%= name.underscore %>1.id)._delete
+      expect(<%= name.underscore %>.id).to eq <%= name.underscore %>1.id
     end
   end
 end

data/lib/gris/generators/templates/scaffold/Procfile

@@ -1 +1 @@
-web: bundle exec puma -p $PORT -e $RACK_ENV -t 0:5
+web: bundle exec puma -C config/puma.rb

data/lib/gris/generators/templates/scaffold/config/initializers/active_record.rb

@@ -1,8 +1,8 @@
-require 'erb'
 if ENV['DATABASE_URL']
   ActiveRecord::Base.establish_connection(ENV['DATABASE_URL'])
 else
   db = YAML.load(ERB.new(File.read('./config/database.yml')).result)[Gris.env]
   ActiveRecord::Base.establish_connection(db)
 end
-ActiveRecord::Base.include_root_in_json = false
+# prevent deprecation warning
+ActiveRecord::Base.raise_in_transactional_callbacks = true

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

@@ -0,0 +1,6 @@
+workers Integer(ENV['WEB_CONCURRENCY'] || 2)
+threads_count = Integer(ENV['MAX_THREADS'] || 5)
+threads threads_count, threads_count
+
+port ENV['PORT'] || 3000
+environment ENV['RACK_ENV'] || 'development'

data/lib/gris/generators/templates/scaffold/spec/spec_helper.rb

@@ -1,10 +1,8 @@
 ENV['RACK_ENV'] = 'test'
 
-require 'webmock/rspec'
-require 'rack/test'
-require 'gris/rspec_extensions/response_helpers'
-
 require File.expand_path('../../config/application', __FILE__)
+require 'gris/rspec_extensions/response_helpers'
+require 'gris/rspec_extensions/active_record_shared_connection'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -17,11 +15,10 @@ RSpec.configure do |config|
 
   config.before(:suite) do
     ActiveRecord::Migration.maintain_test_schema!
-    DatabaseCleaner.strategy = :transaction
-    DatabaseCleaner.clean_with(:truncation)
+    DatabaseCleaner.strategy = :truncation
   end
 
-  config.before(:each) do
+  config.before do
     DatabaseCleaner.clean
   end
 end

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

@@ -0,0 +1,27 @@
+shared_context 'with a running app' do
+  let(:app) { Rack::Builder.parse_file('config.ru').first }
+end
+
+shared_context 'with token authorization' do
+  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
+  include_context 'with a running app'
+  include_context 'with token authorization'
+
+  let(:client) do
+    Hyperclient.new('http://example.org/') do |client|
+      client.headers['Http-Authorization'] = permitted_token
+      client.connection(default: false) do |conn|
+        conn.request :hal_json
+        conn.response :json
+        conn.use Faraday::Adapter::Rack, app
+      end
+    end
+  end
+end

data/lib/gris/rspec_extensions/active_record_shared_connection.rb

@@ -0,0 +1,13 @@
+module ActiveRecord
+  class Base
+    mattr_accessor :shared_connection
+    self.shared_connection = nil
+
+    def self.connection
+      shared_connection || retrieve_connection
+    end
+  end
+end
+
+# Force all threads to share the same connection.
+ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection

data/lib/gris/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gris
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Dylan Fareed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -375,10 +375,11 @@ files:
 - lib/gris/generators/templates/scaffold/config/boot.rb
 - 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/db/schema.rb
 - lib/gris/generators/templates/scaffold/spec/endpoints/cors_spec.rb.tt
 - lib/gris/generators/templates/scaffold/spec/spec_helper.rb
-- lib/gris/generators/templates/scaffold/spec/support/app_helper.rb.tt
+- lib/gris/generators/templates/scaffold/spec/support/app_helper.rb
 - lib/gris/grape_extensions/authentication_helpers.rb
 - lib/gris/grape_extensions/crud_helpers.rb
 - lib/gris/grape_extensions/date_time_helpers.rb
@@ -389,6 +390,7 @@ files:
 - lib/gris/output_formatters/presenter.rb
 - lib/gris/public/errors/404.html
 - lib/gris/public/errors/500.html
+- lib/gris/rspec_extensions/active_record_shared_connection.rb
 - lib/gris/rspec_extensions/response_helpers.rb
 - lib/gris/setup.rb
 - lib/gris/version.rb

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

@@ -1,10 +0,0 @@
-shared_context 'with a running app' do
-  let(:app) { <%= app_name.classify %>::Application.instance }
-end
-
-shared_context 'with token authorization' do
-  before(:each) do
-    permitted_token = ENV['PERMITTED_TOKENS'].split(',').first if ENV['PERMITTED_TOKENS']
-    header 'Http-Authorization', permitted_token
-  end
-end