rails_age 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d54712ca67a303ffa92d78165d30a500b1f695be6176b3198e7ff3f9f60ab4f9
-  data.tar.gz: 8f8f999c42777dc432bf543b6256852d10a0fbcbcd4fe33ad06817277a47bb5d
+  metadata.gz: cd10883497fc245765a9e8313265e4d06c7a602a2f83cad592ecb5a951ab488d
+  data.tar.gz: ce03c6dc4535e2a54dddc9f2b9df8e4b413c6aeb690ee00138c4120fe1d72ce1
 SHA512:
-  metadata.gz: 75c804a5b29705a18344ea70d9a799ea3578d90055b056ba48b70984132f2fbd04bdd906ac744e2a587fe095e9a8e112d773ecc84cf6325be192c212d769090d
-  data.tar.gz: 932a6c5843243a23ef48b69e87f0fef940030c9e47ce652be141bc6efb45a8cbde04c191853b3d15e754e3ee71d7033b301ab6432982c1fc357250fceb892f02
+  metadata.gz: dcb00b35abd3a931c95ffce304c079eee2d1ba1b09ee3aa17f9c9150f4bc3b55276e7670cf3925e4ae484a117bef66bddc0242efc0cbc8295da03538ae628805
+  data.tar.gz: d6ac9aaa1ba0b04c9a48ed320e53a4de65a74e6cb6574f42c407b0c1124fafc650def68df4c41beaad27607b6f1fa22a7962518108c2fc39cd7c0e95f76d8c09

data/CHANGELOG.md

@@ -20,24 +20,34 @@ breaking change?: namespaces (by default) will use their own schema? (add to dat
 
 - **multiple AGE Schema**
 
-## VERSION 0.5.3 - 2024-xx-xx
+## VERSION 0.5.4 - 2024-xx-xx
 
-- **Edge Scaffold** (generates edge, type, view and controller)
-  * add `rails generate apache_age:edge_scaffold HasJob employee_role start_node:person end_node:company`
-
-## VERSION 0.5.2 - 2024-xx-xx
+- **Fix**
+  * show validation errors in scaffold views
 
 - **Edge Generator**
   * add start-/end-nodes types to edge generator (would make scaffold easier), ie:
     `rails generate apache_age:edge HasPet owner_role start_node:person end_node:pet`
     with property and specified start-/end-nodes (person and pet nodes must have already been created)
 
+- **Edge Scaffold** (generates edge, type, view and controller)
+  * add `rails generate apache_age:edge_scaffold HasJob employee_role start_node:person end_node:company`
+
+## VERSION 0.5.3 - 2024-06-23
+
+- **Edge Scaffold** (generates edge, type, view and controller) - without start-/end-nodes types!?
+  * add `rails generate apache_age:edge_scaffold HasJob employee_role`
+  * add system test (to dummy app after scaffold_node is run)
+
+- **Node Scaffold** (generates node, type, view and controller)
+  * add system test (to dummy app after scaffold_node is run)
+
 ## VERSION 0.5.2 - 2024-06-16
 
 - **Node Scaffold** (generates node, type, view and controller)
   * add `rails generate apache_age:node_scaffold Person first_name last_name age:integer`
 
-## VERSION 0.5.1 - 2024-06-16
+## VERSION 0.5.1 - 2024-06-16 (yanked)
 
 **yanked** (2024-06-16) - had an issue with the generator
 
@@ -50,7 +60,7 @@ breaking change?: namespaces (by default) will use their own schema? (add to dat
 
 - **Edge Generator**
   * add `rails generate apache_age:edge HasPet owner_role`
-    caveate: start_node and end_node are of type `:vertex` in the generator but can be changed manually in the class file - having trouble with the generator loading the types (the generator rejects custom types - but rails still works with custom types)
+    caveate: start_node and end_node are of type `:node` in the generator but can be changed manually in the class file - having trouble with the generator loading the types (the generator rejects custom types - but rails still works with custom types)
 
 ## VERSION 0.4.1 - 2024-06-15
 

data/README.md

@@ -1,25 +1,76 @@
 # RailsAge
 
-Simplify Apache Age usage within a Rails application.
+Apache Age integration within a Rails application.
 
-## Installation
+## Quick Start - Essentials
 
 **NOTE:** you must be using Postgres as your database! Apache Age requires it.
 
-Add this line to your application's Gemfile:
+```bash
+bundle add rails_age
+bundle install
+bin/rails apache_age:install
+# optional: prevents `bin/rails db:migrate` from modifying the schema file,
+# bin/rails apache_age:override_db_migrate
+git add .
+git commit -m "Add & configure Apache Age within Rails"
+```
+
+## Generators
+
+**NODES**
+
+```bash
+rails generate apache_age:scaffold_node Company company_name
+
+rails generate apache_age:scaffold_node Person first_name last_name
+```
+
+**EDGES**
 
+```bash
+rails generate apache_age:scaffold_edge HasJob employee_role start_date:date
+```
+
+Ideally, edit the HasJob class so that `start_node` would use a type `:person` and the `end_node` uses at type `:company`
+
+ie:
 ```ruby
-gem "rails_age"
+# app/edges/has_job.rb
+class HasJob
+  include ApacheAge::Entities::Edge
+
+  attribute :employee_role, :string
+  attribute :start_node, :person # instead of `:node`
+  attribute :end_node, :company # instead of `:node`
+
+  validates :employee_role, presence: true
+  validate :validate_unique_edge
+
+  private
+
+  def validate_unique_edge
+    ApacheAge::Validators::UniqueEdge
+      .new(attributes: %i[employee_role start_node end_node])
+      .validate(self)
+  end
+end
 ```
 
-## Quick Start
+## Installation in Detail
 
 using the installer, creates the migration to install age, runs the migration, and adjusts the schema file, and updates the `config/database.yml` file.
 
-setup (& Test) postgresql with AGE (using the docker version of AGE DB may be the easiest way to get started)
-using the docker version of AGE DB, you can confirm psql AGE with the following commands:
+### Install Apache Age
+
+see: [Apache AGE Installation](https://age.apache.org/age-manual/master/intro/setup.html#installation)
+(The docker install is probably the easiest way to get started with a new application - for existing applications you may need to compile the extension from source.)
+
+Verify your PostgreSQL AGE with the following commands:
+
 ```bash
-psql -h localhost -p 5455 -U docker_username
+$ psql -h localhost -p 5455 -U docker_username
+
 > CREATE EXTENSION IF NOT EXISTS age;
 > LOAD 'age';
 > SET search_path = ag_catalog, "$user", public;
@@ -27,7 +78,12 @@ psql -h localhost -p 5455 -U docker_username
 > \q
 ```
 
+### Install and Configure Rails (if not done already)
+
+AGE REQUIRES POSTGRESQL!
+
 create a new Rails app (WITH POSTGRESQL!)
+
 ```bash
 rails new age_demo -d postgresql
 cd age_demo
@@ -35,6 +91,7 @@ git add .
 git commit -m "Initial Rails App"
 ```
 configure `config/database.yml` when using the docker version of AGE DB my config looks like:
+
 ```yaml
 port: 5455
 host: localhost
@@ -42,15 +99,19 @@ username: docker_username
 password: dockerized_password
 ```
 
-now you should be able to create the rails database:
+If both the Rails DB config and AGE DB are correctly configured, you should be able to run the following command without error:
+
 ```bash
 rails db:create
 rails db:migrate
 git add .
-git commit -m "Add Apache Age Postgres DB configured with Rails App"
+git commit -m "Basic Rails Configuration"
 ```
 
-install Apache Age (you can ignore the `unknown OID` warnings)
+### install Apache Age Plugin
+
+NOTE: _ignore the `unknown OID` warnings_
+
 ```bash
 bundle add rails_age
 bundle install
@@ -62,62 +123,52 @@ git add .
 git commit -m "Add & configure Apache Age within Rails"
 ```
 
-make some nodes :string is the default type
+### Optional Migration override (OPTIONAL)
+
+run `bin/rails apache_age:override_db_migrate` to ensure that running `rails db:migrate` does not inappropriately modify the schema file.
+
+However, if you are familiar with the schema file and git then you can safely ignore this step and manage the changes after a migration manually - only submitting changes directly related to the newest migration and not those related AGE.
+
+**NOTE:**
+* **You can run `bin/rails apache_age:config_schema` at any time to repair the schema file as needed.**
+( **You can run `bin/rails apache_age:install` at any time to repair any AGE related config file**
+
+If you are using `db/structure.sql` you will need to manually configure Apache Age (RailsAge).
+
+### NODE Scaffold Generation
+
 ```bash
-rails generate apache_age:node Company company_name
-rails generate apache_age:node Person first_name last_name
-rails generate apache_age:node Pet pet_name:string age:integer
+rails generate apache_age:scaffold_node Company company_name:string
+
+# string is the default type (so it can be omitted)
+rails generate apache_age:scaffold_node Person first_name last_name
+
+# with a namespace
+rails generate apache_age:scaffold_node Animals/Pet pet_name birthdate:date
 ```
-make some edges (`:vertex` is the default type) for start_node and end_node
+
+### EDGE Scaffold Generation**
+
+NOTE: the generator will only allow `:node` (default type) for start_node and end_node, however, it is strongly recommended to specify the start_node and end_node types manually. _Hopefully, I can find a way to get the generators to recognize and allow the usage of custom node types. Thus eventually, I hope: `rails generate apache_age:node HasPet start_node:person end_node:pet caretaker_role` will work._
+
 ```bash
-# when start node and end node are not specified they are of type `:vertex`
-# this is generally not recommended - exept when very generic relationships are needed
 rails generate apache_age:edge HasJob employee_role begin_date:date
-
-# # this is recommended - (but not yet working) add explicit start_node and end_node types manually
-# rails generate apache_age:node HasPet start_node:person end_node:pet caretaker_role
 ```
 
-**NOTE:** the default `rails db:migrate` inappropriately modifies the schema file. This installer patches the migration to prevent this (however this might break on rails updates, etc). **You can run `bin/rails apache_age:install` at any time to repair the schema file as needed.**
-
-For now, if you are using `db/structure.sql` you will need to manually configure Apache Age (RailsAge) as described below.
+_edge scaffold is coming soon._
 
-### Rails Console Usage
+```bash
+# without a namespace
+rails generate apache_age:scaffold_edge HasPet caretaker_role
 
-```ruby
-bin/rails c
-
-fred = Person.new(first_name: 'Fredrick Jay', last_name: 'Flintstone')
-fred.valid?
-fred.save
-fred.to_h # should have an ID
-
-# fails because of a missing required field (Property)
-incomplete = Person.new(first_name: 'Fredrick Jay')
-incomplete.valid?
-incomplete.errors
-incomplete.to_h
-
-# fails because of uniqueness constraints
-jay = Person.create(first_name: 'Fredrick Jay', last_name: 'Flintstone')
-jay.to_h
-=> {:id=>nil, :first_name=>"Fredrick Jay", :last_name=>"Flintstone"}
-jay.valid?
-=> false
-jay.errors
-=> #<ActiveModel::Errors [#<ActiveModel::Error attribute=base, type=record not unique, options={}>, #<ActiveModel::Error attribute=first_name, type=property combination not unique, options={}>, #<ActiveModel::Error attribute=last_name, type=property combination not unique, options={}>]>
-irb(main):008> jav.to_h
-=> {:id=>nil, :first_name=>"Fredrick Jay", :last_name=>"Flintstone"}
-
-# .create is a shortcut for .new and .save
-quarry = Company.create(company_name: 'Bedrock Quarry')
-quarry.to_h # should have an ID
-
-# create an edge (no generator yet)
-job = HasJob.create(start_node: fred, end_node: quarry, employee_role: 'Crane Operator')
-job.to_h # should have an ID
+# with a namespace
+rails generate apache_age:scaffold_edge People/HasSpouse spousal_role
 ```
 
+### AGE Usage within Rails Console
+
+see [AGE Usage within Rails Console](AGE_CONSOLE_USAGE.md)
+
 ## Manual Install, Config and Usage
 
 see [Manuel Installation, Configuration and Usage](MANUAL_INSTALL.md)

data/config/initializers/types.rb

@@ -0,0 +1,20 @@
+# config/initializers/types.rb
+
+require 'apache_age/types/age_type_factory'
+# USAGE (with edges or nodes) - ie:
+# require_dependency 'nodes/company'
+# ActiveModel::Type.register(
+#   :company, ApacheAge::Types::AgeTypeFactory.create_type_for(Nodes::Company)
+# )
+
+Rails.application.config.to_prepare do
+  # Register AGE types
+  require_dependency 'apache_age/node'
+  ActiveModel::Type.register(
+    :node, ApacheAge::Types::AgeTypeFactory.create_type_for(ApacheAge::Node)
+  )
+  require_dependency 'apache_age/edge'
+  ActiveModel::Type.register(
+    :edge, ApacheAge::Types::AgeTypeFactory.create_type_for(ApacheAge::Edge)
+  )
+end

data/lib/apache_age/edge.rb

@@ -0,0 +1,5 @@
+module ApacheAge
+  class Edge
+    include ApacheAge::Entities::Edge
+  end
+end

data/lib/apache_age/entities/common_methods.rb

@@ -7,6 +7,12 @@ module ApacheAge
       def persisted? = id.present?
       def to_s = ":#{age_label} #{properties_to_s}"
 
+      # default display value
+      def display
+        info = age_properties&.values&.first
+        info.blank? ? "#{age_label} (#{id})" : "#{info} (#{age_label})"
+      end
+
       def to_h
         base_h = attributes.to_hash
         if age_type == 'edge'

data/lib/apache_age/entities/edge.rb

@@ -9,11 +9,12 @@ module ApacheAge
         include ActiveModel::Attributes
 
         attribute :id, :integer
+        # attribute :label, :string
         attribute :end_id, :integer
         attribute :start_id, :integer
-        # type: `:vertex` can be overriden with a specific node type
-        attribute :end_node, :vertex
-        attribute :start_node, :vertex
+        # override with a specific node type in the defining class
+        attribute :end_node
+        attribute :start_node
 
         validates :end_node, :start_node, presence: true
         validate :validate_nodes

data/lib/apache_age/entities/node.rb

@@ -0,0 +1,53 @@
+module ApacheAge
+  module Entities
+    module Vertex
+      extend ActiveSupport::Concern
+
+      included do
+        include ActiveModel::Model
+        include ActiveModel::Dirty
+        include ActiveModel::Attributes
+
+        attribute :id, :integer
+
+        extend ApacheAge::Entities::ClassMethods
+        include ApacheAge::Entities::CommonMethods
+      end
+
+      def age_type = 'vertex'
+
+      # AgeSchema::Nodes::Company.create(company_name: 'Bedrock Quarry')
+      # SELECT *
+      # FROM cypher('age_schema', $$
+      #     CREATE (company:Company {company_name: 'Bedrock Quarry'})
+      # RETURN company
+      # $$) as (Company agtype);
+      def create_sql
+        alias_name = age_alias || age_label.downcase
+        <<-SQL
+          SELECT *
+          FROM cypher('#{age_graph}', $$
+              CREATE (#{alias_name}#{self})
+          RETURN #{alias_name}
+          $$) as (#{age_label} agtype);
+        SQL
+      end
+
+      # So far just properties of string type with '' around them
+      def update_sql
+        alias_name = age_alias || age_label.downcase
+        set_caluse =
+          age_properties.map { |k, v| v ? "#{alias_name}.#{k} = '#{v}'" : "#{alias_name}.#{k} = NULL" }.join(', ')
+        <<-SQL
+          SELECT *
+          FROM cypher('#{age_graph}', $$
+              MATCH (#{alias_name}:#{age_label})
+              WHERE id(#{alias_name}) = #{id}
+              SET #{set_caluse}
+              RETURN #{alias_name}
+          $$) as (#{age_label} agtype);
+        SQL
+      end
+    end
+  end
+end

data/lib/apache_age/entities/vertex.rb

@@ -1,6 +1,6 @@
 module ApacheAge
   module Entities
-    module Vertex
+    module Node
       extend ActiveSupport::Concern
 
       included do

data/lib/apache_age/node.rb

@@ -0,0 +1,36 @@
+module ApacheAge
+  class Node
+    include ApacheAge::Entities::Node
+
+    attribute :label, :string
+    attribute :properties
+    # attribute :properties, :hash
+
+    # def display = [label, properties&.values&.first].compact.join(' - ')
+    def display
+      info = properties&.values&.first
+      info.blank? ? "#{label} (#{id})" : "#{info} (#{label})"
+    end
+
+    def self.all
+      all_nodes_sql = <<~SQL
+      SELECT *
+      FROM cypher('age_schema', $$
+          MATCH (node)
+          RETURN node
+      $$) as (node agtype);
+      SQL
+      age_results = ActiveRecord::Base.connection.execute(all_nodes_sql)
+      return [] if age_results.values.count.zero?
+
+      age_results.values.map do |result|
+        json_string = result.first.split('::').first
+        hash = JSON.parse(json_string)
+        attribs = hash.slice('id', 'label').symbolize_keys
+        attribs[:properties] = hash['properties'].symbolize_keys
+
+        new(**attribs)
+      end
+    end
+  end
+end

data/lib/apache_age/types/age_type_factory.rb

@@ -0,0 +1,46 @@
+# lib/apache_age/types/age_type_factory.rb
+# Automatically generates ActiveModel::Type classes
+# Dynamically builds this (as a concrete example):
+# module ApacheAge
+#   module Types
+#     class CompanyType < ActiveModel::Type::Value
+#       def cast(value)
+#         case value
+#         when Nodes::Company
+#           value
+#         when Hash
+#           Nodes::Company.new(value)
+#         else
+#           nil
+#         end
+#       end
+#       def serialize(value)
+#         value.is_a?(Nodes::Company) ? value.attributes : nil
+#       end
+#     end
+#   end
+# end
+module ApacheAge
+  module Types
+    class AgeTypeFactory
+      def self.create_type_for(klass)
+        Class.new(ActiveModel::Type::Value) do
+          define_method(:cast) do |value|
+            case value
+            when klass
+              value
+            when Hash
+              klass.new(value)
+            else
+              nil
+            end
+          end
+
+          define_method(:serialize) do |value|
+            value.is_a?(klass) ? value.attributes : nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/apache_age/validators/expected_node_type.rb

@@ -0,0 +1,17 @@
+module ApacheAge
+  module Validators
+    module ExpectedNodeType
+      def
+        # Register the AGE types vertex_attribute(attribute_name, type_symbol, klass)
+        attribute attribute_name, type_symbol
+
+        validate do
+          value = send(attribute_name)
+          unless value.is_a?(klass)
+            errors.add(attribute_name, "must be a #{klass.name}")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/apache_age/validators/unique_node.rb

@@ -0,0 +1,32 @@
+# lib/apache_age/validators/unique_node.rb
+
+# Usage:
+# validates_with(
+#   ApacheAge::Validators::UniqueNode,
+#   attributes: [:first_name, :last_name, :gender]
+# )
+
+module ApacheAge
+  module Validators
+    class UniqueNode < ActiveModel::Validator
+      def validate(record)
+        allowed_keys = record.age_properties.keys
+        attributes = options[:attributes]
+        return if attributes.blank?
+
+        record_attribs =
+          attributes
+          .map { |attr| [attr, record.send(attr)] }
+          .to_h.symbolize_keys
+          .slice(*allowed_keys)
+        query = record.class.find_by(record_attribs)
+
+        # if no match is found or if it finds itself, it's valid
+        return if query.blank?  || (query.id == record.id)
+
+        record.errors.add(:base, 'record not unique')
+        attributes.each { record.errors.add(_1, 'property combination not unique') }
+      end
+    end
+  end
+end

data/lib/apache_age/validators/{vertex_type_validator.rb → vertex_type_validator copy.rb }

@@ -1,6 +1,7 @@
 module ApacheAge
   module VertexTypeValidator
-    def vertex_attribute(attribute_name, type_symbol, klass)
+    def
+      # Register the AGE typesvertex_attribute(attribute_name, type_symbol, klass)
       attribute attribute_name, type_symbol
 
       validate do

data/lib/generators/apache_age/edge/templates/edge.rb.tt

@@ -4,10 +4,10 @@ class <%= class_name %>
 <%- attributes_list.each do |attribute| -%>
   attribute :<%= attribute[:name] %>, :<%= attribute[:reference] || attribute[:type] %>
 <%- end -%>
-  # recommendation for (start_node and end_node): change `:vertex` with the 'node' type
+  # recommendation for (start_node and end_node): change `:node` with the actual 'node' type
   # see `config/initializers/apache_age.rb` for the list of available node types
-  attribute :start_node, :vertex
-  attribute :end_node, :vertex
+  attribute :start_node
+  attribute :end_node
 
 <%- attributes_list.each do |attribute| -%>
   validates :<%= attribute[:name] %>, presence: true

data/lib/generators/apache_age/generator_entity_helpers.rb

@@ -3,12 +3,15 @@
 module ApacheAge
   module GeneratorEntityHelpers
     def generate_age_entity(age_type)
-      template "#{age_type}.rb.tt", File.join(destination_root, "app/#{age_type}s", class_path, "#{file_name}.rb")
+      template(
+        "#{age_type}.rb.tt",
+        File.join(Rails.root, "app/#{age_type}s", class_path, "#{file_name}.rb")
+      )
       add_type_config
     end
 
     def destroy_age_entity(age_type)
-      file_path = File.join(destination_root, "app/#{age_type}s", class_path, "#{file_name}.rb")
+      file_path = File.join(Rails.root, "app/#{age_type}s", class_path, "#{file_name}.rb")
       File.delete(file_path) if File.exist?(file_path)
       remove_type_config
     end

data/lib/generators/apache_age/scaffold_edge/USAGE

@@ -0,0 +1,16 @@
+Description:
+    Explain the generator
+
+Example:
+    bin/rails generate apache_age:scaffold_edge HasPet careciver_role
+
+    This will create:
+        create  app/edge/has_pet.rb
+        modified: config/initializers/types.rb
+        create  app/controllers/has_pets_controller.rb
+        route  resources :has_pets
+        create  app/views/pets/index.html.erb
+        create  app/views/pets/edit.html.erb
+        create  app/views/pets/show.html.erb
+        create  app/views/pets/new.html.erb
+        create  app/views/pets/partial.html.erb

data/lib/generators/apache_age/scaffold_edge/scaffold_edge_generator.rb

@@ -0,0 +1,67 @@
+# lib/generators/apache_age/scaffold_edge/scaffold_edge_generator.rb
+
+require 'rails/generators'
+require 'rails/generators/named_base'
+require 'rails/generators/resource_helpers'
+
+module ApacheAge
+  class ScaffoldEdgeGenerator < Rails::Generators::NamedBase
+    include Rails::Generators::ResourceHelpers
+
+    desc "Generates an edge, and its controller and views with the given attributes."
+
+    source_root File.expand_path("templates", __dir__)
+
+    argument :attributes, type: :array, default: [], banner: "field:type field:type"
+
+    def create_model_file
+      invoke 'apache_age:edge', [name] + attributes.collect { |attr| "#{attr.name}:#{attr.type}" }
+    end
+
+    def create_controller_files
+      template(
+        "controller.rb.tt",
+        File.join(Rails.root, "app/controllers", controller_class_path, "#{controller_file_name}_controller.rb")
+      )
+    end
+
+    def create_route
+      route_content = route_text(class_path, file_name)
+      inject_into_file(
+        File.join(Rails.root, 'config', 'routes.rb'), "\n#{route_content}",
+        after: "Rails.application.routes.draw do"
+      )
+    end
+
+    def copy_view_files
+      available_views.each do |view|
+        view_name = view == 'partial' ? "_#{singular_table_name}" : view
+        filename = filename_with_extensions(view_name)
+        template(
+          "views/#{view}.html.erb.tt",
+          File.join(Rails.root, "app/views", controller_file_path, filename)
+        )
+      end
+    end
+
+    private
+
+    def available_views
+      %w[index edit show new partial _form]
+    end
+
+    def filename_with_extensions(view)
+      [view, :html, :erb].compact.join('.')
+    end
+
+    def route_text(class_path, file_name)
+      return "  resources :#{file_name.pluralize}" if class_path.empty?
+
+<<-RUBY
+  namespace :#{class_path.join(':')} do
+    resources :#{file_name.pluralize}
+  end
+RUBY
+    end
+  end
+end

data/lib/generators/apache_age/scaffold_edge/scaffold_node_generator.rb

@@ -0,0 +1,67 @@
+# lib/generators/apache_age/scaffold_node/scaffold_node_generator.rb
+
+require 'rails/generators'
+require 'rails/generators/named_base'
+require 'rails/generators/resource_helpers'
+
+module ApacheAge
+  class ScaffoldNodeGenerator < Rails::Generators::NamedBase
+    include Rails::Generators::ResourceHelpers
+
+    desc "Generates a node, and its controller and views with the given attributes."
+
+    source_root File.expand_path("templates", __dir__)
+
+    argument :attributes, type: :array, default: [], banner: "field:type field:type"
+
+    def create_model_file
+      invoke 'apache_age:edge', [name] + attributes.collect { |attr| "#{attr.name}:#{attr.type}" }
+    end
+
+    def create_controller_files
+      template(
+        "controller.rb.tt",
+        File.join(Rails.root, "app/controllers", controller_class_path, "#{controller_file_name}_controller.rb")
+      )
+    end
+
+    def create_route
+      route_content = route_text(class_path, file_name)
+      inject_into_file(
+        File.join(Rails.root, 'config', 'routes.rb'), "\n#{route_content}",
+        after: "Rails.application.routes.draw do"
+      )
+    end
+
+    def copy_view_files
+      available_views.each do |view|
+        view_name = view == 'partial' ? "_#{singular_table_name}" : view
+        filename = filename_with_extensions(view_name)
+        template(
+          "views/#{view}.html.erb.tt",
+          File.join(Rails.root, "app/views", controller_file_path, filename)
+        )
+      end
+    end
+
+    private
+
+    def available_views
+      %w[index edit show new partial _form]
+    end
+
+    def filename_with_extensions(view)
+      [view, :html, :erb].compact.join('.')
+    end
+
+    def route_text(class_path, file_name)
+      return "  resources :#{file_name.pluralize}" if class_path.empty?
+
+<<-RUBY
+  namespace :#{class_path.join(':')} do
+    resources :#{file_name.pluralize}
+  end
+RUBY
+    end
+  end
+end

data/lib/generators/apache_age/scaffold_edge/templates/controller.rb.tt

@@ -0,0 +1,50 @@
+class <%= controller_class_name %>Controller < ApplicationController
+  before_action :set_<%= singular_table_name %>, only: %i[show edit update destroy]
+
+  def index
+    @<%= plural_table_name %> = <%= class_name %>.all
+  end
+
+  def show
+  end
+
+  def new
+    @<%= singular_table_name %> = <%= class_name %>.new
+  end
+
+  def edit
+  end
+
+  def create
+    @<%= singular_table_name %> = <%= class_name %>.new(<%= singular_table_name %>_params)
+
+    if @<%= singular_table_name %>.save
+      redirect_to @<%= singular_table_name %>, notice: '<%= human_name %> was successfully created.'
+    else
+      render :new
+    end
+  end
+
+  def update
+    if @<%= singular_table_name %>.update(<%= singular_table_name %>_params)
+      redirect_to @<%= singular_table_name %>, notice: '<%= human_name %> was successfully updated.'
+    else
+      render :edit
+    end
+  end
+
+  def destroy
+    @<%= singular_table_name %>.destroy
+    redirect_to <%= index_helper %>_url, notice: '<%= human_name %> was successfully destroyed.'
+  end
+
+  private
+
+  def set_<%= singular_table_name %>
+    @<%= singular_table_name %> = <%= class_name %>.find(params[:id])
+  end
+
+  def <%= singular_table_name %>_params
+    params.require(:<%= singular_table_name %>).permit(<%= (attributes + %i[start_id end_id]).map { |attr| ":#{attr.name}" }.join(', ') %>)
+  end
+end

data/lib/generators/apache_age/{scaffold_node/templates/views/_form.html.erb copy.tt → scaffold_edge/templates/views/_form.html.erb.tt}

@@ -31,6 +31,16 @@
   </div>
 
 <% end -%>
+  <div>
+    <%%= form.label :start_node, style: "display: block" %>
+    <%%= form.collection_select(:start_id, ApacheAge::Node.all, :id, :display, prompt: 'Select a Start-Node') %>
+  </div>
+
+  <div>
+    <%%= form.label :end_node, style: "display: block" %>
+    <%%= form.collection_select(:end_id, ApacheAge::Node.all, :id, :display, prompt: 'Select an End-Node') %>
+  </div>
+
   <div>
     <%%= form.submit %>
   </div>

data/lib/generators/apache_age/{scaffold_node/templates/views/index.html.erb copy.tt → scaffold_edge/templates/views/index.html.erb.tt}

@@ -6,7 +6,7 @@
 
 <div id="<%= plural_table_name %>">
   <%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
-    <%%= render <%= singular_table_name %> %>
+    <%%= render '<%= singular_table_name %>', <%= singular_table_name %>: <%= singular_table_name %> %>
     <p>
       <%%= link_to "Show this <%= human_name.downcase %>", <%= model_resource_name(singular_table_name) %> %>
     </p>

data/lib/generators/apache_age/{scaffold_node/templates/views/partial.html.erb copy.tt → scaffold_edge/templates/views/partial.html.erb.tt}

@@ -5,8 +5,8 @@
 <% if attribute.attachment? -%>
     <%%= link_to <%= singular_table_name %>.<%= attribute.column_name %>.filename, <%= singular_table_name %>.<%= attribute.column_name %> if <%= singular_table_name %>.<%= attribute.column_name %>.attached? %>
 <% elsif attribute.attachments? -%>
-    <%% <%= singular_table_name %>.<%= attribute.column_name %>.each do |<%= attribute.singular_table_name %>| %>
-      <div><%%= link_to <%= attribute.singular_table_name %>.filename, <%= attribute.singular_table_name %> %></div>
+    <%% <%= singular_table_name %>.<%= attribute.column_name %>.each do |<%= attribute.singular_name %>| %>
+      <div><%%= link_to <%= attribute.singular_name %>.filename, <%= attribute.singular_name %> %></div>
     <%% end %>
 <% else -%>
     <%%= <%= singular_table_name %>.<%= attribute.column_name %> %>
@@ -14,4 +14,13 @@
   </p>
 
 <% end -%>
+  <p>
+    <strong>Start-Node:</strong>
+    <%%= <%= singular_table_name %>.start_node.display %>
+  </p>
+
+  <p>
+    <strong>End-Node:</strong>
+    <%%= <%= singular_table_name %>.end_node.display %>
+  </p>
 </div>

data/lib/generators/apache_age/{scaffold_node/templates/views/show.html.erb copy.tt → scaffold_edge/templates/views/show.html.erb.tt}

@@ -1,6 +1,6 @@
 <p style="color: green"><%%= notice %></p>
 
-<%%= render @<%= singular_table_name %> %>
+<%%= render '<%= singular_table_name %>', <%= singular_table_name %>: @<%= singular_table_name %> %>
 
 <div>
   <%%= link_to "Edit this <%= human_name.downcase %>", <%= edit_helper(type: :path) %> %> |

data/lib/generators/apache_age/scaffold_node/scaffold_node_generator.rb

@@ -4,14 +4,9 @@ require 'rails/generators'
 require 'rails/generators/named_base'
 require 'rails/generators/resource_helpers'
 
-require_relative '../generator_entity_helpers'
-require_relative '../generator_resource_helpers'
-
 module ApacheAge
   class ScaffoldNodeGenerator < Rails::Generators::NamedBase
     include Rails::Generators::ResourceHelpers
-    # include ApacheAge::GeneratorEntityHelpers
-    # include ApacheAge::GeneratorResourceHelpers
 
     desc "Generates a node, and its controller and views with the given attributes."
 
@@ -25,24 +20,27 @@ module ApacheAge
 
     def create_controller_files
       template(
-        "node_controller.rb.tt",
-        File.join("app/controllers", controller_class_path, "#{controller_file_name}_controller.rb")
+        "controller.rb.tt",
+        File.join(Rails.root, "app/controllers", controller_class_path, "#{controller_file_name}_controller.rb")
       )
     end
 
     def create_route
-      if class_path.empty?
-        route "resources :#{file_name.pluralize}"
-      else
-        route nested_route(class_path, file_name)
-      end
+      route_content = route_text(class_path, file_name)
+      inject_into_file(
+        File.join(Rails.root, 'config', 'routes.rb'), "\n#{route_content}",
+        after: "Rails.application.routes.draw do"
+      )
     end
 
     def copy_view_files
       available_views.each do |view|
         view_name = view == 'partial' ? "_#{singular_table_name}" : view
         filename = filename_with_extensions(view_name)
-        template "views/#{view}.html.erb.tt", File.join("app/views", controller_file_path, filename)
+        template(
+          "views/#{view}.html.erb.tt",
+          File.join(Rails.root, "app/views", controller_file_path, filename)
+        )
       end
     end
 
@@ -56,13 +54,14 @@ module ApacheAge
       [view, :html, :erb].compact.join('.')
     end
 
-    def nested_route(class_path, file_name)
-      # "namespace :#{class_path.join(':')} do\n  resources :#{file_name.pluralize}\nend"
-      <<~RUBY
-      namespace :#{class_path.join(':')} do
-        resources :#{file_name.pluralize}
-      end
-      RUBY
+    def route_text(class_path, file_name)
+      return "  resources :#{file_name.pluralize}" if class_path.empty?
+
+<<-RUBY
+  namespace :#{class_path.join(':')} do
+    resources :#{file_name.pluralize}
+  end
+RUBY
     end
   end
 end

data/lib/rails_age/version.rb

@@ -1,3 +1,3 @@
 module RailsAge
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/lib/rails_age.rb

@@ -8,10 +8,16 @@ end
 module ApacheAge
   require 'apache_age/entities/class_methods'
   require 'apache_age/entities/common_methods'
-  require 'apache_age/entities/edge'
   require 'apache_age/entities/entity'
   require 'apache_age/entities/vertex'
+  require 'apache_age/entities/node'
+  require 'apache_age/entities/edge'
+  require 'apache_age/node'
+  require 'apache_age/edge'
+  require 'apache_age/validators/expected_node_type'
+  require 'apache_age/validators/unique_node'
   require 'apache_age/validators/unique_edge'
   require 'apache_age/validators/unique_vertex'
+  require 'apache_age/types/age_type_factory'
   require 'apache_age/types/age_type_generator'
 end

data/lib/tasks/config_types.rake

@@ -17,16 +17,16 @@ namespace :apache_age do
       RUBY
     node_type_content =
 <<-RUBY
-  require_dependency 'apache_age/entities/vertex'
+  require_dependency 'apache_age/node'
   ActiveModel::Type.register(
-    :vertex, ApacheAge::Types::AgeTypeGenerator.create_type_for(ApacheAge::Entities::Vertex)
+    :node, ApacheAge::Types::AgeTypeGenerator.create_type_for(ApacheAge::Node)
   )
 RUBY
     edge_type_content =
 <<-RUBY
-  require_dependency 'apache_age/entities/edge'
+  require_dependency 'apache_age/edge'
   ActiveModel::Type.register(
-    :edge, ApacheAge::Types::AgeTypeGenerator.create_type_for(ApacheAge::Entities::Edge)
+    :edge, ApacheAge::Types::AgeTypeGenerator.create_type_for(ApacheAge::Edge)
   )
 RUBY
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_age
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Bill Tihen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-16 00:00:00.000000000 Z
+date: 2024-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,6 +44,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This plugin integrates Apache AGE for PostgreSQL with Rails 7.x, providing
   tools and helpers for working with graph databases within a Rails application.
 email:
@@ -64,18 +92,25 @@ files:
 - app/mailers/rails_age/application_mailer.rb
 - app/models/rails_age/application_record.rb
 - app/views/layouts/rails_age/application.html.erb
+- config/initializers/types.rb
 - config/routes.rb
 - db/migrate/20240521062349_add_apache_age.rb
 - db/schema.rb
+- lib/apache_age/edge.rb
 - lib/apache_age/entities/class_methods.rb
 - lib/apache_age/entities/common_methods.rb
 - lib/apache_age/entities/edge.rb
 - lib/apache_age/entities/entity.rb
+- lib/apache_age/entities/node.rb
 - lib/apache_age/entities/vertex.rb
+- lib/apache_age/node.rb
+- lib/apache_age/types/age_type_factory.rb
 - lib/apache_age/types/age_type_generator.rb
+- lib/apache_age/validators/expected_node_type.rb
 - lib/apache_age/validators/unique_edge.rb
+- lib/apache_age/validators/unique_node.rb
 - lib/apache_age/validators/unique_vertex.rb
-- lib/apache_age/validators/vertex_type_validator.rb
+- lib/apache_age/validators/vertex_type_validator copy.rb
 - lib/generators/apache_age/edge/USAGE
 - lib/generators/apache_age/edge/edge_generator.rb
 - lib/generators/apache_age/edge/templates/edge.rb.tt
@@ -84,20 +119,24 @@ files:
 - lib/generators/apache_age/node/USAGE
 - lib/generators/apache_age/node/node_generator.rb
 - lib/generators/apache_age/node/templates/node.rb.tt
+- lib/generators/apache_age/scaffold_edge/USAGE
+- lib/generators/apache_age/scaffold_edge/scaffold_edge_generator.rb
+- lib/generators/apache_age/scaffold_edge/scaffold_node_generator.rb
+- lib/generators/apache_age/scaffold_edge/templates/controller.rb.tt
+- lib/generators/apache_age/scaffold_edge/templates/views/_form.html.erb.tt
+- lib/generators/apache_age/scaffold_edge/templates/views/edit.html.erb.tt
+- lib/generators/apache_age/scaffold_edge/templates/views/index.html.erb.tt
+- lib/generators/apache_age/scaffold_edge/templates/views/new.html.erb.tt
+- lib/generators/apache_age/scaffold_edge/templates/views/partial.html.erb.tt
+- lib/generators/apache_age/scaffold_edge/templates/views/show.html.erb.tt
 - lib/generators/apache_age/scaffold_node/USAGE
 - lib/generators/apache_age/scaffold_node/scaffold_node_generator.rb
-- lib/generators/apache_age/scaffold_node/templates/node_controller.rb.tt
-- lib/generators/apache_age/scaffold_node/templates/views/_form.html.erb copy.tt
+- lib/generators/apache_age/scaffold_node/templates/controller.rb.tt
 - lib/generators/apache_age/scaffold_node/templates/views/_form.html.erb.tt
-- lib/generators/apache_age/scaffold_node/templates/views/edit.html.erb copy.tt
 - lib/generators/apache_age/scaffold_node/templates/views/edit.html.erb.tt
-- lib/generators/apache_age/scaffold_node/templates/views/index.html.erb copy.tt
 - lib/generators/apache_age/scaffold_node/templates/views/index.html.erb.tt
-- lib/generators/apache_age/scaffold_node/templates/views/new.html.erb copy.tt
 - lib/generators/apache_age/scaffold_node/templates/views/new.html.erb.tt
-- lib/generators/apache_age/scaffold_node/templates/views/partial.html.erb copy.tt
 - lib/generators/apache_age/scaffold_node/templates/views/partial.html.erb.tt
-- lib/generators/apache_age/scaffold_node/templates/views/show.html.erb copy.tt
 - lib/generators/apache_age/scaffold_node/templates/views/show.html.erb.tt
 - lib/rails_age.rb
 - lib/rails_age/engine.rb