viewable 0.5.17 → 0.5.18

data/lib/viewable/generators/viewable/templates/controllers/resource_controller.rb

@@ -1,50 +1,50 @@
-class <%=resource_name_camelize.singularize.pluralize%>Controller < ApplicationController
-
-  def index
-    @<%=resource_name_underscore.pluralize%> = <%=resource_name_camelize.singularize%>.all
-  end
-
-  def new
-    @<%=resource_name_underscore.singularize%> = <%=resource_name_camelize.singularize%>.new
-  end
-
-  def create
-    @<%=resource_name_underscore.singularize%> = <%=resource_name_camelize.singularize%>.create(<%=resource_name_underscore.singularize%>_params)
-    if @<%=resource_name_underscore.singularize%>.save
-      name = @<%=resource_name_underscore.singularize%>.name
-      redirect_to <%=resource_name_underscore.pluralize%>_path
-      flash[:notice] = "#{name} created"
-    else
-      render 'new'
-      flash[:error] = "Unable to create <%=resource_name_underscore.singularize.gsub(/(_)/, ' ')%>. Please try again"
-    end
-  end
-
-  def destroy
-    @<%=resource_name_underscore.singularize%> = <%= resource_name_camelize.singularize%>.find(params[:id])
-    @<%=resource_name_underscore.singularize%>.destroy
-    redirect_to <%=resource_name_underscore.pluralize%>_path
-  end
-
-  def edit
-    @<%=resource_name_underscore.singularize%> = <%=resource_name_camelize.singularize%>.find(params[:id])
-  end
-
-  def update
-    @<%=resource_name_underscore.singularize%> = <%=resource_name_camelize.singularize%>.find(params[:id])
-    @<%=resource_name_underscore.singularize%>.update <%=resource_name_underscore.singularize%>_params
-    if @<%=resource_name_underscore.singularize%>.save
-      flash[:notice] = "Your <%=resource_name_underscore.singularize.gsub(/(_)/, ' ')%> was updated succesfully"
-      redirect_to root_path
-    else
-      render 'edit'
-    end
-  end
-
-  private
-
-    def <%=resource_name_underscore.singularize%>_params
-      params.require(:<%=resource_name_underscore.singularize%>).permit(:name, :delete)
-    end
-
-end
+class <%=resource_name_camelize.singularize.pluralize%>Controller < ApplicationController
+
+  def index
+    @<%=resource_name_underscore.pluralize%> = <%=resource_name_camelize.singularize%>.all
+  end
+
+  def new
+    @<%=resource_name_underscore.singularize%> = <%=resource_name_camelize.singularize%>.new
+  end
+
+  def create
+    @<%=resource_name_underscore.singularize%> = <%=resource_name_camelize.singularize%>.create(<%=resource_name_underscore.singularize%>_params)
+    if @<%=resource_name_underscore.singularize%>.save
+      name = @<%=resource_name_underscore.singularize%>.name
+      redirect_to <%=resource_name_underscore.pluralize%>_path
+      flash[:notice] = "#{name} created"
+    else
+      render 'new'
+      flash[:error] = "Unable to create <%=resource_name_underscore.singularize.gsub(/(_)/, ' ')%>. Please try again"
+    end
+  end
+
+  def destroy
+    @<%=resource_name_underscore.singularize%> = <%= resource_name_camelize.singularize%>.find(params[:id])
+    @<%=resource_name_underscore.singularize%>.destroy
+    redirect_to <%=resource_name_underscore.pluralize%>_path
+  end
+
+  def edit
+    @<%=resource_name_underscore.singularize%> = <%=resource_name_camelize.singularize%>.find(params[:id])
+  end
+
+  def update
+    @<%=resource_name_underscore.singularize%> = <%=resource_name_camelize.singularize%>.find(params[:id])
+    @<%=resource_name_underscore.singularize%>.update <%=resource_name_underscore.singularize%>_params
+    if @<%=resource_name_underscore.singularize%>.save
+      flash[:notice] = "Your <%=resource_name_underscore.singularize.gsub(/(_)/, ' ')%> was updated succesfully"
+      redirect_to root_path
+    else
+      render 'edit'
+    end
+  end
+
+  private
+
+    def <%=resource_name_underscore.singularize%>_params
+      params.require(:<%=resource_name_underscore.singularize%>).permit(:name, :delete)
+    end
+
+end

data/lib/viewable/generators/viewable/templates/controllers/viewing_controller.rb

@@ -1,77 +1,77 @@
-class ViewingsController < ApplicationController
-  respond_to :html, :xml, :json
-
-  before_action :find_<%=resource_name_underscore.singularize%>
-
-  def index
-    @viewings = Viewing.where("<%=resource_name.singularize%>_id = ? AND end_time >= ?", @<%=resource_name.singularize%>.id, Time.now).order(:start_time)
-    respond_with @viewings
-  end
-
-  def new
-    @viewing = Viewing.new(<%=resource_name.singularize%>_id: @<%=resource_name.singularize%>.id)
-  end
-
-  def create
-    @viewing =  Viewing.new(params[:viewing].permit(:<%=resource_name.singularize%>_id, :start_time, :length))
-    @viewing.<%=resource_name.singularize%> = @<%=resource_name.singularize%>
-    if @viewing.save
-      redirect_to <%=resource_name.singularize%>_viewings_path(@<%=resource_name.singularize%>, method: :get)
-    else
-      render 'new'
-    end
-  end
-
-  def show
-    @viewing = Viewing.find(params[:id])
-  end
-
-  def destroy
-    @viewing = Viewing.find(params[:id]).destroy
-    if @viewing.destroy
-      flash[:notice] = "Viewing: #{@viewing.start_time.strftime('%e %b %Y %H:%M%p')} to #{@viewing.end_time.strftime('%e %b %Y %H:%M%p')} deleted"
-      redirect_to <%=resource_name.singularize%>_viewings_path(@<%=resource_name.singularize%>)
-    else
-      render 'index'
-    end
-  end
-
-  def edit
-    @viewing = Viewing.find(params[:id])
-  end
-
-  def update
-    @viewing = Viewing.find(params[:id])
-    # @viewing.<%=resource_name%> = @<%=resource_name%>
-
-    if @viewing.update(params[:viewing].permit(:<%=resource_name.singularize%>_id, :start_time, :length))
-      flash[:notice] = 'Your viewing was updated succesfully'
-
-      if request.xhr?
-        render json: {status: :success}.to_json
-      else
-        redirect_to <%=resource_name.singularize%>_viewings_path(@<%=resource_name.singularize%>)
-      end
-    else
-      render 'edit'
-    end
-  end
-
-  private
-
-  def save viewing
-    if @viewing.save
-        flash[:notice] = 'viewing added'
-        redirect_to <%=resource_name.singularize%>_viewing_path(@<%=resource_name.singularize%>, @viewing)
-      else
-        render 'new'
-      end
-  end
-
-  def find_<%=resource_name.singularize%>
-    if params[:<%=resource_name.singularize%>_id]
-      @<%=resource_name.singularize%> = <%=resource_name_camelize.singularize%>.find_by_id(params[:<%=resource_name.singularize%>_id])
-    end
-  end
-
-end
+class ViewingsController < ApplicationController
+  respond_to :html, :xml, :json
+
+  before_action :find_<%=resource_name_underscore.singularize%>
+
+  def index
+    @viewings = Viewing.where("<%=resource_name.singularize%>_id = ? AND end_time >= ?", @<%=resource_name.singularize%>.id, Time.now).order(:start_time)
+    respond_with @viewings
+  end
+
+  def new
+    @viewing = Viewing.new(<%=resource_name.singularize%>_id: @<%=resource_name.singularize%>.id)
+  end
+
+  def create
+    @viewing =  Viewing.new(params[:viewing].permit(:<%=resource_name.singularize%>_id, :start_time, :length))
+    @viewing.<%=resource_name.singularize%> = @<%=resource_name.singularize%>
+    if @viewing.save
+      redirect_to <%=resource_name.singularize%>_viewings_path(@<%=resource_name.singularize%>, method: :get)
+    else
+      render 'new'
+    end
+  end
+
+  def show
+    @viewing = Viewing.find(params[:id])
+  end
+
+  def destroy
+    @viewing = Viewing.find(params[:id]).destroy
+    if @viewing.destroy
+      flash[:notice] = "Viewing: #{@viewing.start_time.strftime('%e %b %Y %H:%M%p')} to #{@viewing.end_time.strftime('%e %b %Y %H:%M%p')} deleted"
+      redirect_to <%=resource_name.singularize%>_viewings_path(@<%=resource_name.singularize%>)
+    else
+      render 'index'
+    end
+  end
+
+  def edit
+    @viewing = Viewing.find(params[:id])
+  end
+
+  def update
+    @viewing = Viewing.find(params[:id])
+    # @viewing.<%=resource_name%> = @<%=resource_name%>
+
+    if @viewing.update(params[:viewing].permit(:<%=resource_name.singularize%>_id, :start_time, :length))
+      flash[:notice] = 'Your viewing was updated succesfully'
+
+      if request.xhr?
+        render json: {status: :success}.to_json
+      else
+        redirect_to <%=resource_name.singularize%>_viewings_path(@<%=resource_name.singularize%>)
+      end
+    else
+      render 'edit'
+    end
+  end
+
+  private
+
+  def save viewing
+    if @viewing.save
+        flash[:notice] = 'viewing added'
+        redirect_to <%=resource_name.singularize%>_viewing_path(@<%=resource_name.singularize%>, @viewing)
+      else
+        render 'new'
+      end
+  end
+
+  def find_<%=resource_name.singularize%>
+    if params[:<%=resource_name.singularize%>_id]
+      @<%=resource_name.singularize%> = <%=resource_name_camelize.singularize%>.find_by_id(params[:<%=resource_name.singularize%>_id])
+    end
+  end
+
+end

data/lib/viewable/generators/viewable/templates/models/datetime.rb

@@ -1,6 +1,6 @@
-class ActiveSupport::HashWithIndifferentAccess
-  def to_datetime(name)
-    units = select{|k,v| k.match /#{name}\(..\)/}.map{|k,v| v.to_i}
-    DateTime.new(*units)
-  end
-end
+class ActiveSupport::HashWithIndifferentAccess
+  def to_datetime(name)
+    units = select{|k,v| k.match /#{name}\(..\)/}.map{|k,v| v.to_i}
+    DateTime.new(*units)
+  end
+end

data/lib/viewable/generators/viewable/templates/models/resource.rb

@@ -1,4 +1,4 @@
-class <%= resource_name_camelize.singularize %> < ActiveRecord::Base
-	validates :name, presence: true, uniqueness: true
-	has_many :viewings
-end
+class <%= resource_name_camelize.singularize %> < ActiveRecord::Base
+	validates :name, presence: true, uniqueness: true
+	has_many :viewings
+end

data/lib/viewable/generators/viewable/templates/models/viewable.rb

@@ -1,85 +1,85 @@
-module Viewable
-  extend ActiveSupport::Concern
-
-  included do
-    belongs_to :<%=resource_name_underscore.singularize%>
-
-    validates :start_time, presence: true
-    validates :length, presence: true, numericality: { greater_than: 0 }
-    validate :start_date_cannot_be_in_the_past
-    validate :overlaps
-
-    before_validation :calculate_end_time
-
-
-    scope :time_constraint, ->(c1, f1, c2, f2) do
-      return nil unless f1 && f2
-      where "%s ? AND %s ?" % [c1, c2], f1, f2
-    end
-
-    scope :end_during,       ->(start_time, end_time) { time_constraint "end_time >",   start_time, "end_time <",   end_time }
-    scope :start_during,     ->(start_time, end_time) { time_constraint "start_time >", start_time, "start_time <", end_time }
-    scope :happening_during, ->(start_time, end_time) { time_constraint "start_time >", start_time, "end_time <",   end_time }
-    scope :enveloping,       ->(start_time, end_time) { time_constraint "start_time <", start_time, "end_time >",   end_time }
-    scope :identical,        ->(start_time, end_time) { time_constraint "start_time =", start_time, "end_time =",   end_time }
-
-  end
-
-  def overlaps
-    overlapping_viewings = [
-      <%=resource_name_underscore.singularize%>.viewings.end_during(start_time, end_time),
-      <%=resource_name_underscore.singularize%>.viewings.start_during(start_time, end_time),
-      <%=resource_name_underscore.singularize%>.viewings.happening_during(start_time, end_time),
-      <%=resource_name_underscore.singularize%>.viewings.enveloping(start_time, end_time),
-      <%=resource_name_underscore.singularize%>.viewings.identical(start_time, end_time)
-    ].flatten
-
-    overlapping_viewings.delete self
-    if overlapping_viewings.any?
-      errors.add(:base, 'Slot has already been booked for viewing')
-    end
-  end
-
-  def start_date_cannot_be_in_the_past
-    if start_time && start_time < DateTime.now + (15.minutes)
-      errors.add(:start_time, 'must be at least 15 minutes from present time')
-    end
-  end
-
-  def calculate_end_time
-    start_time = validate_start_time
-    length = validate_length
-    if start_time && length
-      self.end_time = start_time + (length.hours - 60)
-    end
-  end
-
-
-  def as_json(options = {})
-   {
-    :id => self.id,
-    :start => self.start_time,
-    :end => self.end_time + 60,
-    :recurring => false,
-    :allDay => false
-   }
-  end
-
-  private
-
-    def validate_start_time
-      if !self.start_time.nil?
-        start_time = self.start_time
-      else
-        return nil
-      end
-    end
-
-    def validate_length
-      if !self.length.nil?
-        length = self.length.to_i
-      else
-        return nil
-      end
-    end
-end
+module Viewable
+  extend ActiveSupport::Concern
+
+  included do
+    belongs_to :<%=resource_name_underscore.singularize%>
+
+    validates :start_time, presence: true
+    validates :length, presence: true, numericality: { greater_than: 0 }
+    validate :start_date_cannot_be_in_the_past
+    validate :overlaps
+
+    before_validation :calculate_end_time
+
+
+    scope :time_constraint, ->(c1, f1, c2, f2) do
+      return nil unless f1 && f2
+      where "%s ? AND %s ?" % [c1, c2], f1, f2
+    end
+
+    scope :end_during,       ->(start_time, end_time) { time_constraint "end_time >",   start_time, "end_time <",   end_time }
+    scope :start_during,     ->(start_time, end_time) { time_constraint "start_time >", start_time, "start_time <", end_time }
+    scope :happening_during, ->(start_time, end_time) { time_constraint "start_time >", start_time, "end_time <",   end_time }
+    scope :enveloping,       ->(start_time, end_time) { time_constraint "start_time <", start_time, "end_time >",   end_time }
+    scope :identical,        ->(start_time, end_time) { time_constraint "start_time =", start_time, "end_time =",   end_time }
+
+  end
+
+  def overlaps
+    overlapping_viewings = [
+      <%=resource_name_underscore.singularize%>.viewings.end_during(start_time, end_time),
+      <%=resource_name_underscore.singularize%>.viewings.start_during(start_time, end_time),
+      <%=resource_name_underscore.singularize%>.viewings.happening_during(start_time, end_time),
+      <%=resource_name_underscore.singularize%>.viewings.enveloping(start_time, end_time),
+      <%=resource_name_underscore.singularize%>.viewings.identical(start_time, end_time)
+    ].flatten
+
+    overlapping_viewings.delete self
+    if overlapping_viewings.any?
+      errors.add(:base, 'Slot has already been booked for viewing')
+    end
+  end
+
+  def start_date_cannot_be_in_the_past
+    if start_time && start_time < DateTime.now + (15.minutes)
+      errors.add(:start_time, 'must be at least 15 minutes from present time')
+    end
+  end
+
+  def calculate_end_time
+    start_time = validate_start_time
+    length = validate_length
+    if start_time && length
+      self.end_time = start_time + (length.hours - 60)
+    end
+  end
+
+
+  def as_json(options = {})
+   {
+    :id => self.id,
+    :start => self.start_time,
+    :end => self.end_time + 60,
+    :recurring => false,
+    :allDay => false
+   }
+  end
+
+  private
+
+    def validate_start_time
+      if !self.start_time.nil?
+        start_time = self.start_time
+      else
+        return nil
+      end
+    end
+
+    def validate_length
+      if !self.length.nil?
+        length = self.length.to_i
+      else
+        return nil
+      end
+    end
+end

data/lib/viewable/generators/viewable/templates/models/viewing.rb

@@ -1,4 +1,4 @@
-require_relative './concerns/viewable'
-class Viewing < ActiveRecord::Base
-	include Viewable
-end
+require_relative './concerns/viewable'
+class Viewing < ActiveRecord::Base
+	include Viewable
+end