date_book 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16b86a9b5b8d1c35ae319faf85fbf1c23eebc460
-  data.tar.gz: 54e72d9f916f5749b0c45750d6e301d9e4b52239
+  metadata.gz: 30d824b967dd697a492168690a853b36cfd8ab7c
+  data.tar.gz: a94fea678e79260b094c8e7380a45731bb97058e
 SHA512:
-  metadata.gz: ac397df0c52ef1a1bd82e064429e8ad93576ee38966c31edc740036b5c24d8d8cb765a13e61b487e34e36219015f97848705ceae1b821270edeec5c1f6f489b7
-  data.tar.gz: 5aee94d1b0912d342a59f29060900d7be17a107e951f19bd041e1b2d384a2e2c64de8b1939362513ac3ba42d3be1ad72247da07adbf8a1924c52f6306798c5e9
+  metadata.gz: 360b7ebf587e9b749089338d791d3b0724504b2bb1b7735220cf2b33f3337422e70ef650e4d64953ddd4802f90adeaa7287a7a449b4b4f06f1a843f71752edba
+  data.tar.gz: 5fa3b492c6337a37a1447e2f421853846b29b874ce6e71bf312415b18ec15c09dda56b7d14d19cb8378b84967248cc1bd252f0554972744f47fc04194ebb0a5b

data/.rubocop.yml

@@ -20,4 +20,12 @@ Metrics/ModuleLength:
   Exclude:
     - spec/*
     - spec/*/*
-    - spec/*/*/*
+    - spec/*/*/*
+
+Metrics/MethodLength:
+  Exclude:
+    - db/migrate/*
+
+Style/ClassVars:
+  Exclude:
+    - 'spec/support/shared_connection.rb'

data/.rubocop_todo.yml

@@ -1,7 +1,8 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-04-04 09:26:52 -0600 using RuboCop version 0.48.1.
+# on 2017-08-08 17:08:12 -0600 using RuboCop version 0.49.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
+

data/.travis.yml

@@ -1,3 +1,6 @@
 language: ruby
 rvm:
   - 2.4.1
+before_script:
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start

data/Gemfile

@@ -29,6 +29,9 @@ gem 'bootstrap3-datetimepicker-rails', '~> 4.17.47'
 # Haml because I like it
 gem 'haml-rails', '>= 1.0', '< 2'
 
+# Sass for smart CSS
+gem 'sass-rails', '>= 5.0', '< 6'
+
 # Jbuilder for easy building of json objects
 gem 'jbuilder'
 
@@ -46,14 +49,23 @@ gem 'friendly_id', '>= 5.2', '< 6'
 
 # Ice Cube and Schedulable for recurrence and scheduling
 gem 'ice_cube', '>= 0.16', '< 1'
-# gem 'schedulable', '>= 0.0.10', '< 1', git: 'git@github.com:nerakdon/schedulable.git', branch: 'bug_fix'
-gem 'schedulable', '>= 0.0.10', '< 1', path: '~/Code/schedulable'
+gem(
+  'schedulable',
+  '>= 0.0.10',
+  '< 1',
+  git: 'https://github.com/gemvein/schedulable.git',
+  branch: 'working'
+)
+# gem 'schedulable', '>= 0.0.10', '< 1', path: '~/Code/schedulable'
 # gem 'schedulable', '>= 0.0.10', '< 1'
 
 # Full Calendar to display what we've got
 gem 'fullcalendar-rails', '>= 3.4', '< 4'
 gem 'momentjs-rails', '>= 2.9', '< 3'
 
+# More icons, like the spinner
+gem 'font-awesome-rails', '>= 4.7', '< 5'
+
 # GraphQL for the API
 gem 'graphql', '>= 1.6', '< 2'
 
@@ -64,8 +76,8 @@ group :development do
   gem 'bundler', '~> 1.0'
   gem 'juwelier', '~> 2.4'
   # gem 'rspec', '>= 3.5', '< 4'
-  gem 'rubocop', require: false
   gem 'graphiql-rails', '>= 1.4', '< 2'
+  gem 'rubocop', require: false
 end
 
 group :development, :test do
@@ -73,11 +85,11 @@ group :development, :test do
   gem 'byebug', '~> 9'
   gem 'factory_girl_rails', '~> 4.5'
   gem 'faker', '~> 1.4'
+  gem 'high_voltage', '~> 3'
   gem 'rspec-its', '>= 1'
   gem 'rspec-rails', '>= 3.5', '< 4'
   gem 'seedbank', '~> 0.3'
   gem 'sqlite3', '~> 1.3'
-  gem 'high_voltage', '~> 3'
 end
 
 group :test do

data/Gemfile.lock

@@ -1,5 +1,7 @@
-PATH
-  remote: ../schedulable
+GIT
+  remote: https://github.com/gemvein/schedulable.git
+  revision: 9da6591769c9e488afc537dc3747304125be64ab
+  branch: working
   specs:
     schedulable (0.0.10)
       ice_cube
@@ -110,6 +112,8 @@ GEM
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.18)
+    font-awesome-rails (4.7.0.2)
+      railties (>= 3.2, < 5.2)
     friendly_id (5.2.1)
       activerecord (>= 4.0.0)
     fullcalendar-rails (3.4.0.0)
@@ -297,6 +301,12 @@ GEM
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
+    sass-rails (5.0.6)
+      railties (>= 4.0.0, < 6)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
     seedbank (0.4.0)
     semver2 (3.4.2)
     sexp_processor (4.10.0)
@@ -352,6 +362,7 @@ DEPENDENCIES
   devise (>= 4.3, < 5)
   factory_girl_rails (~> 4.5)
   faker (~> 1.4)
+  font-awesome-rails (>= 4.7, < 5)
   friendly_id (>= 5.2, < 6)
   fullcalendar-rails (>= 3.4, < 4)
   graphiql-rails (>= 1.4, < 2)
@@ -376,6 +387,7 @@ DEPENDENCIES
   rspec-its (>= 1)
   rspec-rails (>= 3.5, < 4)
   rubocop
+  sass-rails (>= 5.0, < 6)
   schedulable (>= 0.0.10, < 1)!
   seedbank (~> 0.3)
   shoulda-matchers (>= 2.8, < 3.2)

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.1.0

data/app/assets/javascripts/date_book/calendar_events.js

@@ -1,11 +1,11 @@
 function calendarBySlugQuery(slug) {
     // GraphQL requires double-quoted strings in the query:
-    return(' { calendar(slug: "' + slug + '") { event_occurrences { url, popover_url, start, end, event {id, name, description, css_class, text_color, background_color, border_color, all_day} } } } ');
+    return(' { calendar(slug: "' + slug + '") { event_occurrences { url, popover_url, start, end, event {id, name, css_class, text_color, background_color, border_color, all_day} } } } ');
 }
 
 function calendarEventsQuery(slug) {
     // GraphQL requires double-quoted strings in the query:
-    return(' { event_occurrences { url, popover_url, start, end, event {id, name, description, css_class, text_color, background_color, border_color, all_day} } } ');
+    return(' { event_occurrences { url, popover_url, start, end, event {id, name, css_class, text_color, background_color, border_color, all_day} } } ');
 }
 
 function formatEventOccurrence(occurrence) {
@@ -43,7 +43,7 @@ function calendarEventRender(event, element) {
             element.popover({
                 html: true,
                 placement: 'auto',
-                viewport: '#calendar-display',
+                viewport: '.date-book--calendar',
                 container: 'body',
                 title: '<a href="' + event.url + '">' + event.title + '</a><span onclick="hideParentPopover(this);" class="float-right glyphicon glyphicon-remove"></span>',
                 content: ajax_data

data/app/assets/stylesheets/date_book.css.scss

@@ -1,6 +1,7 @@
 @import 'fullcalendar.css';
 @import 'bootstrap-wysihtml5/bootstrap3-wysihtml5.css';
 @import 'bootstrap-datetimepicker.css';
+@import 'font-awesome';
 
 .all-day {
   background-image: url('date_book/all-day-bg.png');
@@ -39,6 +40,34 @@
   max-width: 20em;
 }
 
-.margin-left {
-  margin-left: 1em;
+.glyphicon-spinning {
+  animation: spin 3s infinite linear;
+  -webkit-animation: spin2 3s infinite linear;
+}
+
+@keyframes spin {
+  from { transform: scale(1) rotate(0deg); }
+  to { transform: scale(1) rotate(360deg); }
+}
+
+@-webkit-keyframes spin2 {
+  from { -webkit-transform: rotate(0deg); }
+  to { -webkit-transform: rotate(360deg); }
+}
+
+.date-book--spinner {
+  font-size: 300px;
+  color: #999;
+}
+
+.date-book--wrapper {
+  position: relative;
+
+  .date-book--spinner {
+    position: absolute;
+    margin: auto;
+    z-index: 1000;
+    left: 50%;
+    transform: translate(-50%, 0);
+  }
 }

data/app/controllers/date_book/calendars_controller.rb

@@ -1,48 +1,59 @@
+# frozen_string_literal: true
+
 module DateBook
+  # Allows viewing and maintaining Calendars
   class CalendarsController < DateBookController
     load_and_authorize_resource find_by: :slug
 
     # GET /calendars
-    def index
-    end
+    def index; end
 
     # GET /calendars/slug
-    def show
-    end
+    def show; end
 
     # GET /calendars/new
-    def new
-    end
+    def new; end
 
     # GET /calendars/slug/edit
-    def edit
-    end
+    def edit; end
 
     # POST /calendars
     def create
       @calendar.owners = [current_user]
-      if @calendar.save
-        redirect_to @calendar, notice: :item_acted_on.l(item: Calendar.model_name.human, action: :created.l)
-      else
+      unless @calendar.save
         flash[:error] = @calendar.errors.full_messages.to_sentence
         render :new
+        return
       end
+      redirect_to(@calendar, notice: :item_acted_on.l(
+        item: Calendar.model_name.human,
+        action: :created.l
+      ))
     end
 
     # PATCH/PUT /calendars/slug
     def update
-      if @calendar.update(calendar_params)
-        redirect_to @calendar, notice: :item_acted_on.l(item: Calendar.model_name.human, action: :updated.l)
-      else
+      unless @calendar.update(calendar_params)
         flash[:error] = @calendar.errors.full_messages.to_sentence
         render :edit
+        return
       end
+      redirect_to(@calendar, notice: :item_acted_on.l(
+        item: Calendar.model_name.human,
+        action: :updated.l
+      ))
     end
 
     # DELETE /calendars/slug
     def destroy
       @calendar.destroy
-      redirect_to calendars_url, notice: :item_acted_on.l(item: Calendar.model_name.human, action: :destroyed.l)
+      redirect_to(
+        calendars_url,
+        notice: :item_acted_on.l(
+          item: Calendar.model_name.human,
+          action: :destroyed.l
+        )
+      )
     end
 
     private
@@ -50,10 +61,10 @@ module DateBook
     # Only allow a trusted parameter "white list" through.
     def calendar_params
       params.require(:calendar).permit(
-          :id,
-          :name,
-          :description,
-          :css_class
+        :id,
+        :name,
+        :description,
+        :css_class
       )
     end
   end

data/app/controllers/date_book/date_book_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module DateBook
-  # Some documentation goes here
+  # Main DateBookController, all others inherit from this
   class DateBookController < ::ApplicationController
     helper :all
     before_action :set_locale

data/app/controllers/date_book/events_controller.rb

@@ -1,19 +1,26 @@
+# frozen_string_literal: true
+
 module DateBook
+  # Allows viewing and maintaining Events within Calendars
   class EventsController < DateBookController
     load_and_authorize_resource :calendar, find_by: :slug
     load_and_authorize_resource :event, find_by: :slug, through: :calendar
-    before_action :set_occurrence, only: [:show, :popover]
+    before_action :set_occurrence, only: %i[show popover]
 
     # GET /events
     def index
-      start_date = params[:start]&.to_datetime || Time.now.beginning_of_month
-      end_date = params[:end]&.to_datetime || Time.now.beginning_of_month.next_month
+      start_date = params[:start]&.to_datetime || Time
+                   .now
+                   .beginning_of_month
+      end_date   = params[:end]&.to_datetime || Time
+                   .now
+                   .beginning_of_month
+                   .next_month
       @events = @events&.ending_after(start_date)&.starting_before(end_date)
     end
 
     # GET /events/slug
-    def show
-    end
+    def show; end
 
     # GET /events/slug/popover
     def popover
@@ -21,88 +28,79 @@ module DateBook
     end
 
     # GET /events/new
-    def new
-    end
+    def new; end
 
     # GET /events/slug/edit
-    def edit
-    end
+    def edit; end
 
     # POST /events
     def create
       @event.owners = [current_user]
-      if @event.save
-        redirect_to [@calendar, @event], notice: :item_acted_on.l(item: Event.model_name.human, action: :created.l)
-      else
+      unless @event.save
         flash[:error] = @event.errors.full_messages.to_sentence
         render :new
+        return
       end
+      redirect_to([@calendar, @event], notice: :item_acted_on.l(
+        item: Event.model_name.human,
+        action: :created.l
+      ))
     end
 
     # PATCH/PUT /events/slug
     def update
-      if @event.update(event_params)
-        redirect_to [@calendar, @event], notice: :item_acted_on.l(item: Event.model_name.human, action: :updated.l)
-      else
+      unless @event.update(event_params)
         flash[:error] = @event.errors.full_messages.to_sentence
         render :edit
+        return
       end
+      redirect_to([@calendar, @event], notice: :item_acted_on.l(
+        item: Event.model_name.human,
+        action: :updated.l
+      ))
     end
 
     # DELETE /events/slug
     def destroy
       @event.destroy
-      redirect_to calendar_events_url(@calendar), notice: :item_acted_on.l(item: Event.model_name.human, action: :destroyed.l)
+      redirect_to(
+        calendar_events_url(@calendar),
+        notice: :item_acted_on.l(
+          item: Event.model_name.human,
+          action: :destroyed.l
+        )
+      )
     end
 
     private
-      def set_occurrence
-        if params[:occurrence_id].present?
-          @occurrence = @event.event_occurrences.find(params[:occurrence_id])
-        end
-      end
 
-      # Only allow a trusted parameter "white list" through.
-      def event_params
-        schedule_attributes = [
-          :id,
-          :date,
-          :time,
-          :rule,
-          :until,
-          :count,
-          :interval,
-          :all_day,
-          {
-            day: [],
-            day_of_week: [
-              {
-                monday: [],
-                tuesday: [],
-                wednesday: [],
-                thursday: [],
-                friday: [],
-                saturday: [],
-                sunday: []
-              }
-            ],
-            duration_attributes: [
-              :count,
-              :unit
-            ]
-          }
-        ]
+    def set_occurrence
+      return unless params[:occurrence_id].present?
+      @occurrence = @event.event_occurrences.find(params[:occurrence_id])
+    end
 
-        params.require(:event).permit(
-          :id,
-          :name,
-          :description,
-          :css_class,
-          :text_color,
-          :background_color,
-          :border_color,
-          schedule_attributes: schedule_attributes
-        )
-      end
+    # Only allow a trusted parameter "white list" through.
+    # rubocop:disable Metrics/MethodLength
+    def event_params
+      schedule_attributes = [
+        :id, :date, :time, :rule, :until, :count, :interval, :all_day,
+        {
+          day: [],
+          day_of_week: [
+            {
+              monday: [], tuesday: [], wednesday: [], thursday: [],
+              friday: [], saturday: [], sunday: []
+            }
+          ],
+          duration_attributes: %i[count unit]
+        }
+      ]
+
+      params.require(:event).permit(
+        :id, :name, :description, :css_class, :text_color, :background_color,
+        :border_color, schedule_attributes: schedule_attributes
+      )
+    end
   end
+  # rubocop:enable Metrics/MethodLength
 end