graphiti-rails 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8993bd8b17b1d9ba9dcf82ef4b4fec45b2aa4445
-  data.tar.gz: 5d2336e116e9113e231317097e522fcf7a431975
+SHA256:
+  metadata.gz: 9bdb3311560b5685654994efde20e4f5bb73345034ffa64590ffda5a88ea8be6
+  data.tar.gz: 6180b0e0e4645602774e968b161206d47d493da7a200bcbdcb7d9ba99a674eb8
 SHA512:
-  metadata.gz: dae730aa703c72f004843792e64daaa76e1b6772f7ce8cf45cef2971d684c45f598e1f219bbe9b2461eac7a315c90c23e58e284b80b62d67395d0b560807b82c
-  data.tar.gz: 3a2076458bcb51e7cf935593066ebeb5a12d286608ebb4f1febc78d1006330237e443226cad09fb38da1a5d43d21ebbdfe5de0aa2046262199442974ab128c37
+  metadata.gz: fcda213c7e5722a8ab22429a1f9b841bc6a7e5699c45b7c0d6dc2a6cec87cf9c5ad9e992eb5338371e90d9fc3fb64167c5df9141c7d815ee02eb5d6826701932
+  data.tar.gz: 7b3b8dfdfb0b0bf472f335531abb4d049f6e93a551b3e5330a799233305d4ecbd4f0ac024f5bc5297023b26917b20590c0df21afc078435ad61980f2045481ae

data/lib/generators/graphiti/api_test_generator.rb

@@ -13,6 +13,12 @@ module Graphiti
       aliases: ["--actions", "-a"],
       desc: 'Array of controller actions, e.g. "index show destroy"'
 
+    class_option :'rawid',
+      type: :boolean,
+      default: false,
+      aliases: ["--rawid", "-r"],
+      desc: "Generate tests using rawid"
+
     desc "Generates rspec request specs at spec/api"
     def generate
       generate_api_specs

data/lib/generators/graphiti/generator_mixin.rb

@@ -41,5 +41,19 @@ module Graphiti
       config = graphiti_config.merge(attrs)
       File.open(".graphiticfg.yml", "w") { |f| f.write(config.to_yaml) }
     end
+
+    def id_or_rawid
+      @options["rawid"] ? "rawid" : "id"
+    end
+
+    def sort_raw_ids
+      return unless @options["rawid"]
+      ".sort"
+    end
+
+    def sort_raw_ids_descending
+      return unless @options["rawid"]
+      ".sort.reverse"
+    end
   end
 end

data/lib/generators/graphiti/resource_generator.rb

@@ -14,6 +14,12 @@ module Graphiti
       aliases: ["--omit-comments", "-c"],
       desc: "Generate without documentation comments"
 
+    class_option :'rawid',
+      type: :boolean,
+      default: false,
+      aliases: ["--rawid", "-r"],
+      desc: "Generate tests using rawid"
+
     class_option :actions,
       type: :array,
       default: nil,
@@ -143,12 +149,14 @@ module Graphiti
     def generate_resource_specs
       opts = {}
       opts[:actions] = @options[:actions] if @options[:actions]
+      opts[:rawid] = @options[:rawid] if @options[:rawid]
       invoke "graphiti:resource_test", [resource_klass], opts
     end
 
     def generate_api_specs
       opts = {}
       opts[:actions] = @options[:actions] if @options[:actions]
+      opts[:rawid] = @options[:rawid] if @options[:rawid]
       invoke "graphiti:api_test", [resource_klass], opts
     end
 

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

@@ -16,7 +16,7 @@ RSpec.describe "<%= type %>#index", type: :request do
       make_request
       expect(response.status).to eq(200), response.body
       expect(d.map(&:jsonapi_type).uniq).to match_array(['<%= type %>'])
-      expect(d.map(&:id)).to match_array([<%= var %>1.id, <%= var %>2.id])
+      expect(d.map(&:<%= id_or_rawid %>)).to match_array([<%= var %>1.id, <%= var %>2.id])
     end
   end
 end

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

@@ -7,7 +7,7 @@ RSpec.describe <%= resource_class %>, type: :resource do
     it 'works' do
       render
       data = jsonapi_data[0]
-      expect(data.id).to eq(<%= var %>.id)
+      expect(data.<%= id_or_rawid %>).to eq(<%= var %>.id)
       expect(data.jsonapi_type).to eq('<%= type %>')
       <%- attributes.each do |a| -%>
       <%- if [:created_at, :updated_at].include?(a.name.to_sym) -%>
@@ -31,7 +31,7 @@ RSpec.describe <%= resource_class %>, type: :resource do
 
       it 'works' do
         render
-        expect(d.map(&:id)).to eq([<%= var %>2.id])
+        expect(d.map(&:<%= id_or_rawid %>)).to eq([<%= var %>2.id])
       end
     end
   end
@@ -48,10 +48,10 @@ RSpec.describe <%= resource_class %>, type: :resource do
 
         it 'works' do
           render
-          expect(d.map(&:id)).to eq([
+          expect(d.map(&:<%= id_or_rawid %>)).to eq([
             <%= var %>1.id,
             <%= var %>2.id
-          ])
+          ]<%= sort_raw_ids %>)
         end
       end
 
@@ -62,10 +62,10 @@ RSpec.describe <%= resource_class %>, type: :resource do
 
         it 'works' do
           render
-          expect(d.map(&:id)).to eq([
+          expect(d.map(&:<%= id_or_rawid %>)).to eq([
             <%= var %>2.id,
             <%= var %>1.id
-          ])
+          ]<%= sort_raw_ids_descending %>)
         end
       end
     end

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

@@ -15,7 +15,7 @@ RSpec.describe "<%= type %>#show", type: :request do
       make_request
       expect(response.status).to eq(200)
       expect(d.jsonapi_type).to eq('<%= type %>')
-      expect(d.id).to eq(<%= var %>.id)
+      expect(d.<%= id_or_rawid %>).to eq(<%= var %>.id)
     end
   end
 end

data/lib/graphiti/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Graphiti
   module Rails
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Peter Wagenet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-26 00:00:00.000000000 Z
+date: 2019-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphiti
@@ -237,8 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Rails integration for Graphiti