uchi 0.1.6 → 0.1.7

data/app/views/uchi/navigation/_main.html.erb

@@ -2,8 +2,91 @@
   class="
     w-64 h-full px-3 py-4 overflow-y-auto shrink-0
     bg-neutral-secondary-medium
+    hidden md:block
   "
   aria-label="Main"
 >
   <%= render Uchi::Ui::Navigation.new %>
 </nav>
+
+<div
+  class="md:hidden">
+  <button
+    aria-controls="main-navigation"
+    class="
+      text-body bg-transparent hover:text-heading
+      hover:bg-neutral-tertiary rounded-base w-9 h-9
+      flex items-center justify-center
+    "
+    popovertarget="main-navigation"
+    type="button"
+  >
+    <svg
+      aria-hidden="true"
+      class="w-6 h-6"
+      xmlns="http://www.w3.org/2000/svg"
+      width="24"
+      height="24"
+      fill="none"
+      viewBox="0 0 24 24"
+    >
+      <path
+        stroke="currentColor"
+        stroke-linecap="round"
+        stroke-width="2"
+        d="M5 7h14M5 12h14M5 17h14"
+      />
+    </svg>
+  </button>
+</div>
+
+<nav
+  aria-label="Main"
+  class="
+    fixed top-0 left-0 z-40 h-screen p-2
+    flex-col
+    bg-neutral-primary-soft w-80
+    border-e border-default
+    backdrop:bg-dark-backdrop/70
+  "
+  id="main-navigation"
+  popover
+  tabindex="-1"
+>
+  <div>
+    <button
+      aria-controls="main-navigation"
+      class="
+        text-body bg-transparent hover:text-heading
+        hover:bg-neutral-tertiary rounded-base w-9 h-9
+        flex items-center justify-center
+      "
+      popovertarget="main-navigation"
+      type="button"
+    >
+      <svg
+        aria-hidden="true"
+        class="w-5 h-5"
+        fill="none"
+        height="24"
+        viewBox="0 0 24 24"
+        width="24"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          stroke="currentColor"
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          stroke-width="2"
+          d="M6 18 17.94 6M18 18 6.06 6"
+        />
+      </svg>
+
+      <span class="sr-only">Close menu</span>
+    </button>
+  </div>
+
+  <div class="overflow-y-auto max-h-full">
+    <%= render Uchi::Ui::Navigation.new %>
+  </div>
+</nav>

data/lib/generators/uchi/controller/controller_generator.rb

@@ -8,9 +8,5 @@ module Uchi
       destination = File.join("app/controllers/uchi")
       template "controller.rb", File.join(destination, "#{plural_file_name}_controller.rb")
     end
-
-    def add_route
-      route "resources :#{plural_file_name}", namespace: :uchi
-    end
   end
 end

data/lib/generators/uchi/install/install_generator.rb

@@ -7,7 +7,7 @@ module Uchi
     end
 
     def mount_engine
-      route "mount Uchi::Engine, at: \"/uchi\""
+      route "Uchi.routes.mount(self)"
     end
   end
 end

data/lib/uchi/field/configuration.rb

@@ -5,7 +5,7 @@ module Uchi
     module Configuration
       class Unset; end
 
-      DEFAULT_READER = ->(record, field_name) { record.public_send(field_name) }
+      DEFAULT_READER = ->(record, field_name) { record&.public_send(field_name) }
 
       def initialize(*args)
         super

data/lib/uchi/repository.rb

@@ -12,6 +12,13 @@ module Uchi
         }
       end
 
+      # Returns the "name" of the controller that handles requests for this
+      # repository. Note that this is different from the controllers class name
+      # and is intended for generating URLs.
+      def controller_name
+        model_param_key.pluralize
+      end
+
       # Returns the repository for the given model, or nil if none is found.
       def for_model(model)
         all.find { |repository| repository.model.to_s == model.to_s }
@@ -21,6 +28,10 @@ module Uchi
       def model
         @model ||= name.demodulize.constantize
       end
+
+      def model_param_key
+        model.model_name.param_key
+      end
     end
 
     # Returns a new, unsaved instance of the model this repository manages.
@@ -32,7 +43,7 @@ module Uchi
     # repository. Note that this is different from the controllers class name
     # and is intended for generating URLs.
     def controller_name
-      model_param_key.pluralize
+      self.class.controller_name
     end
 
     def default_sort_order
@@ -104,7 +115,7 @@ module Uchi
     end
 
     def model_param_key
-      model.model_name.param_key
+      self.class.model_param_key
     end
 
     # Returns an instance of Uchi::Repository::Routes for this repository,

data/lib/uchi/routes.rb

@@ -0,0 +1,45 @@
+module Uchi
+  class Routes
+    # Mounts the Uchi engine routes onto the host application's routes.
+    #
+    # Example usage in host application's routes.rb that install Uchi at /uchi:
+    #
+    #  Rails.application.routes.draw do
+    #    Uchi.routes.mount(self)
+    #  end
+    def mount(host_routes, at: default_at)
+      host_routes.mount(
+        Uchi::Engine,
+        at: at
+      )
+
+      draw_repository_routes(host_routes, at: at)
+    end
+
+    def draw_root_route(routes, repository:, at: default_at)
+      return unless repository
+
+      routes.namespace(at) do
+        routes.root to: "#{repository.controller_name}#index"
+      end
+    end
+
+    def draw_repository_routes(routes, at: default_at)
+      repositories = Uchi::Repository.all
+      repositories.each do |repository_class|
+        resources_name = repository_class.controller_name
+        routes.namespace(at) do
+          routes.resources(resources_name)
+        end
+      end
+
+      draw_root_route(routes, at: at, repository: repositories.first)
+    end
+
+    private
+
+    def default_at
+      "uchi"
+    end
+  end
+end

data/lib/uchi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uchi
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/uchi.rb

@@ -12,9 +12,12 @@ require "uchi/action_response"
 require "uchi/field"
 require "uchi/i18n"
 require "uchi/repository"
+require "uchi/routes"
 require "uchi/sort_order"
 require "uchi/repository/translate"
 
 module Uchi
-  # Your code goes here...
+  def self.routes
+    @routes ||= Routes.new
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uchi
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Jakob Skjerning
@@ -63,6 +63,8 @@ extra_rdoc_files: []
 files:
 - README.md
 - app/assets/config/uchi_manifest.js
+- app/assets/javascripts/controllers/fields/belongs_to_controller.js
+- app/assets/javascripts/controllers/fields/has_many_controller.js
 - app/assets/javascripts/uchi.js
 - app/assets/javascripts/uchi/application.js
 - app/assets/stylesheets/uchi/application.css
@@ -211,13 +213,19 @@ files:
 - app/components/uchi/ui/spinner/spinner.html.erb
 - app/controllers/uchi/actions/executions_controller.rb
 - app/controllers/uchi/application_controller.rb
+- app/controllers/uchi/belongs_to/associated_records_controller.rb
 - app/controllers/uchi/controller.rb
+- app/controllers/uchi/has_many/associated_records_controller.rb
 - app/controllers/uchi/repository_controller.rb
 - app/helpers/uchi/application_helper.rb
 - app/jobs/uchi/application_job.rb
 - app/mailers/uchi/application_mailer.rb
 - app/views/layouts/uchi/_flash_messages.html.erb
+- app/views/layouts/uchi/_javascript.html.erb
+- app/views/layouts/uchi/_stylesheets.html.erb
 - app/views/layouts/uchi/application.html.erb
+- app/views/uchi/belongs_to/associated_records/index.html.erb
+- app/views/uchi/has_many/associated_records/index.html.erb
 - app/views/uchi/navigation/_main.html.erb
 - app/views/uchi/repository/edit.html.erb
 - app/views/uchi/repository/index.html.erb
@@ -257,6 +265,7 @@ files:
 - lib/uchi/repository.rb
 - lib/uchi/repository/routes.rb
 - lib/uchi/repository/translate.rb
+- lib/uchi/routes.rb
 - lib/uchi/sort_order.rb
 - lib/uchi/version.rb
 - uchi.gemspec