mongoid_recurring 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7a8d2508fb0cd720a37d1a45bd165191f2e9b4f
-  data.tar.gz: 346dec8d6a1af3e1501b04f751b269423272f5b8
+  metadata.gz: 94d65ba8e9128113f411305a33c0772f28ec8bdd
+  data.tar.gz: eef1e3fa0d8780d7c249a057e69bf973b6ad5b5f
 SHA512:
-  metadata.gz: 2fa8a4ae37e61c00080f15f2c1e4fe26eab51cca0bfe47edf224588e28a943e2824a1051d836df9816d44dd4cd31bd4af3c5a01b408257a851038c4d13c6eca4
-  data.tar.gz: ef4fa41fe57f18398cc771f60bad5110b68655266402c661078723eba1de7c93ef398dd80b2f5080ba214c950215a0c82498c1eebbd1d977e2ceade6feea230b
+  metadata.gz: 4513dff61f133e65a3395d95fd56cc595f811061ba94a9820d7ec0a8d4e0fc5931eaa31129842535fbf1606837ddc7eee520d7cfcceff010a9a651598f00b99b
+  data.tar.gz: 3befbe40edcaf52f15117caa75ffea84cae1d06eab94c2d00695d5fc35a95fa81d355e472927be4ec25bcf84b1686b18616559463597e600209809b29aff4d70

data/README.md

@@ -36,7 +36,7 @@ end
 
 Which will then add `dtstart`, `dtend`, `all_day`, `schedule` and `schedule_dtend` fields to the model.
 
-The model will generate all occurrences on before save, and stores them as embedded `MongoidRecurring::Occurrence` documents in the `:occurrences` embedded relation.
+The model will generate all occurrences on before save, and store them as `MongoidRecurring::Occurrence` documents in the `:occurrences` embedded relation.
 
 A scope named `.for_datetime_range` can be then used to query for documents with occurrences in specified DateTime range:
 
@@ -46,10 +46,15 @@ MyModel.for_datetime_range( Date.today, Date.today+1.week )
 
 ## Configuration
 
-By default, when `schedule_dtend` is not specified, the `:occurrences` are populated for 1 year in advance. This duration can be configured as follows:
+By default, when `schedule_dtend` is not specified, the `occurrences` are populated for 1 year in advance. This duration can be configured as follows:
 
   has_recurring_fields schedule_duration: 2.weeks
 
+## See also
+
+* [MongoidIceCubeExtension](https://github.com/tomasc/mongoid_ice_cube_extension) for storing `IceCube` schedule in Mongoid documents
+* [SimpleFormRecurringSelect](https://github.com/tomasc/simple_form_recurring_select) for adding `IceCube` rules via `SimpleForm` input fields
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -58,7 +63,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/mongoid_recurring/fork )
+1. Fork it ( https://github.com/tomasc/mongoid_recurring/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/mongoid_recurring/has_recurring_fields.rb

@@ -24,14 +24,30 @@ module MongoidRecurring
         field :schedule, type: MongoidIceCubeExtension::Schedule
         field :schedule_dtend, type: DateTime
 
+        # ---------------------------------------------------------------------
+
         embeds_many :occurrences, class_name: 'MongoidRecurring::Occurence', order: :dtstart.asc
 
         validates :dtstart, presence: true
 
         before_save :expand_schedule_to_occurrences
 
+        # ---------------------------------------------------------------------
+
         scope :for_datetime_range, -> (dtstart, dtend) {
-          where( occurrences: { "$elemMatch" => { :dtstart.gte => dtstart.to_datetime, :dtend.lte => dtend.to_datetime } } )
+          dtstart = dtstart.beginning_of_day if dtstart.instance_of?(Date)
+          dtend = dtend.end_of_day if dtend.instance_of?(Date)
+          where({ occurrences: { "$elemMatch" => { :dtstart.lte => dtend.to_datetime, :dtend.gte => dtstart.to_datetime } } })
+        }
+
+        scope :from_datetime, -> (dtstart) {
+          dtstart = dtstart.beginning_of_day if dtstart.instance_of?(Date)
+          where( occurrences: { "$elemMatch" => { :dtstart.gte => dtstart.to_datetime } } )
+        }
+
+        scope :to_datetime, -> (dtend) {
+          dtend = dtend.end_of_day if dtend.instance_of?(Date)
+          where( occurrences: { "$elemMatch" => { :dtend.lte => dtend.to_datetime } } )
         }
       end
     end

data/lib/mongoid_recurring/version.rb

@@ -1,3 +1,3 @@
 module MongoidRecurring
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_recurring
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tomáš Celizna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-24 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport