ahoy_captain 0.81 → 0.82

data/app/queries/ahoy_captain/event_query.rb

@@ -3,33 +3,35 @@ module AhoyCaptain
     include Rangeable
 
     def build
-      shared_context = Ransack::Context.for(AhoyCaptain.event)
+      entry_pages = ransack_params_for(:event).select { |k,v| k.start_with?("entry_page") }
+      exit_pages = ransack_params_for(:event).select { |k,v| k.start_with?("exit_page") }
 
-      search_parents = AhoyCaptain.event.ransack(
+      event = AhoyCaptain.event
+      shared_context = Ransack::Context.for(event)
+
+      search_parents = event.ransack(
         ransack_params_for(:event).reject { |k,v| k.start_with?("visit_") }, context: shared_context
       )
+
+      visit_params = ransack_params_for(:visit).reject { |k,v| k.start_with?("event_") || k.start_with?("events_") }.transform_keys { |key| "visit_#{key}" }
       search_children = AhoyCaptain.visit.ransack(
-        ransack_params_for(:visit).reject { |k,v| k.start_with?("event_") }.transform_keys { |key| "visit_#{key}" }, context: shared_context
+        visit_params, context: shared_context
       )
-
       shared_conditions = [search_parents, search_children].map { |search|
         Ransack::Visitor.new.accept(search.base)
       }
 
-      AhoyCaptain.event.joins(shared_context.join_sources)
-                 .where(shared_conditions.reduce(&:or))
+      joined = AhoyCaptain.event.joins(shared_context.join_sources)
 
-    end
+      if entry_pages.values.any?(&:present?) || params[:controller].include?("entry_pages")
+        joined = joined.with_entry_pages
+      end
 
-    def within_range
-      self
-    end
-
-    def with_visit
-      @query = @query.joins(:visit)
+      if exit_pages.values.any?(&:present?) || params[:controller].include?("exit_pages")
+        joined = joined.with_exit_pages
+      end
 
-      self
+      joined.where(shared_conditions.reduce(&:and))
     end
-
   end
 end

data/app/queries/ahoy_captain/visit_query.rb

@@ -17,7 +17,7 @@ module AhoyCaptain
       }
 
       AhoyCaptain.visit.joins(shared_context.join_sources)
-            .where(shared_conditions.reduce(&:or))
+            .where(shared_conditions.reduce(&:and))
 
     end
 

data/app/views/ahoy_captain/devices/_table.html.erb

@@ -0,0 +1,5 @@
+<%= render AhoyCaptain::TableComponent.new(items: @devices,
+                                           category_name: 'Devices',
+                                           unit_name: 'Visitors',
+                                           header: ::AhoyCaptain::Tables::Headers::DevicesHeaderComponent,
+                                           row: ::AhoyCaptain::Tables::Rows::DevicesRowComponent) %>

data/app/views/ahoy_captain/devices/index.html+details.erb

@@ -1,4 +1,4 @@
 <%= turbo_frame_tag :details do %>
-  <%= render AhoyCaptain::TableComponent.new(items: @devices, category_name: 'Devices', unit_name: 'Visitors', additional_cols: [:percent_total]) %>
+  <%= render 'table' %>
   <span class="flex justify-center"><%= render_pagination %></span>
 <% end %>

data/app/views/ahoy_captain/devices/index.html.erb

@@ -1,3 +1,3 @@
 <%= turbo_frame_tag :devices do %>
-  <%= render AhoyCaptain::TableComponent.new(items: @devices, category_name: 'Devices', unit_name: 'Visitors', additional_cols: [:percent_total]) %>
-<% end %>
+  <%= render 'table' %>
+<% end %>

data/app/views/ahoy_captain/goals/index.html.erb

@@ -1,39 +1,7 @@
 <%= turbo_frame_tag :goals do %>
-  <div class="flex flex-col min-h-[380px] w-full pt-4">
-    <div class="flex text-sm font-bold text-base-content mb-4">
-      <span class="grow">Goal</span>
-      <span >Uniques</span>
-      <span class="w-8 ml-8 text-right">Total</span>
-      <span class="w-8 ml-8 text-right">CR</span>
-    </div>
-    <div class='min-h-[420px]'>
-      <div class="grow">
-        <% if @presenter.goals.respond_to?(:each) && @presenter.goals.any? %>
-          <% @presenter.goals.each do |item| %>
-
-            <div class='leading-10 flex relative'>
-              <progress class='progress-primary bg-base-100 h-8 grow' value="<%= item.cr %>" max="100">
-              </progress>
-              <span class="grow text-elipsis overflow-hidden absolute left-4 bottom-3 h-8 text-base-content">
-              <%= item.name %>
-            </span>
-              <span class="w-8 ml-8 text-right">
-              <%= render AhoyCaptain::TooltipComponent.new(amount: item.unique_visits) %>
-            </span>
-              <span class="w-8 ml-8 text-right">
-              <%= render AhoyCaptain::TooltipComponent.new(amount: item.total_events) %>
-            </span>
-              <span class="w-8 ml-8 text-right">
-                <%= item.cr %>%
-              </span>
-            </div>
-          <% end %>
-        <% else %>
-          <p>No data found</p>
-        <% end %>
-      </div>
-    </div>
-  </div>
+  <%= render AhoyCaptain::TableComponent.new(items: @presenter.goals,
+                                             header: ::AhoyCaptain::Tables::Headers::GoalsHeaderComponent,
+                                             row: ::AhoyCaptain::Tables::Rows::GoalsRowComponent) %>
 
 
 <% end %>

data/app/views/ahoy_captain/layouts/application.html.erb

@@ -116,7 +116,7 @@
   </style>
 </head>
 
-<body data-theme='<%= AhoyCaptain.config.theme %>' class='bg-base-300' data-controller='navigation' data-action="filter-tag:remove->navigation#removeQueryParam">
+<body data-theme='<%= AhoyCaptain.config.theme %>' class='bg-base-300' data-controller='application'>
   <%= yield %>
   <div class="flex justify-center bg-base-300 border-t-4 border-base-100 py-4">
     <div class="flex justify-around space-x-4 my-4">

data/app/views/ahoy_captain/roots/show.html.erb

@@ -14,17 +14,17 @@
 
     <%= render AhoyCaptain::TileComponent.new(title: 'Top Sources') do |component| %>
       <% component.with_display_links do %>
-        <div data-controller='link' data-link-top_sources-class="text-primary underline">
-        <a href="<%= sources_path(search_params) %>" data-turbo-frame="sources" data-action='click->link#changeTopSources' data-link-target='top_sourcesLink'>All</a>
-        <%= render AhoyCaptain::DropdownLinkComponent.new(title: "Campaign") do |dropdown| %>
-          <% %w{utm_source utm_medium utm_term utm_content utm_campaign}.each do |source| %>
-            <% dropdown.with_option do %>
-              <a href="<%= public_send("campaign_#{source}_path".to_sym, **search_params) %>" data-turbo-frame="sources" data-action='click->link#changeTopSources' data-link-target='top_sourcesLink'>
-                <%= source.titleize.gsub("Utm", "UTM") %>
-              </a>
+        <div data-controller="active-links">
+          <a href="<%= sources_path(search_params) %>" data-turbo-frame="sources"  data-active-links-target="link">All</a>
+          <%= render AhoyCaptain::DropdownLinkComponent.new(title: "Campaign") do |dropdown| %>
+            <% %w{utm_source utm_medium utm_term utm_content utm_campaign}.each do |source| %>
+              <% dropdown.with_option do %>
+                <a href="<%= public_send("campaign_#{source}_path".to_sym, **search_params) %>" data-turbo-frame="sources"   data-active-links-target="link">
+                  <%= source.titleize.gsub("Utm", "UTM") %>
+                </a>
+              <% end %>
             <% end %>
           <% end %>
-        <% end %>
         </div>
       <% end %>
       <% component.with_statistic_display do %>
@@ -37,11 +37,11 @@
 
     <%= render AhoyCaptain::TileComponent.new(title: 'Top Pages') do |component| %>
       <% component.with_display_links do %>
-      <div data-controller='link' data-link-top_pages-class="text-primary underline" >
-        <a href="<%= top_pages_path(search_params) %>" data-turbo-frame="pages" data-action='click->link#changeTopPages' data-link-target='top_pagesLink'>Top Pages</a>
-        <a href="<%= entry_pages_path(search_params) %>" data-turbo-frame="pages" data-action='click->link#changeTopPages' data-link-target='top_pagesLink'>Entry Pages</a>
-        <a href="<%= exit_pages_path(search_params) %>" data-turbo-frame="pages" data-action='click->link#changeTopPages' data-link-target='top_pagesLink'>Exit Pages</a>
-      </div>
+        <div data-controller='active-links'>
+          <a href="<%= top_pages_path(search_params) %>" data-turbo-frame="pages"   data-active-links-target="link">Top Pages</a>
+          <a href="<%= entry_pages_path(search_params) %>" data-turbo-frame="pages"   data-active-links-target="link">Entry Pages</a>
+          <a href="<%= exit_pages_path(search_params) %>" data-turbo-frame="pages"   data-active-links-target="link">Exit Pages</a>
+        </div>
       <% end %>
       <% component.with_statistic_display do %>
         <%= turbo_frame_tag :pages, src: top_pages_path(search_params), loading: :lazy %>
@@ -53,11 +53,11 @@
 
     <%= render AhoyCaptain::TileComponent.new(title: 'Countries') do |component| %>
       <% component.with_display_links do %>
-      <div data-controller='link' data-link-countries-class="text-primary underline">
-        <a href="<%= countries_path(search_params) %>" data-turbo-frame="geography" data-action='click->link#changeCountries' data-link-target='countriesLink'>Countries</a>
-        <a href="<%= regions_path(search_params) %>" data-turbo-frame="geography" data-action='click->link#changeCountries' data-link-target='countriesLink'>Regions</a>
-        <a href="<%= cities_path(search_params) %>" data-turbo-frame="geography" data-action='click->link#changeCountries' data-link-target='countriesLink'>Cities</a>
-      </div>
+        <div data-controller="active-links">
+          <a href="<%= countries_path(search_params) %>" data-turbo-frame="geography"  data-active-links-target="link">Countries</a>
+          <a href="<%= regions_path(search_params) %>" data-turbo-frame="geography"   data-active-links-target="link">Regions</a>
+          <a href="<%= cities_path(search_params) %>" data-turbo-frame="geography"   data-active-links-target="link">Cities</a>
+        </div>
       <% end %>
       <% component.with_statistic_display do %>
         <%= turbo_frame_tag :geography, src: countries_path(search_params), loading: :lazy %>
@@ -69,11 +69,11 @@
 
     <%= render AhoyCaptain::TileComponent.new(title: 'Devices') do |component| %>
       <% component.with_display_links do %>
-      <div data-controller='link' data-link-devices-class="text-primary underline">
-        <a href="<%= devices_browsers_path(search_params) %>" data-turbo-frame="devices" data-action='click->link#changeDevices' data-link-target='devicesLink'>Browser</a>
-        <a href="<%= devices_operating_systems_path(search_params) %>" data-turbo-frame="devices" data-action='click->link#changeDevices' data-link-target='devicesLink'>OS</a>
-        <a href="<%= devices_device_types_path(search_params) %>" data-turbo-frame="devices" data-action='click->link#changeDevices' data-link-target='devicesLink'>Size</a>
-      </div>
+        <div data-controller="active-links">
+          <a href="<%= devices_browsers_path(search_params) %>" data-turbo-frame="devices"  data-active-links-target="link">Browser</a>
+          <a href="<%= devices_operating_systems_path(search_params) %>" data-turbo-frame="devices"   data-active-links-target="link">OS</a>
+          <a href="<%= devices_device_types_path(search_params) %>" data-turbo-frame="devices"   data-active-links-target="link">Size</a>
+        </div>
       <% end %>
       <% component.with_statistic_display do %>
         <%= turbo_frame_tag :devices, src: devices_browsers_path(search_params), loading: :lazy %>
@@ -98,75 +98,83 @@
         <% end %>
 
       <% end %>
-        <% component.with_statistic_display do %>
+      <% component.with_statistic_display do %>
         <%= turbo_frame_tag :goals, src: goals_path(search_params), loading: :lazy %>
       <% end %>
     <% end %>
   </div>
 </main>
 
-<%= render AhoyCaptain::Filter::ModalComponent.new(title: "Filter by Page", id: "pageModal") do |modal| %>
-  <% modal.with_modal_display do %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "Action", column: :route, url: filters_actions_path, predicates: [:in, :not_in]) %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "Entry page", column: :entry_page, url: filters_entry_pages_path, predicates: [:in, :not_in]) %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "Exit page", column: :exit_page, url: filters_exit_pages_path, predicates: [:in, :not_in]) %>
+<%= form_with url: url_for(params.permit!.except(:q)), method: :get, data: { turbo_frame: "_top", controller: "filter-form", action: "reset->filter-form#handleReset" } do |form| %>
+  <%= form.hidden_field :period, value: params[:period] %>
+  <%= form.hidden_field :start_date, value: params[:start_date] %>
+  <%= form.hidden_field :end_date, value: params[:end_date] %>
+  <%= render AhoyCaptain::Filter::ModalComponent.new(title: "Filter by Page", id: "pageModal") do |modal| %>
+    <% modal.with_modal_display do %>
+      <%= render AhoyCaptain::Filter::SelectComponent.new(label: "Action", column: :route, url: filters_actions_path, predicates: [:in, :not_in], form: form) %>
+      <%= render AhoyCaptain::Filter::SelectComponent.new(label: "Entry page", column: :entry_page, url: filters_entry_pages_path, predicates: [:in, :not_in], form: form) %>
+      <%= render AhoyCaptain::Filter::SelectComponent.new(label: "Exit page", column: :exit_page, url: filters_exit_pages_path, predicates: [:in, :not_in], form: form) %>
+    <% end %>
   <% end %>
-<% end %>
 
-<%= render AhoyCaptain::Filter::ModalComponent.new(title: "Filter by Country", id: "countryModal") do |modal| %>
-  <% modal.with_modal_display do %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "Country", column: :country, url: filters_locations_countries_path, predicates: [:in, :not_in]) %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "Region", column: :region, url: filters_locations_regions_path, predicates: [:in, :not_in]) %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "City", column: :city, url: filters_locations_cities_path, predicates: [:in, :not_in]) %>
+  <%= render AhoyCaptain::Filter::ModalComponent.new(title: "Filter by Country", id: "countryModal") do |modal| %>
+    <% modal.with_modal_display do %>
+      <%= render AhoyCaptain::Filter::SelectComponent.new(label: "Country", column: :country, url: filters_locations_countries_path, predicates: [:in, :not_in], form: form) %>
+      <%= render AhoyCaptain::Filter::SelectComponent.new(label: "Region", column: :region, url: filters_locations_regions_path, predicates: [:in, :not_in], form: form) %>
+      <%= render AhoyCaptain::Filter::SelectComponent.new(label: "City", column: :city, url: filters_locations_cities_path, predicates: [:in, :not_in], form: form) %>
+    <% end %>
   <% end %>
-<% end %>
 
-<%= render AhoyCaptain::Filter::ModalComponent.new(title: "Filter by Source", id: "sourceModal") do |modal| %>
-  <% modal.with_modal_display do %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "Source", column: :referring_domain, url: filters_sources_path, predicates: [:in, :not_in]) %>
+  <%= render AhoyCaptain::Filter::ModalComponent.new(title: "Filter by Source", id: "sourceModal") do |modal| %>
+    <% modal.with_modal_display do %>
+      <%= render AhoyCaptain::Filter::SelectComponent.new(label: "Source", column: :referring_domain, url: filters_sources_path, predicates: [:in, :not_in], form: form) %>
+    <% end %>
   <% end %>
-<% end %>
 
-<%= render AhoyCaptain::Filter::ModalComponent.new(title: "Filter by Screen size", id: "screenModal") do |modal| %>
-  <% modal.with_modal_display do %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "Screen size", column: :device_type, url: filters_screens_path, predicates: [:in, :not_in]) %>
+  <%= render AhoyCaptain::Filter::ModalComponent.new(title: "Filter by Screen size", id: "screenModal") do |modal| %>
+    <% modal.with_modal_display do %>
+      <%= render AhoyCaptain::Filter::SelectComponent.new(label: "Screen size", column: :device_type, url: filters_screens_path, predicates: [:in, :not_in], form: form) %>
+    <% end %>
   <% end %>
-<% end %>
 
-<%= render AhoyCaptain::Filter::ModalComponent.new(title: "Filter by Browser", id: "osModal") do |modal| %>
-  <% modal.with_modal_display do %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "Operating System", column: :os, url: filters_names_path, predicates: [:in, :not_in]) %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "Operating System Version", column: :os_version, url: filters_versions_path, predicates: [:in, :not_in]) %>
+  <%= render AhoyCaptain::Filter::ModalComponent.new(title: "Filter by Browser", id: "osModal") do |modal| %>
+    <% modal.with_modal_display do %>
+      <%= render AhoyCaptain::Filter::SelectComponent.new(label: "Operating System", column: :os, url: filters_names_path, predicates: [:in, :not_in], form: form) %>
+      <%= render AhoyCaptain::Filter::SelectComponent.new(label: "Operating System Version", column: :os_version, url: filters_versions_path, predicates: [:in, :not_in], form: form) %>
+    <% end %>
   <% end %>
-<% end %>
 
-<%= render AhoyCaptain::Filter::ModalComponent.new(title: "Filter by Campaign", id: "utmModal") do |modal| %>
-  <% modal.with_modal_display do %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "UTM Medium", column: :utm_medium, url: filters_utm_mediums_path, predicates: [:in, :not_in]) %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "UTM Source", column: :utm_source, url: filters_utm_sources_path, predicates: [:in, :not_in]) %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "UTM Campaign", column: :utm_campaign, url: filters_utm_campaigns_path, predicates: [:in, :not_in]) %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "UTM Term", column: :utm_term, url: filters_utm_terms_path, predicates: [:in, :not_in]) %>
-    <%= render AhoyCaptain::Filter::SelectComponent.new(label: "UTM Content", column: :utm_content, url: filters_utm_contents_path, predicates: [:in, :not_in]) %>
+  <%= render AhoyCaptain::Filter::ModalComponent.new(title: "Filter by Campaign", id: "utmModal") do |modal| %>
+    <% modal.with_modal_display do %>
+      <%= render AhoyCaptain::Filter::SelectComponent.new(label: "UTM Medium", column: :utm_medium, url: filters_utm_mediums_path, predicates: [:in, :not_in], form: form) %>
+      <%= render AhoyCaptain::Filter::SelectComponent.new(label: "UTM Source", column: :utm_source, url: filters_utm_sources_path, predicates: [:in, :not_in], form: form) %>
+      <%= render AhoyCaptain::Filter::SelectComponent.new(label: "UTM Campaign", column: :utm_campaign, url: filters_utm_campaigns_path, predicates: [:in, :not_in], form: form) %>
+      <%= render AhoyCaptain::Filter::SelectComponent.new(label: "UTM Term", column: :utm_term, url: filters_utm_terms_path, predicates: [:in, :not_in], form: form) %>
+      <%= render AhoyCaptain::Filter::SelectComponent.new(label: "UTM Content", column: :utm_content, url: filters_utm_contents_path, predicates: [:in, :not_in], form: form) %>
+    <% end %>
   <% end %>
-<% end %>
 
-<%= render AhoyCaptain::Filter::ModalComponent.new(title: "Custom Range", id: "customRangeModal") do |modal| %>
-  <% modal.with_modal_display do %>
-    <div class="flex gap-2 w-full">
-      <div class="form-control w-full max-w-xs">
-        <label class="label">
-          <span class="label-text">Start Date</span>
-        </label>
-        <input type="datetime-local" name="start_date" class="input input-bordered w-full" value="<%= params[:start_date] %>" />
-      </div>
-      <div class="form-control w-full max-w-xs">
-        <label class="label">
-          <span class="label-text">End Date</span>
-        </label>
-        <input type="datetime-local" name="end_date" class="input input-bordered w-full" value="<%= params[:end_date] %>" />
+
+  <%= render AhoyCaptain::Filter::ModalComponent.new(title: "Custom Range", id: "customRangeModal") do |modal| %>
+    <% modal.with_modal_display do %>
+      <div class="flex gap-2 w-full">
+        <div class="form-control w-full max-w-xs">
+          <label class="label" for="start_date">
+            <span class="label-text">Start Date</span>
+          </label>
+          <input type="datetime-local" id="start_date" name="start_date" class="input input-bordered w-full" value="<%= params[:start_date] %>" />
+        </div>
+        <div class="form-control w-full max-w-xs">
+          <label class="label" for="end_date">
+            <span class="label-text">End Date</span>
+          </label>
+          <input type="datetime-local" id="end_date" name="end_date" class="input input-bordered w-full" value="<%= params[:end_date] %>" />
+        </div>
       </div>
-    </div>
+    <% end %>
   <% end %>
+
+
 <% end %>
 
 <dialog id="detailsModal" class="modal">

data/app/views/ahoy_captain/stats/base/index.html.erb

@@ -1,11 +1,10 @@
 <%= turbo_frame_tag :chart do %>
-  <div class="flex justify-end gap-3 items-center">
-    <a href="<%= export_path(request.query_parameters) %>" target="_blank" data-turbo-frame="false">Download</a>
+  <div class="flex justify-end ...">
     <%= form_with url: url_for(params.permit!), method: :get, data: { controller: "interval" } do %>
       <%= select_tag :interval, options_for_select(available_intervals.collect { |interval| [interval.titleize, interval] }, selected: selected_interval), class: "select select-bordered select-sm w-full max-w-sm", 'data-action': "change->interval#handleChange" %>
     <% end %>
   </div>
   <div>
-    <%= line_chart @stats %>
+    <canvas data-controller="line-chart" data-line-chart-data-value="<%= @stats.to_json %>" data-line-chart-label-value="<%= @label %>"></canvas>
   </div>
 <% end %>

data/config/routes.rb

@@ -42,6 +42,12 @@ AhoyCaptain::Engine.routes.draw do
     %w{country region city}.each do |type|
       get "locations/#{type.pluralize}" => "locations#index", defaults: { type: type }
     end
+
+    namespace :properties do
+      resources :names, only: [:index]
+      resources :values, only: [:index]
+    end
+
     resources :sources, only: [:index]
     resources :screens, only: [:index]
     scope :operating_systems, module: :operating_systems do

data/lib/ahoy_captain/ahoy/event_methods.rb

@@ -4,104 +4,58 @@ module AhoyCaptain
       extend ActiveSupport::Concern
 
       included do
-        ransacker :route do |parent|
+        ransacker :route do |_parent|
           Arel.sql(AhoyCaptain.config.event[:url_column])
         end
 
-        scope :with_routes, -> { where(AhoyCaptain.config.event[:url_exists]) }
-
-        scope :with_url, -> {
-          select(Arel.sql("#{AhoyCaptain.config.event.url_column} AS url"))
-        }
-
-        scope :distinct_url, -> {
-          distinct(Arel.sql("#{AhoyCaptain.config.event.url_column}"))
-        }
-
-        scope :url_in, ->(*args) {
-          where("#{AhoyCaptain.config.event.url_column} IN (?)", args)
-        }
-
-        scope :url_eq, ->(arg) {
-          if arg.is_a?(Array)
-            arg = arg[0]
-          end
-          where("#{AhoyCaptain.config.event.url_column} = ?", arg)
-        }
-
-        scope :url_not_in, ->(*args) {
-          where("#{AhoyCaptain.config.event.url_column} NOT IN (?)", args)
-        }
-
-        scope :url_i_cont, ->(arg) {
-          where("#{AhoyCaptain.config.event.url_column} ILIKE ?", "%#{arg}%")
-        }
-
-        scope :route_eq, ->(arg) {
-          url_eq(arg)
-        }
-
-        scope :route_in, ->(*args) {
-          url_in(*args)
-        }
+        ransacker :entry_page do |parent|
+          Arel.sql("entry_pages.url")
+        end
 
-        scope :route_not_in, ->(*args) {
-          url_not_in(*args)
-        }
+        ransacker :exit_page do |parent|
+          Arel.sql("exit_pages.url")
+        end
 
-        scope :route_i_cont, ->(arg) {
-          url_i_cont(arg)
+        scope :with_entry_pages, -> {
+          with(entry_pages: self.select("MIN(ahoy_events.id) as min_id, #{Arel.sql("#{AhoyCaptain.config.event.url_column} AS url")}").where(name: AhoyCaptain.config.event[:view_name]).group("ahoy_events.properties")).joins("INNER JOIN entry_pages ON entry_pages.min_id = ahoy_events.id")
         }
-
-        scope :entry_page_in, ->(*args) {
-          table_alias = "first_events_#{SecureRandom.hex.first(6)}"
-
-          subquery = self.select("MIN(id) as min_id").where(name: AhoyCaptain.config.event[:view_name]).route_in(*args).group(:visit_id)
-          joins("INNER JOIN (#{subquery.to_sql}) #{table_alias} ON #{::AhoyCaptain.event.table_name}.id = #{table_alias}.min_id")
+        scope :with_exit_pages, -> {
+          with(exit_pages: self.select("MAX(ahoy_events.id) as max_id, #{Arel.sql("#{AhoyCaptain.config.event.url_column} AS url")}").where(name: AhoyCaptain.config.event[:view_name]).group("ahoy_events.properties")).joins("INNER JOIN exit_pages ON exit_pages.max_id = ahoy_events.id")
         }
 
-        scope :entry_page_not_in, ->(*args) {
-          table_alias = "first_events_#{SecureRandom.hex.first(6)}"
-          subquery = self.select("MIN(id) as min_id").where(name: AhoyCaptain.config.event[:view_name]).route_not_in(*args).group(:visit_id)
-          joins("INNER JOIN (#{subquery.to_sql}) #{table_alias} ON #{::AhoyCaptain.event.table_name}.id = #{table_alias}.min_id")
-        }
+        scope :with_routes, -> { where(AhoyCaptain.config.event[:url_exists]) }
 
-        scope :entry_page_i_cont, ->(arg) {
-          table_alias = "first_events_#{SecureRandom.hex.first(6)}"
-          subquery = self.select("MIN(id) as min_id").where(name: AhoyCaptain.config.event[:view_name]).route_i_cont(arg).group(:visit_id)
-          joins("INNER JOIN (#{subquery.to_sql}) #{table_alias} ON #{::AhoyCaptain.event.table_name}.id = #{table_alias}.min_id")
+        scope :with_url, -> {
+          select(Arel.sql("#{AhoyCaptain.config.event.url_column} AS url"))
         }
 
-        scope :exit_page_in, ->(*args) {
-          table_alias = "last_events_#{SecureRandom.hex.first(6)}"
-
-          subquery = self.select("MAX(id) as max_id").where(name: AhoyCaptain.config.event[:view_name]).route_in(*args).group(:visit_id)
-          joins("INNER JOIN (#{subquery.to_sql}) #{table_alias} ON #{::AhoyCaptain.event.table_name}.id = #{table_alias}.max_id")
+        scope :distinct_url, -> {
+          distinct(Arel.sql("#{AhoyCaptain.config.event.url_column}"))
         }
 
-        scope :exit_page_not_in, ->(*args) {
-          table_alias = "last_events_#{SecureRandom.hex.first(6)}"
-
-          subquery = self.select("MAX(id) as max_id").where(name: AhoyCaptain.config.event[:view_name]).route_not_in(*args).group(:visit_id)
-          joins("INNER JOIN (#{subquery.to_sql}) #{table_alias} ON #{::AhoyCaptain.event.table_name}.id = #{table_alias}.max_id")
+        scope :property_name_eq, ->(value) {
+          where("properties ? :key", key: value)
         }
 
-        scope :exit_page_i_cont, ->(arg) {
-          table_alias = "last_events_#{SecureRandom.hex.first(6)}"
-
-          subquery = self.select("MAX(id) as max_id").where(name: AhoyCaptain.config.event[:view_name]).route_i_cont(*arg).group(:visit_id)
-          joins("INNER JOIN (#{subquery.to_sql}) #{table_alias} ON #{::AhoyCaptain.event.table_name}.id = #{table_alias}.max_id")
+        scope :properties_eq, ->(value) {
+          where("properties @> ?", value)
         }
 
+        scope :properties_not_eq, ->(value) do
+          where.not("properties::jsonb @> ?", value)
+        end
       end
 
       class_methods do
         def ransackable_attributes(auth_object = nil)
-          super + ["action", "controller", "id", "id_property", "name", "name_property", "page", "properties", "time", "url", "user_id", "visit_id"] + self._ransackers.keys
+          super + ["action", "controller", "id", "id_property", "name", "page", "properties", "time", "url", "user_id", "visit_id", "property_name"] + self._ransackers.keys
         end
 
         def ransackable_scopes(auth_object = nil)
-          super + [:entry_page_in, :entry_page_not_in, :exit_page_in, :entry_page_not_in, :route_in, :route_not_in, :route_i_cont, :entry_page_i_cont, :exit_page_i_cont]
+          super + [
+            :properties_eq,
+            :properties_not_eq
+          ]
         end
 
         def ransackable_associations(auth_object = nil)

data/lib/ahoy_captain/goals.rb

@@ -13,7 +13,15 @@ module AhoyCaptain
     end
 
     def name(value)
-      @event_query = -> { AhoyCaptain.event.where(name: value) }
+      @event_query = -> { ::AhoyCaptain.event.where(name: value) }
+    end
+
+    def event(value)
+      ActiveSupport::Deprecation.warn(
+        "event is deprecated. " \
+    "Use name instead."
+      )
+      name(value)
     end
 
     def query(&block)

data/lib/ahoy_captain/version.rb

@@ -1,3 +1,3 @@
 module AhoyCaptain
-  VERSION = "0.81"
+  VERSION = "0.82"
 end