activity_notification 1.4.4 → 2.2.4

data/app/views/activity_notification/subscriptions/default/_subscription.html.erb

@@ -5,7 +5,7 @@
     </h3>
 
     <p>
-      <%= link_to "Notifications", notifications_path_for(subscription.target, filtered_by_key: subscription.key) %>
+      <%= link_to "Notifications", notifications_path_for(subscription.target, option_params.merge(filtered_by_key: subscription.key)) %>
     </p>
   </div>
 
@@ -18,18 +18,18 @@
     <div class="field">
       <div class="ui checkbox">
         <% if subscription.subscribing? %>
-          <%= link_to unsubscribe_path_for(subscription, option_params), onclick: '$(this).find("input").prop("checked", false);$(this).parent().parent().parent().next().slideUp();;$(this).parent().parent().parent().next().next().slideUp();', method: :post, remote: true do %>
+          <%= link_to unsubscribe_path_for(subscription, option_params), onclick: '$(this).find("input").prop("checked", false);$(this).parent().parent().parent().next().slideUp();;$(this).parent().parent().parent().next().next().slideUp();', method: :put, remote: true do %>
             <%= check_box :subscribing, "", { checked: true }, 'true', 'false' %>
             <div class="slider"></div>
           <% end %>
         <% else %>
           <% if ActivityNotification.config.subscribe_as_default %>
-            <%= link_to subscribe_path_for(subscription, option_params), onclick: '$(this).find("input").prop("checked", true);$(this).parent().parent().parent().next().slideDown();$(this).parent().parent().parent().next().find("input").prop("checked", true);$(this).parent().parent().parent().next().next().slideDown();$(this).parent().parent().parent().next().next().find("input").prop("checked", true);', method: :post, remote: true do %>
+            <%= link_to subscribe_path_for(subscription, option_params), onclick: "$(this).find(\"input\").prop(\"checked\", true);$(this).parent().parent().parent().next().slideDown();$(this).parent().parent().parent().next().find(\"input\").prop(\"checked\", #{ActivityNotification.config.subscribe_to_email_as_default.to_s});$(this).parent().parent().parent().next().next().slideDown();$(this).parent().parent().parent().next().next().find(\"input\").prop(\"checked\", #{ActivityNotification.config.subscribe_to_optional_targets_as_default});", method: :put, remote: true do %>
               <%= check_box :subscribing, "", { checked: false }, 'true', 'false' %>
               <div class="slider"></div>
             <% end %>
           <% else %>
-            <%= link_to subscribe_path_for(subscription, option_params.merge(with_email_subscription: false)), onclick: '$(this).find("input").prop("checked", true);$(this).parent().parent().parent().next().slideDown();$(this).parent().parent().parent().next().next().slideDown();', method: :post, remote: true do %>
+            <%= link_to subscribe_path_for(subscription, option_params), onclick: '$(this).find("input").prop("checked", true);$(this).parent().parent().parent().next().slideDown();$(this).parent().parent().parent().next().next().slideDown();', method: :put, remote: true do %>
               <%= check_box :subscribing, "", { checked: false }, 'true', 'false' %>
               <div class="slider"></div>
             <% end %>
@@ -48,14 +48,14 @@
     <div class="field">
       <div class="ui checkbox">
         <% if subscription.subscribing_to_email? %>
-          <%= link_to unsubscribe_to_email_url_for(subscription, option_params), onclick: '$(this).find("input").prop("checked", false)', method: :post, remote: true do %>
+          <%= link_to unsubscribe_to_email_path_for(subscription, option_params), onclick: '$(this).find("input").prop("checked", false)', method: :put, remote: true do %>
             <label>
               <%= check_box :subscribing_to_email, "", { checked: true }, 'true', 'false' %>
               <div class="slider"></div>
             </label>
           <% end %>
         <% else %>
-          <%= link_to subscribe_to_email_url_for(subscription, option_params), onclick: '$(this).find("input").prop("checked", true)', method: :post, remote: true do %>
+          <%= link_to subscribe_to_email_path_for(subscription, option_params), onclick: '$(this).find("input").prop("checked", true)', method: :put, remote: true do %>
             <label>
               <%= check_box :subscribing_to_email, "", { checked: false }, 'true', 'false' %>
               <div class="slider"></div>
@@ -76,14 +76,14 @@
       <div class="field">
         <div class="ui checkbox">
           <% if subscription.subscribing_to_optional_target?(optional_target_name) %>
-            <%= link_to unsubscribe_to_optional_target_url_for(subscription, option_params.merge(optional_target_name: optional_target_name)), onclick: '$(this).find("input").prop("checked", false)', method: :post, remote: true do %>
+            <%= link_to unsubscribe_to_optional_target_path_for(subscription, option_params.merge(optional_target_name: optional_target_name)), onclick: '$(this).find("input").prop("checked", false)', method: :put, remote: true do %>
               <label>
                 <%= check_box optional_target_name, "", { checked: true }, 'true', 'false' %>
                 <div class="slider"></div>
               </label>
             <% end %>
           <% else %>
-            <%= link_to subscribe_to_optional_target_url_for(subscription, option_params.merge(optional_target_name: optional_target_name)), onclick: '$(this).find("input").prop("checked", true)', method: :post, remote: true do %>
+            <%= link_to subscribe_to_optional_target_path_for(subscription, option_params.merge(optional_target_name: optional_target_name)), onclick: '$(this).find("input").prop("checked", true)', method: :put, remote: true do %>
               <label>
                 <%= check_box optional_target_name, "", { checked: false }, 'true', 'false' %>
                 <div class="slider"></div>

data/app/views/activity_notification/subscriptions/default/index.html.erb

@@ -1,7 +1,11 @@
 <div class="subscription_wrapper">
+  <div class="subscription_header">
+    <h1>Subscriptions for <%= @target.printable_target_name %></h1>
+  </div>
+
   <% unless @subscriptions.nil? %>
     <div class="subscription_header">
-      <h1>Configured subscriptions</h1>
+      <h2>Configured subscriptions</h2>
     </div>
     <div class="subscriptions" id="subscriptions">
       <%= render 'subscriptions', subscriptions: @subscriptions, option_params: @index_options %>
@@ -10,7 +14,7 @@
 
   <% unless @notification_keys.nil? %>
     <div class="subscription_header">
-      <h1>Unconfigured notification keys</h1>
+      <h2>Unconfigured notification keys</h2>
     </div>
     <div class="notification_keys" id="notification_keys">
       <%= render 'notification_keys', target: @target, notification_keys: @notification_keys, option_params: @index_options %>
@@ -18,7 +22,7 @@
   <% end %>
 
   <div class="subscription_header">
-    <h1>Create a new subscription</h1>
+    <h2>Create a new subscription</h2>
   </div>
   <div class="subscription_form" id="subscription_form">
     <%= render 'form', target: @target, option_params: @index_options %>
@@ -26,6 +30,10 @@
 </div>
 
 <style>
+  .subscription_header h1 {
+    margin-bottom: 30px;
+  }
+
   .fields_area {
     border: 1px solid #e5e5e5;
     width: 600px;
@@ -44,10 +52,6 @@
     background-color: #f8f9fb;
   }
 
-  .fields_area .fields_wrapper:last-child {
-    border-bottom: none;
-  }
-
   .fields_area .fields_wrapper .fields_title_wrapper {
     margin-bottom: 16px;
     border-bottom: none;
@@ -185,9 +189,9 @@
       $thisFieldWrapper = $(this).parent().parent().parent().parent();
       if ($(this).prop('checked')) {
         $thisFieldWrapper.next().slideDown();
-        $thisFieldWrapper.next().find("input[type='checkbox']").prop("checked", <%= ActivityNotification.config.subscribe_as_default %>);
+        $thisFieldWrapper.next().find("input[type='checkbox']").prop("checked", <%= ActivityNotification.config.subscribe_to_email_as_default %>);
         $thisFieldWrapper.next().next().slideDown();
-        $thisFieldWrapper.next().next().find("input[type='checkbox']").prop("checked", <%= ActivityNotification.config.subscribe_as_default %>);
+        $thisFieldWrapper.next().next().find("input[type='checkbox']").prop("checked", <%= ActivityNotification.config.subscribe_to_optional_targets_as_default %>);
       } else {
         $thisFieldWrapper.next().slideUp();
         $thisFieldWrapper.next().next().slideUp();

data/app/views/activity_notification/subscriptions/default/show.html.erb

@@ -4,7 +4,7 @@
   </div>
   <div class="fields_area">
     <div class="subscription" id="subscription">
-      <%= render 'subscription', subscription: @subscription, option_params: {} %>
+      <%= render 'subscription', subscription: @subscription, option_params: @index_options %>
     </div>
   </div>
 </div>
@@ -165,9 +165,9 @@
       $thisFieldWrapper = $(this).parent().parent().parent().parent();
       if ($(this).prop('checked')) {
         $thisFieldWrapper.next().slideDown();
-        $thisFieldWrapper.next().find("input[type='checkbox']").prop("checked", <%= ActivityNotification.config.subscribe_as_default %>);
+        $thisFieldWrapper.next().find("input[type='checkbox']").prop("checked", <%= ActivityNotification.config.subscribe_to_email_as_default %>);
         $thisFieldWrapper.next().next().slideDown();
-        $thisFieldWrapper.next().next().find("input[type='checkbox']").prop("checked", <%= ActivityNotification.config.subscribe_as_default %>);
+        $thisFieldWrapper.next().next().find("input[type='checkbox']").prop("checked", <%= ActivityNotification.config.subscribe_to_optional_targets_as_default %>);
       } else {
         $thisFieldWrapper.next().slideUp();
         $thisFieldWrapper.next().next().slideUp();

data/app/views/activity_notification/subscriptions/default/subscribe.js.erb

@@ -1,6 +1,6 @@
 setTimeout(function () {
   $("#subscriptions").html("<%= escape_javascript( render 'subscriptions', subscriptions: @subscriptions, option_params: @index_options ) %>");
-  $("#subscription").html("<%= escape_javascript( render 'subscription', subscription: @subscription, option_params: {} ) %>");
+  $("#subscription").html("<%= escape_javascript( render 'subscription', subscription: @subscription, option_params: @index_options ) %>");
 }, 400);
 $("#notification_keys").html("<%= escape_javascript( render 'notification_keys', target: @target, notification_keys: @notification_keys, option_params: @index_options ) %>");
 $("#subscription_form").html("<%= escape_javascript( render 'form', target: @target, option_params: @index_options ) %>");

data/app/views/activity_notification/subscriptions/default/subscribe_to_email.js.erb

@@ -1,5 +1,5 @@
 $("#subscriptions").html("<%= escape_javascript( render 'subscriptions', subscriptions: @subscriptions, option_params: @index_options ) %>");
-$("#subscription").html("<%= escape_javascript( render 'subscription', subscription: @subscription, option_params: {} ) %>");
+$("#subscription").html("<%= escape_javascript( render 'subscription', subscription: @subscription, option_params: @index_options ) %>");
 $("#notification_keys").html("<%= escape_javascript( render 'notification_keys', target: @target, notification_keys: @notification_keys, option_params: @index_options ) %>");
 $("#subscription_form").html("<%= escape_javascript( render 'form', target: @target, option_params: @index_options ) %>");
 

data/app/views/activity_notification/subscriptions/default/subscribe_to_optional_target.js.erb

@@ -1,5 +1,5 @@
 $("#subscriptions").html("<%= escape_javascript( render 'subscriptions', subscriptions: @subscriptions, option_params: @index_options ) %>");
-$("#subscription").html("<%= escape_javascript( render 'subscription', subscription: @subscription, option_params: {} ) %>");
+$("#subscription").html("<%= escape_javascript( render 'subscription', subscription: @subscription, option_params: @index_options ) %>");
 $("#notification_keys").html("<%= escape_javascript( render 'notification_keys', target: @target, notification_keys: @notification_keys, option_params: @index_options ) %>");
 $("#subscription_form").html("<%= escape_javascript( render 'form', target: @target, option_params: @index_options ) %>");
 

data/app/views/activity_notification/subscriptions/default/unsubscribe.js.erb

@@ -1,6 +1,6 @@
 setTimeout(function () {
   $("#subscriptions").html("<%= escape_javascript( render 'subscriptions', subscriptions: @subscriptions, option_params: @index_options ) %>");
-  $("#subscription").html("<%= escape_javascript( render 'subscription', subscription: @subscription, option_params: {} ) %>");
+  $("#subscription").html("<%= escape_javascript( render 'subscription', subscription: @subscription, option_params: @index_options ) %>");
 }, 400);
 $("#notification_keys").html("<%= escape_javascript( render 'notification_keys', target: @target, notification_keys: @notification_keys, option_params: @index_options ) %>");
 $("#subscription_form").html("<%= escape_javascript( render 'form', target: @target, option_params: @index_options ) %>");

data/app/views/activity_notification/subscriptions/default/unsubscribe_to_email.js.erb

@@ -1,5 +1,5 @@
 $("#subscriptions").html("<%= escape_javascript( render 'subscriptions', subscriptions: @subscriptions, option_params: @index_options ) %>");
-$("#subscription").html("<%= escape_javascript( render 'subscription', subscription: @subscription, option_params: {} ) %>");
+$("#subscription").html("<%= escape_javascript( render 'subscription', subscription: @subscription, option_params: @index_options ) %>");
 $("#notification_keys").html("<%= escape_javascript( render 'notification_keys', target: @target, notification_keys: @notification_keys, option_params: @index_options ) %>");
 $("#subscription_form").html("<%= escape_javascript( render 'form', target: @target, option_params: @index_options ) %>");
 

data/app/views/activity_notification/subscriptions/default/unsubscribe_to_optional_target.js.erb

@@ -1,5 +1,5 @@
 $("#subscriptions").html("<%= escape_javascript( render 'subscriptions', subscriptions: @subscriptions, option_params: @index_options ) %>");
-$("#subscription").html("<%= escape_javascript( render 'subscription', subscription: @subscription, option_params: {} ) %>");
+$("#subscription").html("<%= escape_javascript( render 'subscription', subscription: @subscription, option_params: @index_options ) %>");
 $("#notification_keys").html("<%= escape_javascript( render 'notification_keys', target: @target, notification_keys: @notification_keys, option_params: @index_options ) %>");
 $("#subscription_form").html("<%= escape_javascript( render 'form', target: @target, option_params: @index_options ) %>");
 

data/bin/_dynamodblocal

@@ -0,0 +1,4 @@
+DIST_DIR=spec/DynamoDBLocal-latest
+PIDFILE=dynamodb.pid
+LISTEN_PORT=8000
+LOG_DIR="logs"

data/bin/bundle_update.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+bundle update
+BUNDLE_GEMFILE=gemfiles/Gemfile.rails-5.0 bundle update
+BUNDLE_GEMFILE=gemfiles/Gemfile.rails-5.1 bundle update
+BUNDLE_GEMFILE=gemfiles/Gemfile.rails-5.2 bundle update
+BUNDLE_GEMFILE=gemfiles/Gemfile.rails-6.0.rc bundle update

data/bin/deploy_on_heroku.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+HEROKU_DEPLOYMENT_BRANCH=heroku-deployment
+
+CURRENT_BRANCH=`git symbolic-ref --short HEAD`
+git checkout -b $HEROKU_DEPLOYMENT_BRANCH
+bundle install
+sed -i "" -e "s/^\/Gemfile.lock/# \/Gemfile.lock/g" .gitignore
+cp spec/rails_app/bin/webpack* bin/
+git add .gitignore
+git add Gemfile.lock
+git add bin/webpack*
+git commit -m "Add Gemfile.lock and webpack"
+git push heroku ${HEROKU_DEPLOYMENT_BRANCH}:master --force
+git checkout $CURRENT_BRANCH
+git branch -D $HEROKU_DEPLOYMENT_BRANCH

data/bin/install_dynamodblocal.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+wget https://s3-us-west-2.amazonaws.com/dynamodb-local/dynamodb_local_latest.zip --quiet -O spec/dynamodb_temp.zip
+unzip -qq spec/dynamodb_temp.zip -d spec/DynamoDBLocal-latest
+rm spec/dynamodb_temp.zip

data/bin/start_dynamodblocal.sh

@@ -0,0 +1,47 @@
+#!/bin/sh
+
+# Source variables
+. $(dirname $0)/_dynamodblocal
+
+if [ -z $JAVA_HOME ]; then
+  echo >&2 'ERROR: DynamoDBLocal requires JAVA_HOME to be set.'
+  exit 1
+fi
+
+if [ ! -x $JAVA_HOME/bin/java ]; then
+  echo >&2 'ERROR: JAVA_HOME is set, but I do not see the java executable there.'
+  exit 1
+fi
+
+cd $DIST_DIR
+
+if [ ! -f DynamoDBLocal.jar ] || [ ! -d DynamoDBLocal_lib ]; then
+  echo >&2 "ERROR: Could not find DynamoDBLocal files in $DIST_DIR."
+  exit 1
+fi
+
+mkdir -p $LOG_DIR
+echo "DynamoDB Local output will save to ${DIST_DIR}/${LOG_DIR}/"
+hash lsof 2>/dev/null && lsof -i :$LISTEN_PORT && { echo >&2 "Something is already listening on port $LISTEN_PORT; I will not attempt to start DynamoDBLocal."; exit 1; }
+
+NOW=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
+nohup $JAVA_HOME/bin/java -Djava.library.path=./DynamoDBLocal_lib -jar DynamoDBLocal.jar -delayTransientStatuses -port $LISTEN_PORT -inMemory 1>"${LOG_DIR}/${NOW}.out.log" 2>"${LOG_DIR}/${NOW}.err.log" &
+PID=$!
+
+echo 'Verifying that DynamoDBLocal actually started...'
+
+# Allow some seconds for the JDK to start and die.
+counter=0
+while [ $counter -le 5 ]; do
+  kill -0 $PID
+  if [ $? -ne 0 ]; then
+    echo >&2 'ERROR: DynamoDBLocal died after we tried to start it!'
+    exit 1
+  else
+    counter=$(($counter + 1))
+    sleep 1
+  fi
+done
+
+echo "DynamoDB Local started with pid $PID listening on port $LISTEN_PORT."
+echo $PID > $PIDFILE

data/bin/stop_dynamodblocal.sh

@@ -0,0 +1,34 @@
+#!/bin/sh
+
+# Source variables
+. $(dirname $0)/_dynamodblocal
+
+cd $DIST_DIR
+
+if [ ! -f $PIDFILE ]; then
+  echo 'ERROR: There is no pidfile, so if DynamoDBLocal is running you will need to kill it yourself.'
+  exit 1
+fi
+
+pid=$(<$PIDFILE)
+
+echo "Killing DynamoDBLocal at pid $pid..."
+kill $pid
+
+counter=0
+while [ $counter -le 5 ]; do
+  kill -0 $pid 2>/dev/null
+  if [ $? -ne 0 ]; then
+    echo 'Successfully shut down DynamoDBLocal.'
+    rm -f $PIDFILE
+    exit 0
+  else
+    echo 'Still waiting for DynamoDBLocal to shut down...'
+    counter=$(($counter + 1))
+    sleep 1
+  fi
+done
+
+echo 'Unable to shut down DynamoDBLocal; you may need to kill it yourself.'
+rm -f $PIDFILE
+exit 1

data/docs/CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at shota.yamazaki.8@gmail.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

data/docs/CONTRIBUTING.md

@@ -0,0 +1,36 @@
+## How to contribute to *activity_notification*
+
+#### **Did you find a bug?**
+
+* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/simukappu/activity_notification/issues).
+
+* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/simukappu/activity_notification/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible.
+
+#### **Did you write code set for a new feature or a patch that fixes a bug?**
+
+* Open a new GitHub pull request with your code set.
+
+* Ensure the pull request description clearly describes the problem and solution. Include the relevant issue number if applicable.
+
+* Before submitting, please check the followings:
+  * Write tests with RSpec to cover your changes
+  * Write code documents as YARD format to cover your changes
+  * Write [README](/README.md) and [Functions](/docs/Functions.md) documents if applicable
+
+#### **Did you fix whitespace, format code, or make a purely cosmetic patch?**
+
+* Feel free to create a new GitHub pull request.
+
+* If changes that are cosmetic in nature and do not add anything substantial to the stability, functionality, or testability of the gem may not be accepted.
+
+#### **Do you intend to add a new feature or change an existing one?**
+
+* Open an issue on GitHub to suggest your change and collect feedback about the change.
+
+#### **Do you have questions about the source code?**
+
+* If you're unable to find any answers from public information and your own investigation, you can ask any questions about how to use *activity_notification* by creating GitHub issue.
+
+*activity_notification* is a volunteer effort. We appreciate any of your contribution!
+
+Thank you!