foxpage 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80a1fdb0c07dcf54fcca8c9fa2e3d6e2b7b1567edb663d298b1dd97ab33d37f8
-  data.tar.gz: 6b3c0c52f6146f0124e616a07cd941e7845543d813f5aadbbccc70d58c41bf7e
+  metadata.gz: 8037f2e78043aa067766f40fff0d279c4c6b94e205656d3897ea4fa820120928
+  data.tar.gz: c38fa73ab21a672d01ac81de9131e7855805cadbde981a46a97fc5b891f6d8c8
 SHA512:
-  metadata.gz: c745470d17e8ab8b47a9f2c24aab465129fafa219adb42d50a39b10529b71f9d78011d0abc32888038f7a5ddd251efd7f63b99dee83f974933f66b96bdec0f9b
-  data.tar.gz: 91dc44b03e5ba5b431d24d3f462d657ca2b6a306336a64224625ddd488cdc0abbf5c8ff03b4a2ce56a909b9b3c4fa2ef597a85df924d05fad447183c5341364c
+  metadata.gz: d100781bd93a0f7c5900f8f8a0fc062a0d4ff42459af50d8b36684b089ff68774a739458e492824079bf8bbd108bedf88d1d2b3aabe8118480db89ef3c7dd60e
+  data.tar.gz: 938431d7c2787a57c3f31187b6fafc0259f6bde44e8e4e8216af2255c7ca12c2610304fbdf8648b9ed4198b6eb03c5228224994b85068f97725fd67fde1082fe

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    foxpage (0.2.1)
+    foxpage (0.2.2)
       haml (~> 5.1)
       listen (~> 3.1)
       sassc (~> 2.0)
@@ -22,10 +22,9 @@ GEM
       temple (>= 0.8.0)
       tilt
     jaro_winkler (1.5.2)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
+    listen (3.2.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     parallel (1.17.0)
     parser (2.6.3.0)
       ast (~> 2.4.0)
@@ -56,18 +55,17 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.6)
     ruby-progressbar (1.10.1)
-    ruby_dep (1.5.0)
     sassc (2.2.1)
       ffi (~> 1.9)
-    sprockets (4.0.0.beta10)
+    sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     temple (0.8.2)
     thor (0.20.3)
     tilt (2.0.10)
     unicode-display_width (1.5.0)
-    webrick (1.4.2)
-    zeitwerk (2.1.10)
+    webrick (1.5.0)
+    zeitwerk (2.2.1)
 
 PLATFORMS
   ruby

data/lib/fox_page/app_parts/sprockets.rb

@@ -13,6 +13,7 @@ module FoxPage
         env = ::Sprockets::Environment.new(root)
         env.append_path("app/assets/stylesheets")
         env.append_path("app/assets/images")
+        env.append_path("app/assets/javascripts")
 
         manifest = ::Sprockets::Manifest.new(
           env, "./#{OUTPUT_DIRECTORY}/assets/.sprockets_manifest.json"

data/lib/fox_page/builders/pages.rb

@@ -12,12 +12,7 @@ module FoxPage
       def build_pages
         app.routes.each do |path, route|
           if route.generate_all
-            model = route.generate_all.camelize.constantize
-
-            model.all.each do |item|
-              target_path = format(path, id: item.id)
-              build_single_page(target_path, route, id: item.id)
-            end
+            build_all_the_pages(path, route)
             next
           end
 
@@ -25,6 +20,23 @@ module FoxPage
         end
       end
 
+      def build_all_the_pages(path, route)
+        enumerable =
+          if route.generate_all.is_a?(Symbol)
+            model = route.generate_all.camelize.constantize
+            model.all
+          else
+            route.generate_all.call
+          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)
+          build_single_page(target_path, route, id: id)
+        end
+      end
+
       def build_single_page(target_path, route, params = {})
         if params.empty?
           params_log_str = ""

data/lib/fox_page/controller.rb

@@ -15,6 +15,8 @@ module FoxPage
     end
 
     # Instructs the site builder to generate pages for all records of `model`.
+    # model can be a symbol (which will use an actual FoxPage::Model), or a
+    # Proc returning an Enumerable.
     def self.generate_all(model)
       @__generate_all = model
     end

data/lib/fox_page/helpers/assets_helper.rb

@@ -13,6 +13,10 @@ module FoxPage
       def stylesheet_link_tag(source, prepend: "")
         %(<link rel="stylesheet" href=#{asset_path(source, prepend: prepend).inspect} />)
       end
+
+      def javascript_include_tag(source, prepend: "")
+        %(<script language="JavaScript" src=#{asset_path(source, prepend: prepend).inspect}></script>)
+      end
     end
   end
 end

data/lib/fox_page/model.rb

@@ -60,10 +60,13 @@ module FoxPage
       when :dir
         default_opts = { extension: :md }
         opts = default_opts.merge(@__storage_type_opts)
-        files = Dir[app.root.join("data", data_name, "*.#{opts.fetch(:extension)}")]
+        base_data_dir = app.root.join("data", data_name)
+        files = Dir[File.join(base_data_dir, "**", "*.#{opts.fetch(:extension)}")]
 
         @__data = files.map do |fn|
-          id = File.basename(fn, ".#{opts.fetch(:extension)}")
+          id = File.join(File.dirname(fn).sub(/\A#{base_data_dir}/, ""),
+                         File.basename(fn, ".#{opts.fetch(:extension)}"))
+                   .sub(/\A(?:#{File::SEPARATOR})/, "")
           content = IO.read(fn)
 
           front_matter = {}

data/lib/fox_page/router.rb

@@ -39,31 +39,37 @@ module FoxPage
       controller = controller_for(base_name)
       base_path = "/#{path}"
 
-      # show action needs some additional stuff to make it work
-      # since we have to know all the ids beforehand
-      if actions.delete :show
-        method_name = :show
-        validate_controller_method(controller, method_name)
-        route_path = "#{base_path}/%<id>s"
+      # insert a route with id 0 as index if generate_all was specified, but without the /id in the path
+      if actions.find(:index)
+        validate_controller_method(controller, :index)
 
-        routes[route_path] = make_target(
+        routes[base_path] = make_target(
           base_name: base_name,
           controller: controller,
-          method_name: method_name,
-          params: {},
-          generate_all: controller.instance_variable_get(:@__generate_all_for)&.[](method_name)
+          method_name: :index,
+          params: { id: 0 },
+          generate_all: nil
         )
       end
 
       actions.each do |action|
         method_name = action
         validate_controller_method(controller, method_name)
+
+        generate_all = controller.instance_variable_get(:@__generate_all_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"
+        end
 
-        routes[route_path] = make_target(
+        routes[route_path] ||= make_target(
           base_name: base_name,
           controller: controller,
-          method_name: method_name
+          method_name: method_name,
+          params: {},
+          generate_all: generate_all
         )
       end
     end

data/lib/fox_page/version.rb

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

metadata

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