bookable 0.0.45 → 0.0.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a58c14ce9383b8054b73927e8bea2fb235384d6
-  data.tar.gz: 5500b9c3e27bbf9a88c60acad6f2c2c5450c039f
+  metadata.gz: 79e2fdf99990adf8071dd35e3075beaacd802c9e
+  data.tar.gz: aa97dc5d583f0fb90681a1bae7adf8288cdf599b
 SHA512:
-  metadata.gz: 752169119fde34464bc58466d233e335cc1bad675b616a958c48917acdc9ac6729bb46e4378dd0704a5c7094aa47e08a5f855276dd066f30e76a3c80608d4f4c
-  data.tar.gz: 5513d63944df081145362e0a700347ebf3e875b4ca4bfffe97e6ccb7589523111e03391b0d01907efd8a82228b0b606a65cb01e6112407adef37123bb31378d3
+  metadata.gz: 3cd39e6b6d34e246f1490c46f61bc5e4ae4a67b4b53a17cd7ba9de6c9fe3f645b2a67fa52cd812ef9169de81f1872006cb01db0b2b3a3545c6759d2de7b83a61
+  data.tar.gz: ee2f8cf61189fd9542d15cce90ad9c5e385e2cb48e65dfc2a3b65b65b9149ccb61dae4f8ca1967b0f52ad979d5d18a8d7ad348c5a072a69df684544513ad286a

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in bookable.gemspec
 gemspec
+
+

data/README.md

@@ -20,24 +20,36 @@ Or install it yourself as:
 
 After you've installed the gem, you need to run the generator:
 
-    rails generate bookable:install
+    $ rails generate bookable:install
+
+Alternatively you can specify a named resource by providing an argument to the rails generate command e.g. 
+
+    $ rails generate bookable:install tennis_court
 
 The generator will create the file structure you need to implement booking functionality into your app:
 <ul>
   <li>controllers</li>
-  <li>models - resource and booking</li>
+  <li>models - resource(tennis_court) and booking</li>
   <li>views</li>
   <li>javascript - which uses the jquery fullcalendar plugin</li>
   <li>css - some basic css is provided which you may want to override</li>
 </ul>
-The necessary routes will be applied to your routes file.
+The necessary routes will be applied to your routes file and you will need to run
+
+    $ rake db:migrate
 
 ## Validations
 
-Validations have been created for the models to ensure that a bookable resource is created with a unique name and bookings are created in the future and resources are not double booked. For further information, please review the test files.
+Validations have been created for the models to ensure that a bookable resource is created with a unique name and bookings are created in the future and resources are not double booked. For further information, refer to the tests and for an example of how the gem is used, visit <a href="">this site</a>.
+
+## Known Bugs
+<ul>
+  <li>Front end Date validation, for example 30th February is not a valid date but is permitted by the calendar view. </li>
+  <li>Implement server side date validation for above - currently if a booking for 30th February is entered, the booking will be created for 2nd March.</li>
+</ul>
 
 ## Contributing
-There are a number of desired features we hope to implement in the future. Please consider contributing in the following manner. 
+There are a number of desired features we hope to implement in the future. If you wish to contribute please do so in the following manner. 
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
@@ -45,6 +57,20 @@ There are a number of desired features we hope to implement in the future. Pleas
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+## Desired Features
+<ul>
+  <li>optional description attribute for booking and resource models</li>
+  <li>implement show route for bookings</li>
+  <li>provide fix for Known Bugs</li>
+</ul>
+
+## Contributors
+<ul>
+  <li><a href="https://github.com/kunks001">Srikanth Kunkalugunta</a></li>
+  <li><a href="https://github.com/chewymeister">Jon Tsang</a></li>
+  <li><a href="https://github.com/margOnline">Margo Urey</a></li>
+</ul>
+
 ## License
 
 Bookable is released under the <a href="https://github.com/kunks001/bookable/blob/master/LICENSE.txt">MIT License</a>.

data/bookable.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+ 
   spec.add_dependency 'jbuilder', '~> 1.2'
   spec.add_dependency 'rails_12factor'
 

data/lib/bookable/generators/bookable/booking_model_generator.rb

@@ -11,29 +11,13 @@ module Bookable
       end
 
       def create_booking_migration
-        generate "migration CreateBookings start_time:datetime end_time:datetime length:integer #{resource_name_underscore}:belongs_to"
+        generate "migration CreateBookings start_time:datetime end_time:datetime length:integer #{resource_name_underscore.singularize}:belongs_to"
       end
 
       def generate_datetime_initializer
         copy_file "datetime.rb", "config/initializers/datetime.rb"
       end
 
-      # private
-
-      # def migration
-      #   "class CreateBookings < ActiveRecord::Migration\n"\
-      #     "\tdef change\n"\
-      #       "\t\tcreate_table :bookings do |t|\n"\
-      #         "\t\t\tt.datetime :start_time\n"\
-      #         "\t\t\tt.datetime :end_time\n"\
-      #         "\t\t\tt.integer :length\n"\
-      #         "\t\t\tt.integer :resource_id\n"\
-      #         "\t\t\tt.timestamps\n"\
-      #       "\t\tend\n"\
-      #     "\tend\n"\
-      #   "end"
-      # end
-
       private
 
         def resource_name_underscore

data/lib/bookable/generators/bookable/resource_model_generator.rb

@@ -5,7 +5,7 @@ module Bookable
       argument :resource_name, :type => :string, :default => "resource"
 
       def generate_resource_model
-        template "resource.rb", "app/models/#{resource_name_underscore}.rb"
+        template "resource.rb", "app/models/#{resource_name_underscore.singularize}.rb"
       end
 
       def create_resource_migration

data/lib/bookable/generators/bookable/templates/assets/javascript/custom.js

@@ -12,7 +12,7 @@ var calendar = function(){
     // page is now ready, initialize the calendar...
 
     var current_resource = function(){
-    	return window.location.href.match(/<%=bookable_name%>\/(\d+)\/booking/)[1];
+    	return window.location.href.match(/<%=bookable_name%>\/(\d+)\/bookings/)[1];
     };
 
     var today_or_later = function(){

data/lib/bookable/generators/bookable/templates/controllers/booking_controller.rb

@@ -1,22 +1,22 @@
 class BookingsController < ApplicationController
   respond_to :html, :xml, :json
   
-  before_action :find_<%=resource_name_underscore%>
+  before_action :find_<%=resource_name_underscore.singularize%>
 
   def index
-    @bookings = Booking.where("<%=resource_name%>_id = ? AND end_time >= ?", @<%=resource_name%>.id, Time.now).order(:start_time)
+    @bookings = Booking.where("<%=resource_name.singularize%>_id = ? AND end_time >= ?", @<%=resource_name.singularize%>.id, Time.now).order(:start_time)
     respond_with @bookings
   end
 
   def new
-    @booking = Booking.new(<%=resource_name%>_id: @<%=resource_name%>.id)
+    @booking = Booking.new(<%=resource_name.singularize%>_id: @<%=resource_name.singularize%>.id)
   end
 
   def create
-    @booking =  Booking.new(params[:booking].permit(:<%=resource_name%>_id, :start_time, :length))
-    @booking.<%=resource_name%> = @<%=resource_name%>
+    @booking =  Booking.new(params[:booking].permit(:<%=resource_name.singularize%>_id, :start_time, :length))
+    @booking.<%=resource_name.singularize%> = @<%=resource_name.singularize%>
     if @booking.save
-      redirect_to <%=resource_name%>_bookings_path(@<%=resource_name%>, method: :get)
+      redirect_to <%=resource_name.singularize%>_bookings_path(@<%=resource_name.singularize%>, method: :get)
     else
       render 'new'
     end
@@ -30,7 +30,7 @@ class BookingsController < ApplicationController
     @booking = Booking.find(params[:id]).destroy
     if @booking.destroy
       flash[:notice] = "Booking: #{@booking.start_time.strftime('%e %b %Y %H:%M%p')} to #{@booking.end_time.strftime('%e %b %Y %H:%M%p')} deleted"
-      redirect_to <%=resource_name%>_bookings_path(@<%=resource_name%>)
+      redirect_to <%=resource_name.singularize%>_bookings_path(@<%=resource_name.singularize%>)
     else
       render 'index'
     end
@@ -44,13 +44,13 @@ class BookingsController < ApplicationController
     @booking = Booking.find(params[:id])
     # @booking.<%=resource_name%> = @<%=resource_name%>
 
-    if @booking.update(params[:booking].permit(:<%=resource_name%>_id, :start_time, :length))
+    if @booking.update(params[:booking].permit(:<%=resource_name.singularize%>_id, :start_time, :length))
       flash[:notice] = 'Your booking was updated succesfully'
 
       if request.xhr?
         render json: {status: :success}.to_json
       else
-        redirect_to <%=resource_name%>_bookings_path(@<%=resource_name%>)
+        redirect_to <%=resource_name.singularize%>_bookings_path(@<%=resource_name.singularize%>)
       end
     else
       render 'edit'
@@ -62,15 +62,15 @@ class BookingsController < ApplicationController
   def save booking
     if @booking.save
         flash[:notice] = 'booking added'
-        redirect_to <%=resource_name%>_booking_path(@<%=resource_name%>, @booking)
+        redirect_to <%=resource_name.singularize%>_booking_path(@<%=resource_name.singularize%>, @booking)
       else
         render 'new'
       end
   end
 
-  def find_<%=resource_name%>
-    if params[:<%=resource_name%>_id]
-      @<%=resource_name%> = <%=resource_name_camelize%>.find_by_id(params[:<%=resource_name%>_id])
+  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
 

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

@@ -5,36 +5,36 @@ class <%=resource_name_camelize.singularize.pluralize%>Controller < ApplicationC
   end
 
   def new
-    @<%=resource_name_underscore%> = <%=resource_name_camelize.singularize%>.new
+    @<%=resource_name_underscore.singularize%> = <%=resource_name_camelize.singularize%>.new
   end
 
   def create
-    @<%=resource_name_underscore%> = <%=resource_name_camelize.singularize%>.create(<%=resource_name_underscore%>_params)
-    if @<%=resource_name_underscore%>.save
-      name = @<%=resource_name_underscore%>.name
+    @<%=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%>. Please try again"
+      flash[:error] = "Unable to create <%=resource_name_underscore.singularize.gsub(/(_)/, ' ')%>. Please try again"
     end
   end
 
   def destroy
-    @<%=resource_name_underscore%> = <%= resource_name_camelize.singularize%>.find(params[:id])
-    @<%=resource_name_underscore%>.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%> = <%=resource_name_camelize.singularize%>.find(params[:id])
+    @<%=resource_name_underscore.singularize%> = <%=resource_name_camelize.singularize%>.find(params[:id])
   end
 
   def update
-    @<%=resource_name_underscore%> = <%=resource_name_camelize.singularize%>.find(params[:id])
-    @<%=resource_name_underscore%>.update <%=resource_name_underscore%>_params
-    if @<%=resource_name_underscore%>.save
-      flash[:notice] = "Your <%=resource_name_underscore.gsub(/(_)/, ' ')%> was updated succesfully"
+    @<%=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'
@@ -43,8 +43,8 @@ class <%=resource_name_camelize.singularize.pluralize%>Controller < ApplicationC
 
   private
 
-    def <%=resource_name_underscore%>_params
-      params.require(:<%=resource_name_underscore%>).permit(:name, :delete)
+    def <%=resource_name_underscore.singularize%>_params
+      params.require(:<%=resource_name_underscore.singularize%>).permit(:name, :delete)
     end
 
 end

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

@@ -2,7 +2,7 @@ module Bookable
   extend ActiveSupport::Concern
 
   included do
-    belongs_to :<%=resource_name_underscore%>
+    belongs_to :<%=resource_name_underscore.singularize%>
 
     validates :start_time, presence: true 
     validates :length, presence: true, numericality: { greater_than: 0 }
@@ -55,11 +55,11 @@ module Bookable
 
   def overlaps
     overlapping_bookings = [ 
-      <%=resource_name_underscore%>.bookings.end_during(start_time, end_time),
-      <%=resource_name_underscore%>.bookings.start_during(start_time, end_time),
-      <%=resource_name_underscore%>.bookings.happening_during(start_time, end_time),
-      <%=resource_name_underscore%>.bookings.enveloping(start_time, end_time),
-      <%=resource_name_underscore%>.bookings.identical(start_time, end_time)
+      <%=resource_name_underscore.singularize%>.bookings.end_during(start_time, end_time),
+      <%=resource_name_underscore.singularize%>.bookings.start_during(start_time, end_time),
+      <%=resource_name_underscore.singularize%>.bookings.happening_during(start_time, end_time),
+      <%=resource_name_underscore.singularize%>.bookings.enveloping(start_time, end_time),
+      <%=resource_name_underscore.singularize%>.bookings.identical(start_time, end_time)
     ].flatten
 
     overlapping_bookings.delete self

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

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

data/lib/bookable/generators/bookable/templates/views/index.html.erb

@@ -1,8 +1,8 @@
 <h3><%=bookable_views_name.pluralize.gsub(/(_)/,' ')%></h3>
 
-<%% @<%=bookable_views_name.pluralize%>.each do |<%=bookable_views_name%>| %>
-  <div class="<%=bookable_views_name%>">
-    <%%= <%=bookable_views_name%>.name %>
+<%% @<%=bookable_views_name.pluralize%>.each do |<%=bookable_views_name.singularize%>| %>
+  <div class="<%=bookable_views_name.singularize%>">
+    <%%= <%=bookable_views_name.singularize%>.name %>
     <%%= link_to "Show all bookings", <%=bookable_views_name.singularize%>_bookings_path(<%=bookable_views_name.singularize%>) %>
     <%%= link_to "Delete", <%=bookable_views_name.singularize%>_path(<%=bookable_views_name.singularize%>), data: { confirm: 'Are you sure?' }, method: :delete %>
     <%%= link_to "Edit", edit_<%=bookable_views_name.singularize%>_path(<%=bookable_views_name.singularize%>) %>

data/lib/bookable/version.rb

@@ -1,3 +1,3 @@
 module Bookable
-  VERSION = "0.0.45"
+  VERSION = "0.0.51"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookable
 version: !ruby/object:Gem::Version
-  version: 0.0.45
+  version: 0.0.51
 platform: ruby
 authors:
 - Srikanth
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler