graphiti 1.0.alpha.17 → 1.0.alpha.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c143ac6d83e9869c7348b95bbe5dfb7d749f5350
-  data.tar.gz: 68962230d384cbc40bda6ebca1bc92694edf50b0
+  metadata.gz: 7a57e6a62b24c36177cc2d7191754080204f43c3
+  data.tar.gz: 28df77df0640febe4fa4bab38ecb9f51ee0f79f6
 SHA512:
-  metadata.gz: d808239bc90833c4866ba40eb5f16e4f7ad711dcbcdf3ea2570603a339e46e65f2a574682e397d8ca901b2dc4365c6d54d51314706e0d18b89c9444096a4ea7c
-  data.tar.gz: 1aaaec7b0f0a5a179e595d8147f7eef5baa60f8690aa4731fcbbef1a0a9f392143b65ed9d21b50ed82f6157ca586ded103e565717f143c8383d1b3327ef385be
+  metadata.gz: 828cbf88441e63d92a056296751dc9a87ccb6dd4932946824f44ccef48ef0b828c498e0acbdc4751e89858188d4b13951d781d964d006ca8385daa343217c29f
+  data.tar.gz: 2134f9e3dcfb4209179f9c074c17b379af68b00b0182ef7a9d854644b62328ea6d5edc45925d7bf0783b833e0fd5c48166baf29c181b388f9f0442672486ecb5

data/lib/generators/graphiti/generator_mixin.rb

@@ -16,8 +16,8 @@ module Graphiti
         if ns.blank?
           ns = prompt \
             header: "What is your API namespace?",
-            description: "This will be used as a route prefix, e.g. if you want the route '/books_api/v1/authors' your namespace would be 'books_api'",
-            default: 'api'
+            description: "This will be used as a route prefix, e.g. if you want the route '/books_api/v1/authors' your namespace would be '/books_api/v1'",
+            default: '/api/v1'
           update_config!('namespace' => ns)
         end
 

data/lib/generators/graphiti/install_generator.rb

@@ -0,0 +1,58 @@
+$:.unshift File.dirname(__FILE__)
+require 'generator_mixin'
+
+module Graphiti
+  class InstallGenerator < ::Rails::Generators::Base
+    include GeneratorMixin
+
+    source_root File.expand_path('../templates', __FILE__)
+
+    class_option :'omit-comments',
+      type: :boolean,
+      default: false,
+      aliases: ['-c'],
+      desc: 'Generate without documentation comments'
+
+    desc "This generator boostraps graphiti"
+    def install
+      to = File.join('app/resources', "application_resource.rb")
+      template('application_resource.rb.erb', to)
+
+      inject_into_file 'app/controllers/application_controller.rb', after: "class ApplicationController < ActionController::API\n" do
+        app_controller_code
+      end
+
+      inject_into_file 'app/controllers/application_controller.rb', after: "class ApplicationController < ActionController::Base\n" do
+        app_controller_code
+      end
+
+      insert_into_file "config/routes.rb", :after => "Rails.application.routes.draw do\n" do
+        <<-STR
+  scope path: ApplicationResource.endpoint_namespace, defaults: { format: :jsonapi } do
+    # your routes go here
+  end
+        STR
+      end
+    end
+
+    private
+
+    def omit_comments?
+      @options['omit-comments']
+    end
+
+    def app_controller_code
+      str = ""
+      str << "  include Graphiti::Rails\n"
+      str << "  include Graphiti::Responders\n"
+      str << "\n"
+      str << "  register_exception Graphiti::Errors::RecordNotFound,\n"
+      str << "    status: 404\n"
+      str << "\n"
+      str << "  rescue_from Exception do |e|\n"
+      str << "    handle_exception(e)\n"
+      str << "  end\n"
+      str
+    end
+  end
+end

data/lib/generators/graphiti/resource_generator.rb

@@ -59,10 +59,10 @@ module Graphiti
     end
 
     def generate_route
-      code = "      resources :#{type}"
+      code = "    resources :#{type}"
       code << ", only: [#{actions.map { |a| ":#{a}" }.join(', ')}]" if actions.length < 5
       code << "\n"
-      inject_into_file 'config/routes.rb', after: "scope path: '/v1' do\n" do
+      inject_into_file 'config/routes.rb', after: /ApplicationResource.*$\n/ do
         code
       end
     end

data/lib/generators/graphiti/resource_test_generator.rb

@@ -32,12 +32,12 @@ module Graphiti
 
     def generate_resource_specs
       if actions?('create', 'update', 'destroy')
-        to = "spec/resources/#{var}/writes_spec.rb.rb"
+        to = "spec/resources/#{var}/writes_spec.rb"
         template('resource_writes_spec.rb.erb', to)
       end
 
       if actions?('index', 'show')
-        to = "spec/resources/#{var}/reads_spec.rb.rb"
+        to = "spec/resources/#{var}/reads_spec.rb"
         template('resource_reads_spec.rb.erb', to)
       end
     end

data/lib/generators/graphiti/templates/application_resource.rb.erb

@@ -9,5 +9,6 @@ class ApplicationResource < Graphiti::Resource
   # Subclasses can still override this default.
   <%- end -%>
   self.abstract_class = true
-  self.adapter = Graphiti::Adapters::ActiveRecord::Base.new
+  self.adapter = Graphiti::Adapters::ActiveRecord::Base
+  self.endpoint_namespace = '<%= api_namespace %>'
 end

data/lib/generators/graphiti/templates/resource_reads_spec.rb.erb

@@ -37,20 +37,36 @@ RSpec.describe <%= resource_class %>, type: :resource do
   end
 
   describe 'sorting' do
-    context 'by id descending' do
+    describe 'by id' do
       let!(:<%= var %>1) { create(:<%= var %>) }
       let!(:<%= var %>2) { create(:<%= var %>) }
 
-      before do
-        params[:sort] = '-id'
+      context 'when ascending' do
+        before do
+          params[:sort] = 'id'
+        end
+
+        it 'works' do
+          render
+          expect(d.map(&:id)).to eq([
+            <%= var %>1.id,
+            <%= var %>2.id
+          ])
+        end
       end
 
-      it 'works' do
-        render
-        expect(d.map(&:id)).to eq([
-          <%= var %>2.id,
-          <%= var %>1.id
-        ])
+      context 'when descending' do
+        before do
+          params[:sort] = '-id'
+        end
+
+        it 'works' do
+          render
+          expect(d.map(&:id)).to eq([
+            <%= var %>2.id,
+            <%= var %>1.id
+          ])
+        end
       end
     end
   end

data/lib/generators/graphiti/templates/resource_writes_spec.rb.erb

@@ -43,7 +43,7 @@ RSpec.describe <%= resource_class %>, type: :resource do
       expect {
         expect(instance.update_attributes).to eq(true)
       }.to change { <%= var %>.reload.updated_at }
-      # and change { instance.foo }.to('bar') <- example
+      # .and change { <%= var %>.foo }.to('bar') <- example
     end
   end
 

data/lib/graphiti/resource/links.rb

@@ -69,6 +69,8 @@ module Graphiti
       end
 
       def allow_request?(path, params, action)
+        path = path.split('.')[0]
+
         endpoints.any? do |e|
           has_id = params[:id] || params[:data].try(:[], :id)
           if [:update, :show, :destroy].include?(context_namespace) && has_id
@@ -76,7 +78,6 @@ module Graphiti
             path.pop
             path = path.join('/')
           end
-
           e[:full_path].to_s == path && e[:actions].include?(context_namespace)
         end
       end

data/lib/graphiti/resource_proxy.rb

@@ -66,7 +66,15 @@ module Graphiti
     end
 
     def stats
-      @stats ||= @scope.resolve_stats
+      @stats ||= if @query.hash[:stats]
+        payload = Stats::Payload.new @resource,
+          @query,
+          @scope.unpaginated_object,
+          data
+        payload.generate
+      else
+        {}
+      end
     end
 
     def save(action: :create)

data/lib/graphiti/scope.rb

@@ -13,14 +13,6 @@ module Graphiti
       end
     end
 
-    def resolve_stats
-      if @query.hash[:stats]
-        Stats::Payload.new(@resource, @query, @unpaginated_object).generate
-      else
-        {}
-      end
-    end
-
     def resolve
       if @query.zero_results?
         []

data/lib/graphiti/stats/payload.rb

@@ -14,10 +14,11 @@ module Graphiti
     #     meta: { stats: { total: { count: 100 } } }
     #   }
     class Payload
-      def initialize(resource, query, scope)
+      def initialize(resource, query, scope, data)
         @resource   = resource
         @query      = query
         @scope      = scope
+        @data       = data
       end
 
       # Generate the payload for +{ meta: { stats: { ... } } }+
@@ -30,7 +31,11 @@ module Graphiti
             stats[name] = {}
 
             each_calculation(name, calculation) do |calc, function|
-              stats[name][calc] = function.call(@scope, name)
+              args = [@scope, name]
+              args << @resource.context if function.arity >= 3
+              args << @data if function.arity == 4
+
+              stats[name][calc] = function.call(*args)
             end
           end
         end

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.0.alpha.17"
+  VERSION = "1.0.alpha.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.0.alpha.17
+  version: 1.0.alpha.18
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2018-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable
@@ -220,6 +220,7 @@ files:
 - graphiti.gemspec
 - lib/generators/graphiti/api_test_generator.rb
 - lib/generators/graphiti/generator_mixin.rb
+- lib/generators/graphiti/install_generator.rb
 - lib/generators/graphiti/resource_generator.rb
 - lib/generators/graphiti/resource_test_generator.rb
 - lib/generators/graphiti/templates/application_resource.rb.erb