Merge pull request #3143 from TracksApp/dependabot/bundler/nokogiri-1.18.9

Bump nokogiri from 1.18.8 to 1.18.9

.codeclimate.yml

@@ -0,0 +1,25 @@
+version: "2"
+checks:
+  file-lines:
+    config:
+      threshold: 300
+  method-complexity:
+    config:
+      threshold: 50
+  method-count:
+    config:
+      threshold: 20
+  method-lines:
+    config:
+      threshold: 100
+plugins:
+  brakeman:
+    enabled: true
+  fixme:
+    enabled: true
+  flog:
+    enabled: true
+  reek:
+    enabled: true
+#exclude_patterns:
+#- app/assets/javascripts-jquery-ui

.dockerignore

@@ -0,0 +1,9 @@
+.bundle
+config/database.yml
+config/site.yml
+coverage
+db/*.sqlite3
+features
+log
+public/assets
+tmp

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+custom: ['https://www.taskitin.fi/']
+github: zeip

.github/dependabot.yml

@@ -0,0 +1,12 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 10

.github/workflows/build-custom-release.yml

@@ -0,0 +1,55 @@
+---
+name: 'Build custom release'
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Tag to release'
+        required: true
+        type: string
+      name:
+        description: 'Name of the release'
+        required: true
+        type: string
+
+jobs:
+  build-and-publish-release:
+    name: 'Build custom release'
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout the code
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ inputs.tag }}
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          target: production
+          push: true
+          tags: |
+            tracksapp/tracks:${{ inputs.name }}
+            ghcr.io/tracksapp/tracks:${{ inputs.name }}
+
+#          platforms: linux/amd64,linux/arm64

.github/workflows/build-latest.yml

@@ -0,0 +1,45 @@
+---
+name: 'Build latest'
+on:
+  push:
+    branches:
+    - master
+
+jobs:
+  build-and-publish-latest:
+    name: 'Build latest'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2 # Checking out the repo
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          target: production
+          push: true
+          tags: |
+            tracksapp/tracks:latest
+            tracksapp/tracks:master
+            ghcr.io/tracksapp/tracks:latest
+
+#          platforms: linux/amd64,linux/arm64

.github/workflows/build-release.yml

@@ -0,0 +1,44 @@
+---
+name: 'Build release'
+on:
+  release:
+    types:
+      - published
+
+jobs:
+  build-and-publish-release:
+    name: 'Build release'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2 # Checking out the repo
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          target: production
+          push: true
+          tags: |
+            tracksapp/tracks:${{ github.event.release.name }}
+            ghcr.io/tracksapp/tracks:${{ github.event.release.name }}
+
+#          platforms: linux/amd64,linux/arm64

.github/workflows/continuous-integration.yml

@@ -0,0 +1,13 @@
+---
+name: Automated tests
+on: pull_request
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ["3.2", "3.3"]
+        db: [sqlite, mysql, postgres]
+    steps:
+      - uses: actions/checkout@v1
+      - run: bash -x script/cibuild ${{ matrix.ruby }} ${{ matrix.db }}

.gitignore

@@ -1,25 +1,29 @@
-*~
+*.DS_Store
 *.tmproj
+*~
 .dotest
-/.emacs-project
-/.redcar
-config/database.yml
-config/site.yml
-config/deploy.rb
-/db/*.sqlite3
-/db/*.db
-db/data.yml
-db/schema.rb
-/log/*.log
-nbproject
-/tmp
-vendor/plugins/query_trace/
-rerun.txt
 .idea
 .rvmrc
-.yardoc
-tags
-/.bundle
-/public/assets/
+.ruby-gemset
+.ruby-version
 .sass-cache/
+.yardoc
+/.bundle
+/.emacs-project
+/.redcar
 /coverage
+/db/*.db
+/db/*.sqlite3
+/db/*.sqlite3-journal
+/db/assets/*
+/log/*.log
+/public/assets/
+/tmp
+config/deploy.rb
+config/site.yml
+config/database.yml
+db/data.yml
+nbproject
+rerun.txt
+tags
+.use-docker

.rubocop.yml

@@ -0,0 +1,35 @@
+Rails:
+  Enabled: true
+
+AllCops:
+  Exclude:
+    - bin/*
+
+Metrics/LineLength:
+  Max: 120
+
+Style/Documentation:
+  Enabled: false
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Layout/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+
+Metrics/AbcSize:
+  Max: 100
+Metrics/CyclomaticComplexity:
+  Max: 100
+Metrics/MethodLength:
+  Max: 100
+  CountAsOne: ['array', 'hash', 'heredoc']
+Metrics/ModuleLength:
+  Max: 300
+  CountAsOne: ['array', 'hash', 'heredoc']
+Metrics/ClassLength:
+  Max: 300
+Metrics/ParameterLists:
+  Max: 20
+Metrics/PerceivedComplexity:
+  Max: 100

.ruby-version

@@ -0,0 +1 @@
+3.3

.travis.yml

@@ -1,18 +0,0 @@
-language: ruby
-rvm:
- - 1.9.3
-
-before_install:
-  - "mysql -e 'create database tracks_test;'"
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-  - "cp config/site.yml.tmpl config/site.yml"
-  - "cp config/database.yml.tmpl config/database.yml"
-
-script: "bundle exec rake ci"
-
-bundler_args: --without development
-notifications:
-  recipients:
-    - tracksapp@googlegroups.com
-

CONTRIBUTING.md

@@ -0,0 +1,33 @@
+# Contributing
+All contributions are welcome.
+
+There are different ways in which you can contribute to Tracks.
+
+## Documentation
+You can contribute documentation in the [wiki](https://github.com/TracksApp/tracks/wiki).
+
+For example:
+- tutorials on installing Tracks in various environments
+- tutorials on using Tracks (user manual)
+
+## Issues
+If you think having found a problem with Tracks, first search in the [existing issues](https://github.com/TracksApp/tracks/issues). If you cannot find it, open a new issue and try providing information on your setup and what steps are needed to reproduce the problem.
+
+## Enhancements
+It would be great to first discuss them on the [mailing list](https://groups.google.com/group/TracksApp) so you can figure out if it could be merged or not. You may use the wiki too to describe your change if it is too big for an email.
+
+If you want to contribute an enhancement or a fix, you can:
+
+1. [fork the project](https://help.github.com/articles/fork-a-repo) 
+2. [create a topic branch](http://learn.github.com/p/branching.html).
+3. install [docker-compose](https://docs.docker.com/compose/)
+4. copy `app/config/site.yml.tmpl` to `app/config/site.yml` and customize as needed
+5. then with `./bin/setup` you will prepare for the first run
+6. start the server with `./script/server` which will start everything you need in Docker and present Tracks at [http://0.0.0.0:3000](http://0.0.0.0:3000)
+7. if you need, you can launch a Rails console with `./bin/rails c` (will run inside Docker)
+8. make your changes and add/update relevant tests
+9. run the test suite with `./bin/rake test` (will run inside Docker)
+10. commit the changes
+11. send a pull request.
+
+Make sure that you've added the necessary tests for any new functionality and preferably also for any bugs and that your contribution conforms to the coding style defined by the CodeClimate checks. The coding style definition should be approximately the same as the [Shopify Ruby Style Guide](https://ruby-style-guide.shopify.dev/).

COPYING

@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

Capfile

@@ -1,3 +0,0 @@
-load 'deploy' if respond_to?(:namespace) # cap2 differentiator
-Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
-load 'config/deploy'

Dockerfile

@@ -0,0 +1,66 @@
+ARG RUBY_VERSION=3.3
+FROM ruby:${RUBY_VERSION} AS base
+
+WORKDIR /app
+RUN touch /etc/app-env
+
+RUN apt-get update && apt-get install -y npm netcat-openbsd
+RUN npm install -g yarn
+RUN gem install bundler
+
+RUN mkdir /app/log
+
+COPY COPYING /app/
+COPY config /app/config/
+COPY config/database.docker.yml /app/config/database.yml
+COPY config/site.docker.yml /app/config/site.yml
+
+COPY bin /app/bin/
+COPY script /app/script/
+COPY public /app/public/
+COPY vendor /app/vendor/
+
+COPY .yardopts /app/
+COPY Rakefile /app/
+COPY config.ru /app/
+COPY docker-entrypoint.sh /app/
+
+COPY lib /app/lib/
+COPY app /app/app/
+COPY db /app/db/
+
+# Use glob to omit error if the .git directory doesn't exists (in case the
+# code is from a release archive, not a Git clone)
+COPY .gi[t] /app/.git
+
+COPY Gemfile* /app/
+
+ENTRYPOINT ["/app/docker-entrypoint.sh"]
+EXPOSE 3000
+CMD ["./bin/rails", "server", "-b", "0.0.0.0"]
+
+FROM base AS precompile
+RUN bundle config set deployment true
+RUN bundle install --jobs 4
+RUN RAILS_GROUPS=assets bundle exec rake assets:precompile
+
+# Build the environment-specific stuff
+FROM base AS production
+RUN bundle config set without assets
+RUN bundle config --global frozen 1
+RUN bundle install --jobs 4
+COPY --from=precompile /app/public/assets /app/public/assets
+
+FROM base AS test
+COPY test /app/test/
+# For testing the API client
+COPY doc /app/doc/
+RUN bundle config set without assets
+RUN bundle config set with development test
+RUN bundle config --global frozen 1
+RUN bundle install --jobs 4
+COPY --from=precompile /app/public/assets /app/public/assets
+
+FROM base AS development
+RUN bundle config set with development test
+RUN bundle install --jobs 4

Gemfile

@@ -1,72 +1,72 @@
 source 'https://rubygems.org'
 
-gem 'rails'
+gem 'actionpack-xml_parser', '~> 2.0'
+gem 'activemodel-serializers-xml', '~> 1.0.3'
 
-# you may comment out the database driver you will not be using.
-# This will prevent a native build of the driver. Building native drivers is not 
-# always possible on all hosters
-gem "sqlite3"
-gem "mysql2"
+gem 'rails', '~> 7.1'
 
-gem "RedCloth"
-gem "formatize"
-gem "sanitize"
-gem "will_paginate"
-gem "acts_as_list"
-gem "aasm"
-gem "htmlentities"
-gem "swf_fu"
-gem "rails_autolink"
-gem "cache_digests", :git => 'git://github.com/lrbalt/cache_digests.git'
-gem "rack-mini-profiler"
+gem 'font-awesome-sass', '~> 6.7.2'
+gem 'jquery-rails', '~> 4.6'
+gem 'jquery-ui-rails', '~>8.0.0'
+gem 'aasm', '~> 5.5.1'
+gem 'acts_as_list'
+gem 'bcrypt', '~> 3.1.20'
+gem 'htmlentities'
+gem "kt-paperclip", "~> 7.2"
+gem 'puma', '~> 6.6'
+gem 'rails_autolink'
+gem 'RedCloth'
+gem 'sanitize', '~> 7.0'
+gem 'tracks-chartjs-ror'
+gem 'will_paginate'
 
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
-  gem 'sass-rails'
-  gem 'coffee-rails'
+gem 'rexml'
 
-  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  gem 'therubyracer', :platform => :ruby
-  gem "libv8"
+# Use --without <group> argument to skip unnecessary drivers
+gem 'sqlite3', '~> 2.7', group: :sqlite
+gem 'mysql2', '~> 0.5', group: :mysql
+gem 'pg', '~> 1.5', group: :postgresql
 
-  gem 'uglifier'
+# See https://github.com/sstephenson/execjs#readme for more supported runtimes
+gem 'mini_racer', group: :therubyracer
+
+gem 'sprockets-rails'
+gem 'coffee-rails', '~> 5.0.0'
+gem 'dartsass-sprockets'
+gem 'bootstrap-sass', '3.4.1'
+gem 'terser'
+gem 'listen'
+gem 'tolk', '~> 6.0.0'
+
+group :development, :optional => true do
+  gem 'spring', '~> 4'
+  gem 'yard'
+
+  gem 'bullet'
+  gem 'rack-mini-profiler'
+  gem 'solargraph'
+
+  gem 'i18n-tasks', '~> 1.0.15'
 end
 
-gem 'jquery-rails'
-
-# To use ActiveModel has_secure_password
-gem 'bcrypt-ruby'
-
-group :development do
-  if RUBY_VERSION.to_f >= 1.9
-    # gem "ruby-debug19", :require => 'ruby-debug'
-    gem "mongrel", ">=1.2.0.pre2"
-  else
-    gem "ruby-debug"
-    gem "mongrel"
-  end
-  gem "yard"
-  gem "tolk"
-  gem "bullet"
+group :development, :test, :optional => true do
+  gem 'byebug'
+  gem 'rubocop', '~> 1.78'
 end
 
-group :test do
-  gem "factory_girl_rails"
-  gem "capybara"
-  gem "cucumber-rails", :require => false
-  gem "database_cleaner"
-  gem "aruba"
-  gem "simplecov"
-
-  # Note that > 2.14 has problems, see: 
-  # https://code.google.com/p/selenium/issues/detail?id=3075
-  gem "selenium-webdriver" 
-  
-  # uncomment to use the webkit option. This depends on Qt to be installed
-  #gem "capybara-webkit"
-  
-  # uncomment to be able to make screenshots from scenarios
-  #gem "capybara-screenshot"
-  #gem "launchy"
+group :test, :optional => true do
+  # get test coverage info on codeclimate
+  gem 'codeclimate-test-reporter', '1.0.9'
+  gem 'database_cleaner', '~> 2'
+  gem 'factory_bot_rails'
+  gem 'minitest-stub-const'
+  gem 'mocha'
+  gem 'rails-controller-testing'
+  gem 'rails-dom-testing', '~> 2.3.0'
+  gem 'rspec-expectations'
+  gem 'simplecov'
+end
+
+group :stripe, :optional => true do
+  gem 'stripe'
 end

Gemfile.lock

@@ -1,235 +1,471 @@
-GIT
-  remote: git://github.com/lrbalt/cache_digests.git
-  revision: 8469c4153c84c0d918b01daccaa1e69747e93e89
-  specs:
-    cache_digests (0.1.0)
-      actionpack (>= 3.2)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    RedCloth (4.2.9)
-    aasm (3.0.14)
-    actionmailer (3.2.9)
-      actionpack (= 3.2.9)
-      mail (~> 2.4.4)
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
-      builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-    activesupport (3.2.9)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    acts_as_list (0.1.9)
-    addressable (2.3.2)
-    arel (3.0.2)
-    aruba (0.5.1)
-      childprocess (~> 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
-    bcrypt-ruby (3.0.1)
-    bluecloth (2.2.0)
-    builder (3.0.4)
-    bullet (4.2.0)
-      uniform_notifier
-    capybara (2.0.1)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 1.0.0)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
-    coffee-rails (3.2.2)
+    RedCloth (4.3.4)
+    aasm (5.5.1)
+      concurrent-ruby (~> 1.0)
+    actioncable (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+      zeitwerk (~> 2.6)
+    actionmailbox (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      actionview (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.2)
+    actionpack (7.1.5.1)
+      actionview (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actionpack-xml_parser (2.0.1)
+      actionpack (>= 5.0)
+      railties (>= 5.0)
+    actiontext (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (7.1.5.1)
+      activesupport (= 7.1.5.1)
+      builder (~> 3.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (7.1.5.1)
+      activesupport (= 7.1.5.1)
+      globalid (>= 0.3.6)
+    activemodel (7.1.5.1)
+      activesupport (= 7.1.5.1)
+    activemodel-serializers-xml (1.0.3)
+      activemodel (>= 5.0.0.a)
+      activesupport (>= 5.0.0.a)
+      builder (~> 3.1)
+    activerecord (7.1.5.1)
+      activemodel (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      timeout (>= 0.4.0)
+    activestorage (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      marcel (~> 1.0)
+    activesupport (7.1.5.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      mutex_m
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0)
+    acts_as_list (1.2.4)
+      activerecord (>= 6.1)
+      activesupport (>= 6.1)
+    ast (2.4.3)
+    autoprefixer-rails (10.4.21.0)
+      execjs (~> 2)
+    backport (1.2.0)
+    base64 (0.3.0)
+    bcrypt (3.1.20)
+    benchmark (0.4.1)
+    bigdecimal (3.2.2)
+    bootstrap-sass (3.4.1)
+      autoprefixer-rails (>= 5.2.1)
+      sassc (>= 2.0.0)
+    builder (3.3.0)
+    bullet (8.0.8)
+      activesupport (>= 3.0.0)
+      uniform_notifier (~> 1.11)
+    byebug (12.0.0)
+    climate_control (0.2.0)
+    codeclimate-test-reporter (1.0.9)
+      simplecov (<= 0.13)
+    coffee-rails (5.0.0)
       coffee-script (>= 2.2.0)
-      railties (~> 3.2.0)
-    coffee-script (2.2.0)
+      railties (>= 5.2.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.4.0)
-    cucumber (1.2.1)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
-    cucumber-rails (1.3.0)
-      capybara (>= 1.1.2)
-      cucumber (>= 1.1.8)
-      nokogiri (>= 1.5.0)
-    daemons (1.0.10)
-    database_cleaner (0.9.1)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
-    factory_girl (4.1.0)
-      activesupport (>= 3.0.0)
-    factory_girl_rails (4.1.0)
-      factory_girl (~> 4.1.0)
-      railties (>= 3.0.0)
-    ffi (1.2.0)
-    formatize (1.1.0)
-      RedCloth (~> 4.2)
-      actionpack (~> 3.0)
-      bluecloth (~> 2.2)
-    gem_plugin (0.2.3)
-    gherkin (2.11.5)
-      json (>= 1.4.6)
-    hike (1.2.1)
-    htmlentities (4.3.1)
-    i18n (0.6.1)
-    journey (1.0.4)
-    jquery-rails (2.1.4)
-      railties (>= 3.0, < 5.0)
+    coffee-script-source (1.12.2)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
+    crass (1.0.6)
+    dartsass-sprockets (3.2.1)
+      railties (>= 4.0.0)
+      sassc-embedded (~> 1.80.1)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
+    database_cleaner (2.1.0)
+      database_cleaner-active_record (>= 2, < 3)
+    database_cleaner-active_record (2.2.0)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    date (3.4.1)
+    diff-lcs (1.6.2)
+    docile (1.1.5)
+    drb (2.2.3)
+    erb (5.0.1)
+    erubi (1.13.1)
+    execjs (2.10.0)
+    factory_bot (6.5.4)
+      activesupport (>= 6.1.0)
+    factory_bot_rails (6.5.0)
+      factory_bot (~> 6.5)
+      railties (>= 6.1.0)
+    ffi (1.17.0)
+    font-awesome-sass (6.7.2)
+      sassc (~> 2.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    google-protobuf (4.31.1)
+      bigdecimal
+      rake (>= 13)
+    highline (3.1.2)
+      reline
+    htmlentities (4.3.4)
+    i18n (1.14.7)
+      concurrent-ruby (~> 1.0)
+    i18n-tasks (1.0.15)
+      activesupport (>= 4.0.2)
+      ast (>= 2.1.0)
+      erubi
+      highline (>= 2.0.0)
+      i18n
+      parser (>= 3.2.2.1)
+      rails-i18n
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.8, >= 1.8.1)
+      terminal-table (>= 1.5.1)
+    io-console (0.8.0)
+    irb (1.15.2)
+      pp (>= 0.6.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    jaro_winkler (1.6.1)
+    jquery-rails (4.6.0)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (1.7.5)
-    libv8 (3.11.8.4)
-    libwebsocket (0.1.7.1)
-      addressable
-      websocket
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.19)
-    mongrel (1.2.0.pre2)
-      daemons (~> 1.0.10)
-      gem_plugin (~> 0.2.3)
-    multi_json (1.5.0)
-    mysql2 (0.3.11)
-    nokogiri (1.5.6)
-    polyglot (0.3.3)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-mini-profiler (0.1.23)
-      rack (>= 1.1.3)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.2.9)
-      actionmailer (= 3.2.9)
-      actionpack (= 3.2.9)
-      activerecord (= 3.2.9)
-      activeresource (= 3.2.9)
-      activesupport (= 3.2.9)
-      bundler (~> 1.0)
-      railties (= 3.2.9)
-    rails_autolink (1.0.9)
-      rails (~> 3.1)
-    railties (3.2.9)
-      actionpack (= 3.2.9)
-      activesupport (= 3.2.9)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
-    rdoc (3.12)
-      json (~> 1.4)
-    ref (1.0.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rubyzip (0.9.9)
-    sanitize (2.0.3)
-      nokogiri (>= 1.4.4, < 1.6)
-    sass (3.2.4)
-    sass-rails (3.2.5)
-      railties (~> 3.2.0)
-      sass (>= 3.1.10)
-      tilt (~> 1.3)
-    selenium-webdriver (2.27.2)
-      childprocess (>= 0.2.5)
-      libwebsocket (~> 0.1.3)
-      multi_json (~> 1.0)
-      rubyzip
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    swf_fu (2.0.3)
-      coffee-script
+    jquery-ui-rails (8.0.0)
+      railties (>= 3.2.16)
+    json (2.12.2)
+    kramdown (2.5.1)
+      rexml (>= 3.3.9)
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    kt-paperclip (7.2.0)
+      activemodel (>= 4.2.0)
+      activesupport (>= 4.2.0)
+      marcel (~> 1.0.1)
+      mime-types
+      terrapin (~> 0.6.0)
+    language_server-protocol (3.17.0.5)
+    libv8-node (24.1.0.0)
+    lint_roller (1.1.0)
+    listen (3.9.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.7.0)
+    loofah (2.24.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.4)
+    mime-types (3.4.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2023.0218.1)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.9)
+    mini_racer (0.19.0)
+      libv8-node (~> 24.1.0.0)
+    minitest (5.25.5)
+    minitest-stub-const (0.6)
+    mocha (2.7.1)
+      ruby2_keywords (>= 0.0.5)
+    mutex_m (0.3.0)
+    mysql2 (0.5.6)
+    net-imap (0.5.9)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.1)
+      net-protocol
+    nio4r (2.7.4)
+    nokogiri (1.18.9)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
+    observer (0.1.2)
+    ostruct (0.6.2)
+    parallel (1.27.0)
+    parser (3.3.8.0)
+      ast (~> 2.4.1)
+      racc
+    pg (1.5.9)
+    pp (0.6.2)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.4.0)
+    psych (5.2.6)
+      date
+      stringio
+    puma (6.6.0)
+      nio4r (~> 2.0)
+    racc (1.8.1)
+    rack (3.2.0)
+    rack-mini-profiler (4.0.1)
+      rack (>= 1.2.0)
+    rack-session (2.1.1)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
+    rack-test (2.2.0)
+      rack (>= 1.3)
+    rackup (2.2.1)
+      rack (>= 3)
+    rails (7.1.5.1)
+      actioncable (= 7.1.5.1)
+      actionmailbox (= 7.1.5.1)
+      actionmailer (= 7.1.5.1)
+      actionpack (= 7.1.5.1)
+      actiontext (= 7.1.5.1)
+      actionview (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activemodel (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      bundler (>= 1.15.0)
+      railties (= 7.1.5.1)
+    rails-controller-testing (1.0.5)
+      actionpack (>= 5.0.1.rc1)
+      actionview (>= 5.0.1.rc1)
+      activesupport (>= 5.0.1.rc1)
+    rails-dom-testing (2.3.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.2)
+      loofah (~> 2.21)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    rails-i18n (7.0.10)
+      i18n (>= 0.7, < 2)
+      railties (>= 6.0.0, < 8)
+    rails_autolink (1.1.8)
+      actionview (> 3.1)
+      activesupport (> 3.1)
+      railties (> 3.1)
+    railties (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      irb
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
+    rainbow (3.1.1)
+    rake (13.3.0)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
+      ffi (~> 1.0)
+    rbs (3.9.4)
+      logger
+    rdoc (6.14.1)
+      erb
+      psych (>= 4.0.0)
+    regexp_parser (2.10.0)
+    reline (0.6.1)
+      io-console (~> 0.5)
+    reverse_markdown (3.0.0)
+      nokogiri
+    rexml (3.4.1)
+    rspec-expectations (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.4)
+    rubocop (1.78.0)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.45.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.45.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    sanitize (7.0.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.16.8)
+    sass-embedded (1.89.2)
+      google-protobuf (~> 4.31)
+      rake (>= 13)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sassc-embedded (1.80.4)
+      sass-embedded (~> 1.80)
+    securerandom (0.4.1)
+    simplecov (0.13.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    solargraph (0.56.0)
+      backport (~> 1.2)
+      benchmark (~> 0.4)
+      bundler (~> 2.0)
+      diff-lcs (~> 1.4)
+      jaro_winkler (~> 1.6, >= 1.6.1)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.1)
+      logger (~> 1.6)
+      observer (~> 0.1)
+      ostruct (~> 0.6)
+      parser (~> 3.0)
+      prism (~> 1.4)
+      rbs (~> 3.3)
+      reverse_markdown (~> 3.0)
+      rubocop (~> 1.38)
+      thor (~> 1.0)
+      tilt (~> 2.0)
+      yard (~> 0.9, >= 0.9.24)
+      yard-solargraph (~> 0.1)
+    spring (4.3.0)
+    sprockets (4.2.2)
+      concurrent-ruby (~> 1.0)
+      logger
+      rack (>= 2.2.4, < 4)
+    sprockets-rails (3.5.2)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      sprockets (>= 3.0.0)
+    sqlite3 (2.7.3)
+      mini_portile2 (~> 2.8.0)
+    stringio (3.1.7)
+    stripe (15.5.0)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
+    terrapin (0.6.0)
+      climate_control (>= 0.0.3, < 1.0)
+    terser (1.2.6)
+      execjs (>= 0.3.0, < 3)
+    thor (1.4.0)
+    tilt (2.6.0)
+    timeout (0.4.3)
+    tolk (6.0.0)
+      rails (>= 7.0, < 7.3)
+      sprockets-rails (~> 3.4)
+    tracks-chartjs-ror (3.6.4)
       rails (>= 3.1)
-    therubyracer (0.11.0)
-      ref
-    thor (0.16.0)
-    tilt (1.3.3)
-    tolk (1.3.4)
-      will_paginate
-      ya2yaml (~> 0.26)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
-    uglifier (1.3.0)
-      execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
-    uniform_notifier (1.1.0)
-    websocket (1.0.6)
-    will_paginate (3.0.3)
-    xpath (1.0.0)
-      nokogiri (~> 1.3)
-    ya2yaml (0.31)
-    yard (0.8.3)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uniform_notifier (1.17.0)
+    websocket-driver (0.8.0)
+      base64
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    will_paginate (4.0.1)
+    yard (0.9.37)
+    yard-solargraph (0.1.0)
+      yard (~> 0.9)
+    zeitwerk (2.7.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   RedCloth
-  aasm
+  aasm (~> 5.5.1)
+  actionpack-xml_parser (~> 2.0)
+  activemodel-serializers-xml (~> 1.0.3)
   acts_as_list
-  aruba
-  bcrypt-ruby
+  bcrypt (~> 3.1.20)
+  bootstrap-sass (= 3.4.1)
   bullet
-  cache_digests!
-  capybara
-  coffee-rails
-  cucumber-rails
-  database_cleaner
-  factory_girl_rails
-  formatize
+  byebug
+  codeclimate-test-reporter (= 1.0.9)
+  coffee-rails (~> 5.0.0)
+  dartsass-sprockets
+  database_cleaner (~> 2)
+  factory_bot_rails
+  font-awesome-sass (~> 6.7.2)
   htmlentities
-  jquery-rails
-  libv8
-  mongrel (>= 1.2.0.pre2)
-  mysql2
+  i18n-tasks (~> 1.0.15)
+  jquery-rails (~> 4.6)
+  jquery-ui-rails (~> 8.0.0)
+  kt-paperclip (~> 7.2)
+  listen
+  mini_racer
+  minitest-stub-const
+  mocha
+  mysql2 (~> 0.5)
+  pg (~> 1.5)
+  puma (~> 6.6)
   rack-mini-profiler
-  rails
+  rails (~> 7.1)
+  rails-controller-testing
+  rails-dom-testing (~> 2.3.0)
   rails_autolink
-  sanitize
-  sass-rails
-  selenium-webdriver
+  rexml
+  rspec-expectations
+  rubocop (~> 1.78)
+  sanitize (~> 7.0)
   simplecov
-  sqlite3
-  swf_fu
-  therubyracer
-  tolk
-  uglifier
+  solargraph
+  spring (~> 4)
+  sprockets-rails
+  sqlite3 (~> 2.7)
+  stripe
+  terser
+  tolk (~> 6.0.0)
+  tracks-chartjs-ror
   will_paginate
   yard
+
+BUNDLED WITH
+   2.4.19

README.md

@@ -1,42 +1,37 @@
-# Tracks: a GTD(TM) web application, built with Ruby on Rails
+# Tracks: a GTD™ compatible web application built with Ruby on Rails
 
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/TracksApp/tracks)
+[![Build Status](https://github.com/TracksApp/tracks/workflows/Continuous%20Integration/badge.svg)](https://github.com/TracksApp/tracks/actions)
+[![Code Climate](https://codeclimate.com/github/TracksApp/tracks/badges/gpa.svg)](https://codeclimate.com/github/TracksApp/tracks)
+[![Translation status](https://hosted.weblate.org/widgets/tracks/-/tracks/svg-badge.svg)](https://hosted.weblate.org/engage/tracks/)
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/6459/badge)](https://bestpractices.coreinfrastructure.org/projects/6459)
 
-* Project homepage: http://getontracks.org/
-* Manual: http://getontracks.org/manual/
+## About
+
+* Project homepage: http://www.getontracks.org/
+* Manual: http://www.getontracks.org/manual/
 * Source at GitHub: https://github.com/TracksApp/tracks
-* Assembla space (for bug reports and feature requests): https://www.assembla.com/spaces/tracks-tickets/tickets
-* Wiki (community contributed information): https://github.com/TracksApp/tracks/wiki
-* Forum (read-only): http://getontracks.org/forums/
+* Hosted services: https://github.com/TracksApp/tracks/wiki/Hosted-Tracks
+* Bug reports and feature requests: https://github.com/TracksApp/tracks/issues
 * Mailing list: http://groups.google.com/group/TracksApp
-* Original developer: bsag (http://www.rousette.org.uk/)
-* Contributors: https://github.com/TracksApp/tracks/wiki/Contributors
-* Version: 2.2devel
-* Copyright: (cc) 2004-2012 rousette.org.uk.
-* License:  GNU GPL
+* License: See COPYING
 
-More documentation for Tracks can be found within the /doc directory
+Full instructions for both new installations and upgrades from older installations
+of Tracks can be found in the [wiki](https://github.com/TracksApp/tracks/wiki/Installation).
 
-The manual includes full instructions for both new installations and upgrades
-from older installations of Tracks.
-
-The instructions might appear long and intimidatingly complex, but that is
-mostly because of the number of different platforms supported, and the
-different configurations which can be used (e.g. running Tracks on your local
-computer or on a remote server). If you choose the appropriate section for your
-situation (installation vs. upgrade), and use the easiest (recommended) method,
-you should find the instructions easy to follow. If you encounter problems, try
-searching the wiki, forum or mailing list (URLs above), and ask a question if
-you cannot find a solution to your problem.
-
-The wiki has a lot of user contributed installation HOWTOs for various webhosts, specific OS's and more.
-
-If you are thinking about contributing towards the development of Tracks,
-please read /doc/README_DEVELOPERS for general information. Also you can find
-some information on development, testing and contributing on the wiki.
-
-While fully usable for everyday use, Tracks is still a work in progress. Make
-sure that you take sensible precautions and back up all your data frequently,
+As always, make sure that you take sensible precautions and back up all your data frequently,
 taking particular care when you are upgrading.
 
 Enjoy being productive!
+
+## Contributors and consulting
+
+* Original developer: bsag (http://www.rousette.org.uk/)
+* Principal maintainer: [Jyri-Petteri ”ZeiP” Paloposki](https://github.com/ZeiP)
+  (sponsored by [Ardcoras oy](https://www.ardcoras.fi/), also available for paid consulting)
+  * If you want to support the maintainer's work, subscribe to the
+    [hosted version](https://www.taskitin.fi/).
+* Contributors: https://github.com/TracksApp/tracks/wiki/Contributors
+
+If you are thinking about contributing towards the development of Tracks,
+please read /CONTRIBUTING.md for general information. Also you can find
+some information on development, testing and contributing on the wiki.

Rakefile

@@ -1,7 +1,6 @@
-#!/usr/bin/env rake
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require File.expand_path('../config/application', __FILE__)
 
-Tracksapp::Application.load_tasks
+Rails.application.load_tasks

SECURITY.md

@@ -0,0 +1,60 @@
+# Security policy
+
+## Supported versions
+
+Only the most recent stable version is supported.
+
+## Reporting a vulnerability
+
+Please report any security issues via email to security@getontracks.org.
+If you don't get a reply for your email, resend the email after one week.
+If there's still no reply, open an issue in the issue queue but *do not
+disclose the details* in the issue, only ask about the reply and status.
+
+You can (and should) encrypt the email you send with OpenGPG key
+0x8af45b6854414d2d, which you can find for example in pool.sks-keyservers.net.
+
+Unfortunately Tracks is not part of a bug bounty program, but we do provide
+appropriate credits for disclosing security issues.
+
+## Evaluating and fixing a vulnerability
+
+When a security vulnerability is reported to the maintainers, the
+maintainers first validate the vulnerability and preliminarily estimate
+the risk caused by the vulnerability.
+
+Any security issue is kept strictly confidential until a fix is made and
+validated by the maintainers and, if necessary, the reporter. Any fixes
+are not committed to the public repository before publishing.
+
+When a fix has been validated, the final risk assessment of the issue is
+done based on the latest version of the CVSS system and the criteria below.
+
+## Security advisories
+
+A security advisory is a public announcement managed by the maintainers
+which informs instance maintainers about a security problem in the software
+and the steps instance maintainers should take to address it. On release it
+is published widely so that instance maintainers can address it quickly.
+
+If necessary, the maintainers can decide to issue a pre-announcement
+informing the instance maintainers of an upcoming security advisory. This
+is done when timely addressing of the vulnerability is very important due
+to the high risk caused by it.
+
+Security advisories are published for security vulnerabilities that
+
+* Are caused by code included in the software repository (not any libraries
+  or other code not itself in the repository),
+* Exist in stable or release candidate releases (not alpha or beta
+  releases or unreleased code),
+* Are exploitable either without logging in or without admin privileges, and
+* Affect either the whole instance or other users than the one running the
+  exploit.
+
+## Other vulnerabilities
+
+If the vulnerability does not warrant a security advisory, the vulnerability
+is fixed and released with a note in the release notes of the release.
+Details of the vulnerability as well as the risk assessment and grounds for
+not publishing a security advisory are included.

app/assets/config/manifest.js

@@ -0,0 +1,14 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css
+//= link datepicker-cs.js
+//= link datepicker-de.js
+//= link datepicker-es.js
+//= link datepicker-fi.js
+//= link datepicker-fr.js
+//= link datepicker-he.js
+//= link datepicker-nb_NO.js
+//= link datepicker-nl.js
+//= link datepicker-ru.js
+//= link datepicker-sv.js
+//= link datepicker-tr.js

app/assets/javascripts-jquery-ui/datepicker-cs.js

@@ -0,0 +1,40 @@
+/* Czech initialisation for the jQuery UI date picker plugin. */
+/* Written by Tomas Muller (tomas@tomas-muller.net). */
+( function( factory ) {
+	"use strict";
+
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "../widgets/datepicker" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery.datepicker );
+	}
+} )( function( datepicker ) {
+"use strict";
+
+datepicker.regional.cs = {
+	closeText: "Zavřít",
+	prevText: "Dříve",
+	nextText: "Později",
+	currentText: "Nyní",
+	monthNames: [ "leden", "únor", "březen", "duben", "květen", "červen",
+	"červenec", "srpen", "září", "říjen", "listopad", "prosinec" ],
+	monthNamesShort: [ "led", "úno", "bře", "dub", "kvě", "čer",
+	"čvc", "srp", "zář", "říj", "lis", "pro" ],
+	dayNames: [ "neděle", "pondělí", "úterý", "středa", "čtvrtek", "pátek", "sobota" ],
+	dayNamesShort: [ "ne", "po", "út", "st", "čt", "pá", "so" ],
+	dayNamesMin: [ "ne", "po", "út", "st", "čt", "pá", "so" ],
+	weekHeader: "Týd",
+	dateFormat: "dd.mm.yy",
+	firstDay: 1,
+	isRTL: false,
+	showMonthAfterYear: false,
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.cs );
+
+return datepicker.regional.cs;
+
+} );

app/assets/javascripts-jquery-ui/datepicker-de.js

@@ -0,0 +1,40 @@
+/* German initialisation for the jQuery UI date picker plugin. */
+/* Written by Milian Wolff (mail@milianw.de). */
+( function( factory ) {
+	"use strict";
+
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "../widgets/datepicker" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery.datepicker );
+	}
+} )( function( datepicker ) {
+"use strict";
+
+datepicker.regional.de = {
+	closeText: "Schließen",
+	prevText: "Zurück",
+	nextText: "Vor",
+	currentText: "Heute",
+	monthNames: [ "Januar", "Februar", "März", "April", "Mai", "Juni",
+	"Juli", "August", "September", "Oktober", "November", "Dezember" ],
+	monthNamesShort: [ "Jan", "Feb", "Mär", "Apr", "Mai", "Jun",
+	"Jul", "Aug", "Sep", "Okt", "Nov", "Dez" ],
+	dayNames: [ "Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag" ],
+	dayNamesShort: [ "So", "Mo", "Di", "Mi", "Do", "Fr", "Sa" ],
+	dayNamesMin: [ "So", "Mo", "Di", "Mi", "Do", "Fr", "Sa" ],
+	weekHeader: "KW",
+	dateFormat: "dd.mm.yy",
+	firstDay: 1,
+	isRTL: false,
+	showMonthAfterYear: false,
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.de );
+
+return datepicker.regional.de;
+
+} );

app/assets/javascripts-jquery-ui/datepicker-es.js

@@ -0,0 +1,40 @@
+/* Inicialización en español para la extensión 'UI date picker' para jQuery. */
+/* Traducido por Vester (xvester@gmail.com). */
+( function( factory ) {
+	"use strict";
+
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "../widgets/datepicker" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery.datepicker );
+	}
+} )( function( datepicker ) {
+"use strict";
+
+datepicker.regional.es = {
+	closeText: "Cerrar",
+	prevText: "Ant",
+	nextText: "Sig",
+	currentText: "Hoy",
+	monthNames: [ "enero", "febrero", "marzo", "abril", "mayo", "junio",
+	"julio", "agosto", "septiembre", "octubre", "noviembre", "diciembre" ],
+	monthNamesShort: [ "ene", "feb", "mar", "abr", "may", "jun",
+	"jul", "ago", "sep", "oct", "nov", "dic" ],
+	dayNames: [ "domingo", "lunes", "martes", "miércoles", "jueves", "viernes", "sábado" ],
+	dayNamesShort: [ "dom", "lun", "mar", "mié", "jue", "vie", "sáb" ],
+	dayNamesMin: [ "D", "L", "M", "X", "J", "V", "S" ],
+	weekHeader: "Sm",
+	dateFormat: "dd/mm/yy",
+	firstDay: 1,
+	isRTL: false,
+	showMonthAfterYear: false,
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.es );
+
+return datepicker.regional.es;
+
+} );

app/assets/javascripts-jquery-ui/datepicker-fi.js

@@ -0,0 +1,40 @@
+/* Finnish initialisation for the jQuery UI date picker plugin. */
+/* Written by Harri Kilpiö (harrikilpio@gmail.com). */
+( function( factory ) {
+	"use strict";
+
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "../widgets/datepicker" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery.datepicker );
+	}
+} )( function( datepicker ) {
+"use strict";
+
+datepicker.regional.fi = {
+	closeText: "Sulje",
+	prevText: "Edellinen",
+	nextText: "Seuraava",
+	currentText: "Tänään",
+	monthNames: [ "Tammikuu", "Helmikuu", "Maaliskuu", "Huhtikuu", "Toukokuu", "Kesäkuu",
+	"Heinäkuu", "Elokuu", "Syyskuu", "Lokakuu", "Marraskuu", "Joulukuu" ],
+	monthNamesShort: [ "Tammi", "Helmi", "Maalis", "Huhti", "Touko", "Kesä",
+	"Heinä", "Elo", "Syys", "Loka", "Marras", "Joulu" ],
+	dayNamesShort: [ "Su", "Ma", "Ti", "Ke", "To", "Pe", "La" ],
+	dayNames: [ "Sunnuntai", "Maanantai", "Tiistai", "Keskiviikko", "Torstai", "Perjantai", "Lauantai" ],
+	dayNamesMin: [ "Su", "Ma", "Ti", "Ke", "To", "Pe", "La" ],
+	weekHeader: "Vk",
+	dateFormat: "d.m.yy",
+	firstDay: 1,
+	isRTL: false,
+	showMonthAfterYear: false,
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.fi );
+
+return datepicker.regional.fi;
+
+} );

app/assets/javascripts-jquery-ui/datepicker-fr.js

@@ -0,0 +1,42 @@
+/* French initialisation for the jQuery UI date picker plugin. */
+/* Written by Keith Wood (kbwood{at}iinet.com.au),
+			  Stéphane Nahmani (sholby@sholby.net),
+			  Stéphane Raimbault <stephane.raimbault@gmail.com> */
+( function( factory ) {
+	"use strict";
+
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "../widgets/datepicker" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery.datepicker );
+	}
+} )( function( datepicker ) {
+"use strict";
+
+datepicker.regional.fr = {
+	closeText: "Fermer",
+	prevText: "Précédent",
+	nextText: "Suivant",
+	currentText: "Aujourd'hui",
+	monthNames: [ "janvier", "février", "mars", "avril", "mai", "juin",
+		"juillet", "août", "septembre", "octobre", "novembre", "décembre" ],
+	monthNamesShort: [ "janv.", "févr.", "mars", "avr.", "mai", "juin",
+		"juil.", "août", "sept.", "oct.", "nov.", "déc." ],
+	dayNames: [ "dimanche", "lundi", "mardi", "mercredi", "jeudi", "vendredi", "samedi" ],
+	dayNamesShort: [ "dim.", "lun.", "mar.", "mer.", "jeu.", "ven.", "sam." ],
+	dayNamesMin: [ "D", "L", "M", "M", "J", "V", "S" ],
+	weekHeader: "Sem.",
+	dateFormat: "dd/mm/yy",
+	firstDay: 1,
+	isRTL: false,
+	showMonthAfterYear: false,
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.fr );
+
+return datepicker.regional.fr;
+
+} );

app/assets/javascripts-jquery-ui/datepicker-he.js

@@ -0,0 +1,40 @@
+/* Hebrew initialisation for the UI Datepicker extension. */
+/* Written by Amir Hardon (ahardon at gmail dot com). */
+( function( factory ) {
+	"use strict";
+
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "../widgets/datepicker" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery.datepicker );
+	}
+} )( function( datepicker ) {
+"use strict";
+
+datepicker.regional.he = {
+	closeText: "סגור",
+	prevText: "הקודם",
+	nextText: "הבא",
+	currentText: "היום",
+	monthNames: [ "ינואר", "פברואר", "מרץ", "אפריל", "מאי", "יוני",
+	"יולי", "אוגוסט", "ספטמבר", "אוקטובר", "נובמבר", "דצמבר" ],
+	monthNamesShort: [ "ינו", "פבר", "מרץ", "אפר", "מאי", "יוני",
+	"יולי", "אוג", "ספט", "אוק", "נוב", "דצמ" ],
+	dayNames: [ "ראשון", "שני", "שלישי", "רביעי", "חמישי", "שישי", "שבת" ],
+	dayNamesShort: [ "א'", "ב'", "ג'", "ד'", "ה'", "ו'", "שבת" ],
+	dayNamesMin: [ "א'", "ב'", "ג'", "ד'", "ה'", "ו'", "שבת" ],
+	weekHeader: "Wk",
+	dateFormat: "dd/mm/yy",
+	firstDay: 0,
+	isRTL: true,
+	showMonthAfterYear: false,
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.he );
+
+return datepicker.regional.he;
+
+} );

app/assets/javascripts-jquery-ui/datepicker-nb_NO.js

@@ -0,0 +1,52 @@
+/* Norwegian Bokmål initialisation for the jQuery UI date picker plugin. */
+/* Written by Bjørn Johansen (post@bjornjohansen.no). */
+( function( factory ) {
+	"use strict";
+
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "../widgets/datepicker" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery.datepicker );
+	}
+} )( function( datepicker ) {
+"use strict";
+
+datepicker.regional.nb = {
+	closeText: "Lukk",
+	prevText: "Forrige",
+	nextText: "Neste",
+	currentText: "I dag",
+	monthNames: [
+		"januar",
+		"februar",
+		"mars",
+		"april",
+		"mai",
+		"juni",
+		"juli",
+		"august",
+		"september",
+		"oktober",
+		"november",
+		"desember"
+	],
+	monthNamesShort: [ "jan", "feb", "mar", "apr", "mai", "jun", "jul", "aug", "sep", "okt", "nov", "des" ],
+	dayNamesShort: [ "søn", "man", "tir", "ons", "tor", "fre", "lør" ],
+	dayNames: [ "søndag", "mandag", "tirsdag", "onsdag", "torsdag", "fredag", "lørdag" ],
+	dayNamesMin: [ "sø", "ma", "ti", "on", "to", "fr", "lø" ],
+	weekHeader: "Uke",
+	dateFormat: "dd.mm.yy",
+	firstDay: 1,
+	isRTL: false,
+	showMonthAfterYear: false,
+	yearSuffix: ""
+};
+datepicker.setDefaults( datepicker.regional.nb );
+
+return datepicker.regional.nb;
+
+} );

app/assets/javascripts-jquery-ui/datepicker-nl.js

@@ -0,0 +1,40 @@
+/* Dutch (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* Written by Mathias Bynens <http://mathiasbynens.be/> */
+( function( factory ) {
+	"use strict";
+
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "../widgets/datepicker" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery.datepicker );
+	}
+} )( function( datepicker ) {
+"use strict";
+
+datepicker.regional.nl = {
+	closeText: "Sluiten",
+	prevText: "Vorig",
+	nextText: "Volgende",
+	currentText: "Vandaag",
+	monthNames: [ "januari", "februari", "maart", "april", "mei", "juni",
+	"juli", "augustus", "september", "oktober", "november", "december" ],
+	monthNamesShort: [ "jan", "feb", "mrt", "apr", "mei", "jun",
+	"jul", "aug", "sep", "okt", "nov", "dec" ],
+	dayNames: [ "zondag", "maandag", "dinsdag", "woensdag", "donderdag", "vrijdag", "zaterdag" ],
+	dayNamesShort: [ "zon", "maa", "din", "woe", "don", "vri", "zat" ],
+	dayNamesMin: [ "zo", "ma", "di", "wo", "do", "vr", "za" ],
+	weekHeader: "Wk",
+	dateFormat: "dd-mm-yy",
+	firstDay: 1,
+	isRTL: false,
+	showMonthAfterYear: false,
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.nl );
+
+return datepicker.regional.nl;
+
+} );

app/assets/javascripts-jquery-ui/datepicker-ru.js

@@ -0,0 +1,40 @@
+/* Russian (UTF-8) initialisation for the jQuery UI date picker plugin. */
+/* Written by Andrew Stromnov (stromnov@gmail.com). */
+( function( factory ) {
+	"use strict";
+
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "../widgets/datepicker" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery.datepicker );
+	}
+} )( function( datepicker ) {
+"use strict";
+
+datepicker.regional.ru = {
+	closeText: "Закрыть",
+	prevText: "Пред",
+	nextText: "След",
+	currentText: "Сегодня",
+	monthNames: [ "Январь", "Февраль", "Март", "Апрель", "Май", "Июнь",
+	"Июль", "Август", "Сентябрь", "Октябрь", "Ноябрь", "Декабрь" ],
+	monthNamesShort: [ "Янв", "Фев", "Мар", "Апр", "Май", "Июн",
+	"Июл", "Авг", "Сен", "Окт", "Ноя", "Дек" ],
+	dayNames: [ "воскресенье", "понедельник", "вторник", "среда", "четверг", "пятница", "суббота" ],
+	dayNamesShort: [ "вск", "пнд", "втр", "срд", "чтв", "птн", "сбт" ],
+	dayNamesMin: [ "Вс", "Пн", "Вт", "Ср", "Чт", "Пт", "Сб" ],
+	weekHeader: "Нед",
+	dateFormat: "dd.mm.yy",
+	firstDay: 1,
+	isRTL: false,
+	showMonthAfterYear: false,
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.ru );
+
+return datepicker.regional.ru;
+
+} );

app/assets/javascripts-jquery-ui/datepicker-sv.js

@@ -0,0 +1,40 @@
+/* Swedish initialisation for the jQuery UI date picker plugin. */
+/* Written by Anders Ekdahl ( anders@nomadiz.se). */
+( function( factory ) {
+	"use strict";
+
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "../widgets/datepicker" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery.datepicker );
+	}
+} )( function( datepicker ) {
+"use strict";
+
+datepicker.regional.sv = {
+	closeText: "Stäng",
+	prevText: "Förra",
+	nextText: "Nästa",
+	currentText: "Idag",
+	monthNames: [ "januari", "februari", "mars", "april", "maj", "juni",
+	"juli", "augusti", "september", "oktober", "november", "december" ],
+	monthNamesShort: [ "jan.", "feb.", "mars", "apr.", "maj", "juni",
+	"juli", "aug.", "sep.", "okt.", "nov.", "dec." ],
+	dayNamesShort: [ "sön", "mån", "tis", "ons", "tor", "fre", "lör" ],
+	dayNames: [ "söndag", "måndag", "tisdag", "onsdag", "torsdag", "fredag", "lördag" ],
+	dayNamesMin: [ "sö", "må", "ti", "on", "to", "fr", "lö" ],
+	weekHeader: "Ve",
+	dateFormat: "yy-mm-dd",
+	firstDay: 1,
+	isRTL: false,
+	showMonthAfterYear: false,
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.sv );
+
+return datepicker.regional.sv;
+
+} );

app/assets/javascripts-jquery-ui/datepicker-tr.js

@@ -0,0 +1,40 @@
+/* Turkish initialisation for the jQuery UI date picker plugin. */
+/* Written by Izzet Emre Erkan (kara@karalamalar.net). */
+( function( factory ) {
+	"use strict";
+
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "../widgets/datepicker" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery.datepicker );
+	}
+} )( function( datepicker ) {
+"use strict";
+
+datepicker.regional.tr = {
+	closeText: "kapat",
+	prevText: "geri",
+	nextText: "ileri",
+	currentText: "bugün",
+	monthNames: [ "Ocak", "Şubat", "Mart", "Nisan", "Mayıs", "Haziran",
+	"Temmuz", "Ağustos", "Eylül", "Ekim", "Kasım", "Aralık" ],
+	monthNamesShort: [ "Oca", "Şub", "Mar", "Nis", "May", "Haz",
+	"Tem", "Ağu", "Eyl", "Eki", "Kas", "Ara" ],
+	dayNames: [ "Pazar", "Pazartesi", "Salı", "Çarşamba", "Perşembe", "Cuma", "Cumartesi" ],
+	dayNamesShort: [ "Pz", "Pt", "Sa", "Ça", "Pe", "Cu", "Ct" ],
+	dayNamesMin: [ "Pz", "Pt", "Sa", "Ça", "Pe", "Cu", "Ct" ],
+	weekHeader: "Hf",
+	dateFormat: "dd.mm.yy",
+	firstDay: 1,
+	isRTL: false,
+	showMonthAfterYear: false,
+	yearSuffix: "" };
+datepicker.setDefaults( datepicker.regional.tr );
+
+return datepicker.regional.tr;
+
+} );

app/assets/javascripts-jquery-ui/datepicker-zh-TW.js

@@ -0,0 +1,40 @@
+/* Traditional Chinese (Taiwan) initialisation for the jQuery UI date picker plugin. */
+/* Written by Claude Code for Tracks application. */
+( function( factory ) {
+	"use strict";
+
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "../widgets/datepicker" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery.datepicker );
+	}
+} )( function( datepicker ) {
+"use strict";
+
+datepicker.regional["zh-TW"] = {
+	closeText: "關閉",
+	prevText: "上一月",
+	nextText: "下一月",
+	currentText: "今天",
+	monthNames: [ "一月", "二月", "三月", "四月", "五月", "六月",
+	"七月", "八月", "九月", "十月", "十一月", "十二月" ],
+	monthNamesShort: [ "1月", "2月", "3月", "4月", "5月", "6月",
+	"7月", "8月", "9月", "10月", "11月", "12月" ],
+	dayNames: [ "星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六" ],
+	dayNamesShort: [ "日", "一", "二", "三", "四", "五", "六" ],
+	dayNamesMin: [ "日", "一", "二", "三", "四", "五", "六" ],
+	weekHeader: "週",
+	dateFormat: "yy/mm/dd",
+	firstDay: 0,
+	isRTL: false,
+	showMonthAfterYear: true,
+	yearSuffix: "年" };
+datepicker.setDefaults( datepicker.regional["zh-TW"] );
+
+return datepicker.regional["zh-TW"];
+
+} );

app/assets/javascripts/application.js

@@ -2,22 +2,31 @@
 // listed below.
 //
 // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
+// compiled file.
 //
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
+// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// about supported directives.
 //
-//= require jquery
 //= require jquery_ujs
+//= require jquery3
+//= require bootstrap
+
+//= require jquery-ui/widgets/autocomplete
+//= require jquery-ui/widgets/datepicker
+//= require jquery-ui/widgets/dialog
+//= require jquery-ui/widgets/droppable
+//= require jquery-ui/effects/effect-highlight
+//= require jquery-ui/widgets/sortable
 
 // Stuff in app/assets
-//= require tracks.js
+//= require tracks
+//= require tracks_pages
+//= require disable_fx_in_test
 
 // Stuff in vendor/assets
-//= require jquery-ui-1.9.0.custom.min
 //= require jquery.ui.touch-punch.min
 //= require jquery.blockUI
 //= require jquery.cookie
@@ -25,7 +34,8 @@
 //= require jquery.jeditable.mini
 //= require jquery.simulate.drag-sortable
 //= require jquery.truncator
-//= require niftycube
 //= require superfish
 //= require supersubs
-//= require swf_fu
+
+//= require Chart.min
+//= require chartjs-plugin-colorschemes.min

app/assets/javascripts/disable_fx_in_test.js.erb

@@ -0,0 +1,3 @@
+<% if Rails.env.test? %>
+$.fx.off = true;
+<% end %>

app/assets/javascripts/tracks_pages.js

@@ -0,0 +1,192 @@
+var TracksPages = {
+  show_errors: function (html) {
+    $('div#error_status').html(html);
+    $('div#error_status').show();
+  },
+  show_edit_errors: function(html) {
+    $('div#edit_error_status').html(html);
+    $('div#edit_error_status').show();
+  },
+  show_errors_for_multi_add: function(html) {
+    $('div#multiple_error_status').html(html);
+    $('div#multiple_error_status').show();
+  },
+  hide_errors: function() {
+    $('div#error_status').hide();
+    $('div#edit_error_status').hide();
+    $('div#multiple_error_status').hide();
+  },
+  update_sidebar: function(html) {
+    $('#sidebar').html(html);
+  },
+  slide_up_and_remove: function(selector) {
+    $(selector).slideUp(1000, function() {
+      $(selector).remove();
+    });
+  },
+  page_notify: function(type, message, fade_duration_in_sec) {
+    var flash = $('div#message_holder');
+    flash.html("<h4 id=\'flash\' class=\'alert "+type+"\'>"+message+"</h4>");
+    flash = $('h4#flash');
+
+    var fadein_duration = 1500;
+    var fadeout_duration = 1500;
+    var show_duration = fade_duration_in_sec*1000 - fadein_duration - fadeout_duration;
+    if (show_duration < 0) {
+      show_duration = 1000;
+    }
+    flash.fadeIn(fadein_duration).delay(show_duration).fadeOut(fadeout_duration);
+  },
+  page_error: function(message) {
+    TracksPages.page_notify('error', message, 8);
+  },
+  page_inform: function(message) {
+    TracksPages.page_notify('notice', message, 5);
+  },
+  set_page_badge: function(count) {
+    $('#badge_count').html(count);
+  },
+  setup_autocomplete_for_tag_list: function(id) {
+    $(id+':not(.ac_input)')
+    .bind( "keydown", function( event ) { // don't navigate away from the field on tab when selecting an item
+        if ( event.keyCode === $.ui.keyCode.TAB &&
+            $( this ).data( "autocomplete" ).menu.active ) {
+            event.preventDefault();
+        }
+    })
+    .autocomplete({
+      minLength: 2,
+      autoFocus: true,
+      delay: 400, /* increase a bit over the default of 300 */
+      source: function( request, response ) {
+        var last_term = extractLast( request.term );
+        if (last_term !== "" && last_term !== " ") {
+          $.ajax( {
+            url: relative_to_root('tags.autocomplete'),
+            dataType: 'json',
+            data: {
+              term: last_term
+            },
+            success: function(data, textStatus, jqXHR) {
+              // remove spinner as removing the class is not always done by response
+              $(id).removeClass('ui-autocomplete-loading');
+              response(data, textStatus, jqXHR); // call jquery callback to handle data
+            }
+          });
+        } else {
+            // remove spinner as typing will always add the spinner
+            $(id).removeClass('ui-autocomplete-loading');
+        }
+      },
+      focus: function() {
+        // prevent value inserted on focus
+        return false;
+      },
+      select: function( event, ui ) {
+        var terms = split( this.value );
+        // remove the current input
+        terms.pop();
+        // add the selected item
+        terms.push( ui.item.value );
+        // add placeholder to get the comma-and-space at the end
+        //terms.push( "" );
+        this.value = terms.join( ", " );
+        return false;
+      }
+    });
+  },
+  setup_all_autocompleters: function() {
+    //fix for #1036 where closing a edit form before the autocomplete was filled
+    //resulted in a dropdown box that could not be removed. We remove all
+    //autocomplete boxes the hard way
+    $('.ac_results').remove();
+
+    // initialize autocompleters
+    ProjectItems.setup_autocomplete_for_projects('input[name=project_name]');
+    ContextItems.setup_autocomplete_for_contexts('input[name=context_name]');
+    ContextItems.setup_autocomplete_for_contexts('input[id="project_default_context_name"]');
+    TracksPages.setup_autocomplete_for_tag_list('input[name=tag_list]'); // todo edit form
+    TracksPages.setup_autocomplete_for_tag_list('input[name=edit_recurring_todo_tag_list]');
+    TracksPages.setup_autocomplete_for_tag_list('input[id="project_default_tags"]');
+    TodoItems.setup_autocomplete_for_predecessor();
+  },
+  setup_datepicker: function() {
+    $('input.Date').datepicker({
+        'dateFormat': dateFormat,
+        'firstDay': weekStart,
+        'showButtonPanel': true,
+        'showWeek': true,
+        'changeMonth': true,
+        'changeYear': true,
+        'maxDate': '+5y',
+        'minDate': '-1y',
+        'showAnim': '' /* leave empty, see #1117 */
+    });
+  },
+  setup_behavior: function () {
+    /* context menu */
+    $('ul.sf-item-menu').superfish({
+        delay: 100,
+        animation:   {
+            opacity:'show',
+            height:'show'
+        },
+        autoArrows: false,
+        dropShadows: false,
+        speed: 'fast',
+        onBeforeShow: function() { /* highlight todo */
+            $(this.parent().parent().parent()).addClass("sf-item-selected");
+        },
+        onHide: function() { /* remove hightlight from todo */
+            $(this.parent().parent().parent()).removeClass("sf-item-selected");
+        }
+    });
+
+    /* for toggle notes link in mininav */
+    $("#toggle-notes-nav").click(function () {
+        $(".todo_notes").toggle();
+    });
+
+   /* Poor man's perspectives, allows to hide any context that is collapsed */
+    $("#toggle-contexts-nav").click(function () {
+        /* Need to keep a single toggle across all contexts */
+        $(this).toggleClass("context_visibility");
+        if ($(this).hasClass("context_visibility")) {
+            $(".context_collapsed").hide(); /* Hide all collapsed contexts together*/
+        }
+        else {
+            $(".context_collapsed").show();
+        }
+    });
+
+    $("a#group_view_by_link").click(function () {
+        var state = $(this).attr("x_current_group_by");
+        if(state === 'context'){
+            state='project';
+        } else {
+            state='context';
+        }
+        $.cookie('group_view_by', state);
+        refresh_page();
+    });
+
+    /* fade flashes and alerts in automatically */
+    $(".alert").fadeOut(8000);
+  }, sort_container: function(container) {
+    function comparator(a, b) {
+        var contentA = $(a).attr('data-sort') || '';
+        var contentB = $(b).attr('data-sort') || '';
+        if (contentA > contentB) {
+            return 1;
+        }
+        if (contentB > contentA) {
+            return -1;
+        }
+        return 0;
+    }
+
+    var unsortedActions = container.children();
+    var sortedChildren = unsortedActions.sort(comparator);
+    container.append(sortedChildren);
+  }
+};

app/assets/stylesheets/application.css

@@ -1,14 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- *= require_tree ../../../vendor/assets/stylesheets
- *= require tracks
-*/

app/assets/stylesheets/black.scss

@@ -0,0 +1,25 @@
+/*
+ * Apparently the requires need to be in the "root" stylesheet file, not
+ * the imported manifest.
+ *
+ *= require jquery-ui
+ *= require jquery-ui/menu
+ *= require jquery-ui/autocomplete
+ *= require jquery-ui/datepicker
+ *= require jquery-ui/dialog
+ *= require jquery-ui/sortable
+ *= require_self
+ */
+
+$gray-lighter: #EEE;
+$brand-primary: rgba(0, 0, 0, 0.75);
+$navbar-inverse-bg: $brand_primary;
+$navbar-inverse-color: $gray-lighter;
+$navbar-inverse-link-color: $gray-lighter;
+$link-color: #CC3334;
+$link-hover-color: #FFF;
+$link-bgcolor: $link-color;
+$box-tablink-color: unset;
+
+// Import all components
+@import 'include/manifest';

app/assets/stylesheets/include/icons.scss

@@ -0,0 +1 @@
+@import "font-awesome";

app/assets/stylesheets/include/legacy.scss

@@ -14,7 +14,7 @@ div.depends_on label {
     float: left;
 }
 
-div#input_box div#todo_new_action_container div#todo_multi_add form#todo-form-multi-new-action.inline-form label {
+div#input_box div#todo_multi_add form#todo-form-multi-new-action.inline-form label {
     float: center;
 }
 
@@ -63,12 +63,9 @@ abbr,acronym {
     border:0;
 }
 
-body {
-    font-family: "Lucida Grande", Verdana, Geneva, Arial, sans-serif;
+& {
     font-size: 80%;
     padding: 0px 10px;
-    margin: 0px;
-    background: #eee;
 }
 
 p {
@@ -78,15 +75,15 @@ p {
 }
 
 a, a:link, a:active, a:visited {
-    color: #cc3334;
+    color: $link-color;
     text-decoration: none;
     padding-left: 1px;
     padding-right: 1px;
 }
 
 a:hover {
-    color: #fff;
-    background-color: #cc3334;
+    color: $link-hover-color;
+    background-color: $link-bgcolor;
 }
 
 h1 {
@@ -124,6 +121,11 @@ img.delete_item {
     }
 }
 
+a.todo_attachment {
+    background: image-url('bottom_off.png') no-repeat top;
+    border: none;
+}
+
 a.undecorated_link {background-color:transparent;color:transparent;}
 img.todo_star {background-image: image-url('staricons.png'); background-repeat: no-repeat; border:none; background-position: -32px 0px;}
 img.todo_star.starred{ background-position: 0px 0px; }
@@ -157,7 +159,7 @@ a.show_successors:hover, a.link_to_successors:hover {background-image: image-url
 /* Structural divs */
 
 #content {
-    margin-top: 90px;
+    margin-top: 70px;
 }
 
 #display_box {
@@ -233,82 +235,8 @@ a.show_successors:hover, a.link_to_successors:hover {background-image: image-url
     text-align: left;
 }
 
-/* Navigation links at the top */
-
-#navcontainer {
-    position: fixed;
-    top: 48px;
-    left: 0px;
-    a { color: #eee; }
-    a:hover { color: #ccc; }
-}
-
-#navlist {
-    margin: 0;
-    padding: 0 0 20px 5px;
-
-    ul, li {
-        margin: 0;
-        padding: 0;
-        display: inline;
-        list-style-type: none;
-    }
-
-    a:link, a:visited {
-        float: left;
-        line-height: 14px;
-        font-weight: bold;
-        margin: 0 10px 4px 10px;
-        text-decoration: none;
-        color: #eee;
-    }
-
-    a:link#current, a:visited#current, a:hover {
-        border-bottom: 4px solid #CCC;
-        padding-bottom: 2px;
-        background: transparent;
-        color: #CCC;
-    }
-
-    a:hover { color: #CCC; }
-}
-
-#develop-notify-bar {
-    line-height:0.5;
-    background-image: image-url('construction.gif');
-    background-repeat: repeat-x;
-}
-
-#topbar {
-    position: fixed;
-    top: 0px;
-    left: 0px;
-    height: 68px;
-    margin-bottom: 20px;
-    clear: both;
-    background-color: #000;
-    color: #eee;
-    width: 100%;
-    z-index:501;
-}
-
-#date {
-    float: left;
-    width: 45%;
-    padding-left: 15px;
-    margin-top: 15px;
-    margin-bottom: 5px;
-    white-space: nowrap; /* added 2006-05-17 for safari display, timfm */
-
-    h1 { font-size: 152%; }
-}
-
-#minilinks {
-    text-align: right;
-    position: fixed;
-    right: 15px;
-    top: 10px;
-    font-size: 0.9em;
+.recurring_todos .ui-front {
+    z-index:502;
 }
 
 .container {
@@ -317,8 +245,6 @@ a.show_successors:hover, a.link_to_successors:hover {background-image: image-url
     margin: 0px 0px 15px 0px;
     background: #fff;
     border-radius: 5px;
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
 }
 
 .completed {
@@ -334,6 +260,7 @@ a.show_successors:hover, a.link_to_successors:hover {background-image: image-url
     margin-bottom: 0px;
     color: #666;
     position:static;
+    border-radius: 4px 4px 0 0;
 }
 
 .container_toggle img {
@@ -341,7 +268,7 @@ a.show_successors:hover, a.link_to_successors:hover {background-image: image-url
     width: 14px;
     border: 0px;
     background: image-url('collapse_expand.png') no-repeat left top;
-    	
+
     .context_collapsed & { background-position: left bottom; }
 }
 
@@ -363,7 +290,7 @@ div#input_box {
     width: 265px;
     margin: 0;
     padding: 0px 0px 0px 0px;
-    top: 90px;
+    top: 70px;
     right: 40px;
 }
 
@@ -475,19 +402,10 @@ input.item-checkbox {
     border-top: 1px solid #999;
 }
 
-#footer {
-    clear: both;
-    font-size: 85%;
-    text-align: center;
-    color: #999;
-    margin: 20px 310px 5px 20px;
-    padding: 0px;
-}
-
 a.footer_link {
     color: #cc3334;
     font-style: normal;
-    
+
     &:hover {
         color: #fff;
         background-color: #cc3334 !important;
@@ -496,7 +414,7 @@ a.footer_link {
 
 /* preferences */
 
-body.preferences {
+&.preferences {
     div#display_box {
         margin-right:510px;
     }
@@ -510,13 +428,11 @@ body.preferences {
         width: 250px;
     }
 
-    div#footer {
-        margin-right:410px;
+    input[type="checkbox"] {
+        height: auto;
     }
 
     /* override jquery css to match tracks defaults better */
-    div.ui-widget { font-size: 1em; }
-    div.ui-tabs li a { padding: 0.1em 1em; }
     div.pref_new_token a { color: #CC3334; }
 }
 
@@ -600,7 +516,7 @@ div.note_footer a, div.note_footer a:hover {
     padding: 5px;
 }
 
-div.add_note_link {
+div.link_in_container_header {
     margin-top:12px;
     float: right;
 }
@@ -651,7 +567,7 @@ span.tag a:hover {
 
 div#message_holder {
     position: absolute;
-    z-index: 502;
+    z-index: 1502;
     left: 60%;
     top: 30px;
     right: 0px;
@@ -755,20 +671,6 @@ The colour of the background gets progressively yellower with age */
     background: #ff0;
 }
 
-/* Shows the number of undone next action */
-.badge {
-    color: #fff;
-    background: #f00;
-    padding: 3px 5px;
-    font-size: 12pt;
-    margin: 10px 10px 0px 0px;
-    height:26px;
-    -moz-border-radius: 2px;
-    -webkit-border-radius: 2px;
-    border-radius: 2px;
-
-}
-
 ul {
     list-style-type: none;
 }
@@ -809,6 +711,10 @@ li {
     position:relative;
 }
 
+#edit-recurring-todo {
+  background: #fff;
+}
+
 /* Right align labels in forms */
 .label {
     text-align: right;
@@ -914,11 +820,14 @@ form {
 }
 
 #todo_new_action_container, #project_new_project_container, #context_new_container, #recurring_new_container {
-    background: #ddd;
     width: 270px;
     padding: 5px 10px;
-    background-color: #000;
-    color: #eee;
+    background-color: $brand-primary;
+    color: $gray-lighter;
+    border-radius: 5px;
+    a {
+        color: $box-tablink-color;
+    }
 }
 
 #recurring_new_container img {
@@ -993,11 +902,13 @@ input#go_to_project, input#context_hide {
     text-align:right;
 }
 
-#todo-form-new-action label, .edit_todo_form label {
+.edit_todo_form label {
     display: block;
     padding-bottom: 3px;
 }
 
+
+
 form.button-to {
     border: none;
     padding: 0px;
@@ -1018,6 +929,7 @@ input, select, textarea {
     margin: 0px 0px 0px 60px;
     padding: 0px 0px 0px 5px;
     width: 70%;
+    border-radius: 5px;
 }
 
 .feed {
@@ -1152,6 +1064,7 @@ ul#prefs {list-style-type: disc; margin-left: 15px;}
     color: #666;
     padding: 5px 20px;
     text-align: left;
+    border-radius: 5px;
 
     h3, dl, dt, dd {
         display: inline;
@@ -1361,7 +1274,7 @@ button.positive, .widgets a.positive{
     background-color:black;
 }
 
-.stats_content .open-flash-chart, .stats_content .stats_module {
+.stats_content .chart, .stats_content .stats_module {
     float: left;
     width: 450px;
     margin-right:20px;
@@ -1438,10 +1351,6 @@ div.auto_complete {
     }
 }
 
-.ui-datepicker {
-    z-index: 1000 !important;
-}
-
 .ui-autocomplete-loading {
     background: white image-url('ui-anim_basic_16x16.gif') right center no-repeat;
 }
@@ -1475,3 +1384,7 @@ ul.todo-submenu > li > a {
         background: image-url('to_project_off.png') no-repeat;
     }
 }
+
+.recurring_todos .ui-dialog .ui-dialog-title {
+  float: inherit;
+}

app/assets/stylesheets/include/login.scss

@@ -0,0 +1,59 @@
+body {
+  background-color: rgba(0, 0, 0, 0.75);
+}
+
+.login-flash {
+  @include make-xs-column(12);
+  @include make-sm-column(6);
+  @include make-sm-column-offset(3);
+  padding: 10px;
+}
+
+.login-wrapper {
+  @include make-row();
+  .footer {
+    z-index: 1;
+  }
+}
+
+.login-box {
+  @include make-xs-column(12);
+  @include make-sm-column(6);
+  @include make-sm-column-offset(3);
+  margin: 2em auto 1em;
+  background-color: $brand-primary;
+  padding: 0 0 1em 0;
+  box-shadow: 0 2px 6px rgba(0, 0, 0, 0.5), 0 2px 3px rgba(0, 0, 0, 0.3);
+  color: #eaeaea;
+
+  a {
+    color: #eaeaea;
+    text-decoration: underline;
+  }
+
+  .signup-prompt {
+    text-align: right;
+  }
+}
+
+
+@media(min-width: $screen-sm-min) {
+  .login-box {
+    border-radius: 5px;
+  }
+}
+
+.icon-box {
+  padding: 1em 0;
+}
+
+.login-form, .signup-form {
+  @include make-xs-column(12);
+  @include make-sm-column(8);
+  @include make-sm-column-offset(2)
+}
+
+.label-element-combo {
+  @extend .form-group;
+}
+

app/assets/stylesheets/include/manifest.scss

@@ -0,0 +1,52 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any styles
+ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
+ * file per style scope.
+ */
+
+@import "icons";
+
+.legacy-ui {
+  @import "../../../vendor/assets/stylesheets/superfish-navbar";
+  @import "../../../vendor/assets/stylesheets/superfish-vertical";
+  @import "../../../vendor/assets/stylesheets/superfish";
+  @import "legacy";
+}
+
+.bootstrap {
+  @import "bootstrap";
+  @import "tracks-logo";
+  @import "login";
+
+  // resets normally applied to body
+  // TODO: remove when dropping the .bootstrap namespace
+  font-size: $font-size-base;
+  line-height: $line-height-base;
+
+  @import "tracks";
+}
+
+// Hybrid Bootstrap/legacy styles applied to body
+// See bootstrap/_normalize and bootstrap/_scaffolding
+// TODO: clean these up after the migration to Bootstrap is complete
+body {
+  @import "bootstrap/_variables";
+  $font-family-base: "Lucida Grande", Verdana, Geneva, Arial, sans-serif;
+  $body-bg: #eee;
+
+  margin: 0;
+  font-family: $font-family-base;
+  color: $text-color;
+  background-color: $body-bg;
+}
+
+.ui-datepicker {
+  z-index: 999999 !important;
+}

app/assets/stylesheets/include/tracks-logo.scss

@@ -0,0 +1,24 @@
+$logo_color: rgb(214, 55, 64);
+
+.tracks-icon {
+  font-size: 6.5em;
+  color: black;
+  border-radius: 10%;
+  border: 4px solid $logo_color;
+  height: 150px;
+  width: 150px;
+  padding: 5px;
+  margin: auto;
+  box-shadow: 0 2px 6px rgba(0, 0, 0, 0.24), 0 2px 3px rgba(0, 0, 0, 0.4);
+  background: linear-gradient(to bottom, rgb(255, 255, 255), $logo_color 40%);
+  font-weight: 700;
+  text-shadow: rgba(255, 255, 255, 0.24) 1px 1px;
+  position: relative;
+}
+
+.tracks-icon-text {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+}

app/assets/stylesheets/include/tracks.scss

@@ -0,0 +1,42 @@
+.navbar {
+  /* Shows the count of undone next actions */
+  .badge {
+    color: #fff;
+    background: #f00;
+    display: inline;
+    padding: 3px 5px;
+    font-size: 12pt;
+    height:26px;
+    border-radius: 2px;
+  }
+
+  .fa {
+    line-height: inherit;
+  }
+}
+
+.footer {
+  @include make-xs-column(12);
+  @include make-sm-column(10);
+  @include make-sm-column-offset(1);
+  font-size: 85%;
+  text-align: center;
+  color: #999;
+  margin: 20px 0 5px;
+  z-index: -1;
+}
+
+.footer-line {
+  display: block;
+}
+
+form {
+  border: 0px none;
+  padding: 0;
+}
+
+@media screen and (min-width: 1170px) {
+  .footer-line {
+    display: inline;
+  }
+}

app/assets/stylesheets/light_blue.scss

@@ -0,0 +1,25 @@
+/*
+ * Apparently the requires need to be in the "root" stylesheet file, not
+ * the imported manifest.
+ *
+ *= require jquery-ui
+ *= require jquery-ui/menu
+ *= require jquery-ui/autocomplete
+ *= require jquery-ui/datepicker
+ *= require jquery-ui/dialog
+ *= require jquery-ui/sortable
+ *= require_self
+ */
+
+$gray-lighter: lighten(#000, 93.5%);
+$brand-primary: #3C6997;
+$navbar-inverse-bg: $brand_primary;
+$navbar-inverse-color: $gray-lighter;
+$navbar-inverse-link-color: $gray-lighter;
+$link-color: unset;
+$link-hover-color: unset;
+$link-bgcolor: unset;
+$box-tablink-color: lighten(#000, 85%);
+
+// Import all components
+@import 'include/manifest';

app/assets/stylesheets/login.css.scss

@@ -1,160 +0,0 @@
-body { background-color: #fff; color: #333; }
-
-body, ol, ul, td {
-    font-family: verdana, arial, helvetica, sans-serif;
-    font-size: 12px;
-    line-height: 18px;
-    background: #eee;
-}
-
-p {
-    background: #eee;
-}
-
-a, a:link, a:active, a:visited {
-    color: #cc3334;
-    text-decoration: none;
-    padding-left: 1px;
-    padding-right: 1px;
-}
-
-a:hover {
-    color: #fff;
-    background-color: #cc3334;
-}
-
-h1, h2, h3 { color: #333; font-family: verdana, arial, helvetica, sans-serif; text-align: center; }
-h1 { font-size: 28px }
-h2 { font-size: 19px }
-h3 { font-size: 16px }
-
-li { margin-bottom: 7px; }
-
-pre {
-    background-color: #eee;
-    padding: 10px;
-    font-size: 11px;
-}
-
-td {background-color: #ff9;}
-
-#scaffold-main {
-    width: 80%;
-    margin: 10px auto;
-    padding: 6px;
-}
-
-div.form {
-    width: 350px;
-    margin: 100px auto 10px auto;
-    padding: 10px;
-    border: 1px solid #999;
-    background: #ff9;
-}
-
-div.memo {
-    width: 40%;
-    margin: 100px auto;
-    padding: 10px;
-    border: 1px solid #999;
-    background: #ff9;
-}
-
-/* Flash box styling */
-
-h4.alert  {
-    font-size: 0.8em;
-    font-weight: bold;
-    margin: 0;
-    padding: 5px;
-    text-align: center;
-}
-
-h4.warning  {
-    border: 1px solid #ED2E38;
-    background-color: #F6979C;
-    color: #000000;
-}
-h4.error  {
-    color:#fff;
-    background:#c00;
-}
-h4.notice {
-    border: 1px solid #007E00;
-    background-color: #c2ffc2;
-    color: #007E00;
-}
-
-/*#notice {
-    padding: 2px;
-    border: 1px solid #007E00;
-    background-color: #c2ffc2;
-    color: #007E00;
-    margin-bottom: 15px;
-    text-align: center;
-}
-*/
-
-#footer {
-    clear: both;
-    background-color: #eee;
-    font-size: 0.8em;
-    text-align: center;
-    color: #999;
-    margin: 20px auto;
-    padding: 0px;
-}
-
-
-/* Error message styles */
-.fieldWithErrors {
-    padding: 2px;
-    background-color: red;
-    display: table;
-}
-
-#errorExplanation {
-    border: 2px solid #ff0000;
-    padding: 7px;
-    padding-bottom: 12px;
-    margin: 10px auto 10px auto;
-    background-color: #f0f0f0;
-
-    h2 {
-        text-align: left;
-        font-weight: bold;
-        padding: 5px 5px 5px 15px;
-        font-size: 12px;
-        margin: -7px;
-        background-color: #c00;
-        color: #fff;
-    }
-
-    p {
-        color: #333;
-        margin-bottom: 0;
-        padding: 5px;
-    }
-
-    ul li {
-        font-size: 1em;
-        list-style-type: disc;
-        list-style-position: outside;
-    }
-}
-
-input.login_text {
-    width:200px;
-}
-input.open_id {
-    background: image-url('open-id-login-bg.gif') no-repeat;
-    background-color: #fff;
-    background-position: 0 50%;
-    color: #000;
-    padding-left: 18px;
-    width: 182px;
-}
-p.alternate_auth {
-    text-align: center;
-    a { text-decoration:underline; }
-}

app/assets/stylesheets/mobile.scss

@@ -235,7 +235,13 @@ table.c {
 }
 
 input#todo_description, input#tag_list, textarea#todo_notes, select#todo_project_id, select#todo_context_id {
-    width: 95%;
+    width: 100%;
+    padding: 8px 8px;
+    box-sizing: border-box;
+}
+
+select {
+  font-size: 1.1em;
 }
 
 .next-prev-project {
@@ -280,3 +286,22 @@ input#todo_description, input#tag_list, textarea#todo_notes, select#todo_project
         background: #cc3334 image-url('next.png') right center no-repeat;
     }
 }
+
+div.note_wrapper p {
+    display: inline;
+}
+
+.text-right {
+    text-align: right;
+}
+
+.btn {
+    padding: 8px;
+    border-radius: 5px;
+    background-image: none;
+    display: inline-block;
+    white-space: none;
+    border: 1px solid transparent;
+    background-color: #999999;
+    color: #ffffff;
+}

app/assets/stylesheets/print.scss

@@ -16,11 +16,11 @@ img {
     border:0;
 }
 
-#navcontainer, #input_box, #footer, .big-box, .refresh, .badge, h1, .icon,
-#minilinks, .defer-container, .menu_sort, .position, .buttons, .sf-item-menu,
+#input_box, #footer, .big-box, .refresh, .badge, h1, .icon,
+.defer-container, .menu_sort, .position, .buttons, .sf-item-menu,
 .container_toggle, .grip, .show_notes, .recurring_icon, #project-next-prev,
-.project_settings, .add_note_link {
-    display:none; 
+.project_settings, .link_in_container_header {
+    display:none;
 }
 
 .tag {
@@ -64,7 +64,7 @@ ul {
 
 li {
     margin: .1em 0 .1em 2em;
-    line-height: 1.4em; 
+    line-height: 1.4em;
 }
 
 .item-container {

app/controllers/application_controller.rb

@@ -1,81 +1,66 @@
-# The filters added to this controller will be run for all controllers in the
-# application. Likewise will all the methods added be available for all
-# controllers.
-
 require_dependency "login_system"
-require_dependency "tracks/source_view"
+require_dependency "tracks/source_view_switching"
 
 class ApplicationController < ActionController::Base
-
-  protect_from_forgery
+  # Prevent CSRF attacks by raising an exception.
+  # For APIs, you may want to use :null_session instead.
+  protect_from_forgery with: :exception
 
   include LoginSystem
-  helper_method :current_user, :prefs, :format_date, :markdown
+  include Common
+  helper_method :current_user, :prefs, :format_date
 
-  layout proc{ |controller| controller.mobile? ? "mobile" : "application" }
+  layout proc { |controller| controller.mobile? ? "mobile" : "application" }
   # exempt_from_layout /\.js\.erb$/
 
-  before_filter :check_for_deprecated_password_hash
-  before_filter :set_session_expiration
-  before_filter :set_time_zone
-  before_filter :set_zindex_counter
-  before_filter :set_locale
-  prepend_before_filter :login_required
-  prepend_before_filter :enable_mobile_content_negotiation
-  after_filter :set_charset
-
-  # By default, sets the charset to UTF-8 if it isn't already set
-  def set_charset
-    headers["Content-Type"] ||= "text/html; charset=UTF-8"
-  end
+  before_action :set_session_expiration
+  before_action :set_time_zone
+  before_action :set_zindex_counter
+  before_action :set_locale
+  before_action :set_theme
+  append_before_action :set_group_view_by
+  prepend_before_action :login_required
+  prepend_before_action :enable_mobile_content_negotiation
 
   def set_locale
     locale = params[:locale] # specifying a locale in the request takes precedence
-    locale = locale || prefs.locale unless current_user.nil? # otherwise, the locale of the currently logged in user takes over
-    locale = locale || request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first if request.env['HTTP_ACCEPT_LANGUAGE']
-    I18n.locale = locale.nil? ? I18n.default_locale : (I18n::available_locales.include?(locale.to_sym) ? locale : I18n.default_locale)
-    logger.debug("Selected '#{I18n.locale}' as locale")
+    locale ||= prefs.locale unless current_user.nil? # otherwise, the locale of the currently logged in user takes over
+    locale ||= request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first if request.env['HTTP_ACCEPT_LANGUAGE']
+
+    if locale && I18n.available_locales.map(&:to_s).include?(locale.to_s)
+      I18n.locale = locale
+    else
+      I18n.locale = I18n.default_locale
+    end
   end
 
   def set_session_expiration
     # http://wiki.rubyonrails.com/rails/show/HowtoChangeSessionOptions
-    unless session == nil
-      return if self.controller_name == 'feed' or session['noexpiry'] == "on"
-      # If the method is called by the feed controller (which we don't have
-      # under session control) or if we checked the box to keep logged in on
-      # login don't set the session expiry time.
-      if session
-        # Get expiry time (allow ten seconds window for the case where we have
-        # none)
-        expiry_time = session['expiry_time'] || Time.now + 10
-        if expiry_time < Time.now
-          # Too late, matey...  bang goes your session!
-          reset_session
-        else
-          # Okay, you get another hour
-          session['expiry_time'] = Time.now + (60*60)
-        end
-      end
+    # If the method is called by the feed controller (which we don't have
+    # under session control) or if we checked the box to keep logged in on
+    # login don't set the session expiry time.
+    return if session.nil? || controller_name == 'feed' || session['noexpiry'] == "on"
+
+    # Get expiry time (allow ten seconds window for the case where we have
+    # none)
+    now = Time.zone.now
+    expiry_time = session['expiry_time'] || now + 10
+    if expiry_time < now
+      # Too late, matey...  bang goes your session!
+      reset_session
+    else
+      # Okay, you get another hour
+      session['expiry_time'] = now + (60 * 60)
     end
   end
 
-  # Redirects to change_password_user_path if the current user uses a
-  # deprecated password hashing algorithm.
-  def check_for_deprecated_password_hash
-    if current_user and current_user.uses_deprecated_password?
-      notify :warning, t('users.you_have_to_reset_your_password')
-      redirect_to change_password_user_path current_user
-    end
-  end
-
-  def render_failure message, status = 404
-    render :text => message, :status => status
+  def render_failure(message, status = 404)
+    render :body => message, :status => status
   end
 
   # Returns a count of next actions in the given context or project The result
   # is count and a string descriptor, correctly pluralised if there are no
   # actions or multiple actions
-  #
   def count_undone_todos_phrase(todos_parent)
     count = count_undone_todos(todos_parent)
     deferred_count = count_deferred_todos(todos_parent)
@@ -92,28 +77,32 @@ class ApplicationController < ActionController::Base
     if todos_parent.nil?
       count = 0
     elsif (todos_parent.is_a?(Project) && todos_parent.hidden?)
-      count = eval "@project_project_hidden_todo_counts[#{todos_parent.id}]"
+      init_hidden_todo_counts(['project']) if !@project_hidden_todo_counts
+      count = @project_hidden_todo_counts[todos_parent.id]
+    elsif (todos_parent.is_a?(Context) && todos_parent.hidden?)
+      init_hidden_todo_counts(['context']) if !@context_hidden_todo_counts
+      count = @context_hidden_todo_counts[todos_parent.id]
     else
-      count = eval "@#{todos_parent.class.to_s.downcase}_not_done_counts[#{todos_parent.id}]"
+      count = eval("@#{todos_parent.class.to_s.downcase}_not_done_counts[#{todos_parent.id}]", binding, __FILE__, __LINE__)
     end
     count || 0
   end
 
   def count_deferred_todos(todos_parent)
-    return todos_parent.nil? ? 0 : eval("@#{todos_parent.class.to_s.downcase}_deferred_counts[#{todos_parent.id}]") || 0
+    return todos_parent.nil? ? 0 : eval("@#{todos_parent.class.to_s.downcase}_deferred_counts[#{todos_parent.id}]", binding, __FILE__, __LINE__) || 0
   end
 
   # Convert a date object to the format specified in the user's preferences in
   # config/settings.yml
   #
   def format_date(date)
-    return date ? date.in_time_zone(prefs.time_zone).strftime("#{prefs.date_format}") : ''
+    return prefs.format_date(date)
   end
 
   def for_autocomplete(coll, substr)
     if substr # protect agains empty request
-      filtered = coll.find_all{|item| item.name.downcase.include? substr.downcase}
-      json_elems = Array[*filtered.map{ |e| {:id => e.id.to_s, :value => e.name} }].to_json
+      filtered = coll.find_all { |item| item.name.downcase.include? substr.downcase }
+      json_elems = Array[*filtered.map { |e| { :id => e.id.to_s, :value => e.name } }].to_json
       return json_elems
     else
       return ""
@@ -121,7 +110,7 @@ class ApplicationController < ActionController::Base
   end
 
   def format_dependencies_as_json_for_auto_complete(entries)
-    json_elems = Array[*entries.map{ |e| {:value => e.id.to_s, :label => e.specification} }].to_json
+    json_elems = Array[*entries.map { |e| { :value => e.id.to_s, :label => e.specification } }].to_json
     return json_elems
   end
 
@@ -134,10 +123,10 @@ class ApplicationController < ActionController::Base
   # versions. Unfortunately, I ran into a lot of trouble simply registering a
   # new mime type 'text/html' with format :m because :html already is linked to
   # that mime type and the new registration was forcing all html requests to be
-  # rendered in the mobile view. The before_filter and after_filter hackery
+  # rendered in the mobile view. The before_action and after_action hackery
   # below accomplishs that implementation goal by using a 'fake' mime type
   # during the processing and then setting it to 'text/html' in an
-  # 'after_filter' -LKM 2007-04-01
+  # 'after_action' -LKM 2007-04-01
   def mobile?
     return params[:format] == 'm'
   end
@@ -148,44 +137,12 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  def create_todo_from_recurring_todo(rt, date=nil)
-    # create todo and initialize with data from recurring_todo rt
-    todo = current_user.todos.build( { :description => rt.description, :notes => rt.notes, :project_id => rt.project_id, :context_id => rt.context_id})
-    todo.recurring_todo_id = rt.id
-
-    # set dates
-    todo.due = rt.get_due_date(date)
-
-    show_from_date = rt.get_show_from_date(date)
-    if show_from_date.nil?
-      todo.show_from=nil
-    else
-      # make sure that show_from is not in the past
-      todo.show_from = show_from_date < Time.zone.now ? nil : show_from_date
-    end
-
-    saved = todo.save
-    if saved
-      todo.tag_with(rt.tag_list)
-      todo.tags.reload
-    end
-
-    # increate number of occurences created from recurring todo
-    rt.inc_occurences
-
-    # mark recurring todo complete if there are no next actions left
-    checkdate = todo.due.nil? ? todo.show_from : todo.due
-    rt.toggle_completion! unless rt.has_next_todo(checkdate)
-
-    return saved ? todo : nil
-  end
-
   def handle_unverified_request
-    unless request.format=="application/xml"
+    unless request.format == "application/xml"
       super # handle xml http auth via our own login code
     end
   end
-  
+
   def sanitize(arg)
     ActionController::Base.helpers.sanitize(arg)
   end
@@ -193,8 +150,15 @@ class ApplicationController < ActionController::Base
   protected
 
   def admin_login_required
-    unless User.find_by_id_and_is_admin(session['user_id'], true)
-      render :text => t('errors.user_unauthorized'), :status => 401
+    unless User.find(session['user_id']).is_admin
+      render :body => t('errors.user_unauthorized'), :status => 401
+      return false
+    end
+  end
+
+  def admin_or_self_login_required
+    unless User.find(session['user_id']).is_admin || session['user_id'] == params[:id].to_i
+      render :body => t('errors.user_unauthorized'), :status => 401
       return false
     end
   end
@@ -240,34 +204,32 @@ class ApplicationController < ActionController::Base
 
   private
 
-  def parse_date_per_user_prefs( s )
+  def parse_date_per_user_prefs(s)
     prefs.parse_date(s)
   end
 
   def init_data_for_sidebar
-    @completed_projects = current_user.projects.completed
-    @hidden_projects = current_user.projects.hidden
-    @active_projects = current_user.projects.active
-
-    @active_contexts = current_user.contexts.active
-    @hidden_contexts = current_user.contexts.hidden
+    @sidebar = Sidebar.new(current_user)
 
     init_not_done_counts
     if prefs.show_hidden_projects_in_sidebar
-      init_project_hidden_todo_counts(['project'])
+      init_hidden_todo_counts(['project'])
+    end
+    if prefs.show_hidden_contexts_in_sidebar
+      init_hidden_todo_counts(['context'])
     end
   end
 
-  def init_not_done_counts(parents = ['project','context'])
+  def init_not_done_counts(parents = ['project', 'context'])
     parents.each do |parent|
-      eval("@#{parent}_not_done_counts ||= current_user.todos.active.count_by_group('#{parent}_id')")
-      eval("@#{parent}_deferred_counts ||= current_user.todos.deferred.count_by_group('#{parent}_id')")
+      eval("@#{parent}_not_done_counts ||= current_user.todos.active.count_by_group('#{parent}_id')", binding, __FILE__, __LINE__)
+      eval("@#{parent}_deferred_counts ||= current_user.todos.deferred.count_by_group('#{parent}_id')", binding, __FILE__, __LINE__)
     end
   end
 
-  def init_project_hidden_todo_counts(parents = ['project','context'])
+  def init_hidden_todo_counts(parents = ['project', 'context'])
     parents.each do |parent|
-      eval("@#{parent}_project_hidden_todo_counts ||= current_user.todos.active_or_hidden.count_by_group('#{parent}_id')")
+      eval("@#{parent}_hidden_todo_counts ||= current_user.todos.active_or_hidden.count_by_group('#{parent}_id')", binding, __FILE__, __LINE__)
     end
   end
 
@@ -288,4 +250,38 @@ class ApplicationController < ActionController::Base
     @z_index_counter = 500
   end
 
+  def todo_xml_params
+    if params[:limit_fields] == 'index'
+      return [:only => [:id, :created_at, :updated_at, :completed_at]]
+    else
+      return [:except => :user_id, :include => [:tags, :predecessors, :successors]]
+    end
+  end
+
+  def all_done_todos_for(object)
+    object_name = object.class.name.downcase # context or project
+    @source_view = "all_done"
+    @page_title = t("#{object_name.pluralize}.all_completed_tasks_title", "#{object_name}_name".to_sym => object.name)
+
+    @done = object.todos.completed.reorder('completed_at DESC').includes(Todo::DEFAULT_INCLUDES)
+      .paginate(:page => params[:page], :per_page => 20)
+    @count = @done.size
+    render :template => 'todos/all_done'
+  end
+
+  def done_todos_for(object)
+    object_name = object.class.name.downcase # context or project
+    @source_view = "done"
+    eval("@#{object_name} = object", binding, __FILE__, __LINE__)
+    @page_title = t("#{object_name.pluralize}.completed_tasks_title", "#{object_name}_name".to_sym => object.name)
+
+    @done_today, @done_rest_of_week, @done_rest_of_month = DoneTodos.done_todos_for_container(object.todos)
+    @count = @done_today.size + @done_rest_of_week.size + @done_rest_of_month.size
+
+    render :template => 'todos/done'
+  end
+
+  def set_group_view_by
+    @group_view_by = params['_group_view_by'] || cookies['group_view_by'] || 'context'
+  end
 end

app/controllers/calendar_controller.rb

@@ -0,0 +1,21 @@
+class CalendarController < ApplicationController
+  skip_before_action :login_required, :only => [:show]
+  prepend_before_action :login_or_feed_token_required, :only => [:show]
+
+  def show
+    @source_view = 'calendar'
+    @page_title = t('todos.calendar_page_title')
+
+    @calendar = Todos::Calendar.new(current_user)
+    @projects = @calendar.projects
+    @count = current_user.todos.not_completed.are_due.count
+    @due_all = current_user.todos.not_completed.are_due.reorder("due")
+
+    respond_to do |format|
+      format.html
+      format.m { cookies[:mobile_url] = { :value => request.fullpath, :secure => SITE_CONFIG['secure_cookies'] } }
+      format.ics { render :action => 'show', :layout => false, :content_type => Mime[:ics] }
+      format.xml { render :xml => @due_all.to_xml(*[todo_xml_params[0].merge({ :root => :todos })]) }
+    end
+  end
+end

app/controllers/contexts_controller.rb

@@ -1,88 +1,89 @@
 class ContextsController < ApplicationController
-
   helper :todos
 
-  before_filter :init, :except => [:index, :create, :destroy, :order]
-  before_filter :set_context_from_params, :only => [:update, :destroy]
-  skip_before_filter :login_required, :only => [:index]
-  prepend_before_filter :login_or_feed_token_required, :only => [:index]
+  before_action :init, :except => [:index, :create, :destroy, :order]
+  before_action :set_context_from_params, :only => [:update, :destroy]
+  skip_before_action :login_required, :only => [:index, :show]
+  prepend_before_action :login_or_feed_token_required, :only => [:index, :show]
 
   def index
+    @all_contexts    = current_user.contexts
     @active_contexts = current_user.contexts.active
     @hidden_contexts = current_user.contexts.hidden
-    @new_context = current_user.contexts.build
-    init_not_done_counts(['context'])
-
-    # save all contexts here as @new_context will add an empty one to current_user.contexts
-    @all_contexts = @active_contexts + @hidden_contexts
-    @count = @all_contexts.size
+    @closed_contexts = current_user.contexts.closed
+    unless request.format == :autocomplete
+      init_not_done_counts(['context'])
+      init_hidden_todo_counts(['context'])
+    end
 
     respond_to do |format|
       format.html &render_contexts_html
-      format.m    &render_contexts_mobile
-      format.xml  { render :xml => @all_contexts.to_xml( :except => :user_id ) }
-      format.rss  do
-        @feed_title = 'Tracks Contexts'
-        @feed_description = "Lists all the contexts for #{current_user.display_name}"
-      end
-      format.atom do
+      format.m &render_contexts_mobile
+      format.xml { render :xml => @all_contexts.to_xml(:root => :contexts, :except => :user_id) }
+      format.any(:rss, :atom) do
         @feed_title = 'Tracks Contexts'
         @feed_description = "Lists all the contexts for #{current_user.display_name}"
       end
       format.text do
-        # somehow passing Mime::TEXT using content_type to render does not work
-        headers['Content-Type']=Mime::TEXT.to_s
-        render :action => 'index', :layout => false, :content_type => Mime::TEXT
+        # somehow passing Mime[:text] using content_type to render does not work
+        headers['Content-Type'] = Mime[:text].to_s
+        render :action => 'index', :layout => false, :content_type => Mime[:text]
       end
       format.autocomplete &render_autocomplete
     end
   end
-  
+
   def show
     set_context_from_params
-    
+
     unless @context.nil?
       @max_completed = current_user.prefs.show_number_completed
-      @done = @context.todos.completed.limit(@max_completed).reorder("todos.completed_at DESC, todos.created_at DESC").includes(Todo::DEFAULT_INCLUDES)
-      @not_done_todos = @context.todos.active.reorder("todos.due IS NULL, todos.due ASC, todos.created_at ASC").includes(Todo::DEFAULT_INCLUDES)
+      @done = @context.todos.completed.limit(@max_completed).reorder(Arel.sql("todos.completed_at DESC, todos.created_at DESC")).includes(Todo::DEFAULT_INCLUDES)
+      @not_done_todos = @context.todos.active_or_hidden.not_project_hidden.reorder(Arel.sql('todos.due IS NULL, todos.due ASC, todos.created_at ASC')).includes(Todo::DEFAULT_INCLUDES)
+      @todos_without_project = @not_done_todos.select { |t| t.project.nil? }
+
+      @deferred_todos = @context.todos.deferred.includes(Todo::DEFAULT_INCLUDES)
+      @pending_todos = @context.todos.pending.includes(Todo::DEFAULT_INCLUDES)
 
-      @deferred = @context.todos.deferred.includes(Todo::DEFAULT_INCLUDES)
-      @pending = @context.todos.pending.includes(Todo::DEFAULT_INCLUDES)
-        
       @projects = current_user.projects
       @contexts = current_user.contexts
 
-      @count = @not_done_todos.count + @deferred.count + @pending.count
+      @projects_to_show = @projects.active
+      @contexts_to_show = [@context]
+
+      @count = @not_done_todos.count + @deferred_todos.count + @pending_todos.count
       @page_title = "TRACKS::Context: #{@context.name}"
       respond_to do |format|
         format.html
         format.m    &render_context_mobile
-        format.xml  { render :xml => @context.to_xml( :except => :user_id ) }
+        format.xml  { render :xml => @context.to_xml(:root => :context, :except => :user_id) }
       end
     else
       respond_to do |format|
-        format.html { render :text => 'Context not found', :status => 404 }
+        format.html { render :body => 'Context not found', :status => 404 }
         format.xml  { render :xml => '<error>Context not found</error>', :status => 404 }
       end
     end
   end
-  
+
   def create
     if params[:format] == 'application/xml' && params['exception']
       render_failure "Expected post format is valid xml like so: <context><name>context name</name></context>.", 400
       return
     end
-    @context = current_user.contexts.build(params['context'])
+    @context = current_user.contexts.build(context_params)
+    @context.hide! if params['context_state'] && params['context_state']['hide'] == '1'
     @saved = @context.save
     @context_not_done_counts = { @context.id => 0 }
     respond_to do |format|
       format.js do
         @down_count = current_user.contexts.size
         init_not_done_counts
+        init_hidden_todo_counts(['context'])
       end
       format.xml do
         if @context.new_record?
-          render_failure @context.errors.to_xml.html_safe, 409
+          render_failure @context.errors.full_messages.to_xml(root: "errors", skip_types: true).html_safe, 409
         else
           head :created, :location => context_url(@context)
         end
@@ -91,46 +92,30 @@ class ContextsController < ApplicationController
   end
 
   # Edit the details of the context
-  #
   def update
-    params['context'] ||= {}
-    success_text = if params['field'] == 'name' && params['value']
-      params['context']['id'] = params['id']
-      params['context']['name'] = params['value']
-    end
-
-    @original_context_hidden = @context.hidden?
-    @context.attributes = params["context"]
+    process_params_for_update
 
+    @context.attributes = context_params
     @saved = @context.save
+    @state_saved = set_state_for_update(@new_state)
+    @saved &&= @state_saved
 
     if @saved
-      if boolean_param('wants_render')
-        @state_changed = (@original_context_hidden != @context.hidden?)
-        @new_state = (@context.hidden? ? "hidden" : "active") if @state_changed
-        respond_to do |format|
-          format.js
+      @state_changed = (@original_context_state != @context.state)
+      @new_state = @context.state if @state_changed
+      @active_contexts = current_user.contexts.active
+      @hidden_contexts = current_user.contexts.hidden
+      @closed_contexts = current_user.contexts.closed
+    end
+
+    respond_to do |format|
+      format.js
+      format.xml do
+        if @saved
+          render :xml => @context.to_xml(:except => :user_id)
+        else
+          render :body => "Error on update: #{@context.errors.full_messages.inject("") { |v, e| v + e + " " }}", :status => 409
         end
-
-        # TODO is this param ever used? is this dead code?
-
-      elsif boolean_param('update_context_name')
-        @contexts = current_user.projects
-        render :template => 'contexts/update_context_name.js.rjs'
-        return
-      else
-        render :text => success_text || 'Success'
-      end
-    else
-      respond_to do |format|
-        format.js
-        format.xml {
-          if @saved
-            render :xml => @context.to_xml( :except => :user_id )
-          else
-            render :text => "Error on update: #{@context.errors.full_messages.inject("") {|v, e| v + e + " " }}", :status => 409
-          end
-        }
       end
     end
   end
@@ -146,8 +131,8 @@ class ContextsController < ApplicationController
   # actions, you'll get a warning dialogue. If you choose to go ahead, any
   # actions in the context will also be deleted.
   def destroy
-    # make sure the deleted recurring patterns are removed from associated todos
-    @context.recurring_todos.each { |rt| rt.clear_todos_association } unless @context.recurring_todos.nil?
+    # make sure the deleted recurrence patterns are removed from associated todos
+    @context.recurring_todos.each(&:clear_todos_association) unless @context.recurring_todos.nil?
 
     @context.destroy
     respond_to do |format|
@@ -155,7 +140,7 @@ class ContextsController < ApplicationController
         @down_count = current_user.contexts.size
         update_state_counts
       end
-      format.xml { render :text => "Deleted context #{@context.name}" }
+      format.xml { render :body => "Deleted context #{@context.name}" }
     end
   end
 
@@ -163,32 +148,25 @@ class ContextsController < ApplicationController
   #
   def order
     context_ids = params["container_context"]
-    @projects = current_user.contexts.update_positions( context_ids )
-    render :nothing => true
+    @projects = current_user.contexts.update_positions(context_ids)
+    head :ok
   rescue
     notify :error, $!
     redirect_to :action => 'index'
   end
 
   def done_todos
-    @source_view = 'context'
-    @context = current_user.contexts.find(params[:id])
-    @page_title = t('contexts.completed_tasks_title', :context_name => @context.name)
-
-    @done_today, @done_this_week, @done_this_month = DoneTodos.done_todos_for_container(@context)
-    @count = @done_today.size + @done_this_week.size + @done_this_month.size
-
-    render :template => 'todos/done'
+    done_todos_for current_user.contexts.find(params[:id])
   end
 
   def all_done_todos
-    @source_view = 'context'
-    @context = current_user.contexts.find(params[:id])
-    @page_title = t('contexts.all_completed_tasks_title', :context_name => @context.name)
+    all_done_todos_for current_user.contexts.find(params[:id])
+  end
 
-    @done = @context.todos.completed.paginate :page => params[:page], :per_page => 20, :order => 'completed_at DESC', :include => Todo::DEFAULT_INCLUDES
-    @count = @done.size
-    render :template => 'todos/all_done'
+  private
+
+  def context_params
+    params.require(:context).permit(:name, :position, :state)
   end
 
   protected
@@ -196,8 +174,10 @@ class ContextsController < ApplicationController
   def update_state_counts
     @active_contexts_count = current_user.contexts.active.count
     @hidden_contexts_count = current_user.contexts.hidden.count
+    @closed_contexts_count = current_user.contexts.closed.count
     @show_active_contexts = @active_contexts_count > 0
     @show_hidden_contexts = @hidden_contexts_count > 0
+    @show_closed_contexts = @closed_contexts_count > 0
   end
 
   def render_contexts_html
@@ -205,8 +185,13 @@ class ContextsController < ApplicationController
       @page_title = "TRACKS::List Contexts"
       @no_active_contexts = @active_contexts.empty?
       @no_hidden_contexts = @hidden_contexts.empty?
+      @no_closed_contexts = @closed_contexts.empty?
       @active_count = @active_contexts.size
       @hidden_count = @hidden_contexts.size
+      @closed_count = @closed_contexts.size
+      @count = @active_count + @hidden_count + @closed_count
+      @new_context = current_user.contexts.build
+
       render
     end
   end
@@ -217,28 +202,25 @@ class ContextsController < ApplicationController
       @active_contexts = current_user.contexts.active
       @hidden_contexts = current_user.contexts.hidden
       @down_count = @active_contexts.size + @hidden_contexts.size
-      cookies[:mobile_url]= {:value => request.fullpath, :secure => SITE_CONFIG['secure_cookies']}
+      cookies[:mobile_url] = { :value => request.fullpath, :secure => SITE_CONFIG['secure_cookies'] }
       render
     end
   end
 
   def render_context_mobile
     lambda do
-      @page_title = "TRACKS::List actions in "+@context.name
-      @not_done = @not_done_todos.select {|t| t.context_id == @context.id }
+      @page_title = "TRACKS::List actions in " + @context.name
+      @not_done = @not_done_todos.select { |t| t.context_id == @context.id }
       @down_count = @not_done.size
-      cookies[:mobile_url]= {:value => request.fullpath, :secure => SITE_CONFIG['secure_cookies']}
+      cookies[:mobile_url] = { :value => request.fullpath, :secure => SITE_CONFIG['secure_cookies'] }
       @mobile_from_context = @context.id
       render
     end
   end
-  
+
   def render_autocomplete
     lambda do
-      # first get active contexts with todos then those without
-      filled_contexts = @active_contexts.reject { |ctx| ctx.todos.count == 0 } + @hidden_contexts.reject { |ctx| ctx.todos.count == 0 }
-      empty_contexts = @active_contexts.find_all { |ctx| ctx.todos.count == 0 } + @hidden_contexts.find_all { |ctx| ctx.todos.count == 0 }
-      render :text => for_autocomplete(filled_contexts + empty_contexts, params[:term])
+      render :body => for_autocomplete(current_user.contexts, params[:term])
     end
   end
 
@@ -257,4 +239,33 @@ class ContextsController < ApplicationController
     init_data_for_sidebar
   end
 
+  def process_params_for_update
+    params['context'] ||= {}
+    @success_text = if params['field'] == 'name' && params['value']
+      params['context']['id'] = params['id']
+      params['context']['name'] = params['value']
+    end
+
+    @original_context_state = @context.state
+    @new_state = params['context']['state']
+    params['context'].delete('state')
+  end
+
+  def set_state_for_update(new_state)
+    begin
+      unless @original_context_state == new_state
+        if new_state == 'active'
+          @context.activate!
+        elsif new_state == 'hidden'
+          @context.hide!
+        elsif new_state == 'closed'
+          @context.close!
+        end
+      end
+      return true
+    rescue AASM::InvalidTransition
+      @context.errors.add(:state, "cannot be changed. The context cannot be closed if you have uncompleted actions in this context")
+      return false
+    end
+  end
 end

app/controllers/data_controller.rb

@@ -1,63 +1,139 @@
 class DataController < ApplicationController
-  
   require 'csv'
-  
+
   def index
-    @page_title = "TRACKS::Export"
+    @page_title = t('data.export.page_title')
   end
 
-  def import
+  def import; end
+
+  def csv_map
+    if params[:file].blank?
+      flash[:notice] = t "data.import.errors.file_blank"
+      redirect_back fallback_location: root_path
+    else
+      @import_to = params[:import_to]
+
+      begin
+        # Get column headers and format as [['name', column_number]...]
+        i = -1
+        @headers = import_headers(params[:file].path).collect { |v| [v, i += 1] }
+        @headers.unshift ['', i]
+      rescue Exception => e
+        flash[:error] = t "data.import.errors.invalid_csv", e: e
+        redirect_back fallback_location: root_path
+        return
+      end
+
+      # Save file for later
+      begin
+        uploaded_file = params[:file]
+        @filename = sanitize_filename(uploaded_file.original_filename)
+        path_and_file = Rails.root.join('public', 'uploads', 'csv', @filename)
+        File.open(path_and_file, "wb") { |f| f.write(uploaded_file.read) }
+      rescue Exception => e
+        flash[:error] = t "data.import.errors.save_error", path_and_file: path_and_file, e: e
+        redirect_back fallback_location: root_path
+        return
+      end
+
+      case @import_to
+      when 'projects'
+        @labels = [:name, :description]
+      when 'todos'
+        @labels = [:description, :context, :project, :notes, :created_at, :due, :completed_at]
+      else
+        flash[:error] = t "data.import.errors.invalid_destination"
+        redirect_back fallback_location: root_path
+      end
+      respond_to do |format|
+        format.html
+      end
+    end
+  end
+
+  def csv_import
+    begin
+      filename = sanitize_filename(params[:file])
+      path_and_file = Rails.root.join('public', 'uploads', 'csv', filename)
+      case params[:import_to]
+      when 'projects'
+        count = Project.import path_and_file, params, current_user
+        flash[:notice] = t 'data.import.projects_count', count: count
+      when 'todos'
+        count = Todo.import path_and_file, params, current_user
+        if !count
+          flash[:error] = t('data.import.errors.no_context')
+        else
+          flash[:notice] = t 'data.import.todos_count', count: count
+        end
+      else
+        flash[:error] = t('data.import.errors.invalid_destination')
+      end
+    rescue Exception => e
+      flash[:error] = t 'data.import.errors.invalid_destination', e: e
+    end
+    File.delete(path_and_file)
+    redirect_to import_data_path
+  end
+
+  def import_headers(file)
+    CSV.foreach(file, headers: false) do |row|
+      return row
+    end
   end
 
   def export
     # Show list of formats for export
   end
-  
+
   # Thanks to a tip by Gleb Arshinov
   # <http://lists.rubyonrails.org/pipermail/rails/2004-November/000199.html>
   def yaml_export
     all_tables = {}
-    
-    all_tables['todos'] = current_user.todos.includes(:tags).all
-    all_tables['contexts'] = current_user.contexts.all
-    all_tables['projects'] = current_user.projects.all
+
+    all_tables['todos'] = current_user.todos.includes(:tags).load
+    all_tables['contexts'] = current_user.contexts.load
+    all_tables['projects'] = current_user.projects.load
 
     todo_tag_ids = Tag.find_by_sql([
-        "SELECT DISTINCT tags.id "+
-          "FROM tags, taggings, todos "+
-          "WHERE todos.user_id=? "+
-          "AND tags.id = taggings.tag_id " +
-          "AND taggings.taggable_id = todos.id ", current_user.id])
+        "SELECT DISTINCT tags.id
+         FROM tags, taggings, todos
+         WHERE todos.user_id = ?
+         AND tags.id = taggings.tag_id
+         AND taggings.taggable_id = todos.id", current_user.id])
     rec_todo_tag_ids = Tag.find_by_sql([
-        "SELECT DISTINCT tags.id "+
-          "FROM tags, taggings, recurring_todos "+
-          "WHERE recurring_todos.user_id=? "+
-          "AND tags.id = taggings.tag_id " +
-          "AND taggings.taggable_id = recurring_todos.id ", current_user.id])
+        "SELECT DISTINCT tags.id
+         FROM tags, taggings, recurring_todos
+         WHERE recurring_todos.user_id = ?
+         AND tags.id = taggings.tag_id
+         AND taggings.taggable_id = recurring_todos.id", current_user.id])
     tags = Tag.where("id IN (?) OR id IN (?)", todo_tag_ids, rec_todo_tag_ids)
     taggings = Tagging.where("tag_id IN (?) OR tag_id IN(?)", todo_tag_ids, rec_todo_tag_ids)
 
-    all_tables['tags'] = tags.all
-    all_tables['taggings'] = taggings.all
-    all_tables['notes'] = current_user.notes.all
-    all_tables['recurring_todos'] = current_user.recurring_todos.all
-    
+    all_tables['tags'] = tags.load
+    all_tables['taggings'] = taggings.load
+    all_tables['notes'] = current_user.notes.load
+    all_tables['recurring_todos'] = current_user.recurring_todos.load
+
     result = all_tables.to_yaml
-    result.gsub!(/\n/, "\r\n")   # TODO: general functionality for line endings
+    # TODO: general functionality for line endings
+    result.gsub!(/\n/, "\r\n")
     send_data(result, :filename => "tracks_backup.yml", :type => 'text/plain')
   end
-  
+
+  # export all actions as csv
   def csv_actions
     content_type = 'text/csv'
-    CSV::Writer.generate(result = "") do |csv|
+    CSV.generate(result = "") do |csv|
       csv << ["id", "Context", "Project", "Description", "Notes", "Tags",
         "Created at", "Due", "Completed at", "User ID", "Show from",
         "state"]
-      current_user.todos.include(:context, :project).all.each do |todo|
+      current_user.todos.includes(:context, :project, :taggings, :tags).each do |todo|
         csv << [todo.id, todo.context.name,
           todo.project_id.nil? ? "" : todo.project.name,
           todo.description,
-          todo.notes, todo.tags.collect{|t| t.name}.join(', '),
+          todo.notes, todo.tags.collect { |t| t.name }.join(', '),
           todo.created_at.to_formatted_s(:db),
           todo.due? ? todo.due.to_formatted_s(:db) : "",
           todo.completed_at? ? todo.completed_at.to_formatted_s(:db) : "",
@@ -69,12 +145,11 @@ class DataController < ApplicationController
     send_data(result, :filename => "todos.csv", :type => content_type)
   end
 
-  
+  # export all notes as csv
   def csv_notes
     content_type = 'text/csv'
     CSV.generate(result = "") do |csv|
-      csv << ["id", "User ID", "Project", "Note",
-        "Created at", "Updated at"]
+      csv << ["id", "User ID", "Project", "Note", "Created at", "Updated at"]
       # had to remove project include because it's association order is leaking
       # through and causing an ambiguous column ref even with_exclusive_scope
       # didn't seem to help -JamesKebinger
@@ -89,20 +164,20 @@ class DataController < ApplicationController
     end
     send_data(result, :filename => "notes.csv", :type => content_type)
   end
-  
+
   def xml_export
     todo_tag_ids = Tag.find_by_sql([
-        "SELECT DISTINCT tags.id "+
-          "FROM tags, taggings, todos "+
-          "WHERE todos.user_id=? "+
-          "AND tags.id = taggings.tag_id " +
-          "AND taggings.taggable_id = todos.id ", current_user.id])
+        "SELECT DISTINCT tags.id
+         FROM tags, taggings, todos
+         WHERE todos.user_id = ?
+         AND tags.id = taggings.tag_id
+         AND taggings.taggable_id = todos.id", current_user.id])
     rec_todo_tag_ids = Tag.find_by_sql([
-        "SELECT DISTINCT tags.id "+
-          "FROM tags, taggings, recurring_todos "+
-          "WHERE recurring_todos.user_id=? "+
-          "AND tags.id = taggings.tag_id " +
-          "AND taggings.taggable_id = recurring_todos.id ", current_user.id])
+        "SELECT DISTINCT tags.id
+         FROM tags, taggings, recurring_todos
+         WHERE recurring_todos.user_id = ?
+         AND tags.id = taggings.tag_id
+         AND taggings.taggable_id = recurring_todos.id", current_user.id])
     tags = Tag.where("id IN (?) OR id IN (?)", todo_tag_ids, rec_todo_tag_ids)
     taggings = Tagging.where("tag_id IN (?) OR tag_id IN(?)", todo_tag_ids, rec_todo_tag_ids)
 
@@ -117,14 +192,14 @@ class DataController < ApplicationController
     result << "</tracks_data>"
     send_data(result, :filename => "tracks_data.xml", :type => 'text/xml')
   end
-  
+
   def yaml_form
     # Draw the form to input the YAML text data
   end
 
   # adjusts time to utc
   def adjust_time(timestring)
-    if (timestring=='') or ( timestring == nil)
+    if (timestring == '') || (timestring == nil)
       return nil
     else
       return Time.parse(timestring + 'UTC')
@@ -132,103 +207,12 @@ class DataController < ApplicationController
   end
 
   def yaml_import
-    @errmessage = ''
-    @inarray = YAML::load(params['import']['yaml'])
-    # arrays to handle id translations
-
-    # contexts
-    translate_context = Hash.new
-    translate_context[nil] = nil
-    current_user.contexts.each { |context| context.destroy }
-    @inarray['contexts'].each { | item |
-      newitem = Context.new(item.ivars['attributes'])
-      newitem.user_id = current_user.id
-      newitem.created_at = adjust_time(item.ivars['attributes']['created_at'])
-      newitem.save(false)
-      translate_context[item.ivars['attributes']['id'].to_i] = newitem.id
-    }
-
-    # projects
-    translate_project = Hash.new
-    translate_project[nil] = nil
-    current_user.projects.each { |item| item.destroy }
-    @inarray['projects'].each { |item|
-      newitem = Project.new(item.ivars['attributes'])
-      # ids
-      newitem.user_id = current_user.id
-      newitem.default_context_id = translate_context[newitem.default_context_id]
-      newitem.save(false)
-      translate_project[item.ivars['attributes']['id'].to_i] = newitem.id
-
-      # state + dates
-      newitem.transition_to(item.ivars['attributes']['state'])
-      newitem.completed_at = adjust_time(item.ivars['attributes']['completed_at'])
-      newitem.created_at = adjust_time(item.ivars['attributes']['created_at'])
-      newitem.position = item.ivars['attributes']['position']
-      newitem.save(false)
-    }
-
-    # todos
-    translate_todo = Hash.new
-    translate_todo[nil] = nil
-    current_user.todos.each { |item| item.destroy }
-    @inarray['todos'].each { |item|
-      newitem = Todo.new(item.ivars['attributes'])
-      # ids
-      newitem.user_id = current_user.id
-      newitem.context_id = translate_context[newitem.context_id]
-      newitem.project_id = translate_project[newitem.project_id]
-      # TODO: vyresit recurring_todo_id
-      newitem.save(false)
-      translate_todo[item.ivars['attributes']['id'].to_i] = newitem.id
-
-      # state + dates
-      case item.ivars['attributes']['state']
-      when 'active' then newitem.activate!
-      when 'project_hidden' then newitem.hide!
-      when 'completed'
-        newitem.complete!
-        newitem.completed_at = adjust_time(item.ivars['attributes']['completed_at'])
-      when 'deferred' then newitem.defer!
-      end
-      newitem.created_at = adjust_time(item.ivars['attributes']['created_at'])
-      newitem.save(false)
-    }
-
-    # tags
-    translate_tag = Hash.new
-    translate_tag[nil] = nil
-    current_user.tags.each { |item| item.destroy }
-    @inarray['tags'].each { |item|
-      newitem = Tag.new(item.ivars['attributes'])
-      newitem.created_at = adjust_time(item.ivars['attributes']['created_at'])
-      newitem.save
-      translate_tag[item.ivars['attributes']['id'].to_i] = newitem.id
-    }
-
-    # taggings
-    current_user.taggings.each { |item| item.destroy }
-    @inarray['taggings'].each { |item|
-      newitem = Tagging.new(item.ivars['attributes'])
-      newitem.user_id = current_user.id
-      newitem.tag_id = translate_tag[newitem.tag_id]
-      case newitem.taggable_type
-      when 'Todo' then newitem.taggable_id = translate_todo[newitem.taggable_id]
-      else newitem.taggable_id = 0
-      end
-      newitem.save
-    }
-
-    # notes
-    current_user.notes.each { |item| item.destroy }
-    @inarray['notes'].each { |item|
-      newitem = Note.new(item.ivars['attributes'])
-      newitem.id = item.ivars['attributes']['id']
-      newitem.user_id = current_user.id
-      newitem.project_id = translate_project[newitem.project_id]
-      newitem.created_at = adjust_time(item.ivars['attributes']['created_at'])
-      newitem.save
-    }
+    raise t "data.import.yaml_disabled"
   end
-  
-end
+
+  private
+
+  def sanitize_filename(filename)
+    filename.gsub(/[^0-9A-z.\-]/, '_')
+  end
+end

app/controllers/feedlist_controller.rb

@@ -1,44 +1,43 @@
 class FeedlistController < ApplicationController
-
   helper :feedlist
 
   def index
     @page_title = 'TRACKS::Feeds'
-    
+
     unless mobile?
       init_data_for_sidebar
     else
       @projects = current_user.projects
       @contexts = current_user.contexts
     end
-    
+
     @active_projects = current_user.projects.active
     @hidden_projects = current_user.projects.hidden
     @completed_projects = current_user.projects.completed
-    
+
     @active_contexts = current_user.contexts.active
     @hidden_contexts = current_user.contexts.hidden
-    
+
     respond_to do |format|
       format.html
       format.m
     end
   end
-  
+
   def get_feeds_for_context
-    @context = current_user.contexts.find params[:context_id]
-    respond_to do |format|
-      format.html { render :file => 'feedlist/get_feeds_for_context'}
-      format.js
-    end
+    get_feeds_for(@context = current_user.contexts.find(params[:context_id]))
   end
 
   def get_feeds_for_project
-    @project = current_user.projects.find params[:project_id]
+    get_feeds_for(@project = current_user.projects.find(params[:project_id]))
+  end
+
+  private
+
+  def get_feeds_for(object)
     respond_to do |format|
-      format.html { render :file => "feedlist/get_feeds_for_project"}
+      format.html { render :template => "feedlist/get_feeds_for_#{object.class.name.downcase}" }
       format.js
     end
   end
-
 end

app/controllers/integrations_controller.rb

@@ -1,60 +1,38 @@
 class IntegrationsController < ApplicationController
   require 'mail'
-  
-  skip_before_filter :login_required, :only => [:cloudmailin, :search_plugin, :google_gadget]
-  
+
+  skip_before_action :login_required, :only => [:search_plugin]
+
   def index
     @page_title = 'TRACKS::Integrations'
   end
-  
+
   def rest_api
     @page_title = 'TRACKS::REST API Documentation'
   end
-    
-  def get_quicksilver_applescript
-    get_applescript('quicksilver_applescript')
-  end
 
-  def get_applescript1
-    get_applescript('applescript1')
-  end
-
-  def get_applescript2
-    get_applescript('applescript2')
+  def help
+    @page_title = 'TRACKS::Help'
   end
 
   def search_plugin
-    @icon_data = [File.open(File.join(Rails.root, 'app', 'assets', 'images', 'done.png')).read].
-      pack('m').gsub(/\n/, '')
+    @icon_data = [File.open(File.join(Rails.root, 'app', 'assets', 'images', 'done.png')).read]
+      .pack('m').gsub(/\n/, '')
   end
 
-  def google_gadget
-    render :layout => false, :content_type => Mime::XML
-  end
-  
-  def cloudmailin
-    # verify cloudmailin signature
-    provided = request.request_parameters.delete(:signature)
-    signature = Digest::MD5.hexdigest(request.request_parameters.sort{|a,b| a[0].to_s <=> b[0].to_s}.map{|k,v| v}.join + SITE_CONFIG['cloudmailin'])
-
-    # if signature does not match, return 403
-    if provided != signature
-      render :text => "Message signature verification failed.", :status => 403
-      return false
-    end
-    
-    if MessageGateway::receive(Mail.new(params[:message]))
-      render :text => 'success', :status => 200
-    else
-      render :text => "No user found or other error", :status => 404
-    end
-  end
-  
   private
-  
-  def get_applescript(partial_name)
-    context = current_user.contexts.find params[:context_id]
-    render :partial => partial_name, :locals => { :context => context }
+
+  def flatten_params(params, title = nil, result = {})
+    params.each do |key, value|
+      if value.is_a? Hash
+        key_name = title ? "#{title}[#{key}]" : key
+        flatten_params(value, key_name, result)
+      else
+        key_name = title ? "#{title}[#{key}]" : key
+        result[key_name] = value
+      end
+    end
+
+    return result
   end
-  
 end

app/controllers/login_controller.rb

@@ -1,10 +1,12 @@
 class LoginController < ApplicationController
-  
+  include Common
+
   layout 'login'
-  skip_before_filter :set_session_expiration
-  skip_before_filter :login_required
-  before_filter :login_optional
-  before_filter :get_current_user
+  skip_before_action :set_session_expiration
+  skip_before_action :login_required
+  before_action :login_optional
+  before_action :get_current_user
+  before_action :set_theme
 
   protect_from_forgery :except => [:check_expiry, :login]
 
@@ -13,63 +15,27 @@ class LoginController < ApplicationController
     cookies[:preferred_auth] = prefered_auth? unless cookies[:preferred_auth]
     case request.method
     when 'POST'
-      if @user = User.authenticate(params['user_login'], params['user_password'])
-        session['user_id'] = @user.id
-        # If checkbox on login page checked, we don't expire the session after 1 hour
-        # of inactivity and we remember this user for future browser sessions
-        session['noexpiry'] = params['user_noexpiry']
-        msg = (should_expire_sessions?) ? "will expire after 1 hour of inactivity." : "will not expire."
-        notify :notice, "Login successful: session #{msg}"
-        cookies[:tracks_login] = { :value => @user.login, :expires => Time.now + 1.year, :secure => SITE_CONFIG['secure_cookies'] }
-        unless should_expire_sessions?
-          @user.remember_me
-          cookies[:auth_token] = { :value => @user.remember_token , :expires => @user.remember_token_expires_at, :secure => SITE_CONFIG['secure_cookies'] }
-        end
-        redirect_back_or_home
-        return
+      if (@user = User.authenticate(params['user_login'], params['user_password']))
+        @user.update_attribute(:last_login_at, Time.zone.now)
+        return handle_post_success
       else
-        @login = params['user_login']
-        notify :warning, t('login.unsuccessful')
+        handle_post_failure
       end
     when 'GET'
       if User.no_users_yet?
-        redirect_to signup_path
-        return
+        return redirect_to signup_path
       end
     end
     respond_to do |format|
       format.html
-      format.m   { render :action => 'login', :layout => 'mobile' }
+      format.m { render :action => 'login', :layout => 'mobile' }
     end
   end
-  
+
   def logout
     logout_user
   end
 
-  def expire_session
-    # this is a hack to enable cucumber to expire a session by calling this
-    # method. The method will be unavailable for production environment
-    
-    @user.forget_me if logged_in?
-    cookies.delete :auth_token
-    session['user_id'] = nil
-    reset_session
-    
-    unless Rails.env.production?
-      session['expiry_time'] = Time.now
-      respond_to do |format|
-        format.html { render :text => "Session expired for test purposes"}
-        format.js { render :text => "" }
-      end
-    else
-      respond_to do |format|
-        format.html { render :text => "Not available for production use"}
-        format.js { render :text => "" }
-      end
-    end
-  end
-  
   def check_expiry
     # Gets called by periodically_call_remote to check whether
     # the session has timed out yet
@@ -77,20 +43,43 @@ class LoginController < ApplicationController
       if session
         return unless should_expire_sessions?
         # Get expiry time (allow ten seconds window for the case where we have none)
-        expiry_time = session['expiry_time'] || Time.now + 10
-        time_left = expiry_time - Time.now
-        @session_expired = ( time_left < (10*60) ) # Session will time out before the next check
+        time_left = expiry_time - Time.zone.now
+        @session_expired = (time_left < (10 * 60)) # Session will time out before the next check
       end
     end
     respond_to do |format|
       format.js
     end
   end
-  
+
   private
-      
+
+  def handle_post_success
+    session['user_id'] = @user.id
+    # If checkbox on login page checked, we don't expire the session after 1 hour
+    # of inactivity and we remember this user for future browser sessions
+    session['noexpiry'] = params['user_noexpiry']
+    msg = (should_expire_sessions?) ? "will expire after 1 hour of inactivity." : "will not expire."
+    notify :notice, "Login successful: session #{msg}"
+    cookies[:tracks_login] = { :value => @user.login, :expires => Time.zone.now + 1.year, :secure => SITE_CONFIG['secure_cookies'] }
+    unless should_expire_sessions?
+      @user.remember_me
+      cookies[:auth_token] = { :value => @user.remember_token, :expires => @user.remember_token_expires_at, :secure => SITE_CONFIG['secure_cookies'] }
+    end
+    redirect_back_or_home
+  end
+
+  def handle_post_failure
+    @login = params['user_login']
+    notify :warning, t('login.unsuccessful')
+  end
+
   def should_expire_sessions?
     session['noexpiry'] != "on"
   end
-  
+
+  def expiry_time
+    return Time.zone.now + 10 unless session['expiry_time']
+    Time.zone.parse(session['expiry_time'])
+  end
 end

app/controllers/notes_controller.rb

@@ -1,15 +1,14 @@
 class NotesController < ApplicationController
-
-  before_filter :set_source_view
+  before_action :set_source_view
 
   def index
-    @all_notes = current_user.notes.all
+    @all_notes = current_user.notes
     @count = @all_notes.size
     @page_title = "TRACKS::All notes"
     @source_view = 'note_list'
     respond_to do |format|
       format.html
-      format.xml { render :xml => @all_notes.to_xml( :except => :user_id )  }
+      format.xml { render :xml => @all_notes.to_xml(:root => :notes, :except => :user_id) }
     end
   end
 
@@ -24,7 +23,7 @@ class NotesController < ApplicationController
 
   def create
     @note = current_user.notes.build
-    @note.attributes = params["note"]
+    @note.attributes = note_params
 
     @saved = @note.save
 
@@ -38,14 +37,14 @@ class NotesController < ApplicationController
         end
       end
       format.html do
-        render :text => 'unexpected request for html rendering'
+        render :body => 'unexpected request for html rendering'
       end
     end
   end
 
   def update
     @note = current_user.notes.find(params['id'])
-    @note.attributes = params["note"]
+    @note.attributes = note_params
     @saved = @note.save
     respond_to do |format|
       format.html
@@ -56,7 +55,8 @@ class NotesController < ApplicationController
   def destroy
     @note = current_user.notes.find(params['id'])
     @note.destroy
-    
+    set_source_view
+
     respond_to do |format|
       format.html
       format.js { @down_count = current_user.notes.size }
@@ -69,4 +69,9 @@ class NotesController < ApplicationController
     @source_view = params['_source_view'] || 'note'
   end
 
+  private
+
+  def note_params
+    params.require(:note).permit(:project_id, :body)
+  end
 end

app/controllers/preferences_controller.rb

@@ -1,5 +1,4 @@
 class PreferencesController < ApplicationController
-
   def index
     @page_title = t('preferences.page_title')
     @prefs = current_user.prefs
@@ -9,10 +8,10 @@ class PreferencesController < ApplicationController
   def update
     @prefs = current_user.prefs
     @user = current_user
-    user_updated = current_user.update_attributes(params['user'])
-    prefs_updated = current_user.preference.update_attributes(params['prefs'])
+    user_updated = current_user.update(user_params)
+    prefs_updated = current_user.preference.update(prefs_params)
     if (user_updated && prefs_updated)
-      if !params['user']['password'].blank? # password updated?
+      if params['user']['password'].present? # password updated?
         logout_user t('preferences.password_changed')
       else
         preference_updated
@@ -28,15 +27,28 @@ class PreferencesController < ApplicationController
 
   def render_date_format
     format = params[:date_format]
-    render :text => l(Date.today, :format => format)
+    render :body => l(Date.current, :format => format)
   end
 
-private
+  private
+
+  def prefs_params
+    params.require(:prefs).permit(
+      :date_format, :week_starts, :show_number_completed,
+      :show_completed_projects_in_sidebar, :show_hidden_contexts_in_sidebar,
+      :staleness_starts, :due_style, :locale, :title_date_format, :time_zone,
+      :show_hidden_projects_in_sidebar, :show_project_on_todo_done,
+      :review_period, :refresh, :verbose_action_descriptors,
+      :mobile_todos_per_page, :sms_email, :sms_context_id, :theme)
+  end
+
+  def user_params
+    params.require(:user).permit(:login, :first_name, :last_name, :email, :password_confirmation, :password, :auth_type, :open_id_url)
+  end
 
   # Display notification if preferences are successful updated
   def preference_updated
     notify :notice, t('preferences.updated')
     redirect_to :action => 'index'
   end
-  
 end

app/controllers/projects_controller.rb

@@ -1,11 +1,10 @@
 class ProjectsController < ApplicationController
-
   helper :application, :todos, :notes
-  before_filter :set_source_view
-  before_filter :set_project_from_params, :only => [:update, :destroy, :show, :edit, :set_reviewed]
-  before_filter :default_context_filter, :only => [:create, :update]
-  skip_before_filter :login_required, :only => [:index]
-  prepend_before_filter :login_or_feed_token_required, :only => [:index]
+  before_action :set_source_view
+  before_action :set_project_from_params, :only => [:update, :destroy, :show, :edit, :set_reviewed]
+  before_action :default_context_filter, :only => [:create, :update]
+  skip_before_action :login_required, :only => [:index, :show]
+  prepend_before_action :login_or_feed_token_required, :only => [:index, :show]
 
   def index
     @source_view = params['_source_view'] || 'project_list'
@@ -14,45 +13,41 @@ class ProjectsController < ApplicationController
     else
       @contexts = current_user.contexts
       init_not_done_counts(['project'])
-      init_project_hidden_todo_counts(['project'])
+      init_hidden_todo_counts(['project'])
       if params[:only_active_with_no_next_actions]
-        @projects = current_user.projects.active.select { |p| count_undone_todos(p) == 0  }
+        @projects = current_user.projects.active.select { |p| count_undone_todos(p) == 0 }
       else
-        @projects = current_user.projects.all
+        @projects = current_user.projects
       end
-      @new_project = current_user.projects.build
       @active_projects = current_user.projects.active
       @hidden_projects = current_user.projects.hidden
       respond_to do |format|
-        format.html  do
+        format.html do
           @page_title = t('projects.list_projects')
           @count = current_user.projects.count
           @completed_projects = current_user.projects.completed.limit(10)
           @completed_count = current_user.projects.completed.count
           @no_projects = current_user.projects.empty?
           current_user.projects.cache_note_counts
+          @new_project = current_user.projects.build
         end
-        format.m     do
+        format.m do
           @completed_projects = current_user.projects.completed
           @down_count = @active_projects.size + @hidden_projects.size + @completed_projects.size
-          cookies[:mobile_url]= {:value => request.fullpath, :secure => SITE_CONFIG['secure_cookies']}
+          cookies[:mobile_url] = { :value => request.fullpath, :secure => SITE_CONFIG['secure_cookies'] }
         end
-        format.xml   { render :xml => @projects.to_xml( :except => :user_id )  }
-        format.rss   do
-          @feed_title = I18n.t('models.project.feed_title')
-          @feed_description = I18n.t('models.project.feed_description', :username => current_user.display_name)
-        end
-        format.atom  do
+        format.xml { render :xml => @projects.to_xml(:root => :projects, :except => :user_id) }
+        format.any(:rss, :atom) do
           @feed_title = I18n.t('models.project.feed_title')
           @feed_description = I18n.t('models.project.feed_description', :username => current_user.display_name)
         end
         format.text do
-          # somehow passing Mime::TEXT using content_type to render does not work
-          headers['Content-Type']=Mime::TEXT.to_s
+          # somehow passing Mime[:text] using content_type to render does not work
+          headers['Content-Type'] = Mime[:text].to_s
         end
         format.autocomplete do
           projects = current_user.projects.active + current_user.projects.hidden
-          render :text => for_autocomplete(projects, params[:term])
+          render :body => for_autocomplete(projects, params[:term])
         end
       end
     end
@@ -61,15 +56,14 @@ class ProjectsController < ApplicationController
   def review
     @source_view = params['_source_view'] || 'review'
     @page_title = t('projects.list_reviews')
-    @projects = current_user.projects.all
-    @contexts = current_user.contexts.all
-    @projects_to_review = current_user.projects.select  {|p| p.needs_review?(current_user)}
-    @stalled_projects = current_user.projects.select  {|p| p.stalled?}
-    @blocked_projects = current_user.projects.select  {|p| p.blocked?}
-    @current_projects = current_user.projects.uncompleted.select  {|p| not(p.needs_review?(current_user))}
+    projects = current_user.projects
+    @projects_to_review = projects.select { |p| p.needs_review?(current_user) }
+    @stalled_projects = projects.select { |p| p.stalled? }
+    @blocked_projects = projects.select { |p| p.blocked? }
+    @current_projects = projects.uncompleted.select { |p| not p.needs_review?(current_user) }.sort_by { |p| p.last_reviewed || Time.zone.at(0) }
 
     init_not_done_counts(['project'])
-    init_project_hidden_todo_counts(['project'])
+    init_hidden_todo_counts(['project'])
     current_user.projects.cache_note_counts
 
     @page_title = t('projects.list_reviews')
@@ -83,23 +77,26 @@ class ProjectsController < ApplicationController
     @source_view = params['_source_view'] || 'project_list'
     @page_title = t('projects.list_completed_projects')
 
+    items_per_page = 20
     page = params[:page] || 1
-    projects_per_page = 20
-    @projects = current_user.projects.completed.paginate :page => page, :per_page => projects_per_page
+    @projects = current_user.projects.completed.paginate :page => page, :per_page => items_per_page
     @count = @projects.count
     @total = current_user.projects.completed.count
     @no_projects = @projects.empty?
 
-    @range_low = (page.to_i-1) * projects_per_page + 1
+    @range_low = (page.to_i - 1) * items_per_page + 1
     @range_high = @range_low + @projects.size - 1
 
+    @range_low = 0 if @total == 0
+    @range_high = @total if @range_high > @total
+
     init_not_done_counts(['project'])
   end
 
   def set_reviewed
     @project.last_reviewed = Time.zone.now
     @project.save
-    
+
     case @source_view
     when "project"
       redirect_to :action => 'show'
@@ -115,11 +112,11 @@ class ProjectsController < ApplicationController
   def projects_and_actions
     @projects = current_user.projects.active
     respond_to do |format|
-      format.text  {
-        # somehow passing Mime::TEXT using content_type to render does not work
-        headers['Content-Type']=Mime::TEXT.to_s
-        render :action => 'index_text_projects_and_actions', :layout => false, :content_type => Mime::TEXT
-      }
+      format.text do
+        # somehow passing Mime[:text] using content_type to render does not work
+        headers['Content-Type'] = Mime[:text].to_s
+        render :action => 'index_text_projects_and_actions', :layout => false, :content_type => Mime[:text]
+      end
     end
   end
 
@@ -128,18 +125,20 @@ class ProjectsController < ApplicationController
     init_data_for_sidebar unless mobile?
     @page_title = t('projects.page_title', :project => @project.name)
 
-    @not_done = @project.todos.active_or_hidden.includes(Todo::DEFAULT_INCLUDES)
-    @deferred = @project.todos.deferred.includes(Todo::DEFAULT_INCLUDES)
-    @pending = @project.todos.pending.includes(Todo::DEFAULT_INCLUDES)
+    @not_done_todos = @project.todos.active_or_hidden.includes(Todo::DEFAULT_INCLUDES)
+    @deferred_todos = @project.todos.deferred.includes(Todo::DEFAULT_INCLUDES)
+    @pending_todos = @project.todos.pending.includes(Todo::DEFAULT_INCLUDES)
+    @contexts_to_show = current_user.contexts.active
+    @projects_to_show = [@project]
 
     @done = {}
-    @done = @project.todos.completed.
-      reorder("todos.completed_at DESC").
-      limit(current_user.prefs.show_number_completed).
-      includes(Todo::DEFAULT_INCLUDES) unless current_user.prefs.show_number_completed == 0
+    @done = @project.todos.completed
+      .reorder("todos.completed_at DESC")
+      .limit(current_user.prefs.show_number_completed)
+      .includes(Todo::DEFAULT_INCLUDES) unless @max_completed == 0
 
-    @count = @not_done.size
-    @down_count = @count + @deferred.size + @pending.size
+    @down_count = @not_done_todos.size + @deferred_todos.size + @pending_todos.size
+    @count = @down_count
     @next_project = current_user.projects.next_from(@project)
     @previous_project = current_user.projects.previous_from(@project)
     @default_tags = @project.default_tags
@@ -148,20 +147,20 @@ class ProjectsController < ApplicationController
     @contexts = current_user.contexts
     respond_to do |format|
       format.html
-      format.m     do
+      format.m do
         if @project.default_context.nil?
           @project_default_context = t('projects.no_default_context')
         else
           @project_default_context = t('projects.default_context', :context => @project.default_context.name)
         end
-        cookies[:mobile_url]= {:value => request.fullpath, :secure => SITE_CONFIG['secure_cookies']}
+        cookies[:mobile_url] = { :value => request.fullpath, :secure => SITE_CONFIG['secure_cookies'] }
         @mobile_from_project = @project.id
       end
-      format.xml   do
-        render :xml => @project.to_xml(:except => :user_id) { |xml|
-          xml.not_done { @not_done.each { |child| child.to_xml(:builder => xml, :skip_instruct => true) } }
-          xml.deferred { @deferred.each { |child| child.to_xml(:builder => xml, :skip_instruct => true) } }
-          xml.pending { @pending.each { |child| child.to_xml(:builder => xml, :skip_instruct => true) } }
+      format.xml do
+        render :xml => @project.to_xml(:root => :project, :except => :user_id) { |xml|
+          xml.not_done { @not_done_todos.each { |child| child.to_xml(:builder => xml, :skip_instruct => true) } }
+          xml.deferred { @deferred_todos.each { |child| child.to_xml(:builder => xml, :skip_instruct => true) } }
+          xml.pending { @pending_todos.each { |child| child.to_xml(:builder => xml, :skip_instruct => true) } }
           xml.done { @done.each { |child| child.to_xml(:builder => xml, :skip_instruct => true) } }
         }
       end
@@ -173,7 +172,7 @@ class ProjectsController < ApplicationController
       render_failure "Expected post format is valid xml like so: <project><name>project name</name></project>.", 400
       return
     end
-    @project = current_user.projects.build(params['project'])
+    @project = current_user.projects.build(project_params)
     @go_to_project = params['go_to_project']
     @saved = @project.save
     @project_not_done_counts = { @project.id => 0 }
@@ -187,17 +186,16 @@ class ProjectsController < ApplicationController
       end
       format.xml do
         if @project.new_record?
-          render_failure @project.errors.to_xml.html_safe, 409
+          render_failure @project.errors.full_messages.to_xml(root: "errors", skip_types: true).html_safe, 409
         else
           head :created, :location => project_url(@project), :text => @project.id
         end
       end
-      format.html {redirect_to :action => 'index'}
+      format.html { redirect_to :action => 'index' }
     end
   end
 
   # Edit the details of the project
-  #
   def update
     template = ""
 
@@ -212,7 +210,7 @@ class ProjectsController < ApplicationController
       params['project']['name'] = params['value']
     end
 
-    @project.attributes = params['project']
+    @project.attributes = project_params
     @saved = @project.save
     if @saved
       @project.transition_to(@new_state) if @state_changed
@@ -220,6 +218,7 @@ class ProjectsController < ApplicationController
         @contexts = current_user.contexts
         update_state_counts
         init_data_for_sidebar
+        init_hidden_todo_counts(['project'])
 
         template = 'projects/update'
 
@@ -232,10 +231,11 @@ class ProjectsController < ApplicationController
       elsif boolean_param('update_default_tags')
         template = 'projects/update_default_tags'
       elsif boolean_param('update_project_name')
+        # clicking on a project name in the project view gives a form triggering this
         @projects = current_user.projects
         template = 'projects/update_project_name'
       else
-        render :text => success_text || 'Success'
+        render :body => success_text || 'Success'
         return
       end
     else
@@ -245,16 +245,15 @@ class ProjectsController < ApplicationController
 
     respond_to do |format|
       format.js { render :template => template }
-      format.html { redirect_to :action => 'index'}
-      format.xml {
+      format.html { redirect_to :action => 'index' }
+      format.xml do
         if @saved
-          render :xml => @project.to_xml( :except => :user_id )
+          render :xml => @project.to_xml(:except => :user_id)
         else
-          render :text => "Error on update: #{@project.errors.full_messages.inject("") {|v, e| v + e + " " }}", :status => 409
+          render :body => "Error on update: #{@project.errors.full_messages.inject("") { |v, e| v + e + " " }}", :status => 409
         end
-      }
+      end
     end
-
   end
 
   def edit
@@ -264,22 +263,22 @@ class ProjectsController < ApplicationController
   end
 
   def destroy
-    @project.recurring_todos.each {|rt| rt.remove_from_project!}
+    @project.recurring_todos.each(&:remove_from_project!)
     @project.destroy
 
     respond_to do |format|
-      format.js {
+      format.js do
         @down_count = current_user.projects.size
         update_state_counts
-      }
-      format.xml { render :text => "Deleted project #{@project.name}" }
+      end
+      format.xml { render :body => "Deleted project #{@project.name}" }
     end
   end
 
   def order
     project_ids = params["container_project"]
-    @projects = current_user.projects.update_positions( project_ids )
-    render :nothing => true
+    @projects = current_user.projects.update_positions(project_ids)
+    head :ok
   rescue
     notify :error, $!
     redirect_to :action => 'index'
@@ -290,7 +289,7 @@ class ProjectsController < ApplicationController
     @projects = current_user.projects.alphabetize(:state => @state) if @state
     @contexts = current_user.contexts
     init_not_done_counts(['project'])
-    init_project_hidden_todo_counts(['project']) if @state == 'hidden'
+    init_hidden_todo_counts(['project']) if @state == 'hidden'
   end
 
   def actionize
@@ -298,28 +297,15 @@ class ProjectsController < ApplicationController
     @projects = current_user.projects.actionize(:state => @state) if @state
     @contexts = current_user.contexts
     init_not_done_counts(['project'])
-    init_project_hidden_todo_counts(['project']) if @state == 'hidden'
+    init_hidden_todo_counts(['project']) if @state == 'hidden'
   end
 
   def done_todos
-    @source_view = 'project'
-    @project = current_user.projects.find(params[:id])
-    @page_title = t('projects.completed_tasks_title', :project_name => @project.name)
-
-    @done_today, @done_this_week, @done_this_month = DoneTodos.done_todos_for_container(@project)
-    @count = @done_today.size + @done_this_week.size + @done_this_month.size
-
-    render :template => 'todos/done'
+    done_todos_for current_user.projects.find(params[:id])
   end
 
   def all_done_todos
-    @source_view = 'project'
-    @project = current_user.projects.find(params[:id])
-    @page_title = t('projects.all_completed_tasks_title', :project_name => @project.name)
-
-    @done = @project.todos.completed.paginate :page => params[:page], :per_page => 20, :order => 'completed_at DESC', :include => Todo::DEFAULT_INCLUDES
-    @count = @done.size
-    render :template => 'todos/all_done'
+    all_done_todos_for current_user.projects.find(params[:id])
   end
 
   protected
@@ -332,7 +318,7 @@ class ProjectsController < ApplicationController
     @show_hidden_projects = @hidden_projects_count > 0
     @show_completed_projects = @completed_projects_count > 0
   end
-  
+
   def set_project_from_params
     @project = current_user.projects.find_by_params(params)
   end
@@ -348,10 +334,17 @@ class ProjectsController < ApplicationController
     default_context_name = p['default_context_name']
     p.delete('default_context_name')
 
-    unless default_context_name.blank?
-      default_context = current_user.contexts.find_or_create_by_name(default_context_name)
+    if default_context_name.present?
+      default_context = current_user.contexts.where(:name => default_context_name).first_or_create
       p['default_context_id'] = default_context.id
+    else
+      p['default_context_id'] = nil
     end
   end
 
+  private
+
+  def project_params
+    params.require(:project).permit(:name, :position, :user_id, :description, :state, :default_context_id, :default_tags)
+  end
 end

app/controllers/recurring_todos/form_helper.rb

@@ -0,0 +1,49 @@
+module RecurringTodos
+  class FormHelper
+    def initialize(recurring_todo)
+      @recurring_todo = recurring_todo
+
+      @method_map = {
+        # delegate daily_xxx to daily_pattern.xxx
+        "daily"   => { prefix: "",    method: daily_pattern },
+        "weekly"  => { prefix: "",    method: weekly_pattern },
+        "monthly" => { prefix: "",    method: monthly_pattern },
+        "yearly"  => { prefix: "",    method: yearly_pattern },
+        # delegate on_xxx to weekly_pattern.on_xxx
+        "on"      => { prefix: "on_", method: weekly_pattern }
+      }
+    end
+
+    def create_pattern(pattern_class)
+      pattern = pattern_class.new(@recurring_todo.user)
+      pattern.build_from_recurring_todo(@recurring_todo)
+      pattern
+    end
+
+    def daily_pattern
+      @daily_pattern ||= create_pattern(DailyRecurrencePattern)
+    end
+
+    def weekly_pattern
+      @weekly_pattern ||= create_pattern(WeeklyRecurrencePattern)
+    end
+
+    def monthly_pattern
+      @monthly_pattern ||= create_pattern(MonthlyRecurrencePattern)
+    end
+
+    def yearly_pattern
+      @yearly_pattern ||= create_pattern(YearlyRecurrencePattern)
+    end
+
+    def method_missing(method, *args)
+      # delegate daily_xxx to daily_pattern, weekly_xxx to weekly_pattern, etc.
+      if method.to_s =~ /^([^_]+)_(.+)$/
+        return @method_map[$1][:method].send(@method_map[$1][:prefix] + $2, *args) unless @method_map[$1].nil?
+      end
+
+      # no match, let @recurring_todo handle it, or fail
+      @recurring_todo.send(method, *args)
+    end
+  end
+end

app/controllers/recurring_todos_controller.rb

@@ -1,9 +1,8 @@
 class RecurringTodosController < ApplicationController
-
   helper :todos, :recurring_todos
 
-  append_before_filter :init, :only => [:index, :new, :edit, :create]
-  append_before_filter :get_recurring_todo_from_param, :only => [:destroy, :toggle_check, :toggle_star, :edit, :update]
+  append_before_action :init, :only => [:index, :new, :edit, :create]
+  append_before_action :get_recurring_todo_from_param, :only => [:destroy, :toggle_check, :toggle_star, :edit, :update]
 
   def index
     @page_title = t('todos.recurring_actions_title')
@@ -12,84 +11,46 @@ class RecurringTodosController < ApplicationController
     @recurring_todos = current_user.recurring_todos.active.includes(:tags, :taggings)
     @completed_recurring_todos = current_user.recurring_todos.completed.limit(10).includes(:tags, :taggings)
 
-    @no_recurring_todos = @recurring_todos.count == 0
-    @no_completed_recurring_todos = @completed_recurring_todos.count == 0
+    @no_recurring_todos = !@recurring_todos.exists?
+    @no_completed_recurring_todos = !@completed_recurring_todos.exists?
     @count = @recurring_todos.count
 
     @new_recurring_todo = RecurringTodo.new
   end
 
-  def new
-  end
+  def new; end
 
-  def show
-  end
+  def show; end
 
   def done
-    @page_title = t('todos.completed_recurring_actions_title')
     @source_view = params['_source_view'] || 'recurring_todo'
+    @page_title = t('todos.completed_recurring_actions_title')
+
     items_per_page = 20
     page = params[:page] || 1
-    @completed_recurring_todos = current_user.recurring_todos.completed.paginate :page => params[:page], :per_page => items_per_page
+    @completed_recurring_todos = current_user.recurring_todos.completed.paginate :page => page, :per_page => items_per_page
     @total = @count = current_user.recurring_todos.completed.count
-    @range_low = (page.to_i-1) * items_per_page + 1
+
+    @range_low = (page.to_i - 1) * items_per_page + 1
     @range_high = @range_low + @completed_recurring_todos.size - 1
+
+    @range_low = 0 if @total == 0
+    @range_high = @total if @range_high > @total
   end
 
   def edit
+    @form_helper = RecurringTodos::FormHelper.new(@recurring_todo)
+
     respond_to do |format|
       format.js
     end
   end
 
   def update
-    # TODO: write tests for updating
-    @recurring_todo.tag_with(params[:edit_recurring_todo_tag_list]) if params[:edit_recurring_todo_tag_list]
-    @original_item_context_id = @recurring_todo.context_id
-    @original_item_project_id = @recurring_todo.project_id
+    updater = RecurringTodos::RecurringTodosBuilder.new(current_user, update_recurring_todo_params)
+    @saved = updater.update(@recurring_todo)
 
-    # we needed to rename the recurring_period selector in the edit form because
-    # the form for a new recurring todo and the edit form are on the same page.
-    # Same goes for start_from and end_date
-    params['recurring_todo']['recurring_period']=params['recurring_edit_todo']['recurring_period']
-    params['recurring_todo']['end_date']=parse_date_per_user_prefs(params['recurring_todo_edit_end_date'])
-    params['recurring_todo']['start_from']=parse_date_per_user_prefs(params['recurring_todo_edit_start_from'])
-
-    # update project
-    if params['recurring_todo']['project_id'].blank? && !params['project_name'].nil?
-      if params['project_name'] == 'None'
-        project = Project.null_object
-      else
-        project = current_user.projects.find_by_name(params['project_name'].strip)
-        unless project
-          project = current_user.projects.build
-          project.name = params['project_name'].strip
-          project.save
-          @new_project_created = true
-        end
-      end
-      params["recurring_todo"]["project_id"] = project.id
-    end
-
-    # update context
-    if params['recurring_todo']['context_id'].blank? && !params['context_name'].blank?
-      context = current_user.contexts.find_by_name(params['context_name'].strip)
-      unless context
-        context = current_user.contexts.build
-        context.name = params['context_name'].strip
-        context.save
-        @new_context_created = true
-      end
-      params["recurring_todo"]["context_id"] = context.id
-    end
-
-    # make sure that we set weekly_return_xxx to empty (space) when they are
-    # not checked (and thus not present in params["recurring_todo"])
-    %w{monday tuesday wednesday thursday friday saturday sunday}.each do |day|
-      params["recurring_todo"]["weekly_return_"+day]=' ' if params["recurring_todo"]["weekly_return_"+day].nil?
-    end
-
-    @saved = @recurring_todo.update_attributes params["recurring_todo"]
+    @recurring_todo.reload
 
     respond_to do |format|
       format.js
@@ -97,42 +58,21 @@ class RecurringTodosController < ApplicationController
   end
 
   def create
-    p = RecurringTodoCreateParamsHelper.new(params)
-    p.attributes['end_date']=parse_date_per_user_prefs(p.attributes['end_date'])
-    p.attributes['start_from']=parse_date_per_user_prefs(p.attributes['start_from'])
-
-    @recurring_todo = current_user.recurring_todos.build(p.selector_attributes)
-    @recurring_todo.update_attributes(p.attributes)
-
-    if p.project_specified_by_name?
-      project = current_user.projects.find_or_create_by_name(p.project_name)
-      @new_project_created = project.new_record_before_save?
-      @recurring_todo.project_id = project.id
-    end
-
-    if p.context_specified_by_name?
-      context = current_user.contexts.find_or_create_by_name(p.context_name)
-      @new_context_created = context.new_record_before_save?
-      @recurring_todo.context_id = context.id
-    end
-
-    @saved = @recurring_todo.save
-    unless (@saved == false) || p.tag_list.blank?
-      @recurring_todo.tag_with(p.tag_list)
-      @recurring_todo.tags.reload
-    end
+    builder = RecurringTodos::RecurringTodosBuilder.new(current_user, all_recurring_todo_params)
+    @saved = builder.save
 
     if @saved
-      @status_message = t('todos.recurring_action_saved')
-      @todo_saved = create_todo_from_recurring_todo(@recurring_todo).nil? == false
-      if @todo_saved
-        @status_message += " / " + t('todos.new_related_todo_created_short')
-      else
-        @status_message += " / " + t('todos.new_related_todo_not_created_short')
-      end
+      @recurring_todo = builder.saved_recurring_todo
+      todo_saved = TodoFromRecurringTodo.new(current_user, @recurring_todo).create.nil? == false
+
+      @status_message =
+        t('todos.recurring_action_saved') + " / " +
+        t("todos.new_related_todo_#{todo_saved ? "" : "not_"}created_short")
+
       @down_count = current_user.recurring_todos.active.count
       @new_recurring_todo = RecurringTodo.new
     else
+      @recurring_todo = builder.recurring_todo
       @status_message = t('todos.error_saving_recurring')
     end
 
@@ -142,13 +82,10 @@ class RecurringTodosController < ApplicationController
   end
 
   def destroy
+    @number_of_todos = @recurring_todo.todos.count
+
     # remove all references to this recurring todo
-    @todos = @recurring_todo.todos
-    @number_of_todos = @todos.size
-    @todos.each do |t|
-      t.recurring_todo_id = nil
-      t.save
-    end
+    @recurring_todo.clear_todos_association
 
     # delete the recurring todo
     @saved = @recurring_todo.destroy
@@ -158,17 +95,14 @@ class RecurringTodosController < ApplicationController
     @completed_remaining = current_user.recurring_todos.completed.count
 
     respond_to do |format|
-
       format.html do
         if @saved
           notify :notice, t('todos.recurring_deleted_success')
-          redirect_to :action => 'index'
         else
-          notify :error, t('todos.error_deleting_recurring', :description => @recurring_todo.description)
-          redirect_to :action => 'index'
+          notify :error,  t('todos.error_deleting_recurring', :description => @recurring_todo.description)
         end
+        redirect_to :action => 'index'
       end
-
       format.js do
         render
       end
@@ -189,7 +123,7 @@ class RecurringTodosController < ApplicationController
       @active_todos = @recurring_todo.todos.active.count
       # create todo if there is no active todo belonging to the activated
       # recurring_todo
-      @new_recurring_todo = create_todo_from_recurring_todo(@recurring_todo) if @active_todos == 0
+      @new_recurring_todo = TodoFromRecurringTodo.new(current_user, @recurring_todo).create if @active_todos == 0
     end
 
     respond_to do |format|
@@ -205,72 +139,81 @@ class RecurringTodosController < ApplicationController
     end
   end
 
-  class RecurringTodoCreateParamsHelper
-
-    def initialize(params)
-      @params = params['request'] || params
-      @attributes = params['request'] && params['request']['recurring_todo']  || params['recurring_todo']
-
-      # make sure all selectors (recurring_period, recurrence_selector,
-      # daily_selector, monthly_selector and yearly_selector) are first in hash
-      # so that they are processed first by the model
-      @selector_attributes = {
-        'recurring_period' => @attributes['recurring_period'],
-        'daily_selector' => @attributes['daily_selector'],
-        'monthly_selector' => @attributes['monthly_selector'],
-        'yearly_selector' => @attributes['yearly_selector']
-      }
-    end
-
-    def attributes
-      @attributes
-    end
-
-    def selector_attributes
-      return @selector_attributes
-    end
-
-    def project_name
-      @params['project_name'].strip unless @params['project_name'].nil?
-    end
-
-    def context_name
-      @params['context_name'].strip unless @params['context_name'].nil?
-    end
-
-    def tag_list
-      @params['tag_list']
-    end
-
-    def project_specified_by_name?
-      return false unless @attributes['project_id'].blank?
-      return false if project_name.blank?
-      return false if project_name == 'None'
-      true
-    end
-
-    def context_specified_by_name?
-      return false unless @attributes['context_id'].blank?
-      return false if context_name.blank?
-      true
-    end
-
-  end
-
   private
 
+  def recurring_todo_params
+    params.require(:recurring_todo).permit(
+      # model attributes
+      :context_id, :project_id, :description, :notes, :state, :start_from,
+      :ends_on, :end_date, :number_of_occurrences, :occurrences_count, :target,
+      :show_from_delta, :recurring_period, :recurrence_selector, :every_other1,
+      :every_other2, :every_other3, :every_day, :only_work_days, :every_count,
+      :weekday, :show_always, :context_name, :project_name, :tag_list,
+      # form attributes
+      :recurring_period, :daily_selector, :monthly_selector, :yearly_selector,
+      :recurring_target, :daily_every_x_days, :monthly_day_of_week,
+      :monthly_every_x_day, :monthly_every_x_month2, :monthly_every_x_month,
+      :monthly_every_xth_day, :recurring_show_days_before,
+      :recurring_show_always, :weekly_every_x_week, :weekly_return_monday,
+      :yearly_day_of_week, :yearly_every_x_day, :yearly_every_xth_day,
+      :yearly_month_of_year2, :yearly_month_of_year,
+      # derived attributes
+      :weekly_return_monday, :weekly_return_tuesday, :weekly_return_wednesday,
+      :weekly_return_thursday, :weekly_return_friday, :weekly_return_saturday, :weekly_return_sunday
+    )
+  end
+
+  def all_recurring_todo_params
+    # move context_name, project_name and tag_list into :recurring_todo hash for easier processing
+    {
+      context_name: :context_name,
+      project_name: :project_name,
+      tag_list:     :tag_list
+    }.each do |target, source|
+      move_into_recurring_todo_param(params, target, source)
+    end
+    recurring_todo_params
+  end
+
+  def update_recurring_todo_params
+    # we needed to rename the recurring_period selector in the edit form because
+    # the form for a new recurring todo and the edit form are on the same page.
+    # Same goes for start_from and end_date
+    params['recurring_todo']['recurring_period'] = params['recurring_edit_todo']['recurring_period']
+
+    {
+      context_name: :context_name,
+      project_name: :project_name,
+      tag_list:     :edit_recurring_todo_tag_list,
+      end_date:     :recurring_todo_edit_end_date,
+      start_from:   :recurring_todo_edit_start_from
+    }.each do |target, source|
+      move_into_recurring_todo_param(params, target, source)
+    end
+
+    # make sure that we set weekly_return_xxx to empty (space) when they are
+    # not checked (and thus not present in params["recurring_todo"])
+    %w{monday tuesday wednesday thursday friday saturday sunday}.each do |day|
+      params["recurring_todo"]["weekly_return_#{day}"] = ' ' if params["recurring_todo"]["weekly_return_#{day}"].nil?
+    end
+
+    recurring_todo_params
+  end
+
+  def move_into_recurring_todo_param(params, target, source)
+    params[:recurring_todo][target] = params[source] unless params[source].blank?
+  end
+
   def init
-    @days_of_week = []
-    0.upto 6 do |i|
-      @days_of_week << [t('date.day_names')[i], i]
-    end
-
-    @months_of_year = []
-    1.upto 12 do |i|
-      @months_of_year << [t('date.month_names')[i], i]
-    end
-
-    @xth_day = [[t('common.first'),1],[t('common.second'),2],[t('common.third'),3],[t('common.fourth'),4],[t('common.last'),5]]
+    @days_of_week = (0..6).map { |i| [t('date.day_names')[i], i] }
+    @months_of_year = (1..12).map { |i| [t('date.month_names')[i], i] }
+    @xth_day = [
+      [t('common.first'), 1],
+      [t('common.second'), 2],
+      [t('common.third'), 3],
+      [t('common.fourth'), 4],
+      [t('common.last'),5]
+    ]
     @projects = current_user.projects.includes(:default_context)
     @contexts = current_user.contexts
   end
@@ -282,11 +225,10 @@ class RecurringTodosController < ApplicationController
   def find_and_inactivate
     # find active recurring todos without active todos and inactivate them
 
-    current_user.recurring_todos.active.
-      select("recurring_todos.id, recurring_todos.state").
-      joins("LEFT JOIN todos fai_todos ON (recurring_todos.id = fai_todos.recurring_todo_id) AND (NOT fai_todos.state='completed')").
-      where("fai_todos.id IS NULL").
-      each { |rt| current_user.recurring_todos.find(rt.id).toggle_completion! }
+    current_user.recurring_todos.active
+      .select("recurring_todos.id, recurring_todos.state")
+      .joins("LEFT JOIN todos fai_todos ON (recurring_todos.id = fai_todos.recurring_todo_id) AND (NOT fai_todos.state='completed')")
+      .where("fai_todos.id IS NULL")
+      .each { |rt| current_user.recurring_todos.find(rt.id).toggle_completion! }
   end
-
 end

app/controllers/search_controller.rb

@@ -1,51 +1,21 @@
 class SearchController < ApplicationController
-
   helper :todos, :application, :notes, :projects, :contexts
-  
+
   def results
     @source_view = params['_source_view'] || 'search'
     @page_title = "TRACKS::Search Results for #{params[:search]}"
-    terms = "%#{params[:search]}%"
 
-    @found_not_complete_todos = current_user.todos.
-      where("(todos.description LIKE ? OR todos.notes LIKE ?) AND todos.completed_at IS NULL", terms, terms).
-      includes(Todo::DEFAULT_INCLUDES).
-      reorder("todos.due IS NULL, todos.due ASC, todos.created_at ASC").
-      all
-    
-    @found_complete_todos = current_user.todos.
-      where("(todos.description LIKE ? OR todos.notes LIKE ?) AND NOT (todos.completed_at IS NULL)", terms, terms).
-      includes(Todo::DEFAULT_INCLUDES).
-      reorder("todos.completed_at DESC").
-      all
-      
-    @found_todos = @found_not_complete_todos + @found_complete_todos
+    searcher = Search::SearchResults.new(current_user, params[:search])
+    searcher.search
 
-    @found_projects = current_user.projects.where("name LIKE ? OR description LIKE ?", terms, terms).all
-    @found_notes = current_user.notes.where("body LIKE ?", terms).all
-    @found_contexts = current_user.contexts.where("name LIKE ?", terms).all
-    
-    # TODO: limit search to tags on todos
-    @found_tags = Tagging.find_by_sql([
-        "SELECT DISTINCT tags.name as name "+
-          "FROM tags "+
-          "LEFT JOIN taggings ON tags.id = taggings.tag_id "+
-          "LEFT JOIN todos ON taggings.taggable_id = todos.id "+
-          "WHERE todos.user_id=? "+
-          "AND tags.name LIKE ? ", current_user.id, terms])
-
-    @count = @found_todos.size  + @found_projects.size + @found_notes.size + @found_contexts.size + @found_tags.size
+    @results = searcher.results
+    @count = searcher.number_of_finds
 
     init_not_done_counts
-    init_project_hidden_todo_counts
+    init_hidden_todo_counts
   end
 
   def index
     @page_title = "TRACKS::Search"
   end
-
-  def init
-    @source_view = params['_source_view'] || 'search'
-  end
-
 end

app/controllers/stats_controller.rb

@@ -1,293 +1,44 @@
 class StatsController < ApplicationController
-
-  SECONDS_PER_DAY = 86400;
+  SECONDS_PER_DAY = 86_400
 
   helper :todos, :projects, :recurring_todos
-  append_before_filter :init
+  append_before_action :init, :except => :index
 
   def index
     @page_title = t('stats.index_title')
-
-    @first_action = current_user.todos.reorder("created_at ASC").first
-    @tags_count = get_total_number_of_tags_of_user
-    @unique_tags_count = get_unique_tags_of_user.size
     @hidden_contexts = current_user.contexts.hidden
-
-    get_stats_actions
-    get_stats_contexts
-    get_stats_projects
-    get_stats_tags
-  end
-  
-  def actions_done_last12months_data
-    # get actions created and completed in the past 12+3 months. +3 for running
-    #   average
-    @actions_done_last12months = current_user.todos.completed_after(@cut_off_year).select("completed_at" )
-    @actions_created_last12months = current_user.todos.created_after(@cut_off_year).select("created_at")
-    @actions_done_last12monthsPlus3 = current_user.todos.completed_after(@cut_off_year_plus3).select("completed_at" )
-    @actions_created_last12monthsPlus3 = current_user.todos.created_after(@cut_off_year_plus3).select("created_at")
-
-    # convert to array and fill in non-existing months
-    @actions_done_last12months_array = convert_to_months_from_today_array(@actions_done_last12months, 13, :completed_at)
-    @actions_created_last12months_array = convert_to_months_from_today_array(@actions_created_last12months, 13, :created_at)
-    @actions_done_last12monthsPlus3_array = convert_to_months_from_today_array(@actions_done_last12monthsPlus3, 16, :completed_at)
-    @actions_created_last12monthsPlus3_array = convert_to_months_from_today_array(@actions_created_last12monthsPlus3, 16, :created_at)
-    
-    # find max for graph in both arrays
-    @max = [@actions_done_last12months_array.max, @actions_created_last12months_array.max].max
-
-    # find running avg
-    @actions_done_avg_last12months_array, @actions_created_avg_last12months_array =
-      find_running_avg_array(@actions_done_last12monthsPlus3_array, @actions_created_last12monthsPlus3_array, 13)
-
-    # interpolate avg for current month.
-    percent_of_month = Time.zone.now.day.to_f / Time.zone.now.end_of_month.day.to_f
-    @interpolated_actions_created_this_month = interpolate_avg(@actions_created_last12months_array, percent_of_month)
-    @interpolated_actions_done_this_month = interpolate_avg(@actions_done_last12months_array, percent_of_month)
-
-    render :layout => false
+    @stats = Stats::UserStats.new(current_user)
   end
 
   def actions_done_last_years
     @page_title = t('stats.index_title')
-    @chart_width = 900
-    @chart_height = 400
+    @chart = Stats::Chart.new('actions_done_lastyears_data', :height => 400, :width => 900)
   end
 
   def actions_done_lastyears_data
-    @actions_done_last_months = current_user.todos.completed.select("completed_at").reorder("completed_at DESC")
-    @actions_created_last_months = current_user.todos.select("created_at").reorder("created_at DESC" )
+    actions_last_months = current_user.todos.select("completed_at,created_at")
 
-    # query is sorted, so use last todo to calculate number of months
-    @month_count = [difference_in_months(@today, @actions_created_last_months.last.created_at),
-      difference_in_months(@today, @actions_done_last_months.last.completed_at)].max
+    month_count = difference_in_months(@today, actions_last_months.minimum(:created_at))
+    # because this action is not scoped by date, the minimum created_at should always be
+    # less than the minimum completed_at, so no reason to check minimum completed_at
 
     # convert to array and fill in non-existing months
-    @actions_done_last_months_array = convert_to_months_from_today_array(@actions_done_last_months, @month_count+1, :completed_at)
-    @actions_created_last_months_array = convert_to_months_from_today_array(@actions_created_last_months, @month_count+1, :created_at)
+    @actions_done_last_months_array = put_events_into_month_buckets(actions_last_months, month_count + 1, :completed_at)
+    @actions_created_last_months_array = put_events_into_month_buckets(actions_last_months, month_count + 1, :created_at)
 
     # find max for graph in both hashes
-    @max = [@actions_done_last_months_array.max, @actions_created_last_months_array.max].max
+    @max = (@actions_done_last_months_array + @actions_created_last_months_array).max
 
-    # find running avg
-    @actions_done_avg_last_months_array, @actions_created_avg_last_months_array =
-      find_running_avg_array(@actions_done_last_months_array, @actions_created_last_months_array, @month_count+1)
-
-    # correct last two months since the data of last+1 and last+2 are not available for avg
-    correct_last_two_months(@actions_done_avg_last_months_array, @month_count)
-    correct_last_two_months(@actions_created_avg_last_months_array, @month_count)
+    # set running avg
+    @actions_done_avg_last_months_array = compute_running_avg_array(@actions_done_last_months_array, month_count + 1)
+    @actions_created_avg_last_months_array = compute_running_avg_array(@actions_created_last_months_array, month_count + 1)
 
     # interpolate avg for this month.
-    percent_of_month = Time.zone.now.day.to_f / Time.zone.now.end_of_month.day.to_f
-    @interpolated_actions_created_this_month = interpolate_avg(@actions_created_last_months_array, percent_of_month)
-    @interpolated_actions_done_this_month = interpolate_avg(@actions_done_last_months_array, percent_of_month)
+    @interpolated_actions_created_this_month = interpolate_avg_for_current_month(@actions_created_last_months_array)
+    @interpolated_actions_done_this_month = interpolate_avg_for_current_month(@actions_done_last_months_array)
 
-    render :layout => false
-  end
-
-  def actions_done_last30days_data
-    # get actions created and completed in the past 30 days.
-    @actions_done_last30days = current_user.todos.completed_after(@cut_off_month).select("completed_at")
-    @actions_created_last30days = current_user.todos.created_after(@cut_off_month).select("created_at")
-
-    # convert to array. 30+1 to have 30 complete days and one current day [0]
-    @actions_done_last30days_array = convert_to_days_from_today_array(@actions_done_last30days, 31, :completed_at)
-    @actions_created_last30days_array = convert_to_days_from_today_array(@actions_created_last30days, 31, :created_at)
-
-    # find max for graph in both hashes
-    @max = [@actions_done_last30days_array.max, @actions_created_last30days_array.max].max
-
-    render :layout => false
-  end
-
-  def actions_completion_time_data
-    @actions_completion_time = current_user.todos.completed.select("completed_at, created_at").reorder("completed_at DESC" )
-
-    # convert to array and fill in non-existing weeks with 0
-    @max_weeks = difference_in_weeks(@today, @actions_completion_time.last.completed_at)
-    @actions_completed_per_week_array = convert_to_weeks_running_array(@actions_completion_time, @max_weeks+1)
-        
-    # stop the chart after 10 weeks
-    @count = [10, @max_weeks].min
-    
-    # convert to new array to hold max @cut_off elems + 1 for sum of actions after @cut_off
-    @actions_completion_time_array = cut_off_array_with_sum(@actions_completed_per_week_array, @count)
-    @max_actions = @actions_completion_time_array.max
-
-    # get percentage done cummulative
-    @cumm_percent_done = convert_to_cummulative_array(@actions_completion_time_array, @actions_completion_time.count)
-
-    render :layout => false
-  end
-
-  def actions_running_time_data
-    @actions_running_time = current_user.todos.not_completed.select("created_at").reorder("created_at DESC")
-
-    # convert to array and fill in non-existing weeks with 0
-    @max_weeks = difference_in_weeks(@today, @actions_running_time.last.created_at)
-    @actions_running_per_week_array = convert_to_weeks_from_today_array(@actions_running_time, @max_weeks+1, :created_at)
-
-    # cut off chart at 52 weeks = one year
-    @count = [52, @max_weeks].min
-    
-    # convert to new array to hold max @cut_off elems + 1 for sum of actions after @cut_off
-    @actions_running_time_array = cut_off_array_with_sum(@actions_running_per_week_array, @count)
-    @max_actions = @actions_running_time_array.max
-
-    # get percentage done cummulative
-    @cumm_percent_done = convert_to_cummulative_array(@actions_running_time_array, @actions_running_time.count )
-      
-    render :layout => false
-  end
-
-  def actions_visible_running_time_data
-    # running means
-    # - not completed (completed_at must be null)
-    # visible means
-    # - actions not part of a hidden project
-    # - actions not part of a hidden context
-    # - actions not deferred (show_from must be null)
-    # - actions not pending/blocked
-
-    @actions_running_time = current_user.todos.not_completed.not_hidden.not_deferred_or_blocked.
-      select("todos.created_at").
-      reorder("todos.created_at DESC")
-
-    @max_weeks = difference_in_weeks(@today, @actions_running_time.last.created_at)
-    @actions_running_per_week_array = convert_to_weeks_from_today_array(@actions_running_time, @max_weeks+1, :created_at)
-
-    # cut off chart at 52 weeks = one year
-    @count = [52, @max_weeks].min
-    
-    # convert to new array to hold max @cut_off elems + 1 for sum of actions after @cut_off
-    @actions_running_time_array = cut_off_array_with_sum(@actions_running_per_week_array, @count)
-    @max_actions = @actions_running_time_array.max
-
-    # get percentage done cummulative
-    @cumm_percent_done = convert_to_cummulative_array(@actions_running_time_array, @actions_running_time.count )
-
-    render :layout => false
-  end
-  
-  def actions_open_per_week_data
-    @actions_started = current_user.todos.created_after(@today-53.weeks).
-      select("todos.created_at, todos.completed_at").
-      reorder("todos.created_at DESC")
-      
-    @max_weeks = difference_in_weeks(@today, @actions_started.last.created_at)
-
-    # cut off chart at 52 weeks = one year
-    @count = [52, @max_weeks].min
-    
-    @actions_open_per_week_array = convert_to_weeks_running_from_today_array(@actions_started, @max_weeks+1)
-    @actions_open_per_week_array = cut_off_array(@actions_open_per_week_array, @count)
-    @max_actions = (@actions_open_per_week_array.max or 0)
-    
-    render :layout => false
-  end
-
-  def context_total_actions_data
-    # get total action count per context Went from GROUP BY c.id to c.name for
-    # compatibility with postgresql. Since the name is forced to be unique, this
-    # should work.
-    all_actions_per_context = current_user.contexts.find_by_sql(
-      "SELECT c.name AS name, c.id as id, count(*) AS total "+
-        "FROM contexts c, todos t "+
-        "WHERE t.context_id=c.id "+
-        "AND c.user_id = #{current_user.id} " +
-        "GROUP BY c.name, c.id "+
-        "ORDER BY total DESC"
-    )
-
-    prep_context_data_for_view(all_actions_per_context)
-
-    render :layout => false
-  end
-
-  def context_running_actions_data
-    # get incomplete action count per visible context
-    #
-    # Went from GROUP BY c.id to c.name for compatibility with postgresql. Since
-    # the name is forced to be unique, this should work.
-    all_actions_per_context = current_user.contexts.find_by_sql(
-      "SELECT c.name AS name, c.id as id, count(*) AS total "+
-        "FROM contexts c, todos t "+
-        "WHERE t.context_id=c.id AND t.completed_at IS NULL AND NOT c.hide "+
-        "AND c.user_id = #{current_user.id} " +
-        "GROUP BY c.name, c.id "+
-        "ORDER BY total DESC"
-    )
-
-    prep_context_data_for_view(all_actions_per_context)
-
-    render :layout => false
-  end
-
-  def actions_day_of_week_all_data
-    @actions_creation_day = current_user.todos.select("created_at")
-    @actions_completion_day = current_user.todos.completed.select("completed_at")
-
-    # convert to array and fill in non-existing days
-    @actions_creation_day_array = Array.new(7) { |i| 0}
-    @actions_creation_day.each { |t| @actions_creation_day_array[ t.created_at.wday ] += 1 }
-    @max = @actions_creation_day_array.max
-
-    # convert to array and fill in non-existing days
-    @actions_completion_day_array = Array.new(7) { |i| 0}
-    @actions_completion_day.each { |t| @actions_completion_day_array[ t.completed_at.wday ] += 1 }
-    @max = @actions_completion_day_array.max
-
-    render :layout => false
-  end
-
-  def actions_day_of_week_30days_data
-    @actions_creation_day = current_user.todos.created_after(@cut_off_month).select("created_at")
-    @actions_completion_day = current_user.todos.completed_after(@cut_off_month).select("completed_at")
-
-    # convert to hash to be able to fill in non-existing days
-    @max=0
-    @actions_creation_day_array = Array.new(7) { |i| 0}
-    @actions_creation_day.each { |r| @actions_creation_day_array[ r.created_at.wday ] += 1 }
-
-    # convert to hash to be able to fill in non-existing days
-    @actions_completion_day_array = Array.new(7) { |i| 0}
-    @actions_completion_day.each { |r| @actions_completion_day_array[r.completed_at.wday] += 1 }
-
-    @max = [@actions_creation_day_array.max, @actions_completion_day_array.max].max
-
-    render :layout => false
-  end
-
-  def actions_time_of_day_all_data
-    @actions_creation_hour = current_user.todos.select("created_at")
-    @actions_completion_hour = current_user.todos.completed.select("completed_at")
-
-    # convert to hash to be able to fill in non-existing days
-    @actions_creation_hour_array = Array.new(24) { |i| 0}
-    @actions_creation_hour.each{|r| @actions_creation_hour_array[r.created_at.hour] += 1 }
-
-    # convert to hash to be able to fill in non-existing days
-    @actions_completion_hour_array = Array.new(24) { |i| 0}
-    @actions_completion_hour.each{|r| @actions_completion_hour_array[r.completed_at.hour] += 1 }
-
-    @max = [@actions_creation_hour_array.max, @actions_completion_hour_array.max].max
-
-    render :layout => false
-  end
-
-  def actions_time_of_day_30days_data
-    @actions_creation_hour = current_user.todos.created_after(@cut_off_month).select("created_at")
-    @actions_completion_hour = current_user.todos.completed_after(@cut_off_month).select("completed_at")
-
-    # convert to hash to be able to fill in non-existing days
-    @actions_creation_hour_array = Array.new(24) { |i| 0}
-    @actions_creation_hour.each{|r| @actions_creation_hour_array[r.created_at.hour] += 1 }
-
-    # convert to hash to be able to fill in non-existing days
-    @actions_completion_hour_array = Array.new(24) { |i| 0}
-    @actions_completion_hour.each{|r| @actions_completion_hour_array[r.completed_at.hour] += 1 }
-
-    @max = [@actions_creation_hour_array.max, @max = @actions_completion_hour_array.max].max
+    @created_count_array = Array.new(month_count + 1, actions_last_months.select { |x| x.created_at }.size / month_count)
+    @done_count_array    = Array.new(month_count + 1, actions_last_months.select { |x| x.completed_at }.size / month_count)
 
     render :layout => false
   end
@@ -300,16 +51,15 @@ class StatsController < ApplicationController
 
     case params['id']
     when 'avrt', 'avrt_end' # actions_visible_running_time
-
       # HACK: because open flash chart uses & to denote the end of a parameter,
       # we cannot use URLs with multiple parameters (that would use &). So we
       # revert to using two id's for the same selection. avtr_end means that the
       # last bar of the chart is selected. avtr is used for all other bars
 
       week_from = params['index'].to_i
-      week_to = week_from+1
+      week_to = week_from + 1
 
-      @chart_name = "actions_visible_running_time_data"
+      @chart = Stats::Chart.new('actions_visible_running_time_data')
       @page_title = t('stats.actions_selected_from_week')
       @further = false
       if params['id'] == 'avrt_end'
@@ -320,11 +70,11 @@ class StatsController < ApplicationController
       end
 
       # get all running actions that are visible
-      @actions_running_time = current_user.todos.not_completed.not_hidden.not_deferred_or_blocked.
-        select("todos.id, todos.created_at").
-        reorder("todos.created_at DESC")
+      @actions_running_time = current_user.todos.not_completed.not_hidden.not_deferred_or_blocked
+        .select("todos.id, todos.created_at")
+        .reorder("todos.created_at DESC")
 
-      selected_todo_ids = get_ids_from(@actions_running_time, week_from, week_to, params['id']== 'avrt_end')
+      selected_todo_ids = get_ids_from(@actions_running_time, week_from, week_to, params['id'] == 'avrt_end')
       @selected_actions = selected_todo_ids.size == 0 ? [] : current_user.todos.where("id in (" + selected_todo_ids.join(",") + ")")
       @count = @selected_actions.size
 
@@ -332,9 +82,9 @@ class StatsController < ApplicationController
 
     when 'art', 'art_end'
       week_from = params['index'].to_i
-      week_to = week_from+1
+      week_to = week_from + 1
 
-      @chart_name = "actions_running_time_data"
+      @chart = Stats::Chart.new('actions_running_time_data')
       @page_title = "Actions selected from week "
       @further = false
       if params['id'] == 'art_end'
@@ -347,10 +97,10 @@ class StatsController < ApplicationController
       # get all running actions
       @actions_running_time = current_user.todos.not_completed.select("id, created_at")
 
-      selected_todo_ids = get_ids_from(@actions_running_time, week_from, week_to, params['id']=='art_end')
+      selected_todo_ids = get_ids_from(@actions_running_time, week_from, week_to, params['id'] == 'art_end')
       @selected_actions = selected_todo_ids.size == 0 ? [] : current_user.todos.where("id in (#{selected_todo_ids.join(",")})")
       @count = @selected_actions.size
-      
+
       render :action => "show_selection_from_chart"
     else
       # render error
@@ -367,66 +117,14 @@ class StatsController < ApplicationController
     @last_completed_projects = current_user.projects.completed.limit(10).reorder('completed_at DESC').includes(:todos, :notes)
     @last_completed_contexts = []
     @last_completed_recurring_todos = current_user.recurring_todos.completed.limit(10).reorder('completed_at DESC').includes(:tags, :taggings)
-    #TODO: @last_completed_contexts = current_user.contexts.completed.all(:limit => 10, :order => 'completed_at DESC')
+    # TODO: @last_completed_contexts = current_user.contexts.completed.all(:limit => 10, :order => 'completed_at DESC')
   end
 
   private
 
-  def prep_context_data_for_view(all_actions_per_context)
-
-    @sum = all_actions_per_context.inject(0){|sum, apc| sum += apc['total'].to_i }
-
-    pie_cutoff=10
-    size = [all_actions_per_context.size, pie_cutoff].min
-
-    # explicitely copy contents of hash to avoid ending up with two arrays pointing to same hashes
-    @actions_per_context = Array.new(size){|i| {
-      'name' => all_actions_per_context[i][:name],
-      'total' => all_actions_per_context[i][:total].to_i,
-      'id' => all_actions_per_context[i][:id]
-    } }
-
-    if size==pie_cutoff
-      @actions_per_context[size-1]['name']=t('stats.other_actions_label')
-      @actions_per_context[size-1]['total']=@actions_per_context[size-1]['total']
-      @actions_per_context[size-1]['id']=-1
-      size.upto(all_actions_per_context.size-1){ |i| @actions_per_context[size-1]['total']+=(all_actions_per_context[i]['total'].to_i) }
-    end
-
-    @truncate_chars = 15
-  end
-
-  def get_unique_tags_of_user
-    tag_ids = current_user.todos.find_by_sql([
-        "SELECT DISTINCT tags.id as id "+
-          "FROM tags, taggings, todos "+
-          "WHERE tags.id = taggings.tag_id " +
-          "AND taggings.taggable_id = todos.id "+
-          "AND todos.user_id = #{current_user.id}"])
-    tags_ids_s = tag_ids.map(&:id).sort.join(",")
-    return {} if tags_ids_s.blank?  # return empty hash for .size to work
-    return Tag.where("id in (#{tags_ids_s})")
-  end
-
-  def get_total_number_of_tags_of_user
-    # same query as get_unique_tags_of_user except for the DISTINCT
-    return current_user.todos.find_by_sql([
-        "SELECT tags.id as id "+
-          "FROM tags, taggings, todos "+
-          "WHERE tags.id = taggings.tag_id " +
-          "AND taggings.taggable_id = todos.id " +
-          "AND todos.user_id = #{current_user.id}"]).size
-  end
-
   def init
     @me = self # for meta programming
 
-    # default chart dimensions
-    @chart_width=460
-    @chart_height=250
-    @pie_width=@chart_width
-    @pie_height=325
-
     # get the current date wih time set to 0:0
     @today = Time.zone.now.utc.beginning_of_day
 
@@ -434,176 +132,10 @@ class StatsController < ApplicationController
     @cut_off_year = 12.months.ago.beginning_of_day
     @cut_off_year_plus3 = 15.months.ago.beginning_of_day
     @cut_off_month = 1.month.ago.beginning_of_day
-    @cut_off_3months = 3.months.ago.beginning_of_day
+    @cut_off_30days = 30.days.ago.beginning_of_day
   end
 
-  def get_stats_actions
-    # time to complete
-    @completed_actions = current_user.todos.completed.select("completed_at, created_at")
-
-    actions_sum, actions_max = 0,0
-    actions_min = @completed_actions.first ? @completed_actions.first.completed_at - @completed_actions.first.created_at : 0
-    
-    @completed_actions.each do |r|
-      actions_sum += (r.completed_at - r.created_at)
-      actions_max = [(r.completed_at - r.created_at), actions_max].max
-      actions_min = [(r.completed_at - r.created_at), actions_min].min
-    end
-
-    sum_actions = @completed_actions.size
-    sum_actions = 1 if sum_actions==0 # to prevent dividing by zero
-
-    @actions_avg_ttc = (actions_sum/sum_actions)/SECONDS_PER_DAY
-    @actions_max_ttc = actions_max/SECONDS_PER_DAY
-    @actions_min_ttc = actions_min/SECONDS_PER_DAY
-
-    min_ttc_sec = Time.utc(2000,1,1,0,0)+actions_min # convert to a datetime
-    @actions_min_ttc_sec = (min_ttc_sec).strftime("%H:%M:%S")
-    @actions_min_ttc_sec = (actions_min / SECONDS_PER_DAY).round.to_s + " days " + @actions_min_ttc_sec if actions_min > SECONDS_PER_DAY
-
-    # get count of actions created and actions done in the past 30 days.
-    @sum_actions_done_last30days = current_user.todos.completed.completed_after(@cut_off_month).count
-    @sum_actions_created_last30days = current_user.todos.created_after(@cut_off_month).count
-
-    # get count of actions done in the past 12 months.
-    @sum_actions_done_last12months = current_user.todos.completed.completed_after(@cut_off_year).count
-    @sum_actions_created_last12months = current_user.todos.created_after(@cut_off_year).count
-  end
-
-  def get_stats_contexts
-    # get action count per context for TOP 5
-    #
-    # Went from GROUP BY c.id to c.id, c.name for compatibility with postgresql.
-    # Since the name is forced to be unique, this should work.
-    @actions_per_context = current_user.contexts.find_by_sql(
-      "SELECT c.id AS id, c.name AS name, count(*) AS total "+
-        "FROM contexts c, todos t "+
-        "WHERE t.context_id=c.id "+
-        "AND t.user_id=#{current_user.id} " +
-        "GROUP BY c.id, c.name ORDER BY total DESC " +
-        "LIMIT 5"
-    )
-
-    # get incomplete action count per visible context for TOP 5
-    #
-    # Went from GROUP BY c.id to c.id, c.name for compatibility with postgresql.
-    # Since the name is forced to be unique, this should work.
-    @running_actions_per_context = current_user.contexts.find_by_sql(
-      "SELECT c.id AS id, c.name AS name, count(*) AS total "+
-        "FROM contexts c, todos t "+
-        "WHERE t.context_id=c.id AND t.completed_at IS NULL AND NOT c.hide "+
-        "AND t.user_id=#{current_user.id} " +
-        "GROUP BY c.id, c.name ORDER BY total DESC " +
-        "LIMIT 5"
-    )
-  end
-
-  def get_stats_projects
-    # get the first 10 projects and their action count (all actions)
-    #
-    # Went from GROUP BY p.id to p.name for compatibility with postgresql. Since
-    # the name is forced to be unique, this should work.
-    @projects_and_actions = current_user.projects.find_by_sql(
-      "SELECT p.id, p.name, count(*) AS count "+
-        "FROM projects p, todos t "+
-        "WHERE p.id = t.project_id "+
-        "AND t.user_id=#{current_user.id} " +
-        "GROUP BY p.id, p.name "+
-        "ORDER BY count DESC " +
-        "LIMIT 10"
-    )
-
-    # get the first 10 projects with their actions count of actions that have
-    # been created or completed the past 30 days
-
-    # using GROUP BY p.name (was: p.id) for compatibility with Postgresql. Since
-    # you cannot create two contexts with the same name, this will work.
-    @projects_and_actions_last30days = current_user.projects.find_by_sql([
-        "SELECT p.id, p.name, count(*) AS count "+
-          "FROM todos t, projects p "+
-          "WHERE t.project_id = p.id AND "+
-          "      (t.created_at > ? OR t.completed_at > ?) "+
-          "AND t.user_id=#{current_user.id} " +
-          "GROUP BY p.id, p.name "+
-          "ORDER BY count DESC " +
-          "LIMIT 10", @cut_off_month, @cut_off_month]
-    )
-
-    # get the first 10 projects and their running time (creation date versus
-    # now())
-    @projects_and_runtime_sql = current_user.projects.find_by_sql(
-      "SELECT id, name, created_at "+
-        "FROM projects "+
-        "WHERE state='active' "+
-        "AND user_id=#{current_user.id} "+
-        "ORDER BY created_at ASC "+
-        "LIMIT 10"
-    )
-
-    i=0
-    @projects_and_runtime = Array.new(10, [-1, t('common.not_available_abbr'), t('common.not_available_abbr')])
-    @projects_and_runtime_sql.each do |r|
-      days = difference_in_days(@today, r.created_at)
-      # add one so that a project that you just created returns 1 day
-      @projects_and_runtime[i]=[r.id, r.name, days.to_i+1]
-      i += 1
-    end
-
-  end
-
-  def get_stats_tags
-    # tag cloud code inspired by this article
-    #  http://www.juixe.com/techknow/index.php/2006/07/15/acts-as-taggable-tag-cloud/
-
-    levels=10
-    # TODO: parameterize limit
-
-    # Get the tag cloud for all tags for actions
-    query = "SELECT tags.id, name, count(*) AS count"
-    query << " FROM taggings, tags, todos"
-    query << " WHERE tags.id = tag_id"
-    query << " AND taggings.taggable_id = todos.id"
-    query << " AND todos.user_id="+current_user.id.to_s+" "
-    query << " AND taggings.taggable_type='Todo' "
-    query << " GROUP BY tags.id, tags.name"
-    query << " ORDER BY count DESC, name"
-    query << " LIMIT 100"
-    @tags_for_cloud = Tag.find_by_sql(query).sort_by { |tag| tag.name.downcase }
-
-    max, @tags_min = 0, 0
-    @tags_for_cloud.each { |t|
-      max = [t.count.to_i, max].max
-      @tags_min = [t.count.to_i, @tags_min].min
-    }
-
-    @tags_divisor = ((max - @tags_min) / levels) + 1
-
-    # Get the tag cloud for all tags for actions
-    query = "SELECT tags.id, tags.name AS name, count(*) AS count"
-    query << " FROM taggings, tags, todos"
-    query << " WHERE tags.id = tag_id"
-    query << " AND todos.user_id=? "
-    query << " AND taggings.taggable_type='Todo' "
-    query << " AND taggings.taggable_id=todos.id "
-    query << " AND (todos.created_at > ? OR "
-    query << "      todos.completed_at > ?) "
-    query << " GROUP BY tags.id, tags.name"
-    query << " ORDER BY count DESC, name"
-    query << " LIMIT 100"
-    @tags_for_cloud_90days = Tag.find_by_sql(
-      [query, current_user.id, @cut_off_3months, @cut_off_3months]
-    ).sort_by { |tag| tag.name.downcase }
-
-    max_90days, @tags_min_90days = 0, 0
-    @tags_for_cloud_90days.each { |t|
-      max_90days = [t.count.to_i, max_90days].max
-      @tags_min_90days = [t.count.to_i, @tags_min_90days].min
-    }
-
-    @tags_divisor_90days = ((max_90days - @tags_min_90days) / levels) + 1
-  end
-
-  def get_ids_from (actions, week_from, week_to, at_end)
+  def get_ids_from(actions, week_from, week_to, at_end)
     selected_todo_ids = []
 
     actions.each do |r|
@@ -611,7 +143,7 @@ class StatsController < ApplicationController
       if at_end
         selected_todo_ids << r.id.to_s if weeks >= week_from
       else
-        selected_todo_ids << r.id.to_s if weeks.between?(week_from, week_to-1)
+        selected_todo_ids << r.id.to_s if weeks.between?(week_from, week_to - 1)
       end
     end
 
@@ -621,97 +153,22 @@ class StatsController < ApplicationController
   # uses the supplied block to determine array of indexes in hash
   # the block should return an array of indexes each is added to the hash and summed
   def convert_to_array(records, upper_bound)
-    # use 0 to initialise action count to zero
-    a = Array.new(upper_bound){|i| 0 }
-    records.each { |r| (yield r).each { |i| a[i] += 1 } }
-    return a
-  end
-  
-  def convert_to_months_from_today_array(records, array_size, date_method_on_todo)
-    return convert_to_array(records, array_size){ |r| [difference_in_months(@today, r.send(date_method_on_todo))]}
-  end
-  
-  def convert_to_days_from_today_array(records, array_size, date_method_on_todo)
-    return convert_to_array(records, array_size){ |r| [difference_in_days(@today, r.send(date_method_on_todo))]}
+    a = Array.new(upper_bound, 0)
+    records.each { |r| (yield r).each { |i| a[i] += 1 if a[i] } }
+    a
   end
 
-  def convert_to_weeks_from_today_array(records, array_size, date_method_on_todo)
-    return convert_to_array(records, array_size) { |r| [difference_in_weeks(@today, r.send(date_method_on_todo))]}
-  end
-
-  def convert_to_weeks_running_array(records, array_size)
-    return convert_to_array(records, array_size) { |r| [difference_in_weeks(r.completed_at, r.created_at)]}
-  end
-
-  def convert_to_weeks_running_from_today_array(records, array_size)
-    return convert_to_array(records, array_size) { |r| week_indexes_of(r) }
-  end
-  
-  def week_indexes_of(record)
-    a = []
-    start_week = difference_in_weeks(@today, record.created_at)
-    end_week   = record.completed_at ? difference_in_weeks(@today, record.completed_at) : 0
-    end_week.upto(start_week) { |i| a << i };
-    return a
-  end
-  
-  # returns a new array containing all elems of array up to cut_off and
-  # adds the sum of the rest of array to the last elem
-  def cut_off_array_with_sum(array, cut_off)
-    # +1 to hold sum of rest
-    a = Array.new(cut_off+1){|i| array[i]||0}
-    # add rest of array to last elem
-    a[cut_off] += array.inject(:+) - a.inject(:+)
-    return a
-  end
-  
-  def cut_off_array(array, cut_off)
-    return Array.new(cut_off){|i| array[i]||0}
-  end
-
-  def convert_to_cummulative_array(array, max)
-    # calculate fractions
-    a = Array.new(array.size){|i| array[i]*100.0/max}
-    # make cummulative
-    1.upto(array.size-1){ |i| a[i] += a[i-1] }
-    return a
-  end
-
-  # assumes date1 > date2
-  # this results in the number of months before the month of date1, not taking days into account, so diff of 31-dec and 1-jan is 1 month!
-  def difference_in_months(date1, date2)
-    return (date1.utc.year - date2.utc.year)*12 + (date1.utc.month - date2.utc.month)
+  def put_events_into_month_buckets(records, array_size, date_method_on_todo)
+    convert_to_array(records.select { |x| x.send(date_method_on_todo) }, array_size) { |r| [difference_in_months(@today, r.send(date_method_on_todo))] }
   end
 
   # assumes date1 > date2
   def difference_in_days(date1, date2)
-    return ((date1.utc.at_midnight-date2.utc.at_midnight)/SECONDS_PER_DAY).to_i
+    return ((date1.utc.at_midnight - date2.utc.at_midnight) / SECONDS_PER_DAY).to_i
   end
-  
+
   # assumes date1 > date2
   def difference_in_weeks(date1, date2)
     return difference_in_days(date1, date2) / 7
   end
-
-  def three_month_avg(set, i)
-    return ( (set[i]||0) + (set[i+1]||0) + (set[i+2]||0) ) / 3.0
-  end
-
-  def interpolate_avg(set, percent)
-    return (set[0]*(1/percent) + set[1] + set[2]) / 3.0
-  end
-
-  def correct_last_two_months(month_data, count)
-    month_data[count] = month_data[count] * 3
-    month_data[count-1] = month_data[count-1] * 3 / 2 if count > 1
-  end
-
-  def find_running_avg_array(done_array, created_array, upper_bound)
-    avg_done    = Array.new(upper_bound){ |i| three_month_avg(done_array,i) }
-    avg_created = Array.new(upper_bound){ |i| three_month_avg(created_array,i) }
-    avg_done[0] = avg_created[0] = "null"
-    
-    return avg_done, avg_created
-  end
-
 end

app/controllers/todos/todo_create_params_helper.rb

@@ -0,0 +1,164 @@
+module Todos
+  class TodoCreateParamsHelper
+    attr_reader :new_project_created, :new_context_created, :attributes
+
+    def initialize(params, user)
+      set_params(params)
+      filter_attributes(params)
+      filter_tags
+      filter_starred
+
+      @user = user
+      @errors = []
+
+      @new_project_created = find_or_create_group(:project, user.projects, project_name)
+      @new_context_created = find_or_create_group(:context, user.contexts, context_name)
+    end
+
+    def set_params(params)
+      @params = params['request'] || params
+    end
+
+    def filter_attributes(params)
+      if params[:request]
+        @attributes = todo_params(params[:request])
+      elsif params[:todo]
+        @attributes = todo_params(params)
+      end
+      # Make sure there is at least an empty hash
+      @attributes = {} if @attributes.nil?
+    end
+
+    def filter_tags
+      if @attributes[:tags]
+        # for single tags, @attributed[:tags] returns a hash. For multiple tags,
+        # it with return an array of hashes. Make sure it is always an array of hashes
+        @attributes[:tags][:tag] = [@attributes[:tags][:tag]] unless @attributes[:tags][:tag].class == Array
+        # the REST api may use <tags> which will collide with tags association, so rename tags to add_tags
+        @attributes[:add_tags] = @attributes[:tags]
+        @attributes.delete :tags
+      end
+    end
+
+    def filter_starred
+      if @params[:new_todo_starred]
+        @attributes["starred"] = (@params[:new_todo_starred] || "").include? "true"
+      end
+    end
+
+    def show_from
+      @attributes['show_from']
+    end
+
+    def due
+      @attributes['due']
+    end
+
+    def project_name
+      @params['project_name'].strip unless @params['project_name'].nil?
+    end
+
+    def project_id
+      @attributes['project_id']
+    end
+
+    def context_name
+      @params['context_name'].strip unless @params['context_name'].nil?
+    end
+
+    def context_id
+      @attributes['context_id']
+    end
+
+    def tag_list
+      @params['tag_list']
+    end
+
+    def predecessor_list
+      @params['predecessor_list']
+    end
+
+    def parse_dates
+      @attributes['show_from'] = @user.prefs.parse_date(show_from)
+      @attributes['due'] = @user.prefs.parse_date(due)
+      @attributes['due'] ||= ''
+    end
+
+    def sequential?
+      return @params[:todos_sequential].present? && @params[:todos_sequential] == 'true'
+    end
+
+    def specified_by_name?(group_type)
+      return send("#{group_type}_specified_by_name?")
+    end
+
+    def specified_by_id?(group_type)
+      group_id = send("#{group_type}_id")
+      group_id.present?
+    end
+
+    def project_specified_by_name?
+      return false if @attributes['project_id'].present?
+      return false if project_name.blank?
+      true
+    end
+
+    def context_specified_by_name?
+      return false if @attributes['context_id'].present?
+      return false if context_name.blank?
+      true
+    end
+
+    def add_errors(model)
+      @errors.each { |e| model.errors.add(e[:attribute], e[:message]) }
+    end
+
+    private
+
+    def todo_params(params)
+      # keep :predecessor_dependencies from being filterd (for XML API).
+      # The permit cannot handle multiple precessors
+      if params[:todo][:predecessor_dependencies]
+        deps = params[:todo][:predecessor_dependencies][:predecessor]
+      end
+
+      # accept empty :todo hash
+      if params[:todo].empty?
+        params[:todo] = { :ignore => true }
+      end
+
+      filtered = params.require(:todo).permit(
+        :context_id, :project_id, :description, :notes,
+        :due, :show_from, :state,
+        # XML API
+        :tags => [:tag => [:name]],
+        :context => [:name],
+        :project => [:name])
+
+      # add back :predecessor_dependencies
+      filtered[:predecessor_dependencies] = { :predecessor => deps } unless deps.nil?
+      filtered
+    end
+
+    def find_or_create_group(group_type, set, name)
+      return set_id_by_name(group_type, set, name) if specified_by_name?(group_type)
+      return set_id_by_id_string(group_type, set, @attributes["#{group_type}_id"]) if specified_by_id?(group_type)
+    end
+
+    def set_id_by_name(group_type, set, name)
+      group = set.where(:name => name).first_or_initialize
+      group_is_new = group.new_record?
+      group.save if group_is_new
+      @attributes["#{group_type}_id"] = group.id
+      group_is_new
+    end
+
+    def set_id_by_id_string(group_type, set, id)
+      # be aware, this will replace the project_id/context_id (string) in @attributes with the new found id (int)
+      @attributes["#{group_type}_id"] = set.find(id).id
+      return false
+      rescue
+        @errors << { :attribute => group_type, :message => "unknown" }
+    end
+  end
+end

app/controllers/users_controller.rb

@@ -1,25 +1,27 @@
 class UsersController < ApplicationController
-  
-  before_filter :admin_login_required, :only => [ :index, :show, :destroy ]
-  skip_before_filter :login_required, :only => [ :new, :create ]
-  skip_before_filter :check_for_deprecated_password_hash,
-    :only => [ :change_password, :update_password ]
-  prepend_before_filter :login_optional, :only => [ :new, :create ]
+  before_action :admin_login_required, :only => [:index, :show]
+  before_action :admin_or_self_login_required, :only => [:destroy]
+  skip_before_action :login_required, :only => [:new, :create]
+  prepend_before_action :login_optional, :only => [:new, :create]
 
   # GET /users GET /users.xml
   def index
     respond_to do |format|
+      order_by = 'login'
+      if params[:order] && User.column_names.include?(params[:order])
+        order_by = params[:order]
+      end
       format.html do
-        @page_title = "TRACKS::Manage Users"
-        @users = User.paginate :page => params[:page], :order => 'login ASC'
+        @page_title = t('users.manage_users_title')
+        @users = User.order(order_by + ' ASC').paginate :page => params[:page]
         @total_users = User.count
         # When we call users/signup from the admin page we store the URL so that
         # we get returned here when signup is successful
         store_location
       end
       format.xml do
-        @users  = User.order('login').all
-        render :xml => @users.to_xml(:except => [ :password ])
+        @users = User.order(order_by)
+        render :xml => @users.to_xml(:root => :users, :except => [:password])
       end
     end
   end
@@ -27,16 +29,16 @@ class UsersController < ApplicationController
   # GET /users/id GET /users/id.xml
   def show
     @user = User.find(params[:id])
-    render :xml => @user.to_xml(:except => [ :password ])
+    render :xml => @user.to_xml(:root => :user, :except => [:password])
   end
 
   # GET /users/new
   def new
     @auth_types = []
     unless session[:cas_user]
-      Tracks::Config.auth_schemes.each {|auth| @auth_types << [auth,auth]}
+      Tracks::Config.auth_schemes.each { |auth| @auth_types << [auth, auth] }
     else
-      @auth_types << ['cas','cas']
+      @auth_types << ['cas', 'cas']
     end
 
     if User.no_users_yet?
@@ -68,6 +70,7 @@ class UsersController < ApplicationController
       render_failure "Expected post format is valid xml like so: <user><login>username</login><password>abc123</password></user>."
       return
     end
+
     respond_to do |format|
       format.html do
         unless User.no_users_yet? || (@user && @user.is_admin?) || SITE_CONFIG['open_signups']
@@ -77,34 +80,26 @@ class UsersController < ApplicationController
           return
         end
 
-        user = User.new(params['user'])
-
-        if Tracks::Config.auth_schemes.include?('ldap') &&
-            user.auth_type == 'ldap' &&
-            !SimpleLdapAuthenticator.valid?(user.login, params['user']['password'])
-          notify :warning, "Incorrect password"
+        unless params['approve_tos'] == 'on' || SITE_CONFIG['tos_link'].blank?
+          notify :error,  t('users.tos_error')
           redirect_to signup_path
           return
         end
 
-        if Tracks::Config.auth_schemes.include?('cas')
-          if user.auth_type.eql? "cas"
-             user.crypted_password = "cas"
-          end
-        end
+        user = User.new(user_params)
 
         unless user.valid?
-          session['new_user'] = user
+          notify :error,  t('users.create_error')
           redirect_to signup_path
           return
         end
 
-        signup_by_admin = true if (@user && @user.is_admin?)
+        signup_by_admin = true if @user && @user.is_admin?
         first_user_signing_up = User.no_users_yet?
         user.is_admin = true if first_user_signing_up
         if user.save
           @user = User.authenticate(user.login, params['user']['password'])
-          @user.create_preference({:locale => I18n.locale})
+          @user.create_preference(:locale => I18n.locale)
           @user.save
           session['user_id'] = @user.id unless signup_by_admin
           notify :notice, t('users.signup_successful', :username => @user.login)
@@ -114,20 +109,25 @@ class UsersController < ApplicationController
       end
       format.xml do
         unless current_user && current_user.is_admin
-          render :text => "401 Unauthorized: Only admin users are allowed access to this function.", :status => 401
+          render :body => t('errors.user_unauthorized'), :status => 401
           return
         end
         unless check_create_user_params
           render_failure "Expected post format is valid xml like so: <user><login>username</login><password>abc123</password></user>.", 400
           return
         end
-        user = User.new(params[:user])
-        user.password_confirmation = params[:user][:password]
+        unless user_params['approve_tos'] == 'on' || SITE_CONFIG['tos_link'].blank?
+          render_failure "You have to accept the terms of service to sign up!"
+          return
+        end
+
+        user = User.new(user_params)
+        user.password_confirmation = user_params[:password]
         saved = user.save
         unless user.new_record?
-          render :text => t('users.user_created'), :status => 200
+          render :body => t('users.user_created'), :status => 200
         else
-          render_failure user.errors.to_xml, 409
+          render_failure user.errors.full_messages.to_xml(root: "errors", skip_types: true), 409
         end
         return
       end
@@ -137,8 +137,14 @@ class UsersController < ApplicationController
   # DELETE /users/id DELETE /users/id.xml
   def destroy
     @deleted_user = User.find(params[:id])
+
+    # Remove the user
     @saved = @deleted_user.destroy
-    @total_users = User.all.size
+
+    # Log out the user if they've deleted their own user and it succeeded.
+    if @saved && current_user == @deleted_user
+      logout_user
+    end
 
     respond_to do |format|
       format.html do
@@ -147,10 +153,18 @@ class UsersController < ApplicationController
         else
           notify :error, t('users.failed_to_delete_user', :username => @deleted_user.login)
         end
-        redirect_to users_url
+        if current_user == @deleted_user
+          redirect_to login
+        else
+          redirect_to users_url
+        end
+      end
+      format.js do
+        @total_users = User.count
+      end
+      format.xml do
+        head :ok
       end
-      format.js
-      format.xml { head :ok }
     end
   end
 
@@ -160,7 +174,7 @@ class UsersController < ApplicationController
 
   def update_password
     # is used for focing password change after sha->bcrypt upgrade
-    current_user.change_password(params[:user][:password], params[:user][:password_confirmation])
+    current_user.change_password(user_params[:password], user_params[:password_confirmation])
     notify :notice, t('users.password_updated')
     redirect_to preferences_path
   rescue Exception => error
@@ -173,7 +187,7 @@ class UsersController < ApplicationController
   end
 
   def update_auth_type
-    current_user.auth_type = params[:user][:auth_type]
+    current_user.auth_type = user_params[:auth_type]
     if current_user.save
       notify :notice, t('users.auth_type_updated')
       redirect_to preferences_path
@@ -192,6 +206,10 @@ class UsersController < ApplicationController
 
   private
 
+  def user_params
+    params.require(:user).permit(:login, :first_name, :last_name, :email, :password_confirmation, :password, :auth_type, :open_id_url)
+  end
+
   def get_new_user
     if session['new_user']
       user = session['new_user']
@@ -203,12 +221,11 @@ class UsersController < ApplicationController
   end
 
   def check_create_user_params
-    return false unless params.has_key?(:user)
-    return false unless params[:user].has_key?(:login)
+    return false unless params.key?(:user)
+    return false unless params[:user].key?(:login)
     return false if params[:user][:login].empty?
-    return false unless params[:user].has_key?(:password)
+    return false unless params[:user].key?(:password)
     return false if params[:user][:password].empty?
     return true
   end
-
 end

app/helpers/application_helper.rb

@@ -1,86 +1,40 @@
-# The methods added to this helper will be available to all templates in the
-# application.
 module ApplicationHelper
-  
-  def navigation_link(name, options = {}, html_options = nil, *parameters_for_method_reference)
-    link_to name, options, html_options
+  def group_view_by_menu_entry
+    # not set, no menu entry
+    return "" if @group_view_by.nil?
+
+    # if view == context, the menu shows Order By Project
+    menu_name = @group_view_by == 'context' ? 'project' : 'context'
+
+    content_tag(:li) do
+      link_to(
+        t("layouts.navigation.group_view_by_#{menu_name}"),
+        '#',
+        { :id => "group_view_by_link", :accesskey => "g", :title => t('layouts.navigation.group_view_by_title'), :x_current_group_by => @group_view_by })
+    end
   end
-  
-  def days_from_today(date)
-    (date.in_time_zone.to_date - current_user.time.to_date).to_i
+
+  def container_toggle(id)
+    link_to(
+      image_tag("blank.png", :alt => t('common.collapse_expand')),
+      "#",
+      { :class => "container_toggle", :id => id })
   end
-  
+
   # Check due date in comparison to today's date Flag up date appropriately with
   # a 'traffic light' colour code
   #
   def due_date(due)
-    return "" if due.nil?
-
-    days = days_from_today(due)
-
-    colors = ['amber','amber','orange','orange','orange','orange','orange','orange']
-    color = :red if days < 0
-    color = :green if days > 7
-    color = colors[days] if color.nil?
-    
-    return content_tag(:a, {:title => format_date(due)}) {
-      content_tag(:span, {:class => color}) {
-        case days
-        when 0
-          t('todos.next_actions_due_date.due_today')
-        when 1
-          t('todos.next_actions_due_date.due_tomorrow')
-        when 2..7
-          if prefs.due_style == Preference.due_styles[:due_on]
-            # TODO: internationalize strftime here
-            t('models.preference.due_on', :date => due.strftime("%A"))
-          else
-            t('models.preference.due_in', :days => days)
-          end
-        else
-          # overdue or due very soon! sound the alarm!
-          if days == -1
-            t('todos.next_actions_due_date.overdue_by', :days => days * -1)
-          elsif days < -1
-            t('todos.next_actions_due_date.overdue_by_plural', :days => days * -1)
-          else
-            # more than a week away - relax
-            t('models.preference.due_in', :days => days)
-          end
-        end
-      }
-    }
+    return DateLabelHelper::DueDateView.new(due, prefs).due_date_html
   end
 
   # Check due date in comparison to today's date Flag up date appropriately with
   # a 'traffic light' colour code Modified method for mobile screen
   #
   def due_date_mobile(due)
-    if due == nil
-      return ""
-    end
-
-    days = days_from_today(due)
-       
-    case days
-    when 0
-      "<span class=\"amber\">"+ format_date(due) + "</span>"
-    when 1
-      "<span class=\"amber\">" + format_date(due) + "</span>"
-      # due 2-7 days away
-    when 2..7
-      "<span class=\"orange\">" + format_date(due) + "</span>"
-    else
-      # overdue or due very soon! sound the alarm!
-      if days < 0
-        "<span class=\"red\">" + format_date(due) +"</span>"
-      else
-        # more than a week away - relax
-        "<span class=\"green\">" + format_date(due) + "</span>"
-      end
-    end
+    return DateLabelHelper::DueDateView.new(due, prefs).due_date_mobile_html
   end
-  
+
   # Returns a count of next actions in the given context or project. The result
   # is count and a string descriptor, correctly pluralised if there are no
   # actions or multiple actions
@@ -90,7 +44,7 @@ module ApplicationHelper
   end
 
   def count_undone_todos_phrase_text(todos_parent)
-    count_undone_todos_phrase(todos_parent).gsub("&nbsp;"," ").html_safe
+    count_undone_todos_phrase(todos_parent).gsub("&nbsp;", " ").html_safe
   end
 
   def count_undone_todos_and_notes_phrase(project)
@@ -98,32 +52,35 @@ module ApplicationHelper
     s += ", #{t('common.note', :count => project.note_count)}" unless project.note_count == 0
     s.html_safe
   end
-  
+
   def link_to_context(context, descriptor = sanitize(context.name))
-    link_to( descriptor, context, :title => "View context: #{context.name}" )
-  end
-  
-  def link_to_project(project, descriptor = sanitize(project.name))
-    link_to( descriptor, project, :title => "View project: #{project.name}" )
+    link_to(descriptor, context, :title => I18n.t("contexts.view_link", :name => context.name))
   end
 
-  def link_to_edit_note (note, descriptor = sanitize(note.id.to_s))
+  def link_to_project(project, descriptor = sanitize(project.name))
+    link_to(descriptor, project, :title => I18n.t("projects.view_link", :name => project.name))
+  end
+
+  def link_to_edit_note(note, descriptor = sanitize(note.id.to_s))
     link_to(descriptor, edit_note_path(note),
-      {:id => "link_edit_#{dom_id(note)}", :class => "note_edit_settings"})
+      :id => "link_edit_#{dom_id(note)}", :class => "note_edit_settings")
   end
-  
+
   def link_to_project_mobile(project, accesskey, descriptor = sanitize(project.name))
-    link_to( descriptor, project_path(project, :format => 'm'), {:title => "View project: #{project.name}", :accesskey => accesskey} )
+    link_to(descriptor, project_path(project, :format => 'm'),
+      :title => I18n.t("projects.view_link", :name => project.name), :accesskey => accesskey)
   end
-  
+
   def item_link_to_context(item)
-    link_to_context( item.context, prefs.verbose_action_descriptors ? "[#{item.context.name}]" : "[C]" )
+    link_to_context(item.context,
+      prefs.verbose_action_descriptors ? "[#{item.context.name}]" : "[" + I18n.t("contexts.letter_abbreviation") + "]")
   end
-  
+
   def item_link_to_project(item)
-    link_to_project( item.project, prefs.verbose_action_descriptors ? "[#{item.project.name}]" : "[P]" )
+    link_to_project(item.project,
+      prefs.verbose_action_descriptors ? "[#{item.project.name}]" : "[" + I18n.t("projects.letter_abbreviation") + "]")
   end
-  
+
   def render_flash
     render :partial => 'shared/flash', :object => flash
   end
@@ -131,33 +88,35 @@ module ApplicationHelper
   def time_span_text(date, i18n_text)
     return (date ? "#{i18n_text} #{format_date(date)}" : "").html_safe
   end
-  
+
   def recurrence_time_span(rt)
     case rt.ends_on
     when "no_end_date"
       return time_span_text(rt.start_from, I18n.t("todos.recurrence.pattern.from"))
     when "ends_on_number_of_times"
-      return I18n.t("todos.recurrence.pattern.times", :number => rt.number_of_occurences)
+      return I18n.t("todos.recurrence.pattern.times", :number => rt.number_of_occurrences)
     when "ends_on_end_date"
       starts = time_span_text(rt.start_from, I18n.t("todos.recurrence.pattern.from"))
       ends = time_span_text(rt.end_date, I18n.t("todos.recurrence.pattern.until"))
-      return starts+ends
+      return starts + " " + ends
     else
       raise Exception.new, "unknown recurrence time span selection (#{rt.ends_on})"
     end
   end
 
   def recurrence_pattern_as_text(recurring_todo)
-    rt = recurring_todo.recurring_target_as_text
-    rp = recurring_todo.recurrence_pattern
-    rp = " " + rp unless rp.nil?
-    rts = recurrence_time_span(recurring_todo)
-    # only add space if recurrence_time_span has content
-    rts = " " + rts unless rts == ""
-    return rt+rp+rts
+    recurring_target = recurring_todo.recurring_target_as_text
+
+    recurrence_pattern = recurring_todo.recurrence_pattern
+    recurrence_pattern = ' ' + recurrence_pattern unless recurrence_pattern.nil?
+
+    recurrence_time_span = recurrence_time_span(recurring_todo)
+    recurrence_time_span = ' ' + recurrence_time_span unless recurrence_time_span.empty?
+
+    recurring_target + recurrence_pattern + recurrence_time_span
   end
 
-  def date_format_for_date_picker()
+  def date_format_for_date_picker
     [
       ['%m', 'mm'],
       ['%b', 'M'],
@@ -170,18 +129,18 @@ module ApplicationHelper
     ].inject(current_user.prefs.date_format) { |str, translation| str.gsub(*translation) }
   end
 
-  def sidebar_html_for_titled_list (list, title)
-    return content_tag(:h3, title+" (#{list.size})")  + content_tag(:ul, sidebar_html_for_list(list))
+  def sidebar_html_for_titled_list(list, title)
+    return content_tag(:h3, title + " (#{list.size})") + content_tag(:ul, sidebar_html_for_list(list))
   end
 
   def link_to_sidebar_item(item)
-    item.is_a?(Project) ? link_to_project( item ) : link_to_context( item )
+    item.is_a?(Project) ? link_to_project(item) : link_to_context(item)
   end
-  
+
   def sidebar_html_for_item(item)
-    content_tag(:li, link_to_sidebar_item(item) + " (" + count_undone_todos_phrase(item)+")")
+    content_tag(:li, link_to_sidebar_item(item) + " (" + count_undone_todos_phrase(item) + ")")
   end
-  
+
   def sidebar_html_for_list(list)
     return content_tag(:li, t('sidebar.list_empty')).html_safe if list.empty?
     return list.inject("") { |html, item| html << sidebar_html_for_item(item) }.html_safe
@@ -203,7 +162,7 @@ module ApplicationHelper
     common.update             common.create
     common.ajaxError          todos.unresolved_dependency
     }.each do |s|
-      js << "i18n['#{s}'] = '#{ t(s).gsub(/'/, "\\\\'") }';\n"
+      js << "i18n['#{s}'] = '#{t(s).gsub(/'/, "\\\\'")}';\n"
     end
     return js.html_safe
   end
@@ -211,53 +170,83 @@ module ApplicationHelper
   def javascript_tag_for_i18n_datepicker
     locale = I18n.locale
     # do not include en as locale since this the available by default
-    if locale && locale != :en
-      javascript_include_tag("i18n/jquery.ui.datepicker-#{locale}.js")
+    javascript_include_tag("datepicker-#{locale}") if locale && locale != :en
+  end
+
+  def done_path(controller_name, type)
+    case controller_name
+    when "contexts"
+      send("#{type}_todos_context_path", @context)
+    when "projects"
+      send("#{type}_todos_project_path", @project)
+    when "todos"
+      if @tag_name
+        send("#{type}_tag_path", @tag_name)
+      else
+        send("#{type}_todos_path")
+      end
+    else
+      send("#{type}_todos_path")
     end
   end
-  
+
   def determine_done_path
-    case controller.controller_name
-    when "contexts"
-      done_todos_context_path(@context)
-    when "projects"
-      done_todos_project_path(@project)
-    when "todos"
-      if source_view_is(:tag)
-        done_tag_path(@tag_name)
-      else
-        done_todos_path
-      end
-    else
-      done_todos_path
-    end
+    done_path(controller.controller_name, :done)
   end
-  
+
   def determine_all_done_path
-    case controller.controller_name
-    when "contexts"
-      all_done_todos_context_path(@context)
-    when "projects"
-      all_done_todos_project_path(@project)
-    when "todos"
-      if source_view_is(:tag)
-        all_done_tag_path(@tag_name)
-      else
-        all_done_todos_path
-      end
-    else
-      all_done_todos_path
-    end
+    done_path(controller.controller_name, :all_done)
   end
-  
+
   def get_list_of_error_messages_for(model)
     if model.errors.any?
-      content_tag(:div, {:id=>"errorExplanation"}) do
+      content_tag(:div, { :id => "errorExplanation" }) do
         content_tag(:ul) do
           model.errors.full_messages.collect { |msg| concat(content_tag(:li, msg)) }
         end
       end
     end
   end
-  
+
+  def link_to_delete(type, object, descriptor = sanitize(object.name))
+    link_to(descriptor, self.send("#{type}_path", object, :format => 'js'),
+      {
+        :id => "delete_#{type}_#{object.id}",
+        :class => "delete_#{type}_button icon",
+        :x_confirm_message => t("#{type}s.delete_#{type}_confirmation", :name => object.name),
+        :title => t("#{type}s.delete_#{type}_title")
+      }
+    )
+  end
+
+  def link_to_edit(type, object, descriptor)
+    link_to(descriptor, send("edit_#{type}_path", object),
+      {
+        :id => "link_edit_#{dom_id(object)}",
+        :class => "#{type}_edit_settings icon"
+      })
+  end
+
+  def source_view_key
+    # uses @project.id or @context.id depending on source_view
+    source_view_is_one_of(:project, :context) ? "#{@source_view}-#{eval("@#{@source_view}.id", binding, __FILE__, __LINE__)}" : @source_view
+  end
+
+  # create a unique object name which can be used in ajax calls returning js
+  # to prevent concurrent calls with same functions to overwrite each other functions
+  def unique_object_name_for(name)
+    "#{name}_#{SecureRandom.hex(5)}"
+  end
+
+  def js_render(partial, locals = {}, object = nil)
+    if object
+      escape_javascript(render(partial: partial, locals: locals, object: object))
+    else
+      escape_javascript(render(partial: partial, locals: locals))
+    end
+  end
+
+  def js_error_messages_for(object)
+    escape_javascript(get_list_of_error_messages_for(object))
+  end
 end

app/helpers/bootstrap_flash_helper.rb

@@ -0,0 +1,35 @@
+module BootstrapFlashHelper
+  ALERT_MAPPING = {
+    :notice => :success,
+    :alert => :danger,
+    :error => :danger,
+    :info => :info,
+    :warning => :warning
+  }.freeze unless const_defined?(:ALERT_MAPPING)
+
+  def bootstrap_flash(options = { :close_button => true })
+    flash_messages = []
+    flash.each do |type, message|
+      # Skip empty messages, e.g. for devise messages set to nothing in a locale file.
+      next if message.blank?
+      type = type.to_sym
+      next unless ALERT_MAPPING.keys.include?(type)
+
+      tag_class = options.extract!(:class)[:class]
+      tag_options = {
+        class: "alert fade in alert-#{ALERT_MAPPING[type]} #{tag_class}"
+      }.merge(options)
+
+      close_button = ""
+      if options[:close_button]
+        close_button = content_tag(:button, raw("×"), type: "button", class: "close", "data-dismiss" => "alert")
+      end
+
+      Array(message).each do |msg|
+        text = content_tag(:div, close_button + msg, tag_options)
+        flash_messages << text if msg
+      end
+    end
+    flash_messages.join("\n").html_safe
+  end
+end

app/helpers/contexts_helper.rb

@@ -1,26 +1,21 @@
 module ContextsHelper
-  
-  def link_to_delete_context(context, descriptor = sanitize(context.name))
-    link_to(descriptor,
-      context_path(context, :format => 'js'),
-      {
-        :id => "delete_context_#{context.id}",
-        :class => "delete_context_button icon",
-        :x_confirm_message => t('contexts.delete_context_confirmation', :name => context.name),
-        :title => t('contexts.delete_context_title')
-      })
+  def show_context_name(context)
+    if source_view_is :context
+      content_tag(:span, :id => "context_name"){ context.name }
+    else
+      link_to_context(context)
+    end
   end
 
-  def link_to_edit_context (context, descriptor = sanitize(context.name))
-    link_to(descriptor, edit_context_path(context),
-      {
-        :id => "link_edit_#{dom_id(context)}",
-        :class => "context_edit_settings icon"
-      })
+  def link_to_delete_context(context, descriptor = sanitize(context.name))
+    link_to_delete(:context, context, descriptor)
+  end
+
+  def link_to_edit_context(context, descriptor = sanitize(context.name))
+    link_to_edit(:context, context, descriptor)
   end
 
   def context_summary(context, undone_todo_count)
     content_tag(:p, "#{undone_todo_count}. Context is #{context.hidden? ? 'Hidden' : 'Active'}.".html_safe)
   end
-
 end

app/helpers/date_label_helper.rb

@@ -0,0 +1,122 @@
+module DateLabelHelper
+  class GenericDateView
+    include ActionView::Context
+    include ActionView::Helpers
+
+    COLORS = {
+      :overdue_by_more_than_one => :red,
+      :overdue_by_one           => :red,
+      :today                    => :amber,
+      :tomorrow                 => :amber,
+      :this_week                => :orange,
+      :more_than_a_week         => :green
+    }.freeze
+
+    def initialize(date, prefs)
+      @date = date
+      @days = date.nil? ? nil : days_from_today(date)
+      @days_sym = days_to_sym(@days)
+      @prefs = prefs
+    end
+
+    def get_color
+      COLORS[@days_sym]
+    end
+
+    def days_from_today(date)
+      (date.in_time_zone.to_date - Date.current).to_i
+    end
+
+    def days_to_sym(days)
+      case days
+      when nil
+        return nil
+      when 0
+        return :today
+      when 1
+        return :tomorrow
+      when 2..7
+        return :this_week
+      else
+        if days == -1
+          return :overdue_by_one
+        elsif days < -1
+          return :overdue_by_more_than_one
+        else
+          return :more_than_a_week
+        end
+      end
+    end
+
+    def date_html_wrapper
+      return "" if @date.nil?
+
+      return content_tag(:a, { :title => @prefs.format_date(@date) }) {
+              content_tag(:span, { :class => get_color }) { yield }
+            }
+    end
+
+    def date_mobile_html_wrapper
+      return "" if @date.nil?
+
+      return content_tag(:span, { :class => get_color }) { yield }
+    end
+  end
+
+  class DueDateView < GenericDateView
+    def due_text
+      case @days_sym
+      when :overdue_by_one
+        t('todos.next_actions_due_date.overdue_by', :days => @days * -1)
+      when :overdue_by_more_than_one
+        t('todos.next_actions_due_date.overdue_by_plural', :days => @days * -1)
+      when :today
+        t('todos.next_actions_due_date.due_today')
+      when :tomorrow
+        t('todos.next_actions_due_date.due_tomorrow')
+      when :this_week
+        if @prefs.due_style == Preference.due_styles[:due_on]
+          # TODO: internationalize strftime here
+          t('models.preference.due_on', :date => @date.strftime("%A"))
+        else
+          t('models.preference.due_in', :days => @days)
+        end
+      else # should be :more_than_a_week
+        t('models.preference.due_in', :days => @days)
+      end
+    end
+
+    def due_date_html
+      date_html_wrapper { due_text }
+    end
+
+    def due_date_mobile_html
+      date_mobile_html_wrapper { @prefs.format_date(@due) }
+    end
+  end
+
+  class ShowFromDateView < GenericDateView
+    def show_from_text
+      case @days_sym
+      when :overdue_by_more_than_one, :overdue_by_one
+        t('todos.scheduled_overdue', :days => @days * -1)
+      when :today
+        t('todos.show_today')
+      when :tomorrow
+        t('todos.show_tomorrow')
+      when :this_week
+        if @prefs.due_style == Preference.due_styles[:due_on]
+          t('todos.show_on_date', :date => @date.strftime("%A"))
+        else
+          t('todos.show_in_days', :days => @days.to_s)
+        end
+      else
+        t('todos.show_in_days', :days => @days.to_s)
+      end
+    end
+
+    def show_from_date_html
+      date_html_wrapper { show_from_text }
+    end
+  end
+end

app/helpers/feedlist_helper.rb

@@ -1,48 +1,50 @@
 module FeedlistHelper
-  
   def linkoptions(format, options)
-    merge_hashes( {:format => format}, options, user_token_hash)
+    merge_hashes({ :format => format }, options, user_token_hash)
   end
-  
+
   def rss_formatted_link(options = {})
     image_tag = image_tag("feed-icon.png", :size => "16X16", :border => 0, :class => "rss-icon")
-		link_to(image_tag, linkoptions('rss', options), :title => "RSS feed")
+    link_to(image_tag, linkoptions('rss', options), :title => "RSS feed")
   end
 
   def text_formatted_link(options = {})
-    link_to(content_tag(:span, 'TXT', {:class => 'feed', :title => "Plain text feed"}), linkoptions('txt', options))
+    link_to(content_tag(:span, 'TXT', { :class => 'feed', :title => "Plain text feed" }), linkoptions('txt', options))
   end
-  
+
   def ical_formatted_link(options = {})
-    link_to(content_tag(:span, 'iCal', {:class=>"feed", :title => "iCal feed"}), linkoptions('ics', options))
+    link_to(content_tag(:span, 'iCal', { :class => "feed", :title => "iCal feed" }), linkoptions('ics', options))
   end
 
   def feed_links(feeds, link_options, title)
     space = " "
     html = ""
-    html << rss_formatted_link(link_options) +space if feeds.include?(:rss)
-    html << text_formatted_link(link_options)+space if feeds.include?(:txt)
-    html << ical_formatted_link(link_options)+space if feeds.include?(:ical)
+    html << rss_formatted_link(link_options) + space if feeds.include?(:rss)
+    html << text_formatted_link(link_options) + space if feeds.include?(:txt)
+    html << ical_formatted_link(link_options) + space if feeds.include?(:ical)
     html << title
     return html.html_safe
   end
 
+  def all_feed_links(object, symbol)
+    feed_links([:rss, :txt, :ical], { :controller => 'todos', :action => 'index', symbol => object.to_param }, content_tag(:strong, object.name))
+  end
+
   def all_feed_links_for_project(project)
-    feed_links([:rss, :txt, :ical], { :controller=> 'todos', :action => 'index', :project_id => project.to_param }, content_tag(:strong, project.name))
+    all_feed_links(project, :project_id)
   end
 
   def all_feed_links_for_context(context)
-    feed_links([:rss, :txt, :ical], { :controller=> 'todos', :action => 'index', :context_id => context.to_param }, content_tag(:strong, context.name))
+    all_feed_links(context, :context_id)
   end
 
   protected
 
   def merge_hashes(*hashes)
-    hashes.inject(Hash.new){ |result, h| result.merge(h) }
+    hashes.inject({}) { |result, h| result.merge(h) }
   end
 
   def user_token_hash
     { :token => current_user.token }
   end
-    
 end

app/helpers/icon_helper.rb

@@ -0,0 +1,15 @@
+module IconHelper
+  include FontAwesome::Sass::Rails::ViewHelpers
+
+  def icon_fw(style, name, text = nil, html_options = {})
+    text, html_options = nil, text if text.is_a?(Hash)
+
+    if html_options.key?(:class)
+      html_options[:class] = "fa-fw #{html_options[:class]}"
+    else
+      html_options[:class] = "fa-fw"
+    end
+
+    icon(style, name, text, html_options)
+  end
+end

app/helpers/login_helper.rb

@@ -1,3 +1,2 @@
 module LoginHelper
-  
-end
+end