nacelle 0.4.1 → 0.5.0

data/lib/nacelle/cell.rb

@@ -4,12 +4,36 @@ module Nacelle
   class Cell < Cell::Base
     self.view_paths += %w[app/cells app/views]
 
-    def self.new_with_request request
-      new.tap { |cell| cell.instance_variable_set :@request, request }
+    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
 
-    private def request
-      @request
+    def self.updated_at
+      Time.new(2000) # can be overriden to bust caches
+    end
+
+    def self.cache_key
+      to_s # can be overriden to bust caches
+    end
+
+    attr_reader :request, :session, :cookies
+
+    delegate :perform_caching, :read_fragment, :write_fragment, to: :@controller
+
+    def self.action_methods
+      super - %w[
+        cookies
+        request
+        session
+        read_fragment
+        write_fragment
+        perform_caching
+      ]
     end
   end
 end
@@ -19,5 +43,9 @@ if Rails.version >= "6.1.0"
     def compiled_method_container
       ActionView::Base
     end
+
+    def view_cache_dependencies
+      []
+    end
   end
 end

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.1"
+  VERSION = "0.5.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|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nacelle
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-22 00:00:00.000000000 Z
+date: 2023-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -161,10 +161,6 @@ files:
 - bin/setup
 - config/routes.rb
 - gemfiles/.bundle/config
-- gemfiles/rails_5.1.gemfile
-- gemfiles/rails_5.1.gemfile.lock
-- gemfiles/rails_5.2.gemfile
-- gemfiles/rails_5.2.gemfile.lock
 - gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.0.gemfile.lock
 - gemfiles/rails_6.1.gemfile
@@ -172,9 +168,10 @@ files:
 - gemfiles/rails_7.0.gemfile
 - gemfiles/rails_7.0.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
@@ -196,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Embed cells in the markup of your CMS.

data/gemfiles/rails_5.1.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~>5.1.0"
-gem "sprockets", "~>3.0"
-
-gemspec path: "../"

data/gemfiles/rails_5.1.gemfile.lock

@@ -1,165 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    nacelle (0.4.1)
-      cells (~> 3.0)
-      rails
-      sprockets-rails
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (5.1.7)
-      actionpack (= 5.1.7)
-      nio4r (~> 2.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.7)
-      actionpack (= 5.1.7)
-      actionview (= 5.1.7)
-      activejob (= 5.1.7)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.1.7)
-      actionview (= 5.1.7)
-      activesupport (= 5.1.7)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.7)
-      activesupport (= 5.1.7)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.7)
-      activesupport (= 5.1.7)
-      globalid (>= 0.3.6)
-    activemodel (5.1.7)
-      activesupport (= 5.1.7)
-    activerecord (5.1.7)
-      activemodel (= 5.1.7)
-      activesupport (= 5.1.7)
-      arel (~> 8.0)
-    activesupport (5.1.7)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    appraisal (2.4.1)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (8.0.0)
-    builder (3.2.4)
-    byebug (11.1.3)
-    capybara (3.32.2)
-      addressable
-      mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
-      rack (>= 1.6.0)
-      rack-test (>= 0.6.3)
-      regexp_parser (~> 1.5)
-      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 (0.4.2)
-      activesupport (>= 4.2.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)
-    method_source (1.0.0)
-    mini_mime (1.1.2)
-    mini_portile2 (2.4.0)
-    minitest (5.15.0)
-    nio4r (2.5.8)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    public_suffix (4.0.6)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (5.1.7)
-      actioncable (= 5.1.7)
-      actionmailer (= 5.1.7)
-      actionpack (= 5.1.7)
-      actionview (= 5.1.7)
-      activejob (= 5.1.7)
-      activemodel (= 5.1.7)
-      activerecord (= 5.1.7)
-      activesupport (= 5.1.7)
-      bundler (>= 1.3.0)
-      railties (= 5.1.7)
-      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 (5.1.7)
-      actionpack (= 5.1.7)
-      activesupport (= 5.1.7)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (13.0.6)
-    regexp_parser (1.8.2)
-    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.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      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.6.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    xpath (3.2.0)
-      nokogiri (~> 1.8)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  bundler
-  byebug
-  capybara
-  nacelle!
-  rails (~> 5.1.0)
-  rake
-  rspec
-  sprockets (~> 3.0)
-
-BUNDLED WITH
-   2.2.32

data/gemfiles/rails_5.2.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~>5.2.0"
-gem "sprockets", "~>3.0"
-
-gemspec path: "../"

data/gemfiles/rails_5.2.gemfile.lock

@@ -1,171 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    nacelle (0.4.1)
-      cells (~> 3.0)
-      rails
-      sprockets-rails
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (5.2.6)
-      actionpack (= 5.2.6)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailer (5.2.6)
-      actionpack (= 5.2.6)
-      actionview (= 5.2.6)
-      activejob (= 5.2.6)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.2.6)
-      actionview (= 5.2.6)
-      activesupport (= 5.2.6)
-      rack (~> 2.0, >= 2.0.8)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.6)
-      activesupport (= 5.2.6)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.6)
-      activesupport (= 5.2.6)
-      globalid (>= 0.3.6)
-    activemodel (5.2.6)
-      activesupport (= 5.2.6)
-    activerecord (5.2.6)
-      activemodel (= 5.2.6)
-      activesupport (= 5.2.6)
-      arel (>= 9.0)
-    activestorage (5.2.6)
-      actionpack (= 5.2.6)
-      activerecord (= 5.2.6)
-      marcel (~> 1.0.0)
-    activesupport (5.2.6)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    appraisal (2.4.1)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (9.0.0)
-    builder (3.2.4)
-    byebug (11.1.3)
-    capybara (3.32.2)
-      addressable
-      mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
-      rack (>= 1.6.0)
-      rack-test (>= 0.6.3)
-      regexp_parser (~> 1.5)
-      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 (0.4.2)
-      activesupport (>= 4.2.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.4.0)
-    minitest (5.15.0)
-    nio4r (2.5.8)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    public_suffix (4.0.6)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (5.2.6)
-      actioncable (= 5.2.6)
-      actionmailer (= 5.2.6)
-      actionpack (= 5.2.6)
-      actionview (= 5.2.6)
-      activejob (= 5.2.6)
-      activemodel (= 5.2.6)
-      activerecord (= 5.2.6)
-      activestorage (= 5.2.6)
-      activesupport (= 5.2.6)
-      bundler (>= 1.3.0)
-      railties (= 5.2.6)
-      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 (5.2.6)
-      actionpack (= 5.2.6)
-      activesupport (= 5.2.6)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rake (13.0.6)
-    regexp_parser (1.8.2)
-    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.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      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)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  bundler
-  byebug
-  capybara
-  nacelle!
-  rails (~> 5.2.0)
-  rake
-  rspec
-  sprockets (~> 3.0)
-
-BUNDLED WITH
-   2.2.32