foxpage 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8037f2e78043aa067766f40fff0d279c4c6b94e205656d3897ea4fa820120928
-  data.tar.gz: c38fa73ab21a672d01ac81de9131e7855805cadbde981a46a97fc5b891f6d8c8
+  metadata.gz: e093d627bdcf6c0c28b6a5894f26c48550ea4ac365fba4686510158427c1cf24
+  data.tar.gz: 537350679cd49f185d1a5b6c19af93e1028846f477025f8cc579714f2afc59c3
 SHA512:
-  metadata.gz: d100781bd93a0f7c5900f8f8a0fc062a0d4ff42459af50d8b36684b089ff68774a739458e492824079bf8bbd108bedf88d1d2b3aabe8118480db89ef3c7dd60e
-  data.tar.gz: 938431d7c2787a57c3f31187b6fafc0259f6bde44e8e4e8216af2255c7ca12c2610304fbdf8648b9ed4198b6eb03c5228224994b85068f97725fd67fde1082fe
+  metadata.gz: 46abc20157e01f95c80a8b20b21a2239a4875e7af66d568146f2588e178adbdd7ff22e9cbda236d4675985512015b31d49dfa91f2d5c5b7d00131a0b69b250de
+  data.tar.gz: 85df91b9704b9e1d32f265469e4e5aa20a8f939fd1daff77db0faa75c222238a818a29403d1b3e2fa80e6e0da1f1f68db82a75dc8f12b5eb2cff1b1920e74f74

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    foxpage (0.2.2)
+    foxpage (0.2.3)
       haml (~> 5.1)
       listen (~> 3.1)
       sassc (~> 2.0)
@@ -17,36 +17,36 @@ GEM
     ast (2.4.0)
     concurrent-ruby (1.1.5)
     diff-lcs (1.3)
-    ffi (1.11.1)
+    ffi (1.11.3)
     haml (5.1.2)
       temple (>= 0.8.0)
       tilt
-    jaro_winkler (1.5.2)
-    listen (3.2.0)
+    jaro_winkler (1.5.4)
+    listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    parallel (1.17.0)
-    parser (2.6.3.0)
+    parallel (1.19.1)
+    parser (2.7.0.1)
       ast (~> 2.4.0)
-    rack (2.0.7)
+    rack (2.0.8)
     rainbow (3.0.0)
-    rake (12.3.2)
+    rake (12.3.3)
     rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.3)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
     rubocop (0.68.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -64,8 +64,8 @@ GEM
     thor (0.20.3)
     tilt (2.0.10)
     unicode-display_width (1.5.0)
-    webrick (1.5.0)
-    zeitwerk (2.2.1)
+    webrick (1.6.0)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby
@@ -78,4 +78,4 @@ DEPENDENCIES
   rubocop (~> 0.68.1)
 
 BUNDLED WITH
-   2.0.1
+   2.1.2

data/lib/fox_page/builders/pages.rb

@@ -30,9 +30,16 @@ module FoxPage
           end
 
         enumerable.each_with_index do |item, index|
-          id = (item.respond_to?(:id) && item.id) || index
-          # have page numbers start with 1
-          target_path = format(path, id: id == index ? id + 1 : id)
+          if route.generate_all_ids
+            # generate_all returns ids
+            id = enumerable.at(index)
+            target_path = format(path, id: id)
+          else
+            id = (item.respond_to?(:id) && item.id) || index
+            # have page numbers start with 1
+            target_path = format(path, id: id == index ? id + 1 : id)
+          end
+
           build_single_page(target_path, route, id: id)
         end
       end

data/lib/fox_page/controller.rb

@@ -21,14 +21,20 @@ module FoxPage
       @__generate_all = model
     end
 
+    # Set this to true if `generate_all` returns IDs (i.e. urls)
+    def self.generate_all_ids(generate_all_ids)
+      @__generate_all_ids = generate_all_ids
+    end
+
     def self.use_layout(layout)
       @__use_layout = layout
     end
 
     def self.method_added(method_name)
-      return unless @__generate_all.nil? || @__use_layout.nil?
+      return unless @__generate_all.nil? || @__use_layout.nil? || @__generate_all_ids.nil?
 
       set_method_option(method_name, "generate_all")
+      set_method_option(method_name, "generate_all_ids")
       set_method_option(method_name, "use_layout")
     end
 

data/lib/fox_page/model.rb

@@ -155,7 +155,13 @@ module FoxPage
           value_key_name = "__#{key}_value"
           key = value_key_name if object.respond_to?(value_key_name)
 
-          object.public_send(key) == value
+          returned_value = object.public_send(key)
+          case returned_value
+          when Array
+            returned_value.include?(value)
+          else
+            returned_value == value
+          end
         end
       end
     end

data/lib/fox_page/router.rb

@@ -40,7 +40,7 @@ module FoxPage
       base_path = "/#{path}"
 
       # insert a route with id 0 as index if generate_all was specified, but without the /id in the path
-      if actions.find(:index)
+      if actions.include?(:index)
         validate_controller_method(controller, :index)
 
         routes[base_path] = make_target(
@@ -48,7 +48,8 @@ module FoxPage
           controller: controller,
           method_name: :index,
           params: { id: 0 },
-          generate_all: nil
+          generate_all: nil,
+          generate_all_ids: false
         )
       end
 
@@ -57,11 +58,16 @@ module FoxPage
         validate_controller_method(controller, method_name)
 
         generate_all = controller.instance_variable_get(:@__generate_all_for)&.[](method_name)
+        generate_all_ids = controller.instance_variable_get(:@__generate_all_ids_for)&.[](method_name)
 
         route_path = method_name == :index ? base_path : "#{base_path}/#{method_name}"
         if generate_all
           # :show gets a pretty id, whereas :index (and others) get it prefixed with /page
-          route_path = method_name == :show ? "#{base_path}/%<id>s" : "#{route_path}/page/%<id>s"
+          route_path = if generate_all_ids
+                         "#{base_path}/%<id>s"
+                       else
+                         method_name == :show ? "#{base_path}/%<id>s" : "#{route_path}/page/%<id>s"
+                       end
         end
 
         routes[route_path] ||= make_target(
@@ -69,7 +75,8 @@ module FoxPage
           controller: controller,
           method_name: method_name,
           params: {},
-          generate_all: generate_all
+          generate_all: generate_all,
+          generate_all_ids: generate_all_ids
         )
       end
     end
@@ -102,13 +109,14 @@ module FoxPage
       raise ArgumentError, "#{controller} does not define ##{method_name}"
     end
 
-    def make_target(base_name:, controller:, method_name:, params: {}, generate_all: nil, single_file: false)
+    def make_target(base_name:, controller:, method_name:, params: {}, generate_all: nil, generate_all_ids: false, single_file: false)
       OpenStruct.new(
         base_name: base_name,
         controller: controller,
         method_name: method_name,
         params: OpenStruct.new(params),
         generate_all: generate_all,
+        generate_all_ids: generate_all_ids,
         single_file: single_file
       )
     end

data/lib/fox_page/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FoxPage
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foxpage
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Georg Gadinger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-22 00:00:00.000000000 Z
+date: 2020-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor