graphql-relay 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fb50f9e3030be285c1be81b0f0e302919a49c2f
-  data.tar.gz: fd869d0de9f2f47085c12e94c093a0ca791ee004
+  metadata.gz: ee15c8ecfc7211458db3f5c9ea677f58e0a836a0
+  data.tar.gz: 408c83f5849052f11bf89fa8eb16e7228dd7dcd8
 SHA512:
-  metadata.gz: 68734a2849039b20d4fcfe57855217247aebbf47c3252a22b96993e26880f0f4b739f41c75c203ce32fcf4e5e15d7b0c0a2b3f2f447ae838a21f6abfaf6617f2
-  data.tar.gz: c76dd82ddc3eef84a26fd1ab949b9e4483d9d2c81ea6c41e1c08497fc900c0b476b55b2d157b8091aab1906f438317822c1f4718f56b1eec00f11d54e62f8e5f
+  metadata.gz: cdc02c0272c909596c5c05816f2881b2e619d01a35a08e4efaa8f75b685fe225d9581f573c96d8fc2f7365679801770999b7e8607c861b2a776144e99c1a0bd1
+  data.tar.gz: 314b20cbbc0ce9fb73b5ffcdc63a6a0662cdfac9d057f6393bb98dc7135290d100a4a66fd7a14817709b38b3a9d65f30577ce6e090ac537a4b7822f08f02e9e9

data/lib/graphql/relay/array_connection.rb

@@ -12,7 +12,12 @@ module GraphQL
       def paged_nodes
         @paged_nodes = begin
           items = sliced_nodes
-          items.first(limit)
+
+          if limit
+            items.first(limit)
+          else
+            items
+          end
         end
       end
 
@@ -37,25 +42,27 @@ module GraphQL
       end
 
       def previous_offset
-        @initial_offset ||= if before
-          index_from_cursor(before) - last - 1
-        elsif after
+        @previous_offset ||= if after
           index_from_cursor(after)
+        elsif before
+          index_from_cursor(before) - (last ? last : 0) - 1
         else
           0
         end
       end
 
       def limit
-        @limit ||= if first
-          [first, max_page_size].compact.min
-        else
-          last_limit = if previous_offset <= 0
-            previous_offset + last
+        @limit ||= begin
+          limit_from_arguments = if first
+            first
           else
-            last
+            if previous_offset < 0
+              previous_offset + (last ? last : 0)
+            else
+              last
+            end
           end
-          [last_limit, max_page_size].compact.min
+          [limit_from_arguments, max_page_size].compact.min
         end
       end
     end

data/lib/graphql/relay/relation_connection.rb

@@ -7,12 +7,12 @@ module GraphQL
       end
 
       def has_next_page
-        !!(first && sliced_nodes.limit(first + 1).count > first)
+        exceeds_limit?(first)
       end
 
       # Used by `pageInfo`
       def has_previous_page
-        !!(last && sliced_nodes.limit(last + 1).count > last)
+        exceeds_limit?(last)
       end
 
       private
@@ -53,28 +53,40 @@ module GraphQL
         @previous_offset ||= if after
           offset_from_cursor(after)
         elsif before
-          offset_from_cursor(before) - last - 1
+          offset_from_cursor(before) - (last ? last : 0) - 1
         else
           0
         end
       end
 
+      # Limit to apply to this query:
+      # - find a value from the query
+      # - don't exceed max_page_size
+      # - otherwise, don't limit
       def limit
-        @limit ||= if first
-          [first, max_page_size].compact.min
-        else
-          last_limit = if previous_offset <= 0
-            previous_offset + last
+        @limit ||= begin
+          limit_from_arguments = if first
+            first
           else
-            last
+            if previous_offset < 0
+              previous_offset + (last ? last : 0)
+            else
+              last
+            end
           end
-          [last_limit, max_page_size].compact.min
+          [limit_from_arguments, max_page_size].compact.min
         end
       end
 
       def paged_nodes_array
         @paged_nodes_array ||= paged_nodes.to_a
       end
+
+      # Returns true if the limit is specified
+      # and there are more items that follow
+      def exceeds_limit?(limit_value)
+        !!(limit_value && sliced_nodes.limit(limit_value + 1).count > limit_value)
+      end
     end
 
 

data/lib/graphql/relay/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module Relay
-    VERSION = '0.9.0'
+    VERSION = '0.9.1'
   end
 end

data/spec/graphql/relay/array_connection_spec.rb

@@ -77,5 +77,12 @@ describe GraphQL::Relay::ArrayConnection do
       names = get_names(result)
       assert_equal(1, names.length)
     end
+
+    it 'works without first/last/after/before' do
+      result = query(query_string)
+
+      assert_equal(false, result["data"]["rebels"]["ships"]["pageInfo"]["hasNextPage"])
+      assert_equal(5, result["data"]["rebels"]["ships"]["edges"].length)
+    end
   end
 end

data/spec/graphql/relay/relation_connection_spec.rb

@@ -27,6 +27,9 @@ describe GraphQL::Relay::RelationConnection do
           node {
             name
           }
+        },
+        pageInfo {
+          hasNextPage
         }
       }
     |}
@@ -84,6 +87,12 @@ describe GraphQL::Relay::RelationConnection do
       assert_equal(["Death Star"], get_names(result))
     end
 
+    it 'works without first/last/after/before' do
+      result = query(query_string)
+
+      assert_equal(3, result["data"]["empire"]["bases"]["edges"].length)
+    end
+
     it "applies the maximum limit for relation connection types" do
       limit_query_string = %|
         query getShips($first: Int){
@@ -120,6 +129,9 @@ describe GraphQL::Relay::RelationConnection do
 
       result = query(limit_query_string, "first" => 3)
       assert_equal(2, result["data"]["empire"]["basesWithMaxLimitArray"]["edges"].size)
+
+      result = query(limit_query_string)
+      assert_equal(2, result["data"]["empire"]["basesWithMaxLimitArray"]["edges"].size, "it works without arguments")
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-relay
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql