nacelle 0.4.2 → 0.6.0

data/gemfiles/rails_7.2.gemfile.lock

@@ -0,0 +1,238 @@
+PATH
+  remote: ..
+  specs:
+    nacelle (0.5.0)
+      rails
+      sprockets-rails
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (7.2.1)
+      actionpack (= 7.2.1)
+      activesupport (= 7.2.1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+      zeitwerk (~> 2.6)
+    actionmailbox (7.2.1)
+      actionpack (= 7.2.1)
+      activejob (= 7.2.1)
+      activerecord (= 7.2.1)
+      activestorage (= 7.2.1)
+      activesupport (= 7.2.1)
+      mail (>= 2.8.0)
+    actionmailer (7.2.1)
+      actionpack (= 7.2.1)
+      actionview (= 7.2.1)
+      activejob (= 7.2.1)
+      activesupport (= 7.2.1)
+      mail (>= 2.8.0)
+      rails-dom-testing (~> 2.2)
+    actionpack (7.2.1)
+      actionview (= 7.2.1)
+      activesupport (= 7.2.1)
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4, < 3.2)
+      rack-session (>= 1.0.1)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+      useragent (~> 0.16)
+    actiontext (7.2.1)
+      actionpack (= 7.2.1)
+      activerecord (= 7.2.1)
+      activestorage (= 7.2.1)
+      activesupport (= 7.2.1)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (7.2.1)
+      activesupport (= 7.2.1)
+      builder (~> 3.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (7.2.1)
+      activesupport (= 7.2.1)
+      globalid (>= 0.3.6)
+    activemodel (7.2.1)
+      activesupport (= 7.2.1)
+    activerecord (7.2.1)
+      activemodel (= 7.2.1)
+      activesupport (= 7.2.1)
+      timeout (>= 0.4.0)
+    activestorage (7.2.1)
+      actionpack (= 7.2.1)
+      activejob (= 7.2.1)
+      activerecord (= 7.2.1)
+      activesupport (= 7.2.1)
+      marcel (~> 1.0)
+    activesupport (7.2.1)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
+    builder (3.3.0)
+    byebug (11.1.3)
+    capybara (3.40.0)
+      addressable
+      matrix
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.11)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (>= 1.5, < 3.0)
+      xpath (~> 3.2)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
+    crass (1.0.6)
+    date (3.3.4)
+    diff-lcs (1.5.1)
+    drb (2.2.1)
+    erubi (1.13.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    i18n (1.14.5)
+      concurrent-ruby (~> 1.0)
+    io-console (0.7.2)
+    irb (1.14.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    logger (1.6.0)
+    loofah (2.22.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.4)
+    matrix (0.4.2)
+    mini_mime (1.1.5)
+    minitest (5.25.1)
+    net-imap (0.4.14)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.0)
+      net-protocol
+    nio4r (2.7.3)
+    nokogiri (1.16.7-x86_64-linux)
+      racc (~> 1.4)
+    psych (5.1.2)
+      stringio
+    public_suffix (6.0.1)
+    racc (1.8.1)
+    rack (2.2.9)
+    rack-session (1.0.2)
+      rack (< 3)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rackup (1.0.0)
+      rack (< 3)
+      webrick
+    rails (7.2.1)
+      actioncable (= 7.2.1)
+      actionmailbox (= 7.2.1)
+      actionmailer (= 7.2.1)
+      actionpack (= 7.2.1)
+      actiontext (= 7.2.1)
+      actionview (= 7.2.1)
+      activejob (= 7.2.1)
+      activemodel (= 7.2.1)
+      activerecord (= 7.2.1)
+      activestorage (= 7.2.1)
+      activesupport (= 7.2.1)
+      bundler (>= 1.15.0)
+      railties (= 7.2.1)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (7.2.1)
+      actionpack (= 7.2.1)
+      activesupport (= 7.2.1)
+      irb (~> 1.13)
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
+    rake (13.2.1)
+    rdoc (6.7.0)
+      psych (>= 4.0.0)
+    regexp_parser (2.9.2)
+    reline (0.5.9)
+      io-console (~> 0.5)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    securerandom (0.3.1)
+    sprockets (3.7.3)
+      base64
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.5.2)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      sprockets (>= 3.0.0)
+    stringio (3.1.1)
+    thor (1.3.1)
+    timeout (0.4.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    useragent (0.16.10)
+    webrick (1.8.1)
+    websocket-driver (0.7.6)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
+    zeitwerk (2.6.17)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  appraisal
+  bundler
+  byebug
+  capybara
+  nacelle!
+  rails (~> 7.2.0)
+  rake
+  rspec
+  sprockets (~> 3.0)
+
+BUNDLED WITH
+   2.4.19

data/lib/nacelle/after_filter.rb

@@ -0,0 +1,49 @@
+require "active_support/xml_mini/nokogiri"
+ActiveSupport::XmlMini.backend = "Nokogiri"
+require "active_support/core_ext/hash"
+# we need all this for Hash.from_xml
+
+module Nacelle
+  class AfterFilter < Struct.new(:controller)
+    def self.after controller
+      if controller.content_type&.include?("text/html")
+        new(controller).call
+      end
+    end
+
+    def call
+      cells = cells controller.response.body
+
+      controller.response.body.gsub!(/(#{cells.keys.join('|')})/) do |tag|
+        name, action, attrs = cells[tag]
+        action = action.to_sym
+        attrs = HashWithIndifferentAccess.new(attrs)
+        cell = "#{name.camelize}Cell".constantize.new_with_controller(controller)
+        attrs.delete "class" # ignore styling class
+        if cell.class.action_methods.include?(action)
+          cell.action = action
+          if cell.method(action).arity.zero? && attrs.empty?
+            cell.send(action)
+          else
+            cell.send(action, attrs)
+          end
+        else
+          "<strong>Cell “#{name.capitalize} #{action}” not found!</strong>"
+        end
+      end unless cells.empty?
+    end
+
+    private
+
+    def cells html
+      html.scan(/(<cell[^>]*\/\s*>|<cell[^>]*>.*?<\/cell>)/m).inject({}) do |cells, matches|
+        tag = matches.first
+        attrs = Hash.from_xml(tag)['cell']
+        name, state = attrs.delete('name').split('/')
+        cells[tag] = [name, state, attrs]
+        cells
+      end
+    end
+  end
+end
+

data/lib/nacelle/cell.rb

@@ -1,23 +1,68 @@
-require "cells"
-
 module Nacelle
-  class Cell < Cell::Base
-    self.view_paths += %w[app/cells app/views]
+  class Cell
+    def self.new_with_controller controller
+      new.tap do |cell|
+        cell.instance_variable_set :@controller, controller
+        cell.instance_variable_set :@request, controller.request
+        cell.instance_variable_set :@session, controller.session
+        cell.instance_variable_set :@cookies, controller.send(:cookies)
+      end
+    end
 
-    def self.new_with_request request
-      new.tap { |cell| cell.instance_variable_set :@request, request }
+    def self.updated_at
+      Time.new(2000) # can be overriden to bust caches
     end
 
-    private def request
-      @request
+    def self.cache_key
+      to_s # can be overriden to bust caches
     end
-  end
-end
 
-if Rails.version >= "6.1.0"
-  Cell::Base::View.class_eval do
-    def compiled_method_container
-      ActionView::Base
+    attr_reader :request, :session, :cookies
+
+    delegate :perform_caching, :read_fragment, :write_fragment, to: :@controller
+
+    def self.action_methods
+      instance_methods - Class.new(superclass).instance_methods
+    end
+
+    def self.name
+      to_s.underscore.sub("_cell","")
+    end
+
+    cattr_accessor(:view_path) { "app/cells" }
+    attr_accessor :action
+
+    class_attribute :helpers, default: []
+    def self.helper mod
+      helpers << mod
+    end
+
+    class_attribute :helper_methods, default: []
+    def self.helper_method meth
+      helper_methods << meth
+    end
+
+    def render template: nil
+      template ||= "#{self.class.name}/#{action}"
+      assigns = instance_variables.reduce({}) do |hash, key|
+        new_key = key.to_s.split("@").last.to_sym
+        value = instance_variable_get(key)
+        hash.merge(new_key => value)
+      end
+      view_context = @controller.view_context.dup
+      paths = view_context.lookup_context.view_paths + [view_path]
+      view_context.lookup_context.instance_variable_set :@view_paths, paths
+      view_context.assign assigns
+      cell = self
+
+      helper_methods.each do |meth|
+        view_context.compiled_method_container.define_method meth do
+          cell.send(meth)
+        end
+      end
+
+      view_context.render template: template
     end
   end
 end
+

data/lib/nacelle/cells_serializer.rb

@@ -9,7 +9,7 @@ class Nacelle::CellsSerializer
     cell = klass.to_s.sub("Cell", "").underscore
     cell_name = cell.humanize
 
-    klass.action_methods.map do |action|
+    klass.action_methods.sort.map do |action|
       action_name = action.to_s.humanize
       {
         id:   "#{cell}/#{action}",

data/lib/nacelle/has_cells.rb

@@ -0,0 +1,17 @@
+module Nacelle
+  module HasCells
+    def has_cells *columns
+      define_method :cells do
+        columns.flat_map do |column|
+          send(column).to_s.scan(/(<cell[^>]*\/\s*>|<cell[^>]*>.*?<\/cell>)/m).map do |matches|
+            tag = matches.first
+            attrs = Hash.from_xml(tag)['cell']
+            name, _ = attrs.delete('name').split('/')
+            "#{name.camelize}Cell".constantize
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/nacelle/version.rb

@@ -1,3 +1,3 @@
 module Nacelle
-  VERSION = "0.4.2"
+  VERSION = "0.6.0"
 end

data/lib/nacelle.rb

@@ -2,12 +2,14 @@ require "nacelle/version"
 require "action_controller/railtie"
 require "sprockets/railtie"
 require "nacelle/cell"
-require "nacelle/middleware"
+require "nacelle/has_cells"
+require "nacelle/after_filter"
 
 module Nacelle
   class Engine < ::Rails::Engine
     initializer "nacelle.init" do |app|
-      app.config.middleware.use Nacelle::Middleware
+      ActionController::Base.after_action AfterFilter
+      ActiveRecord::Base.extend HasCells if defined?(ActiveRecord)
     end
 
     initializer "nacelle.assets.precompile" do |app|

data/nacelle.gemspec

@@ -28,5 +28,4 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rails"
   spec.add_dependency "sprockets-rails"
-  spec.add_dependency "cells", "~>3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nacelle
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-28 00:00:00.000000000 Z
+date: 2024-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,20 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: cells
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 description: Embed cells in the markup of your CMS.
 email:
 - micah@botandrose.com
@@ -151,6 +137,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/assets/config/manifest.js
 - app/assets/javascripts/ckeditor/plugins/cells.js
 - app/assets/javascripts/ckeditor/plugins/cells/dialogs/cells.js
 - app/assets/javascripts/ckeditor/plugins/cells/icons/insertcell.png
@@ -161,16 +148,17 @@ files:
 - bin/setup
 - config/routes.rb
 - gemfiles/.bundle/config
-- gemfiles/rails_6.0.gemfile
-- gemfiles/rails_6.0.gemfile.lock
-- gemfiles/rails_6.1.gemfile
-- gemfiles/rails_6.1.gemfile.lock
 - gemfiles/rails_7.0.gemfile
 - gemfiles/rails_7.0.gemfile.lock
+- gemfiles/rails_7.1.gemfile
+- gemfiles/rails_7.1.gemfile.lock
+- gemfiles/rails_7.2.gemfile
+- gemfiles/rails_7.2.gemfile.lock
 - lib/nacelle.rb
+- lib/nacelle/after_filter.rb
 - lib/nacelle/cell.rb
 - lib/nacelle/cells_serializer.rb
-- lib/nacelle/middleware.rb
+- lib/nacelle/has_cells.rb
 - lib/nacelle/version.rb
 - nacelle.gemspec
 homepage: https://github.com/botandrose/nacelle
@@ -192,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: Embed cells in the markup of your CMS.

data/gemfiles/rails_6.0.gemfile.lock

@@ -1,189 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    nacelle (0.4.2)
-      cells (~> 3.0)
-      rails
-      sprockets-rails
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (6.0.4.4)
-      actionpack (= 6.0.4.4)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.4.4)
-      actionpack (= 6.0.4.4)
-      activejob (= 6.0.4.4)
-      activerecord (= 6.0.4.4)
-      activestorage (= 6.0.4.4)
-      activesupport (= 6.0.4.4)
-      mail (>= 2.7.1)
-    actionmailer (6.0.4.4)
-      actionpack (= 6.0.4.4)
-      actionview (= 6.0.4.4)
-      activejob (= 6.0.4.4)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (6.0.4.4)
-      actionview (= 6.0.4.4)
-      activesupport (= 6.0.4.4)
-      rack (~> 2.0, >= 2.0.8)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.4.4)
-      actionpack (= 6.0.4.4)
-      activerecord (= 6.0.4.4)
-      activestorage (= 6.0.4.4)
-      activesupport (= 6.0.4.4)
-      nokogiri (>= 1.8.5)
-    actionview (6.0.4.4)
-      activesupport (= 6.0.4.4)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.4.4)
-      activesupport (= 6.0.4.4)
-      globalid (>= 0.3.6)
-    activemodel (6.0.4.4)
-      activesupport (= 6.0.4.4)
-    activerecord (6.0.4.4)
-      activemodel (= 6.0.4.4)
-      activesupport (= 6.0.4.4)
-    activestorage (6.0.4.4)
-      actionpack (= 6.0.4.4)
-      activejob (= 6.0.4.4)
-      activerecord (= 6.0.4.4)
-      marcel (~> 1.0.0)
-    activesupport (6.0.4.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    appraisal (2.4.1)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    builder (3.2.4)
-    byebug (11.1.3)
-    capybara (3.35.3)
-      addressable
-      mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
-      rack (>= 1.6.0)
-      rack-test (>= 0.6.3)
-      regexp_parser (>= 1.5, < 3.0)
-      xpath (~> 3.2)
-    cells (3.11.3)
-      actionpack (>= 3.0)
-      railties (>= 3.0)
-      uber (~> 0.0.8)
-    concurrent-ruby (1.1.9)
-    crass (1.0.6)
-    diff-lcs (1.5.0)
-    erubi (1.10.0)
-    globalid (1.0.0)
-      activesupport (>= 5.0)
-    i18n (1.8.11)
-      concurrent-ruby (~> 1.0)
-    loofah (2.13.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    marcel (1.0.2)
-    method_source (1.0.0)
-    mini_mime (1.1.2)
-    mini_portile2 (2.6.1)
-    minitest (5.15.0)
-    nio4r (2.5.8)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
-      racc (~> 1.4)
-    public_suffix (4.0.6)
-    racc (1.6.0)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (6.0.4.4)
-      actioncable (= 6.0.4.4)
-      actionmailbox (= 6.0.4.4)
-      actionmailer (= 6.0.4.4)
-      actionpack (= 6.0.4.4)
-      actiontext (= 6.0.4.4)
-      actionview (= 6.0.4.4)
-      activejob (= 6.0.4.4)
-      activemodel (= 6.0.4.4)
-      activerecord (= 6.0.4.4)
-      activestorage (= 6.0.4.4)
-      activesupport (= 6.0.4.4)
-      bundler (>= 1.3.0)
-      railties (= 6.0.4.4)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
-      loofah (~> 2.3)
-    railties (6.0.4.4)
-      actionpack (= 6.0.4.4)
-      activesupport (= 6.0.4.4)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
-    rake (13.0.6)
-    regexp_parser (2.2.0)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      sprockets (>= 3.0.0)
-    thor (1.1.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-    uber (0.0.15)
-    websocket-driver (0.7.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    xpath (3.2.0)
-      nokogiri (~> 1.8)
-    zeitwerk (2.5.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  bundler
-  byebug
-  capybara (~> 3.35.0)
-  nacelle!
-  rails (~> 6.0.0)
-  rake
-  rspec
-  sprockets (~> 3.0)
-
-BUNDLED WITH
-   2.2.32