gris 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e96164641eef10ebe5b1b0ef9585128b9dab21a2
-  data.tar.gz: 0766137f4a9db102e5395d5bc13c6a7cab92663b
+  metadata.gz: 6718fa8810cdc849424f62dfad2e12c47c3b9d38
+  data.tar.gz: 82de9f1d439386614bcf8a037382c0c8a40eee24
 SHA512:
-  metadata.gz: 58888cb5cc8a00967780a977879657610f50b0a362f10a931340919fcc1d479cb71eaacc45de6989b77a8ef036f57a6cbededa8c6274aa9861b11f5f0abc7a93
-  data.tar.gz: c6e15aaa11a99516c9e4353876b9bc2b5f82bbcfe4c16c52e59bf18fc286bb23fce78676edb4643e79e4457578baff98dff086b068faa933277e3307c65d6a6c
+  metadata.gz: d4afc70c3a4e8f2c74283e8f9b8b4edca4c417327774d0efe1fe4fc850f681d0ab955b3def9da585580165ecbd0b8ca71a5fe312a74079559f6f5d371fc0b60c
+  data.tar.gz: 4fa100baca239ebe31e2a2f79862c98d4fd83ded2c1136b1741122e8b6ff1b8285282471ba8d09a64290a5f99982a918969fec401551cc6f6e3e391694738a57

data/.rubocop_todo.yml

@@ -1,5 +1,5 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-05-20 22:54:33 -0400 using RuboCop version 0.31.0.
+# on 2015-08-17 12:39:38 -0400 using RuboCop version 0.31.0.
 # 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
@@ -11,9 +11,9 @@
 Lint/EndAlignment:
   Enabled: false
 
-# Offense count: 5
+# Offense count: 6
 Metrics/AbcSize:
-  Max: 38
+  Max: 33
 
 # Offense count: 1
 # Configuration parameters: CountComments.
@@ -24,27 +24,22 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 11
 
-# Offense count: 67
+# Offense count: 74
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Max: 159
 
-# Offense count: 9
+# Offense count: 11
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 27
+  Max: 33
 
 # Offense count: 16
 # Configuration parameters: IndentWhenRelativeTo, SupportedStyles, IndentOneStep.
 Style/CaseIndentation:
   Enabled: false
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/ClosingParenthesisIndentation:
-  Enabled: false
-
-# Offense count: 24
+# Offense count: 27
 Style/Documentation:
   Enabled: false
 

data/Gemfile.lock

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

data/lib/gris/generators/api_generator.rb

@@ -40,21 +40,7 @@ module Gris
         say 'Appending links to RootPresenter.'
         insert_into_file path_to_root_presenter, after: "# Additional endpoint links\n" do
           text =  "\n"
-          text << "  link :#{name_tableize} do |opts|\n"
-          text << "    {\n"
-          text << '      href: "#{base_url(opts)}/'
-          text << "#{name_tableize}{?page,size}\",\n"
-          text << "      templated: true\n"
-          text << "    }\n"
-          text << "  end\n"
-          text << "\n"
-          text << "  link :#{name_underscore} do |opts|\n"
-          text << "    {\n"
-          text << '      href: "#{base_url(opts)}/'
-          text << "#{name_tableize}/{id}\",\n"
-          text << "      templated: true\n"
-          text << "    }\n"
-          text << "  end\n"
+          text << "  resource_links :#{name_underscore}\n"
           text
         end
       end

data/lib/gris/generators/templates/api/app/presenters/%name_underscore%_presenter.rb.tt

@@ -3,8 +3,7 @@ module <%= name.classify %>Presenter
 
   property :id, writeable: false, type: String, desc: '<%= name.classify %> unique ID.'
 
-  link :self do |opts|
-    request = Grape::Request.new(opts[:env])
-    "#{request.base_url}/<%= name.tableize %>/#{id}"
+  link :self do
+    "#{Gris::Identity.base_url}/<%= name.tableize %>/#{id}"
   end
 end

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

@@ -32,9 +32,9 @@ describe <%= name.classify.pluralize %>Endpoint do
 
       it 'returns pagination' do
         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'
+        expect(response._links.next._url).to eq "#{Gris::Identity.base_url}/<%= name.tableize %>?page=3&size=2"
+        expect(response._links.prev._url).to eq "#{Gris::Identity.base_url}/<%= name.tableize %>?page=1&size=2"
+        expect(response._links.self._url).to eq "#{Gris::Identity.base_url}/<%= name.tableize %>?page=2&size=2"
       end
 
       it 'returns all unique ids' do

data/lib/gris/generators/templates/scaffold/app/presenters/root_presenter.rb

@@ -1,20 +1,10 @@
 module RootPresenter
-  include Gris::Presenter
+  include Gris::RootPresenter
 
-  link :self do |opts|
-    "#{base_url(opts)}"
-  end
-
-  link :health do |opts|
-    { href: "#{base_url(opts)}/health" }
+  link :self do
+    Gris::Identity.base_url
   end
 
   # Additional endpoint links
-
-  private
-
-  def base_url(opts)
-    request = Grape::Request.new(opts[:env])
-    request.base_url
-  end
+  endpoint_link :health
 end

data/lib/gris/output_formatters/paginated_presenter.rb

@@ -24,11 +24,6 @@ module Gris
 
         private
 
-        def request_url(opts)
-          request = Grape::Request.new(opts[:env])
-          "#{request.base_url}#{opts[:env]['PATH_INFO']}"
-        end
-
         # replace the page parameter in the query string
         def query_string_for_page(page, opts)
           qs = Rack::Utils.parse_nested_query(opts[:env]['QUERY_STRING'])

data/lib/gris/output_formatters/presenter.rb

@@ -9,6 +9,13 @@ module Gris
         include Roar::JSON::HAL
         include Roar::Hypermedia
         include Grape::Roar::Representer
+
+        private
+
+        def request_url(opts)
+          request = Grape::Request.new(opts[:env])
+          "#{request.base_url}#{opts[:env]['PATH_INFO']}"
+        end
       end
     end
   end

data/lib/gris/output_formatters/root_presenter.rb

@@ -0,0 +1,43 @@
+module Gris
+  module RootPresenter
+    def self.included(base)
+      base.class_eval do
+        include Gris::Presenter
+
+        def self.resource_links(name, args = [])
+          args += %w(page size)
+          link name.to_s.pluralize do
+            link = {
+              href: "#{Gris::Identity.base_url}/#{name.to_s.pluralize}#{format_args(args)}",
+              templated: true
+            }
+            link
+          end
+          link name do
+            {
+              href: "#{Gris::Identity.base_url}/#{name.to_s.pluralize}/{id}",
+              templated: true
+            }
+          end
+        end
+
+        def self.endpoint_link(name, args = [])
+          link name do
+            link = {
+              href: "#{Gris::Identity.base_url}/#{name}#{format_args(args)}"
+            }
+            link[:templated] = true unless args.blank?
+            link
+          end
+        end
+
+        private
+
+        def format_args(args = [])
+          return unless args.any?
+          "{?#{args.join(',')}}"
+        end
+      end
+    end
+  end
+end

data/lib/gris/version.rb

@@ -1,5 +1,5 @@
 module Gris
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 
   class Version
     class << self

data/lib/gris.rb

@@ -14,13 +14,14 @@ require 'hashie-forbidden_attributes'
 require 'gris/application'
 require 'gris/caching'
 require 'gris/deprecations'
-require 'gris/grape_extensions/crud_helpers'
-require 'gris/grape_extensions/error_helpers'
 require 'gris/grape_extensions/authentication_helpers'
+require 'gris/grape_extensions/crud_helpers'
 require 'gris/grape_extensions/date_time_helpers'
+require 'gris/grape_extensions/error_helpers'
 require 'gris/identity'
 require 'gris/middleware/health'
 require 'gris/output_formatters/paginated_presenter'
+require 'gris/output_formatters/root_presenter'
 require 'gris/output_formatters/presenter'
 require 'gris/setup'
 require 'gris/version'

data/spec/generators/api_generator_spec.rb

@@ -72,8 +72,7 @@ describe Gris::Generators::ApiGenerator do
     it 'adds links to RootPresenter' do
       expected_root_presenter_file = File.join(generator_tmp_directory, 'app/presenters/root_presenter.rb')
       presenter_file = File.read(expected_root_presenter_file)
-      expect(presenter_file).to match(/link :article do |opts|/)
-      expect(presenter_file).to match(/link :articles do |opts|/)
+      expect(presenter_file).to match(/resource_links :article/)
     end
   end
 

data/spec/generators/scaffold_generator_spec.rb

@@ -98,8 +98,16 @@ describe Gris::Generators::ScaffoldGenerator do
         expect(root_presenter_file).to match(/module RootPresenter/)
       end
 
-      it 'includes Gris::Presenter' do
-        expect(RootPresenter).to include(Gris::Presenter)
+      it 'includes Gris::RootPresenter' do
+        expect(RootPresenter).to include(Gris::RootPresenter)
+      end
+
+      it 'includes link to self' do
+        expect(root_presenter_file).to match(/link :self do/)
+      end
+
+      it 'includes link to health middleware' do
+        expect(root_presenter_file).to match(/endpoint_link :health/)
       end
     end
 

data/spec/integration/application_error_response_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+require 'faraday'
+
+describe 'application error response' do
+  include_context 'with a generated app'
+
+  it 'returns a json formatted message' do
+    request = Faraday.get "http://localhost:#{app_port}/bogus"
+    response = JSON.parse request.body
+    expect(request.status).to eq 404
+    expect(response['code']).to eq 404
+    expect(response['message']).to eq ['Not Found']
+  end
+end

data/spec/output_formatters/root_presenter_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+require 'gris'
+require 'rack/test'
+
+describe Gris::RootPresenter do
+  include Rack::Test::Methods
+
+  module RootPresenter
+    include Gris::RootPresenter
+    resource_links :painter, [:sort]
+    endpoint_link :painting, [:account_id]
+    resource_links :sculptor
+    endpoint_link :sculpture
+  end
+
+  class ApplicationEndpoint < Grape::API
+    format :json
+    formatter :json, Grape::Formatter::Roar
+    get do
+      present self, with: RootPresenter
+    end
+  end
+
+  def app
+    ApplicationEndpoint.new
+  end
+
+  before do
+    get '/'
+    @result = Hashie::Mash.new JSON.parse(last_response.body)
+  end
+
+  it 'returns uri template for resource_links with additional arguments' do
+    expect(@result['_links']['painters']['href']).to eq "#{Gris::Identity.base_url}/painters{?sort,page,size}"
+    expect(@result['_links']['painters']['templated']).to eq true
+    expect(@result['_links']['painter']['href']).to eq "#{Gris::Identity.base_url}/painters/{id}"
+    expect(@result['_links']['painter']['templated']).to eq true
+  end
+
+  it 'returns uri template for resource_links without additional arguments' do
+    expect(@result['_links']['sculptors']['href']).to eq "#{Gris::Identity.base_url}/sculptors{?page,size}"
+    expect(@result['_links']['sculptors']['templated']).to eq true
+    expect(@result['_links']['sculptor']['href']).to eq "#{Gris::Identity.base_url}/sculptors/{id}"
+    expect(@result['_links']['sculptor']['templated']).to eq true
+  end
+
+  it 'returns uri template for endpoint_link with additional arguments' do
+    expect(@result['_links']['painting']['href']).to eq "#{Gris::Identity.base_url}/painting{?account_id}"
+    expect(@result['_links']['painting']['templated']).to eq true
+  end
+
+  it 'returns uri template for endpoint_link without additional arguments' do
+    expect(@result['_links']['sculpture']['href']).to eq "#{Gris::Identity.base_url}/sculpture"
+    expect(@result['_links']['sculpture']['templated']).to be_nil
+  end
+end

data/spec/support/integration_setup.rb

@@ -16,6 +16,7 @@ shared_context 'with a generated app' do
   end
 
   def prepare_app
+    use_local_gris
     Bundler.with_clean_env do
       project = ChildProcess.build('bundle', 'install')
       project.io.inherit!
@@ -31,6 +32,14 @@ shared_context 'with a generated app' do
     end
   end
 
+  def use_local_gris
+    IO.write(
+      "#{app_name}/Gemfile", File.open("#{app_name}/Gemfile") do |f|
+        f.read.gsub(/gem 'gris'/, "gem 'gris', path: '../'")
+      end
+    )
+  end
+
   def start_app
     @app = ChildProcess.build('bundle', 'exec', 'rackup')
     @app.environment['PERMITTED_TOKENS'] = 'replace-me'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gris
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Dylan Fareed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-15 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -376,6 +376,7 @@ files:
 - lib/gris/middleware/health.rb
 - lib/gris/output_formatters/paginated_presenter.rb
 - lib/gris/output_formatters/presenter.rb
+- lib/gris/output_formatters/root_presenter.rb
 - lib/gris/rspec_extensions/active_record_shared_connection.rb
 - lib/gris/rspec_extensions/response_helpers.rb
 - lib/gris/setup.rb
@@ -392,7 +393,9 @@ files:
 - spec/grape_extensions/date_time_helpers_spec.rb
 - spec/grape_extensions/error_helpers_spec.rb
 - spec/identity_spec.rb
+- spec/integration/application_error_response_spec.rb
 - spec/integration/token_authentication_spec.rb
+- spec/output_formatters/root_presenter_spec.rb
 - spec/spec_helper.rb
 - spec/support/caching_helper.rb
 - spec/support/integration_setup.rb
@@ -421,7 +424,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A simple api microservice generator framework.
@@ -436,7 +439,9 @@ test_files:
 - spec/grape_extensions/date_time_helpers_spec.rb
 - spec/grape_extensions/error_helpers_spec.rb
 - spec/identity_spec.rb
+- spec/integration/application_error_response_spec.rb
 - spec/integration/token_authentication_spec.rb
+- spec/output_formatters/root_presenter_spec.rb
 - spec/spec_helper.rb
 - spec/support/caching_helper.rb
 - spec/support/integration_setup.rb