sitepress-rails 4.0.9 → 4.1.1

data/spec/dummy/tmp/local_secret.txt

@@ -1 +1 @@
-58a1f8ca2a4e85b4dcd48db97f269c77fbacba764e9a14e8a54e7b642516a03a6553e71de80315890db4099182f24bb9a3f38e674b884e57d819c7122e2a8a43
+562a460288a803f042f8d3c711b2422e98d21e7371552de151a3b7717ad51ff6113392421335ee125878549d5d81d2564bf2b20fe192a0f9624e9a63ae3d48c8

data/spec/sitepress/collection_spec.rb

@@ -0,0 +1,281 @@
+require "spec_helper"
+
+describe Sitepress::Models::Collection do
+  let(:model_class) { PageModel }
+  let(:site) { Sitepress.site }
+  let(:collection) do
+    Sitepress::Models::Collection.new(model: model_class) do
+      site.glob("**/*.html*")
+    end
+  end
+
+  describe "#initialize" do
+    it "accepts a model and resources block" do
+      expect(collection).to be_a(Sitepress::Models::Collection)
+    end
+
+    it "stores the model class" do
+      expect(collection.model).to eq(model_class)
+    end
+  end
+
+  describe "#resources" do
+    it "returns an array of resources" do
+      expect(collection.resources).to be_an(Array)
+    end
+
+    it "returns Sitepress::Resource instances" do
+      expect(collection.resources.first).to be_a(Sitepress::Resource)
+    end
+
+    it "calls the block passed to initialize" do
+      block_called = false
+      test_collection = Sitepress::Models::Collection.new(model: model_class) do
+        block_called = true
+        site.glob("*.html*")
+      end
+      test_collection.resources
+      expect(block_called).to be true
+    end
+  end
+
+  describe "#each" do
+    it "yields model instances, not resources" do
+      collection.each do |item|
+        expect(item).to be_a(model_class)
+        expect(item).not_to be_a(Sitepress::Resource)
+      end
+    end
+
+    it "wraps each resource in the model class" do
+      resources = collection.resources
+      models = []
+      collection.each { |model| models << model }
+      
+      expect(models.size).to eq(resources.size)
+    end
+
+    it "returns an enumerator when no block is given" do
+      enumerator = collection.each
+      expect(enumerator).to be_a(Enumerator)
+    end
+
+    it "can iterate over the enumerator" do
+      enumerator = collection.each
+      first_item = enumerator.next
+      expect(first_item).to be_a(model_class)
+    end
+  end
+
+  describe "Enumerable methods" do
+    describe "#map" do
+      it "maps over model instances" do
+        paths = collection.map(&:request_path)
+        expect(paths).to be_an(Array)
+        expect(paths).to all(be_a(String))
+      end
+
+      it "returns results, not models" do
+        paths = collection.map(&:request_path)
+        expect(paths.first).to be_a(String)
+        expect(paths.first).not_to be_a(model_class)
+      end
+    end
+
+    describe "#select" do
+      it "filters model instances" do
+        filtered = collection.select { |page| page.request_path.include?("hi") }
+        expect(filtered).to be_an(Array)
+        expect(filtered).to all(be_a(model_class))
+      end
+
+      it "returns fewer items when filtered" do
+        all_count = collection.count
+        filtered = collection.select { |page| page.request_path.include?("hi") }
+        expect(filtered.size).to be <= all_count
+      end
+    end
+
+    describe "#reject" do
+      it "filters out model instances" do
+        rejected = collection.reject { |page| page.request_path.include?("hi") }
+        expect(rejected).to be_an(Array)
+        expect(rejected).to all(be_a(model_class))
+      end
+    end
+
+    describe "#find" do
+      it "finds a model instance" do
+        result = collection.find { |page| page.request_path == "/hi" }
+        expect(result).to be_a(model_class)
+      end
+
+      it "returns nil when not found" do
+        result = collection.find { |page| page.request_path == "does-not-exist" }
+        expect(result).to be_nil
+      end
+    end
+
+    describe "#first" do
+      it "returns the first model instance" do
+        expect(collection.first).to be_a(model_class)
+      end
+
+      it "returns the same as accessing via each" do
+        first_via_each = nil
+        collection.each { |item| first_via_each = item; break }
+        expect(collection.first).to eq(first_via_each)
+      end
+    end
+
+    describe "#count" do
+      it "returns the number of items" do
+        expect(collection.count).to be_a(Integer)
+        expect(collection.count).to be > 0
+      end
+
+      it "matches the resource count" do
+        expect(collection.count).to eq(collection.resources.count)
+      end
+    end
+
+    describe "#to_a" do
+      it "converts to an array of models" do
+        array = collection.to_a
+        expect(array).to be_an(Array)
+        expect(array).to all(be_a(model_class))
+      end
+
+      it "returns all items" do
+        array = collection.to_a
+        expect(array.size).to eq(collection.count)
+      end
+    end
+
+    describe "#any?" do
+      it "returns true when collection has items" do
+        expect(collection.any?).to be true
+      end
+
+      it "can be used with a block" do
+        result = collection.any? { |page| page.request_path == "/hi" }
+        expect(result).to be true
+      end
+    end
+
+    describe "#all?" do
+      it "returns true when all items match" do
+        result = collection.all? { |page| page.is_a?(model_class) }
+        expect(result).to be true
+      end
+
+      it "returns false when not all items match" do
+        result = collection.all? { |page| page.request_path == "/hi" }
+        expect(result).to be false
+      end
+    end
+
+    describe "#none?" do
+      it "returns false when collection has items" do
+        result = collection.none? { |page| page.is_a?(model_class) }
+        expect(result).to be false
+      end
+
+      it "returns true when no items match" do
+        result = collection.none? { |page| page.request_path == "does-not-exist" }
+        expect(result).to be true
+      end
+    end
+  end
+
+  describe "chaining" do
+    it "supports chaining multiple enumerable methods" do
+      result = collection
+        .select { |page| page.request_path.length > 0 }
+        .map(&:request_path)
+        .sort
+
+      expect(result).to be_an(Array)
+      expect(result).to all(be_a(String))
+    end
+
+    it "can chain with array methods after to_a" do
+      result = collection.to_a.reverse.first
+      expect(result).to be_a(model_class)
+    end
+  end
+
+  describe "lazy evaluation" do
+    it "doesn't call the resources block until enumeration" do
+      block_called = false
+      lazy_collection = Sitepress::Models::Collection.new(model: model_class) do
+        block_called = true
+        site.glob("*.html*")
+      end
+      
+      expect(block_called).to be false
+      lazy_collection.first
+      expect(block_called).to be true
+    end
+
+    it "calls the resources block multiple times if accessed multiple times" do
+      call_count = 0
+      counting_collection = Sitepress::Models::Collection.new(model: model_class) do
+        call_count += 1
+        site.glob("*.html*")
+      end
+      
+      counting_collection.first
+      counting_collection.count
+      expect(call_count).to eq(2)
+    end
+  end
+
+  describe "with custom model" do
+    let(:custom_model) do
+      Class.new(Sitepress::Model) do
+        def custom_method
+          "custom"
+        end
+      end
+    end
+
+    let(:custom_collection) do
+      Sitepress::Models::Collection.new(model: custom_model) do
+        site.glob("*.html*")
+      end
+    end
+
+    it "returns instances of the custom model" do
+      expect(custom_collection.first).to be_a(custom_model)
+    end
+
+    it "has access to custom methods" do
+      expect(custom_collection.first.custom_method).to eq("custom")
+    end
+  end
+
+  describe "with empty results" do
+    let(:empty_collection) do
+      Sitepress::Models::Collection.new(model: model_class) do
+        site.glob("does-not-exist-*.html")
+      end
+    end
+
+    it "returns zero count" do
+      expect(empty_collection.count).to eq(0)
+    end
+
+    it "returns nil for first" do
+      expect(empty_collection.first).to be_nil
+    end
+
+    it "returns empty array for to_a" do
+      expect(empty_collection.to_a).to eq([])
+    end
+
+    it "returns false for any?" do
+      expect(empty_collection.any?).to be false
+    end
+  end
+end

data/spec/sitepress/model_spec.rb

@@ -14,6 +14,9 @@ describe Sitepress::Model do
       it "is instances of model" do
         expect(subject.first).to be_instance_of PageModel
       end
+      it "returns a Collection" do
+        expect(subject).to be_a(Sitepress::Models::Collection)
+      end
     end
     describe "#resources" do
       subject { model.all.resources }
@@ -53,4 +56,119 @@ describe Sitepress::Model do
       end
     end
   end
+
+  describe ".collection" do
+    context "with block (new style)" do
+      it "returns a Collection directly" do
+        test_model = Class.new(Sitepress::Model)
+        result = test_model.collection(:custom_pages) { test_model.site.glob("*.html*") }
+        expect(result).to be_a(Sitepress::Models::Collection)
+      end
+
+      it "returns model instances from the collection" do
+        test_model = Class.new(Sitepress::Model)
+        result = test_model.collection { test_model.site.glob("*.html*") }
+        expect(result.first).to be_a(test_model)
+      end
+
+      it "can be chained with enumerable methods" do
+        test_model = Class.new(Sitepress::Model)
+        result = test_model.collection { test_model.site.glob("*.html*") }
+        paths = result.map(&:request_path)
+        expect(paths).to be_an(Array)
+        expect(paths).to all(be_a(String))
+      end
+    end
+
+    context "without block (deprecated style)" do
+      let(:test_model) do
+        Class.new(Sitepress::Model) do
+          collection :deprecated_pages, glob: "*.html*"
+        end
+      end
+
+      it "defines the collection method" do
+        expect(test_model).to respond_to(:deprecated_pages)
+      end
+
+      it "shows deprecation warning" do
+        expect(ActiveSupport::Deprecation).to receive(:new).and_call_original
+        test_model.deprecated_pages
+      end
+
+      it "still returns a Collection" do
+        expect(test_model.deprecated_pages).to be_a(Sitepress::Models::Collection)
+      end
+
+      it "still returns model instances" do
+        expect(test_model.deprecated_pages.first).to be_a(test_model)
+      end
+    end
+  end
+
+  describe ".glob" do
+    it "returns a Collection" do
+      expect(model.glob("*.html*")).to be_a(Sitepress::Models::Collection)
+    end
+
+    it "returns model instances" do
+      result = model.glob("*.html*")
+      expect(result.first).to be_a(PageModel)
+    end
+
+    it "filters resources by glob pattern" do
+      result = model.glob("hi.html")
+      expect(result.count).to eql 1
+      expect(result.first.request_path).to eql "/hi"
+    end
+  end
+
+  describe "chaining" do
+    it "supports standard enumerable methods" do
+      result = model.all.select { |page| page.request_path.include?("hi") }
+      expect(result).to be_an(Array)
+      expect(result).to all(be_a(PageModel))
+    end
+
+    it "supports map" do
+      paths = model.all.map(&:request_path)
+      expect(paths).to be_an(Array)
+      expect(paths).to all(be_a(String))
+    end
+
+    it "supports each" do
+      count = 0
+      model.all.each { |page| count += 1 }
+      expect(count).to eql 3
+    end
+
+    it "supports first" do
+      expect(model.all.first).to be_a(PageModel)
+    end
+
+    it "supports count" do
+      expect(model.all.count).to be_a(Integer)
+    end
+
+    it "can convert to array" do
+      array = model.all.to_a
+      expect(array).to be_an(Array)
+      expect(array).to all(be_a(PageModel))
+    end
+  end
+
+  describe "model equality" do
+    it "considers models equal if they have the same page and class" do
+      page1 = model.first
+      page2 = model.get(page1.request_path)
+      expect(page1).to eq(page2)
+    end
+
+    it "considers models unequal if they have different pages" do
+      pages = model.all.to_a
+      if pages.size >= 2
+        expect(pages[0]).not_to eq(pages[1])
+      end
+    end
+  end
 end

data/spec/sitepress/sitepress_site_controller_spec.rb

@@ -70,8 +70,29 @@ describe Sitepress::SiteController, type: :controller do
     context "helper_paths" do
       subject{ Sitepress::SiteController.helpers_path }
       it { is_expected.to include(site.helpers_path.to_s) }
-      it "has site#helper_paths in ActiveSupport::Dependencies.autoload_paths" do
-        expect(ActiveSupport::Dependencies.autoload_paths).to include(site.helpers_path.to_s)
+      
+      it "adds helpers_path to Rails autoload_paths" do
+        expect(Rails.application.config.autoload_paths).to include(site.helpers_path)
+      end
+      
+      it "adds helpers_path to Rails eager_load_paths" do
+        expect(Rails.application.config.eager_load_paths).to include(site.helpers_path)
+      end
+      
+      it "makes helpers autoloadable" do
+        # SampleHelper is defined in app/content/helpers/sample_helper.rb
+        expect { SampleHelper }.not_to raise_error
+        expect(SampleHelper).to be_a(Module)
+      end
+    end
+    
+    context "model_paths" do
+      it "adds models_path to Rails autoload_paths" do
+        expect(Rails.application.config.autoload_paths).to include(site.models_path)
+      end
+      
+      it "adds models_path to Rails eager_load_paths" do
+        expect(Rails.application.config.eager_load_paths).to include(site.models_path)
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sitepress-rails
 version: !ruby/object:Gem::Version
-  version: 4.0.9
+  version: 4.1.1
 platform: ruby
 authors:
 - Brad Gessler
 bindir: exe
 cert_chain: []
-date: 2025-10-11 00:00:00.000000000 Z
+date: 2025-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -57,14 +57,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.9
+        version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.9
+        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -196,6 +196,7 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
 - spec/dummy/config/spring.rb
+- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -205,6 +206,7 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/tmp/local_secret.txt
 - spec/sitepress-rails_spec.rb
+- spec/sitepress/collection_spec.rb
 - spec/sitepress/compiler_spec.rb
 - spec/sitepress/model_spec.rb
 - spec/sitepress/rails_configuration_spec.rb
@@ -294,6 +296,7 @@ test_files:
 - spec/dummy/config/secrets.yml
 - spec/dummy/config/spring.rb
 - spec/dummy/config.ru
+- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -302,6 +305,7 @@ test_files:
 - spec/dummy/public/apple-touch-icon.png
 - spec/dummy/public/favicon.ico
 - spec/dummy/tmp/local_secret.txt
+- spec/sitepress/collection_spec.rb
 - spec/sitepress/compiler_spec.rb
 - spec/sitepress/model_spec.rb
 - spec/sitepress/rails_configuration_spec.rb