luck_remover 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 299fc4fe0fdcf639a343606a2dd14e2db5de3a90533e34cf3878a502543efbac
-  data.tar.gz: 99a2a9908de7438d4dd943d30d446557e5da1358dc449b8d21439ca1ec7d4f5a
+  metadata.gz: aafbd78e90cb21bdd20ca01473fa1a1632c8306542c35cd6872fa84e7c999fd8
+  data.tar.gz: 041f0bee7cd3feb2c65196bbd39d15967af0e359ea858241b5898dbcc54fe7d8
 SHA512:
-  metadata.gz: 7b2d448d73e226d47c088fde1aabca3dde56a2195df88a5c08af8eef33efbf639e191a6d232e90c2843568ba4481d5a486d01b058ae5a11218be8ba86980b941
-  data.tar.gz: 4b787250eb21bd2750235b4a2dec6ca9ea0cc65c1fba6996474efba372bdff1436465a13e8afeeb7003cdcfea84a5e45578a66592ff8ce53ebca282c179e4525
+  metadata.gz: fadad526b3e0c6289f5ea0c2534730e054695043da13f86b1820070569b6479fb7160749d75e1b103945659f85bd6ea5c8b307447fba2e75fdc5f5d3dc2900c1
+  data.tar.gz: 855c26cd1682e3f87c34d0206ed65876ecba06443dc05949a01992a50509b2d511c0ad66361cf76a1f04be67de3988f98aa3f03cfcc7953124180ddd542ce4b2

data/app/controllers/luck_remover/goals_controller.rb

@@ -1,7 +1,9 @@
 module LuckRemover
   class GoalsController < LuckRemover.parent_controller.constantize
+    helper_method :page_query
+
     def index
-      @goals = goal_scope.order(:name)
+      @goals = goals_in_area.order(:name)
       @person_names = LuckRemover.people(current_goal_owner).to_h { |label, id| [ id, label ] }
     end
 
@@ -12,7 +14,7 @@ module LuckRemover
 
     def create
       @goal = goal_scope.new(goal_params)
-      return redirect_to goals_path if @goal.save
+      return redirect_to after_change_path if @goal.save
 
       load_choices
       render :new, status: :unprocessable_content
@@ -25,7 +27,7 @@ module LuckRemover
 
     def update
       @goal = goal_scope.find(params[:id])
-      return redirect_to goals_path if @goal.update(goal_params)
+      return redirect_to after_change_path if @goal.update(goal_params)
 
       load_choices
       render :edit, status: :unprocessable_content
@@ -33,13 +35,13 @@ module LuckRemover
 
     def destroy
       goal_scope.find(params[:id]).destroy!
-      redirect_to goals_path
+      redirect_to after_change_path
     end
 
     private
 
     def load_choices
-      @metrics = LuckRemover.metrics.all
+      @metrics = area ? LuckRemover.metrics.in_area(area) : LuckRemover.metrics.all
       @people = LuckRemover.people(current_goal_owner)
     end
 
@@ -54,5 +56,21 @@ module LuckRemover
     def goal_scope
       Goal.for_owner(current_goal_owner)
     end
+
+    def goals_in_area
+      area ? goal_scope.in_area(area) : goal_scope
+    end
+
+    def page_query
+      params.permit(:area, :return_to).to_h.compact_blank.symbolize_keys
+    end
+
+    def after_change_path
+      url_from(params[:return_to]) || goals_path
+    end
+
+    def area
+      params[:area].presence
+    end
   end
 end

data/app/models/luck_remover/goal.rb

@@ -5,6 +5,7 @@ module LuckRemover
     belongs_to :owner, polymorphic: true
 
     scope :for_owner, ->(owner) { where(owner: owner) }
+    scope :in_area, ->(area) { where(metric_key: LuckRemover.metrics.in_area(area).map { |stat| stat.key.to_s }) }
 
     enum :direction, { at_least: "at_least", at_most: "at_most" }, validate: true
     enum :period, { week: "week", month: "month" }, validate: true

data/app/views/luck_remover/goals/edit.html.erb

@@ -1,10 +1,10 @@
 <%= ui_form_page(title: "Edit", subtitle: @goal.name) %>
 <%= ui_page(max_width: :md) do %>
-  <%= ui_form(action: luck_remover.goal_path(@goal), method: :patch) do %>
+  <%= ui_form(action: luck_remover.goal_path(@goal, **page_query), method: :patch) do %>
     <%= render "luck_remover/goals/form", goal: @goal, metrics: @metrics, people: @people %>
     <%= ui_button(label: "Save") %>
   <% end %>
   <%= ui_action_menu do %>
-    <%= ui_action_menu_item(label: "Delete", href: luck_remover.goal_path(@goal), method: :delete) %>
+    <%= ui_action_menu_item(label: "Delete", href: luck_remover.goal_path(@goal, **page_query), method: :delete) %>
   <% end %>
 <% end %>

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

@@ -1,8 +1,9 @@
 <%= ui_show_page(title: "Goals") %>
+<% new_goal_path = luck_remover.new_goal_path(area: params[:area].presence) %>
 <%= ui_page(max_width: :xl) do %>
-  <%= ui_page_header(title: "Goals", action_url: luck_remover.new_goal_path, action_label: "Add") do |header| %>
+  <%= ui_page_header(title: "Goals", action_url: new_goal_path, action_label: "Add") do |header| %>
     <% header.action do %>
-      <%= ui_button(label: "Add", href: luck_remover.new_goal_path) %>
+      <%= ui_button(label: "Add", href: new_goal_path) %>
     <% end %>
   <% end %>
   <% rows = @goals.map do |goal|

data/app/views/luck_remover/goals/new.html.erb

@@ -1,6 +1,6 @@
 <%= ui_form_page(title: "Add goal") %>
 <%= ui_page(max_width: :md) do %>
-  <%= ui_form(action: luck_remover.goals_path) do %>
+  <%= ui_form(action: luck_remover.goals_path(**page_query)) do %>
     <%= render "luck_remover/goals/form", goal: @goal, metrics: @metrics, people: @people %>
     <%= ui_button(label: "Create") %>
   <% end %>

data/lib/luck_remover/metric_registry.rb

@@ -7,13 +7,15 @@ module LuckRemover
     def initialize
       @stats = {}
       @per_person = Set.new
+      @areas = {}
     end
 
-    def register(stat, per_person: false)
+    def register(stat, per_person: false, area: nil)
       key = stat.key.to_sym
       raise DuplicateMetricError, "A goal metric is already registered under #{key}" if registered?(key)
 
       @per_person << key if per_person
+      @areas[key] = area.to_sym if area
       @stats[key] = stat
     end
 
@@ -29,6 +31,10 @@ module LuckRemover
       @stats.values
     end
 
+    def in_area(area)
+      @stats.values_at(*@areas.select { |_key, name| name == area.to_sym }.keys)
+    end
+
     def fetch(key)
       @stats.fetch(key.to_sym)
     end

data/lib/luck_remover/version.rb

@@ -1,3 +1,3 @@
 module LuckRemover
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/luck_remover.rb

@@ -20,8 +20,8 @@ module LuckRemover
     @metrics ||= MetricRegistry.new
   end
 
-  def self.register_metric(stat, per_person: false)
-    metrics.register(stat, per_person: per_person)
+  def self.register_metric(stat, per_person: false, area: nil)
+    metrics.register(stat, per_person: per_person, area: area)
   end
 
   def self.metric(key)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: luck_remover
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Tyler Schneider