sage-rails 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d1bccb977fae3786227b2511a90fdb9163e497ba560a82d457fe6fc25b53153
-  data.tar.gz: 4f56781eaa2545ffd8970491d68c897897b38fdd518f05cc2ef9fe235d411db8
+  metadata.gz: '085941f32e26330f8fccca54aa1908dddd9c295e89157539a20a851bc020e98c'
+  data.tar.gz: 01f0c003a16fcac98c33cbfb0d53007947f99fb65972ab15db14dd8c9a0ce890
 SHA512:
-  metadata.gz: eac2215b633b6eeb16b707cbb74e79c081496f03748c4e98e9d9305c34896c6b2397a413c679b5eac97b68c7d436035794539fc048d6a8fc68d323ec74dcd5ca
-  data.tar.gz: 52dec8f05a2c39e85977b803dfce1d119e160ee534bf76fb4d6c528a1757c358c94a62ae4ad85d235677d22e397011b6e3588c300cb5638c7249f353ed39c881
+  metadata.gz: ea7714fffba89cc55b14102e97203b8792918b91627b0ad59610279d71ed4b6edb08b8470ab87513a5e625ab30a2a7defbf63dbffec75557d756486b7bfa573c
+  data.tar.gz: 783b058656f060a52cc55177656bf06c46cb66390beaf214f8a7b8831018d941d514804d54046020603e220b2fbb0e735b5fed5d3ad95a61816aba8eeee7f634

data/app/controllers/sage/base_controller.rb

@@ -1,6 +1,13 @@
 module Sage
   class BaseController < Blazer::BaseController
-    include Pagy::Backend
+    # Support both Pagy 9.x (Backend) and Pagy 43.x (Method)
+    if defined?(Pagy::Backend)
+      include Pagy::Backend # Pagy 9.x
+    elsif defined?(Pagy::Method)
+      include Pagy::Method # Pagy 43.x
+    else
+      raise "Pagy must be loaded before Sage::BaseController"
+    end
 
     layout "sage/application"
     helper Importmap::ImportmapTagsHelper

data/app/controllers/sage/dashboards_controller.rb

@@ -16,8 +16,12 @@ module Sage
         @dashboards = @dashboards.where(creator_id: blazer_user.id).reorder(updated_at: :desc)
       end
 
-      # Apply pagination with Pagy
-      @pagy, @dashboards = pagy(@dashboards)
+      # Apply pagination with Pagy (support both 9.x and 43.x)
+      @pagy, @dashboards = if defined?(Pagy::Backend)
+        pagy(@dashboards) # Pagy 9.x
+      else
+        pagy(:offset, @dashboards) # Pagy 43.x
+      end
     end
 
     def new

data/app/controllers/sage/queries_controller.rb

@@ -23,8 +23,12 @@ module Sage
       # Filter out private queries (starting with #) unless they belong to the current user
       @queries = @queries.where("name NOT LIKE ? OR creator_id = ?", "#%", blazer_user.try(:id))
 
-      # Apply pagination with Pagy
-      @pagy, @queries = pagy(@queries)
+      # Apply pagination with Pagy (support both 9.x and 43.x)
+      @pagy, @queries = if defined?(Pagy::Backend)
+        pagy(@queries) # Pagy 9.x
+      else
+        pagy(:offset, @queries) # Pagy 43.x
+      end
     end
 
     def new

data/app/helpers/sage/application_helper.rb

@@ -1,7 +1,5 @@
 module Sage
   module ApplicationHelper
-    include Pagy::Frontend
-
     # Provide access to Sage engine routes
     def sage
       Sage::Engine.routes.url_helpers
@@ -26,5 +24,16 @@ module Sage
         end
       end
     end
+
+    # Support both Pagy 9.x and 43.x
+    def pagy_navigation(pagy_object)
+      if defined?(Pagy::Backend)
+        # Pagy 9.x uses pagy_nav helper
+        pagy_nav(pagy_object)
+      else
+        # Pagy 43.x uses instance method
+        pagy_object.series_nav
+      end
+    end
   end
 end

data/app/views/sage/dashboards/index.html.erb

@@ -48,7 +48,7 @@
     </table>
 
     <div style="display: flex; justify-content: center; padding: 1rem;">
-      <%== pagy_nav(@pagy) if @pagy.pages > 1 %>
+      <%== pagy_navigation(@pagy) if @pagy.pages > 1 %>
     </div>
   <% else %>
     <div class="mt-3">

data/app/views/sage/queries/_statement_box.html.erb

@@ -26,6 +26,12 @@
     outline: 2px solid rgba(66, 165, 245, 1);
     outline-offset: 2px;
   }
+
+  /* ACE Editor cursor styling - sharp vertical line */
+  .ace_cursor {
+    border-left: 2px solid !important;
+    border-radius: 0 !important;
+  }
 </style>
 
 <div id=<%= dom_id(query, 'statement-box') %> class='' style="position: relative; border-radius: 10px;">

data/app/views/sage/queries/index.html.erb

@@ -49,7 +49,7 @@
     </table>
 
     <div style="display: flex; justify-content: center; padding: 1rem;">
-      <%== pagy_nav(@pagy) if @pagy.pages > 1 %>
+      <%== pagy_navigation(@pagy) if @pagy.pages > 1 %>
     </div>
   <% else %>
     <div class="mt-3">

data/app/views/sage/queries/new.html.erb

@@ -198,6 +198,12 @@
     text-overflow: ellipsis;
     margin-bottom: 10px;
   }
+
+  /* ACE Editor cursor styling - sharp vertical line */
+  .ace_cursor {
+    border-left: 2px solid !important;
+    border-radius: 0 !important;
+  }
 </style>
 
 <script>
@@ -251,12 +257,16 @@
     }
   }
 
-  document.addEventListener('DOMContentLoaded', function() {
+  let tabsInitialized = false;
+
+  function setupTabSwitching() {
     const promptTab = document.getElementById('prompt-tab');
     const sqlTab = document.getElementById('sql-tab');
     const promptPage = document.getElementById('prompt-page');
     const sqlPage = document.getElementById('sql-page');
 
+    if (!promptTab || !sqlTab || !promptPage || !sqlPage) return;
+
     function switchToPromptMode() {
       promptTab.classList.add('active');
       sqlTab.classList.remove('active');
@@ -269,32 +279,29 @@
       promptTab.classList.remove('active');
       sqlPage.classList.add('active');
       promptPage.classList.remove('active');
+
+      // Initialize ACE editor when switching to SQL mode
+      setTimeout(() => {
+        initializeAceEditor();
+      }, 100);
     }
 
-    promptTab.addEventListener('click', switchToPromptMode);
-    sqlTab.addEventListener('click', switchToSqlMode);
+    // Only attach listeners once
+    if (!tabsInitialized) {
+      promptTab.addEventListener('click', switchToPromptMode);
+      sqlTab.addEventListener('click', switchToSqlMode);
+      tabsInitialized = true;
+    }
 
     // If we have fork parameters, automatically switch to SQL mode
     const urlParams = new URLSearchParams(window.location.search);
     if (urlParams.get('fork_query_id') || urlParams.get('name')) {
-      console.log('Fork detected, switching to SQL mode');
       switchToSqlMode();
-      // Initialize ACE editor immediately for forks
-      setTimeout(() => {
-        console.log('Initializing ACE editor for fork');
-        initializeAceEditor();
-      }, 200);
     }
-  });
+  }
 
-  // Initialize ACE editor when SQL tab is clicked
-  document.addEventListener('click', function(e) {
-    if (e.target.id === 'sql-tab') {
-      setTimeout(() => {
-        initializeAceEditor();
-      }, 100);
-    }
-  });
+  document.addEventListener('DOMContentLoaded', setupTabSwitching);
+  document.addEventListener('turbo:load', setupTabSwitching);
 
   // Ensure form submission captures the editor value
   document.addEventListener('submit', function(e) {
@@ -305,28 +312,4 @@
       }
     }
   });
-
-  // Handle Turbo navigation for fork detection
-  document.addEventListener('turbo:load', function() {
-    const urlParams = new URLSearchParams(window.location.search);
-    if (urlParams.get('fork_query_id') || urlParams.get('name')) {
-      console.log('Fork detected via turbo:load, switching to SQL mode');
-      const promptTab = document.getElementById('prompt-tab');
-      const sqlTab = document.getElementById('sql-tab');
-      const promptPage = document.getElementById('prompt-page');
-      const sqlPage = document.getElementById('sql-page');
-      
-      if (sqlTab && promptTab && sqlPage && promptPage) {
-        sqlTab.classList.add('active');
-        promptTab.classList.remove('active');
-        sqlPage.classList.add('active');
-        promptPage.classList.remove('active');
-        
-        setTimeout(() => {
-          console.log('Initializing ACE editor for fork via turbo:load');
-          initializeAceEditor();
-        }, 200);
-      }
-    }
-  });
 </script>

data/config/initializers/pagy.rb

@@ -1,2 +1,17 @@
-Pagy::DEFAULT[:items] = 10
-Pagy::DEFAULT[:overflow] = :last_page
+# Handle both mutable and frozen Pagy::DEFAULT (frozen in Pagy 9.x and Rails 8.1.1+ / Ruby 3.4+)
+# Also support both Pagy 9.x (items/overflow) and Pagy 43.x (limit/overflow)
+
+# Pagy 43.x uses :limit instead of :items and it's already in DEFAULT
+if Pagy::DEFAULT.key?(:limit)
+  # Pagy 43.x - DEFAULT already has :limit, just need to set overflow if not present
+  unless Pagy::DEFAULT.key?(:overflow)
+    new_defaults = Pagy::DEFAULT.merge(overflow: :last_page)
+    Pagy.send(:remove_const, :DEFAULT)
+    Pagy.const_set(:DEFAULT, new_defaults)
+  end
+else
+  # Pagy 9.x - use :items and :overflow
+  new_defaults = Pagy::DEFAULT.merge(items: 10, overflow: :last_page)
+  Pagy.send(:remove_const, :DEFAULT)
+  Pagy.const_set(:DEFAULT, new_defaults)
+end

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

@@ -50,8 +50,16 @@ module Sage
       def create_migrations
         say "Creating Sage database migrations...", :green
 
-        # Generate timestamp for migration
-        timestamp = Time.now.utc.strftime("%Y%m%d%H%M%S")
+        # Generate unique timestamp for migration by checking existing migrations
+        # and ensuring we don't create a duplicate timestamp
+        existing_timestamps = Dir.glob("db/migrate/*").map do |file|
+          File.basename(file).match(/^(\d+)_/)[1].to_i
+        end.compact
+
+        timestamp = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
+        while existing_timestamps.include?(timestamp)
+          timestamp += 1
+        end
 
         # Create the migration file
         migration_file = "db/migrate/#{timestamp}_create_sage_messages.rb"
@@ -86,14 +94,13 @@ module Sage
         say "Sage installation complete!", :green
         say "="*50, :green
         say "\nNext steps:"
-        say "1. Run 'bundle install' to install dependencies"
-        say "2. Run 'rails db:migrate' to create Blazer tables"
-        say "3. Configure your AI service in config/initializers/sage.rb"
-        say "4. Visit #{root_url}sage to start using Sage"
+        say "1. Run 'rails db:migrate' to create Blazer tables"
+        say "2. Configure your AI service in config/initializers/sage.rb"
+        say "3. Visit #{root_url}sage to start using Sage"
         say "\nFor AI integration, you'll need to:"
         say "- Set up an Anthropic API key (or OpenAI if preferred)"
         say "- Add the API key to Rails credentials or .env file"
-        say "- Configure database schema context for better SQL generation"
+        say "- Leverage model scopes for better SQL inference"
       end
 
       private

data/lib/sage/engine.rb

@@ -51,9 +51,14 @@ module Sage
       end
     end
 
+    # Support both Pagy 9.x (Frontend) and Pagy 43.x (instance methods)
     initializer "sage.pagy_helpers" do
       ActiveSupport.on_load(:action_view) do
-        include Pagy::Frontend if defined?(Pagy::Frontend)
+        if defined?(Pagy::Frontend)
+          # Pagy 9.x uses Frontend module
+          include Pagy::Frontend
+        end
+        # Pagy 43.x uses instance methods on @pagy objects, no module needed
       end
     end
 

data/lib/sage/version.rb

@@ -1,3 +1,3 @@
 module Sage
-  VERSION = "0.1.8"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sage-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - Nathan Jones