rails_age 0.5.2 → 0.6.0

data/lib/apache_age/validators/unique_vertex.rb

@@ -1,32 +1,32 @@
-# lib/apache_age/validators/unique_vertex.rb
+# # lib/apache_age/validators/unique_vertex.rb
 
-# Usage (within an Age Model)
-# validates_with(
-#   ApacheAge::Validators::UniqueVertex,
-#   attributes: [:first_name, :last_name, :gender]
-# )
+# # Usage (within an Age Model)
+# # validates_with(
+# #   ApacheAge::Validators::UniqueVertex,
+# #   attributes: [:first_name, :last_name, :gender]
+# # )
 
-module ApacheAge
-  module Validators
-    class UniqueVertex < ActiveModel::Validator
-      def validate(record)
-        allowed_keys = record.age_properties.keys
-        attributes = options[:attributes]
-        return if attributes.blank?
+# module ApacheAge
+#   module Validators
+#     class UniqueVertex < 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)
+#         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)
+#         # 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
+#         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

@@ -1,14 +1,15 @@
-module ApacheAge
-  module VertexTypeValidator
-    def vertex_attribute(attribute_name, type_symbol, klass)
-      attribute attribute_name, type_symbol
+# module ApacheAge
+#   module VertexTypeValidator
+#     def
+#       # Register the AGE typesvertex_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
+#       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

data/lib/generators/apache_age/edge/USAGE

@@ -23,9 +23,9 @@ Example:
           validates :employee_role, presence: true
           validates :begin_date, presence: true
 
-          # unique node validator (remove any attributes that are not important to uniqueness)
+          # unique edge validator (remove any attributes that are not important to uniqueness)
           validates_with(
-            ApacheAge::Validators::UniqueVertex,
+            ApacheAge::Validators::UniqueEdge,
             attributes: [:employee_role, :begin_date :start_node, :end_node]
           )
         end
@@ -35,12 +35,12 @@ Example:
         `bin/rails g apache_age:edge Animals/Cat name age:integer`
 
     This creates:
-        `app/nodes/animals/cat.rb`
+        `app/edges/animals/has_cat.rb`
 
     with the contents
         ```
-        class Animals::Cat
-          include ApacheAge::Entities::Vertex
+        class Animals::HatCat
+          include ApacheAge::Entities::Edge
 
           attribute :name, :string
           attribute :age, :integer
@@ -48,9 +48,9 @@ Example:
           validates :name, presence: true
           validates :age, presence: true
 
-          # unique node validator (remove any attributes that are not important to uniqueness)
+          # unique edge validator (remove any attributes that are not important to uniqueness)
           validates_with(
-            ApacheAge::Validators::UniqueVertex,
+            ApacheAge::Validators::UniqueEdge,
             attributes: [:name, :age, :start_node, :end_node]
           )
         end

data/lib/generators/apache_age/edge/edge_generator.rb

@@ -14,6 +14,7 @@ module ApacheAge
 
     source_root File.expand_path('templates', __dir__)
     argument :attributes, type: :array, default: [], banner: "field:type field:type"
+    class_option :skip_namespace, type: :boolean, default: true, desc: "Skip namespace 'rails_age' in generated files"
 
     def perform_task
       age_type = 'edge'

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
@@ -37,14 +40,6 @@ module ApacheAge
       end.join("\n") + "\n"
     end
 
-    # def indented_end_namespace
-    #   return '' if parent_module.empty?
-
-    #   parent_module.split('::').map.with_index do |_, index|
-    #     "#{'  ' * (parent_module.split('::').length - 1 - index)}end"
-    #   end.join("\n") + "\n"
-    # end
-
     def add_type_config
       return unless File.exist?(types_config_file)
 
@@ -76,7 +71,7 @@ module ApacheAge
 <<-RUBY
   require_dependency '#{file_path}'
   ActiveModel::Type.register(
-    :#{type_name}, ApacheAge::Types::AgeTypeGenerator.create_type_for(#{entity_namespaced_class})
+    :#{type_name}, ApacheAge::Types::Factory.type_for(#{entity_namespaced_class})
   )
 RUBY
     end

data/lib/generators/apache_age/node/USAGE

@@ -12,7 +12,7 @@ Example:
     with the contents:
         ```
         class Cat
-          include ApacheAge::Entities::Vertex
+          include ApacheAge::Entities::Node
 
           attribute :full_name, :string
           attribute :birthdate, :date
@@ -22,7 +22,7 @@ Example:
 
           # unique node validator (remove any attributes that are not important to uniqueness)
           validates_with(
-            ApacheAge::Validators::UniqueVertex,
+            ApacheAge::Validators::UniqueNode,
             attributes: [:full_name, :birthdate]
           )
         end
@@ -37,7 +37,7 @@ Example:
     with the contents
         ```
         class Animals::Cat
-          include ApacheAge::Entities::Vertex
+          include ApacheAge::Entities::Node
 
           attribute :name, :string
           attribute :age, :integer
@@ -47,7 +47,7 @@ Example:
 
           # unique node validator (remove any attributes that are not important to uniqueness)
           validates_with(
-            ApacheAge::Validators::UniqueVertex,
+            ApacheAge::Validators::UniqueNode,
             attributes: [:name, :age]
           )
         end

data/lib/generators/apache_age/node/node_generator.rb

@@ -9,9 +9,9 @@ module ApacheAge
     include ApacheAge::GeneratorEntityHelpers
 
     desc "Generates node (model) with attributes."
-
     source_root File.expand_path('templates', __dir__)
     argument :attributes, type: :array, default: [], banner: "field:type field:type"
+    class_option :skip_namespace, type: :boolean, default: true, desc: "Skip namespace 'rails_age' in generated files"
 
     def perform_task
       age_type = 'node'

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

@@ -1,5 +1,5 @@
 class <%= class_name %>
-  include ApacheAge::Entities::Vertex
+  include ApacheAge::Entities::Node
 
 <%- attributes_list.each do |attribute| -%>
   attribute :<%= attribute[:name] %>, :<%= attribute[:type] %>
@@ -11,7 +11,7 @@ class <%= class_name %>
 
   # custom unique node validator (remove any attributes that are NOT important to uniqueness)
   validates_with(
-    ApacheAge::Validators::UniqueVertex,
+    ApacheAge::Validators::UniqueNode,
     attributes: <%= unique_attributes.inspect %>
   )
 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,66 @@
+# 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"
+    class_option :skip_namespace, type: :boolean, default: true, desc: "Skip namespace 'rails_age' in generated files"
+
+    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,20 +4,14 @@ 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."
-
     source_root File.expand_path("templates", __dir__)
-
     argument :attributes, type: :array, default: [], banner: "field:type field:type"
+    class_option :skip_namespace, type: :boolean, default: true, desc: "Skip namespace 'rails_age' in generated files"
 
     def create_model_file
       invoke 'apache_age:node', [name] + attributes.collect { |attr| "#{attr.name}:#{attr.type}" }
@@ -25,24 +19,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 +53,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.6.0'
 end

data/lib/rails_age.rb

@@ -8,10 +8,13 @@ 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_generator'
+  require 'apache_age/types/factory'
 end

data/lib/tasks/config_types.rake

@@ -5,28 +5,28 @@ namespace :apache_age do
   desc "Install AGE types from rails_age into the rails initializers"
   task :config_types => :environment do
     types_file_path = File.expand_path("#{Rails.root}/config/initializers/types.rb", __FILE__)
-    required_file_path = "require 'apache_age/types/age_type_generator'"
+    required_file_path = "require 'apache_age/types/factory'"
     required_file_content =
       <<~RUBY
-      require 'apache_age/types/age_type_generator'
+      require 'apache_age/types/factory'
       # AGE Type Definition Usage (edges/nodes):
-      # require_dependency 'nodes/company'
+      # require_dependency 'company'
       # ActiveModel::Type.register(
-      #   :company, ApacheAge::Types::AgeTypeGenerator.create_type_for(Nodes::Company)
+      #   :company, ApacheAge::Types::Factory.type_for(Company)
       # )
       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::Factory.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::Factory.type_for(ApacheAge::Edge)
   )
 RUBY