graphiti 1.0.beta.17 → 1.0.beta.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40e367c51c95cce626468a8e5fc363d1e5b462bb
-  data.tar.gz: 6456a1f6d474505b2364039083221a056e5f7cba
+  metadata.gz: cb24b2b7bb6f301a77b66b9e7648503fb66b77e6
+  data.tar.gz: 38f73f1c31347e2f71094299c782c38dccce527f
 SHA512:
-  metadata.gz: 110202c3f62d3b1dd711f36ae0eac8baa746dc0711e8b30b20f7838c18db22544a89d8485ac361378afe8f7f27c1786396a0233da4823bcf616098a75c3a6469
-  data.tar.gz: 95db7dd5fcaa17800abb4d8a0aa80ebe76273ec20de154facbacf994a677bf0f3299c567855ed0a0047782ab2c6e3f6089072e627024784e5e61a3f0e1f797de
+  metadata.gz: ae790c813766213d2daa5fc6b10c36116f4425c00c9cfc6491a78facf8fbafec29809b77bbe40df533a56c1fc9f7d45013cb1acb19d4afa1f021de46274f74a5
+  data.tar.gz: d42f132d7757531c9f8e96f21671098085de4fafec03b819965838d3076d20a1ad75e4c7ac36d75770b2f36a6284d107541c5c1116a31766de5b691adfc22c49

data/lib/generators/graphiti/install_generator.rb

@@ -27,7 +27,10 @@ module Graphiti
       end
 
       inject_into_file 'config/application.rb', after: "Rails::Application\n" do
-"    routes.default_url_options[:host] = ENV.fetch('HOST', 'http://localhost:3000')\n"
+<<-'TXT'
+    argv_options = Rails::Server::Options.new.parse!(ARGV)
+    routes.default_url_options[:host] = ENV.fetch('HOST', "http://#{argv_options[:Host]}:#{argv_options[:Port]}")
+TXT
       end
 
       inject_into_file 'spec/rails_helper.rb', after: /RSpec.configure.+^end$/m do

data/lib/generators/graphiti/resource_generator.rb

@@ -22,10 +22,7 @@ module Graphiti
 
     desc "This generator creates a resource file at app/resources, as well as corresponding controller/specs/route/etc"
     def generate_all
-      unless model_klass
-        raise "You must define a #{class_name} model before generating the corresponding resource."
-      end
-
+      generate_model
       generate_controller
       generate_application_resource unless application_resource_defined?
       generate_route
@@ -36,6 +33,27 @@ module Graphiti
 
     private
 
+    class ModelAction
+      attr_reader :class_name
+      def initialize(class_name)
+        @class_name = class_name
+      end
+
+      def invoke!
+        unless class_name.safe_constantize
+          raise "You must define a #{class_name} model before generating the corresponding resource."
+        end
+      end
+
+      def revoke!
+        # Do nothing on destroy
+      end
+    end
+
+    def generate_model
+      action(ModelAction.new(class_name))
+    end
+
     def omit_comments?
       @options['omit-comments']
     end
@@ -60,11 +78,11 @@ module Graphiti
     end
 
     def generate_route
-      code = "    resources :#{type}"
-      code << ", only: [#{actions.map { |a| ":#{a}" }.join(', ')}]" if actions.length < 5
+      code = "resources :#{plural_route_name}"
+      code << %{, only: [#{actions.map { |a| ":#{a}" }.join(', ')}]} if actions.length < 5
       code << "\n"
       inject_into_file 'config/routes.rb', after: /ApplicationResource.*$\n/ do
-        code
+        indent(code, 4)
       end
     end
 
@@ -83,7 +101,11 @@ module Graphiti
     def generate_resource
       to = File.join('app/resources', class_path, "#{file_name}_resource.rb")
       template('resource.rb.erb', to)
-      require "#{::Rails.root}/#{to}"
+      require "#{::Rails.root}/#{to}" if create?
+    end
+
+    def create?
+      behavior == :invoke
     end
 
     def model_klass

data/lib/graphiti/adapters/abstract.rb

@@ -35,6 +35,7 @@ module Graphiti
             :match,
             :not_match
           ],
+          uuid: [:eq, :not_eq],
           integer_id: numerical_operators,
           integer: numerical_operators,
           big_decimal: numerical_operators,
@@ -87,6 +88,14 @@ module Graphiti
         raise Errors::AdapterNotImplemented.new(self, attribute, :filter_string_not_match)
       end
 
+      def filter_uuid_eq(scope, attribute, value)
+        raise Errors::AdapterNotImplemented.new(self, attribute, :filter_uuid_eq)
+      end
+
+      def filter_uuid_not_eq(scope, attribute, value)
+        raise Errors::AdapterNotImplemented.new(self, attribute, :filter_uuid_not_eq)
+      end
+
       def filter_integer_eq(scope, attribute, value)
         raise Errors::AdapterNotImplemented.new(self, attribute, :filter_integer_eq)
       end

data/lib/graphiti/adapters/active_record.rb

@@ -24,6 +24,7 @@ module Graphiti
       alias :filter_big_decimal_eq :filter_eq
       alias :filter_date_eq :filter_eq
       alias :filter_boolean_eq :filter_eq
+      alias :filter_uuid_eq :filter_eq
 
       def filter_not_eq(scope, attribute, value)
         scope.where.not(attribute => value)
@@ -33,6 +34,7 @@ module Graphiti
       alias :filter_big_decimal_not_eq :filter_not_eq
       alias :filter_date_not_eq :filter_not_eq
       alias :filter_boolean_not_eq :filter_not_eq
+      alias :filter_uuid_not_eq :filter_not_eq
 
       def filter_string_eq(scope, attribute, value, is_not: false)
         column = scope.klass.arel_table[attribute]

data/lib/graphiti/adapters/null.rb

@@ -181,7 +181,7 @@ module Graphiti
       end
 
       def base_scope(model)
-        raise 'Null adapter has no base scope!'
+        {}
       end
 
       # (see Adapters::Abstract#order)
@@ -231,6 +231,10 @@ module Graphiti
       def resolve(scope)
         scope
       end
+
+      def save(model)
+        model
+      end
     end
   end
 end

data/lib/graphiti/query.rb

@@ -192,6 +192,10 @@ module Graphiti
       end
     end
 
+    def paginate?
+      not [false, 'false'].include?(@params[:paginate])
+    end
+
     private
 
     # Try to find on this resource

data/lib/graphiti/schema.rb

@@ -28,8 +28,7 @@ module Graphiti
       {
         resources: generate_resources,
         endpoints: generate_endpoints,
-        types: generate_types,
-        base_url: resources.map(&:base_url)[0]
+        types: generate_types
       }
     end
 

data/lib/graphiti/scope.rb

@@ -94,6 +94,7 @@ module Graphiti
 
     def apply_scoping(scope, opts)
       @object = scope
+      opts[:default_paginate] = false unless @query.paginate?
       add_scoping(nil, Graphiti::Scoping::DefaultFilter, opts)
       add_scoping(:filter, Graphiti::Scoping::Filter, opts)
       add_scoping(:sort, Graphiti::Scoping::Sort, opts)

data/lib/graphiti/scoping/paginate.rb

@@ -1,32 +1,7 @@
 module Graphiti
-  # Apply pagination logic to the scope
-  #
-  # If the user requests a page size greater than +MAX_PAGE_SIZE+,
-  # a +Graphiti::Errors::UnsupportedPageSize+ error will be raised.
-  #
-  # Notably, this will not fire when the `default: false` option is passed.
-  # This is the case for sideloads - if the user requests "give me the post
-  # and its comments", we shouldn't implicitly limit those comments to 20.
-  # *BUT* if the user requests, "give me the post and 3 of its comments", we
-  # *should* honor that pagination.
-  #
-  # This can be confusing because there are also 'default' and 'customized'
-  # pagination procs. The default comes 'for free'. Customized pagination
-  # looks like
-  #
-  #   class PostResource < ApplicationResource
-  #     paginate do |scope, current_page, per_page|
-  #       # ... the custom logic ...
-  #     end
-  #   end
-  #
-  # We should use the default unless the user has customized.
-  # @see Resource.paginate
   class Scoping::Paginate < Scoping::Base
     DEFAULT_PAGE_SIZE = 20
 
-    # Apply the pagination logic. Raise error if over the max page size.
-    # @return the scope object we are chaining/modifying
     def apply
       if size > resource.max_page_size
         raise Graphiti::Errors::UnsupportedPageSize

data/lib/graphiti/types.rb

@@ -86,6 +86,13 @@ module Graphiti
             kind: 'scalar',
             description: 'Base Type. Query/persist as integer, render as string.'
           },
+          uuid: {
+            params: Dry::Types['coercible.string'],
+            read: Dry::Types['coercible.string'],
+            write: Dry::Types['coercible.string'],
+            kind: 'scalar',
+            description: 'Base Type. Like a normal string, but by default only eq/!eq and case-sensitive.'
+          },
           string: {
             params: Dry::Types['coercible.string'],
             read: Dry::Types['coercible.string'],

data/lib/graphiti/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.0.beta.17
+  version: 1.0.beta.18
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2018-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable