Merge pull request #30 from merefield/main

FEATURE: Support new Discourse Home Pages Theme Component for highly integrated presentation

app/controllers/landing_pages/landing.rb

@@ -36,12 +36,30 @@ def show
         @footer = @global.footer if @global.footer.present?
       end
 
-      render inline: @page.body, layout: "landing"
+      if request.format == "json"
+        render json: { page: @page.body }
+      else
+        if !SiteSetting.landing_redirect_to_homepages || visit_from_crawler?
+          render inline: @page.body, layout: "landing"
+        else
+          redirect_to path("/#{SiteSetting.landing_redirect_to_homepages_root_path}/#{request.path.split("/").last}")
+        end
+      end
     else
       redirect_to path("/")
     end
   end
 
+  def path(p)
+    "#{Discourse.base_url}#{p}"
+  end
+
+  def visit_from_crawler?
+      request.user_agent && (request.media_type.blank? || request.media_type.include?("html")) &&
+        !%w[json rss].include?(params[:format]) &&
+        CrawlerDetection.crawler?(request.user_agent, request.headers["HTTP_VIA"])
+  end
+
   def contact
     Jobs.enqueue(
       :send_contact_email,

config/locales/server.en.yml

@@ -35,4 +35,6 @@ en:
   
   site_settings:
     landing_contact_email: "Email to send landing page contacts to."
-    landing_authorized_extensions: "Authorized file extensions for landing pages."
+    landing_authorized_extensions: "Authorized file extensions for landing pages."
+    landing_redirect_to_homepages: "Redirect to landing pages to be consumed and presented by Home Pages Theme Component."
+    landing_redirect_to_homepages_root_path: "Root path for Landing Pages when presented via Home Pages Theme Component."

config/settings.yml

@@ -4,4 +4,9 @@ plugins:
   landing_authorized_extensions:
     default: "jpg|jpeg|png|woff|woff2|svg|eot|ttf|otf|gif|js|json"
     type: list
-    list_type: compact
+    list_type: compact
+  landing_redirect_to_homepages:
+    default: false
+    type: boolean
+  landing_redirect_to_homepages_root_path:
+    default: '/home-pages/sp'

plugin.rb

@@ -2,7 +2,7 @@
 
 # name: discourse-landing-pages
 # about: Adds landing pages to Discourse
-# version: 0.3.0
+# version: 0.3.1
 # authors: Angus McLeod, Pablo Cabido
 # url: https://github.com/paviliondev/discourse-landing-pages
 

spec/requests/landing_pages/landing_controller_spec.rb

@@ -28,4 +28,24 @@
     get "/private"
     expect(response.status).to eq(403)
   end
+
+  it "sends back a json representation of the page" do
+    get "/public.json"
+    expect(response.status).to eq(200)
+    expect(response.parsed_body["page"]["body"]).to eq("body")
+  end
+
+  it "shows the normal page if the user agent is a bot even if redirect to Home Page TC is set" do
+    SiteSetting.landing_redirect_to_homepages = true
+    get "/public", headers: { "HTTP_USER_AGENT" => "Googlebot" }
+    expect(response.status).to eq(200)
+    expect(response.parsed_body["body"]).to eq("body")
+  end
+
+  it "shows the normal page if redirect to Home Page TC is set to false" do
+    SiteSetting.landing_redirect_to_homepages = false
+    get "/public"
+    expect(response.status).to eq(200)
+    expect(response.parsed_body["body"]).to eq("body")
+  end
 end