detour 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56b427edb8fe39d2b124dde7956617717f7a31d2
-  data.tar.gz: 1de6769e6f69d524232fa2a2f6d60e9c0214ed9b
+  metadata.gz: a220248ad207160603f672e811b577ed86219921
+  data.tar.gz: c7538218ad95016610473c86ab3d35fc633b66b1
 SHA512:
-  metadata.gz: 8dac7e6ee1f0d717b735530382354b080eba36cbcae8b6d66191a6d6e6f6bf468a8ce2a105670db292cea968b027627fecd2c1dc35cecd88b1dc8463238360f3
-  data.tar.gz: dcff87181b0126f6c6276b4a01549f8af074ff8064fd69b09ca16065722dbc0f093c8c52f8f41b50e648f0cb4b62f5267eae6029c442246d9df908a05bb90ab2
+  metadata.gz: 37cf839b98df18604e536b699239c5a7425bd37d3c301c5770f84646906cfc43edbd2e3e006bb795907e3083ec140839deff96d5138240cd3d4c6a64da4530e5
+  data.tar.gz: fdc0b1a0f69bbf0e6e669903777f0c3ae6011987ec0b18aebe77c8466dca2255e9e9e55ef25fb8b6953043ec0a4fc081d081b3eb99b6fb35a5c7bbd9ba83967b

data/app/helpers/detour/flaggable_flags_helper.rb

@@ -12,7 +12,7 @@ module Detour::FlaggableFlagsHelper
   end
 
   def flag_type
-    params[:flag_type].underscore
+    params[:flag_type].underscore.singularize
   end
 
   def flag_verb

data/app/models/detour/concerns/custom_human_attributes.rb

@@ -0,0 +1,21 @@
+module Detour::Concerns
+  module CustomHumanAttributes
+    extend ActiveSupport::Concern
+
+    included do
+      @human_attribute_names = {}
+
+      class << self
+        alias :original_human_attribute_name :human_attribute_name
+      end
+
+      def self.human_attribute_name(*args)
+        @human_attribute_names[args[0]] || original_human_attribute_name(*args)
+      end
+
+      def self.set_human_attribute_name(key, name)
+        @human_attribute_names[key] = name
+      end
+    end
+  end
+end

data/app/models/detour/feature.rb

@@ -1,6 +1,8 @@
 # Represents an individual feature that may be rolled out to a set of records
 # via individual flags, percentages, or defined groups.
 class Detour::Feature < ActiveRecord::Base
+  include Detour::Concerns::CustomHumanAttributes
+
   self.table_name = :detour_features
 
   serialize :flag_in_counts, JSON

data/app/models/detour/group.rb

@@ -1,4 +1,6 @@
 class Detour::Group < ActiveRecord::Base
+  include Detour::Concerns::CustomHumanAttributes
+
   validates :name,           presence: true, uniqueness: { scope: :flaggable_type }
   validates :flaggable_type, presence: true, inclusion: { in: Detour.config.flaggable_types }
   has_many :memberships, dependent: :destroy

data/app/views/detour/flaggable_flags/index.html.erb

@@ -1,11 +1,17 @@
-<h1><%= flaggable_type.classify %> <%= flag_verb %> <%= feature_name %></h1>
+<h1><%= flaggable_type.classify.pluralize %> <%= flag_verb %> <%= feature_name %></h1>
 
 <% if @feature.errors.any? %>
-  <ul>
-    <% @feature.errors.full_messages.each do |msg| %>
-      <li><%= msg %></li>
-    <% end %>
-  </ul>
+  <div class="panel panel-danger">
+    <div class="panel-heading">Whoops! There were some errors saving your <%= flag_noun.pluralize %>:</div>
+
+    <div class="panel-body">
+      <ul>
+        <% @feature.errors.full_messages.each do |msg| %>
+          <li><%= msg %></li>
+        <% end %>
+      </ul>
+    </div>
+  </div>
 <% end %>
 
 <%= form_for @feature, url: request.path do |form| %>

data/app/views/detour/groups/show.html.erb

@@ -1,11 +1,17 @@
 <h1><%= @group.flaggable_class %> Group: <%= @group %></h1>
 
 <% if @group.errors.any? %>
-  <ul>
-    <% @group.errors.full_messages.each do |msg| %>
-      <li><%= msg %></li>
-    <% end %>
-  </ul>
+  <div class="panel panel-danger">
+    <div class="panel-heading">Whoops! There were some errors saving your group:</div>
+
+    <div class="panel-body">
+      <ul>
+        <% @group.errors.full_messages.each do |msg| %>
+          <li><%= msg %></li>
+        <% end %>
+      </ul>
+    </div>
+  </div>
 <% end %>
 
 <%= form_for @group do |form| %>

data/app/views/detour/shared/_errors.html.erb

@@ -1,5 +1,5 @@
 <div class="panel panel-danger">
-  <div class="panel-heading">Whoops! There were some errors saving your <%= model.class.model_name.singular %>:</div>
+  <div class="panel-heading">Whoops! There were some errors saving your <%= model.class.model_name.demodulize.downcase %>:</div>
 
   <div class="panel-body">
     <ul>

data/lib/detour/acts_as_flaggable.rb

@@ -17,6 +17,7 @@ module Detour::ActsAsFlaggable
         dependent:  :destroy,
         conditions: { flaggable_type: "#{self}" }
 
+      set_human_attribute_name(:"#{table_name}_percentage_flag.percentage", "Percentage")
       attr_accessible :#{table_name}_percentage_flag_attributes
 
       accepts_nested_attributes_for :#{table_name}_percentage_flag,
@@ -47,6 +48,7 @@ module Detour::ActsAsFlaggable
         dependent:  :destroy,
         conditions: { flaggable_type: "#{self}" }
 
+      set_human_attribute_name(:"#{table_name}_flag_ins.#{self.model_name}", "#{self.model_name}")
       attr_accessible :#{table_name}_flag_ins_attributes
       accepts_nested_attributes_for :#{table_name}_flag_ins, allow_destroy: true
 
@@ -56,10 +58,15 @@ module Detour::ActsAsFlaggable
         dependent:  :destroy,
         conditions: { flaggable_type: "#{self}" }
 
+      set_human_attribute_name(:"#{table_name}_opt_outs.#{self.model_name}", "#{self.model_name}")
       attr_accessible :#{table_name}_opt_outs_attributes
       accepts_nested_attributes_for :#{table_name}_opt_outs, allow_destroy: true
     EOF
 
+    Detour::Group.class_eval <<-EOF
+      set_human_attribute_name(:"memberships.#{self.model_name}", "#{self.model_name}")
+    EOF
+
     class_eval do
       @detour_flaggable_find_by = :id
 

data/lib/detour/version.rb

@@ -1,3 +1,3 @@
 module Detour
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/spec/features/database_groups_spec.rb

@@ -62,6 +62,12 @@ describe "creating a group", js: true do
       click_button "Create Group"
     end
 
+    it "displays a correct error header" do
+      within ".modal .panel-heading" do
+        page.should have_content "Whoops! There were some errors saving your group:"
+      end
+    end
+
     it "displays error messages" do
       page.should have_content "Name can't be blank"
     end
@@ -135,8 +141,14 @@ describe "adding a member to a group", js: true do
       click_button "Update Group"
     end
 
+    it "displays a correct error header" do
+      within ".panel-danger .panel-heading" do
+        page.should have_content "Whoops! There were some errors saving your group:"
+      end
+    end
+
     it "displays error messages" do
-      page.should have_content "Memberships user \"\" could not be found"
+      page.should have_content "User \"\" could not be found"
     end
   end
 end

data/spec/features/features_spec.rb

@@ -89,6 +89,12 @@ describe "creating a new feature", js: true do
       click_button "Create Feature"
     end
 
+    it "displays a correct error header" do
+      within ".modal .panel-heading" do
+        page.should have_content "Whoops! There were some errors saving your feature:"
+      end
+    end
+
     it "displays error messages" do
       page.should have_content "Name can't be blank"
     end

data/spec/features/flag_in_flags_spec.rb

@@ -22,6 +22,12 @@ describe "listing flag_in_flags" do
     visit "/detour/flag-ins/#{flag.feature.name}/users"
   end
 
+  it "displays the correct header" do
+    within "h1" do
+      page.should have_content "Users flagged in to #{flag.feature.name}"
+    end
+  end
+
   it "displays the flagged-in model's find-by" do
     page.find("input[type='text'][disabled]").value.should eq flag.flaggable.email
   end
@@ -58,8 +64,14 @@ describe "creating a flag-in", js: true do
       click_button "Update Flag-in"
     end
 
+    it "displays a correct error header" do
+      within ".panel-danger .panel-heading" do
+        page.should have_content "Whoops! There were some errors saving your flag-ins:"
+      end
+    end
+
     it "displays error messages" do
-      page.should have_content "Users flag ins user \"\" could not be found"
+      page.should have_content "User \"\" could not be found"
     end
   end
 end

data/spec/features/opt_out_flags_spec.rb

@@ -22,6 +22,12 @@ describe "listing opt_out_flags" do
     visit "/detour/opt-outs/#{flag.feature.name}/users"
   end
 
+  it "displays the correct header" do
+    within "h1" do
+      page.should have_content "Users opted out of #{flag.feature.name}"
+    end
+  end
+
   it "displays the opted-out model's find-by" do
     page.find("input[type='text'][disabled]").value.should eq flag.flaggable.email
   end
@@ -58,8 +64,14 @@ describe "creating a opt-out", js: true do
       click_button "Update Opt-outs"
     end
 
+    it "displays a correct error header" do
+      within ".panel-danger .panel-heading" do
+        page.should have_content "Whoops! There were some errors saving your opt-outs:"
+      end
+    end
+
     it "displays error messages" do
-      page.should have_content "Users opt outs user \"\" could not be found"
+      page.should have_content "User \"\" could not be found"
     end
   end
 end

data/spec/features/percentage_flags_spec.rb

@@ -42,7 +42,7 @@ describe "creating a percentage flag" do
     end
 
     it "displays error messages" do
-      page.should have_content "#{feature.name}: Users percentage flag percentage is not a number"
+      page.should have_content "#{feature.name}: Percentage is not a number"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: detour
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Jonathan Clem
@@ -244,6 +244,7 @@ files:
 - app/helpers/detour/flaggable_flags_helper.rb
 - app/helpers/detour/flags_helper.rb
 - app/models/detour/concerns/countable_flag.rb
+- app/models/detour/concerns/custom_human_attributes.rb
 - app/models/detour/concerns/keepable.rb
 - app/models/detour/database_group_flag.rb
 - app/models/detour/defined_group.rb