gris 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fd7431c1a4ef8cba9d3433e9c4ef99150ce312e
-  data.tar.gz: 78bb4402d7fdd2ee04a28640f876238e6381debe
+  metadata.gz: 9d466b03d28285650e9e80343a13c2937cdd8687
+  data.tar.gz: bd36651baf560be5a54148460b4b1ec1d7a47a2d
 SHA512:
-  metadata.gz: b376e89a5cabcc44b96c3c781d0df82e6af0c1c083224dbb525f85918a01f4dfd3714ce2d18bb81971d158ff5c9e5f734dcd5010894ce849746a98d984adddfb
-  data.tar.gz: 68e760d526d57c1ea3fbd88390c9f22308013db711e380f91ae9ee819bd606f00e870ebdfb902b7a249ef308419e77e096e764ff1274dd9e1329f52a53fd6503
+  metadata.gz: 72e27c2761c148dfc0a36a7a5e5da119458451077dfc9cd07a4ebd55184d49112afead1396a542b3bd1a1b6fd7ec54709fd78f09868d188e4108eb996789d00f
+  data.tar.gz: fd41e4bcd217adc3db9652c2ef8eec2e83618a307cf8889ef3171fc6abc52fb3b44f85cc10ae16282b9e3a0ee5221b7e20e3dc4eb58b2163e7d4a6f9d5f4266b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gris (0.4.0)
+    gris (0.4.2)
       activesupport (~> 4.2, >= 4.2.0)
       chronic (~> 0.10.0)
       dalli (~> 2.7)
@@ -74,7 +74,7 @@ GEM
     ffi (1.9.8)
     futuroscope (0.1.11)
     git (1.2.9.1)
-    grape (0.12.0)
+    grape (0.13.0)
       activesupport
       builder
       hashie (>= 2.1.0)
@@ -84,7 +84,7 @@ GEM
       rack-accept
       rack-mount
       virtus (>= 1.0.0)
-    grape-entity (0.4.7)
+    grape-entity (0.4.8)
       activesupport
       multi_json (>= 1.3.2)
     grape-roar (0.3.0)
@@ -165,7 +165,7 @@ GEM
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uber (0.0.13)
+    uber (0.0.14)
     uri_template (0.7.0)
     virtus (1.0.5)
       axiom-types (~> 0.1)

data/lib/gris/application.rb

@@ -8,11 +8,6 @@ module Gris
     def initialize
       Gris::Deprecations.initialization_checks
       @filenames = ['', '.html', 'index.html', '/index.html']
-      @rack_static = ::Rack::Static.new(
-        -> { [404, {}, []] },
-        root: File.expand_path('../public', __FILE__),
-        urls: ['/']
-        )
     end
 
     def self.instance(config = {})
@@ -33,8 +28,8 @@ module Gris
       # Render error pages or return API response
       case response[0]
       when 404, 500
-        content = @rack_static.call(env.merge('PATH_INFO' => "/errors/#{response[0]}.html"))
-        [response[0], content[1], content[2]]
+        body = { code: response[0], message: response[2] }.to_json
+        [response[0], response[1], body]
       else
         response
       end

data/lib/gris/generators/templates/api/app/endpoints/%name_tableize%_endpoint.rb.tt

@@ -7,8 +7,7 @@ class <%= name.classify.pluralize %>Endpoint < Grape::API
     end
     get do
       conditions = {}
-      <%= name.underscore.tableize %> = <%= name.classify %>.where(conditions)
-      present Kaminari.paginate_array(<%= name.underscore.tableize %>).page(params[:page]).per(params[:size]), with: <%= name.classify.pluralize %>Presenter
+      paginate <%= name.classify %>, conditions: conditions, with: <%= name.classify.pluralize %>Presenter
     end
 
     desc 'Create new <%= name.underscore %>.'

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

@@ -7,6 +7,7 @@ gem 'activerecord', '~> 4.2.0', require: 'active_record'
 gem 'json'
 
 gem 'gris'
+gem 'gris_paginator'
 
 gem 'roar'
 gem 'grape-roar', '~> 0.3.0'

data/lib/gris/rspec_extensions/response_helpers.rb

@@ -9,16 +9,16 @@ module Gris
         last_response.body
       end
 
-      def parsed_response
-        Hashie::Mash.new(JSON.parse(last_response.body))
+      def parsed_response_body
+        Hashie::Mash.new JSON.parse(response_body)
       end
 
       def result
-        parsed_response
+        parsed_response_body
       end
 
       def embedded_results(klass)
-        parsed_response[:_embedded][klass.name.tableize.to_sym]
+        parsed_response_body[:_embedded][klass.name.tableize.to_sym]
       end
 
       def embedded_results_count(klass)
@@ -38,7 +38,7 @@ module Gris
       end
 
       def links
-        parsed_response['_links']
+        parsed_response_body['_links']
       end
 
       def link_to_self

data/lib/gris/version.rb

@@ -1,5 +1,5 @@
 module Gris
-  VERSION = '0.4.0'
+  VERSION = '0.4.2'
 
   class Version
     class << self

data/spec/generators/api_generator_spec.rb

@@ -21,6 +21,12 @@ describe Gris::Generators::ApiGenerator do
       expect(api_code).to match(/class ArticlesEndpoint/)
     end
 
+    it 'endpoint class uses GrisPaginator' do
+      expected_api_file = File.join(generator_tmp_directory, 'app/endpoints/articles_endpoint.rb')
+      api_code = File.read(expected_api_file)
+      expect(api_code).to match(/paginate Article, conditions: conditions, with: ArticlesPresenter/)
+    end
+
     it 'creates a model class' do
       expected_model_file = File.join(generator_tmp_directory, 'app/models/article.rb')
       model_code = File.read(expected_model_file)

data/spec/generators/scaffold_generator_spec.rb

@@ -54,6 +54,11 @@ describe Gris::Generators::ScaffoldGenerator do
       expect(gemfile).to match(/gem 'puma'/)
     end
 
+    it 'adds the gris_paginator gem in the Gemfile' do
+      gemfile = File.read("#{app_path}/Gemfile")
+      expect(gemfile).to match(/gem 'gris_paginator'/)
+    end
+
     it 'generates an application endpoint' do
       expect(File).to exist("#{app_path}/app/endpoints/application_endpoint.rb")
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gris
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Dylan Fareed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2015-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -328,7 +328,6 @@ files:
 - gris.gemspec
 - lib/gris.rb
 - lib/gris/application.rb
-- lib/gris/application/configuration.rb
 - lib/gris/caching.rb
 - lib/gris/cli.rb
 - lib/gris/deprecations.rb
@@ -377,8 +376,6 @@ files:
 - lib/gris/middleware/health.rb
 - lib/gris/output_formatters/paginated_presenter.rb
 - 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

data/lib/gris/application/configuration.rb

@@ -1,16 +0,0 @@
-module Gris
-  class Application
-    class Configuration
-      attr_accessor :use_app_monitor
-
-      def initialize(*)
-        super
-        @use_app_monitor = false
-      end
-
-      def app_monitor
-        puts "@use_app_monitor: #{@use_app_monitor}"
-      end
-    end
-  end
-end

data/lib/gris/public/errors/404.html

@@ -1,11 +0,0 @@
-<html>
- <head>
-  <title>Page Not Found</title>
-</head>
- <body>
-  <h1>Ooops...</h1>
-  <p>
-    This page could not be found.
-  </p>
- </body>
-</html>

data/lib/gris/public/errors/500.html

@@ -1,11 +0,0 @@
-<html>
- <head>
-  <title>Unexpected Error</title>
-</head>
- <body>
-  <h1>Ouch...</h1>
-  <p>
-    Something went terribly wrong.
-  </p>
- </body>
-</html>