gris 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b4abfeb569455ac1557220759fed00d91b12698
-  data.tar.gz: 5a07d55604ba7d0f070a03e3d1066796ceab5f60
+  metadata.gz: 034350c7d90aff8466b08aff40fb6e9dafe967c7
+  data.tar.gz: 7c9390ef0aeea7537d8da9d0688a930cf9aa0150
 SHA512:
-  metadata.gz: df3b86ca754667587d31fe5d70cb079c890009f0c31ee8588425e12e058bea9514e9848326476d582856e9f312d235df6e380ad7e32672a7e70f47d8685335e3
-  data.tar.gz: 57159e0bec4873868f9437f49c14694720775730af8210b623f4866a3b53ba5dce81349c68fae28f95ac12cd57b7ee467941f864acaea2f19f8dd52080f268e0
+  metadata.gz: 606f7d968a885ff8ea1c3665169aabd2de08ea75c4b72ce19f57b5098c72a4087cf5536e8e3daba233abc5b6d9afa5050601daafbe67651639b5c82ade73bcfa
+  data.tar.gz: 97ceee9239f360daf0d4ba61a3a8677549626667b48ac0f0ef51f040759458210dcbe550539ea368fe6f76d246c58e5c5946b2d42dc08c339ad85cf84b9f9663

data/Gemfile.lock

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

data/lib/gris.rb

@@ -21,8 +21,8 @@ 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/output_formatters/presenter_link_helpers'
 require 'gris/setup'
 require 'gris/version'
 

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

@@ -1,5 +1,5 @@
 module RootPresenter
-  include Gris::RootPresenter
+  include Gris::Presenter
 
   link :self do
     Gris::Identity.base_url

data/lib/gris/output_formatters/presenter.rb

@@ -9,6 +9,7 @@ module Gris
         include Roar::JSON::HAL
         include Roar::Hypermedia
         include Grape::Roar::Representer
+        include Gris::PresenterLinkHelpers
 
         private
 

data/lib/gris/output_formatters/presenter_link_helpers.rb

@@ -0,0 +1,41 @@
+module Gris
+  module PresenterLinkHelpers
+    def self.included(base)
+      base.class_eval do
+        def self.resource_links(name, args = [], resource_uri_template = '/{id}')
+          args += %w(page size)
+          endpoint_link(
+            name.to_s.pluralize,
+            template_options: args, templated: true
+          )
+          endpoint_link(
+            name,
+            namespace: name.to_s.pluralize,
+            uri_template: resource_uri_template,
+            templated: true
+          )
+        end
+
+        def self.endpoint_link(name, options = {})
+          namespace = options[:namespace] || name
+          template_options = options[:template_options] || []
+          uri_template = options[:uri_template] || format_template_options(template_options)
+          link name do
+            link = {
+              href: "#{Gris::Identity.base_url}/#{namespace}#{uri_template}"
+            }
+            link[:templated] = true if !!options[:templated] || !template_options.blank?
+            link
+          end
+        end
+
+        private
+
+        def self.format_template_options(template_options = [])
+          return unless template_options.any?
+          "{?#{template_options.join(',')}}"
+        end
+      end
+    end
+  end
+end

data/lib/gris/version.rb

@@ -1,5 +1,5 @@
 module Gris
-  VERSION = '0.4.5'
+  VERSION = '0.4.6'
 
   class Version
     class << self

data/spec/generators/scaffold_generator_spec.rb

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

data/spec/output_formatters/{root_presenter_spec.rb → presenter_link_helpers_spec.rb}

@@ -2,27 +2,31 @@ require 'spec_helper'
 require 'gris'
 require 'rack/test'
 
-describe Gris::RootPresenter do
+describe Gris::PresenterLinkHelpers do
   include Rack::Test::Methods
 
-  module RootPresenter
-    include Gris::RootPresenter
+  module MyRootPresenter
+    include Gris::Presenter
+
+    resource_links :printmaker, [:account_id], '/{id}?account_id={account_id}'
     resource_links :painter, [:sort]
-    endpoint_link :painting, [:account_id]
     resource_links :sculptor
+
+    endpoint_link :painting, template_options: [:account_id, :user_id]
     endpoint_link :sculpture
+    endpoint_link :self, namespace: 'drawings', uri_template: '/{id}'
   end
 
-  class ApplicationEndpoint < Grape::API
+  class MyApplicationEndpoint < Grape::API
     format :json
     formatter :json, Grape::Formatter::Roar
     get do
-      present self, with: RootPresenter
+      present self, with: MyRootPresenter
     end
   end
 
   def app
-    ApplicationEndpoint.new
+    MyApplicationEndpoint.new
   end
 
   before do
@@ -30,6 +34,10 @@ describe Gris::RootPresenter do
     @result = Hashie::Mash.new JSON.parse(last_response.body)
   end
 
+  it 'includes Gris::PresenterLinkHelpers' do
+    expect(RootPresenter).to include(Gris::PresenterLinkHelpers)
+  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
@@ -37,6 +45,13 @@ describe Gris::RootPresenter do
     expect(@result['_links']['painter']['templated']).to eq true
   end
 
+  it 'returns uri template for resource_links with resource_uri_template' do
+    expect(@result['_links']['printmakers']['href']).to eq "#{Gris::Identity.base_url}/printmakers{?account_id,page,size}"
+    expect(@result['_links']['printmakers']['templated']).to eq true
+    expect(@result['_links']['printmaker']['href']).to eq "#{Gris::Identity.base_url}/printmakers/{id}?account_id={account_id}"
+    expect(@result['_links']['printmaker']['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
@@ -44,8 +59,8 @@ describe Gris::RootPresenter do
     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}"
+  it 'returns uri template for endpoint_link with template_options' do
+    expect(@result['_links']['painting']['href']).to eq "#{Gris::Identity.base_url}/painting{?account_id,user_id}"
     expect(@result['_links']['painting']['templated']).to eq true
   end
 
@@ -53,4 +68,9 @@ describe Gris::RootPresenter do
     expect(@result['_links']['sculpture']['href']).to eq "#{Gris::Identity.base_url}/sculpture"
     expect(@result['_links']['sculpture']['templated']).to be_nil
   end
+
+  it 'returns uri template for endpoint_link with namespace and uri_template options' do
+    expect(@result['_links']['self']['href']).to eq "#{Gris::Identity.base_url}/drawings/{id}"
+    expect(@result['_links']['self']['templated']).to be_nil
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gris
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Dylan Fareed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -376,7 +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/output_formatters/presenter_link_helpers.rb
 - lib/gris/rspec_extensions/active_record_shared_connection.rb
 - lib/gris/rspec_extensions/response_helpers.rb
 - lib/gris/setup.rb
@@ -396,7 +396,7 @@ files:
 - 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/output_formatters/presenter_link_helpers_spec.rb
 - spec/secrets_spec.rb
 - spec/spec_helper.rb
 - spec/support/caching_helper.rb
@@ -445,7 +445,7 @@ test_files:
 - 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/output_formatters/presenter_link_helpers_spec.rb
 - spec/secrets_spec.rb
 - spec/spec_helper.rb
 - spec/support/caching_helper.rb

data/lib/gris/output_formatters/root_presenter.rb

@@ -1,43 +0,0 @@
-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