fullcalendar_engine 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9742e1b21b73c19987724ce800930dbfa237e40c
-  data.tar.gz: e5d0596c823d4f58c4fd743b33bcfdba8ddc9bd2
+  metadata.gz: 9fc5707c3a2cbbc16be0a936788ecae0a55a2a82
+  data.tar.gz: d57182dc0f901ec5781261d20f4f29ea6e99a1fc
 SHA512:
-  metadata.gz: 01153133485e101a74f4d65fbd1cca10b17c1a234787623ea80febd531a62069c10962ad21581e44eaec78272ae440b6a6e10fdef1df2071a331568214974621
-  data.tar.gz: caabf0750fd7c4a862983337f35fa9ff4af531f05ff6cd050f63404b0d42efb3fb03d2b738b9b424606a2e41bbb7a2051a8593b506a62f3435bf4046a049debf
+  metadata.gz: 90d792bd2aecb54f004f0d7bf296ffdbcf2a9a3081569cff8a965d91b4cad59e4d15fa166d6b7c84dda6b2bffb0f4ce73d556f0b71218c2d7eac4c008ee2d991
+  data.tar.gz: edeef740477d9423e1d87cd0ecab14c574aa06d6889f468855ae8009d0cb91569c15c2014561cb5439c61f50359a1043e5193d8967051402bc2b670df70c0f9d

data/app/controllers/fullcalendar_engine/events_controller.rb

@@ -23,10 +23,15 @@ module FullcalendarEngine
     end
 
     def get_events
-      @events = Event.where('starttime  >= :start_time and 
-                            endtime     <= :end_time',
-                            start_time: Time.at(params['start'].to_i).to_formatted_s(:db),
-                            end_time:   Time.at(params['end'].to_i).to_formatted_s(:db))
+      start_time = Time.at(params[:start].to_i).to_formatted_s(:db)
+      end_time   = Time.at(params[:end].to_i).to_formatted_s(:db)
+
+      @events = Event.where('
+                  (starttime >= :start_time and endtime <= :end_time) or
+                  (starttime >= :start_time and endtime > :end_time and starttime <= :end_time) or
+                  (starttime <= :start_time and endtime >= :start_time and endtime <= :end_time) or
+                  (starttime <= :start_time and endtime > :end_time)',
+                  start_time: start_time, end_time: end_time)
       events = []
       @events.each do |event|
         events << { id: event.id,

data/config/routes.rb

@@ -1,7 +1,6 @@
 FullcalendarEngine::Engine.routes.draw do
-  root :to => 'events#index'
-  resources :events do 
-    collection do 
+  resources :events do
+    collection do
       get :get_events
     end
     member do
@@ -9,4 +8,5 @@ FullcalendarEngine::Engine.routes.draw do
       post :resize
     end
   end
+  root :to => 'events#index'
 end

data/lib/fullcalendar_engine/version.rb

@@ -1,3 +1,3 @@
 module FullcalendarEngine
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullcalendar_engine
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Mohit Bansal
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-19 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails