trusty-festivity-extension 2.0.7 → 2.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGZiOTZhZTc5NzI0MGI0ZGJiNDE5Mjg0NjhkMTk1ZmNhN2ZjOGM5ZQ==
+    NGQxN2I5NDA1ZjZlZWUxYzg0MWRlY2JjMmEwN2I1OWI5NDdiYzNhMA==
   data.tar.gz: !binary |-
-    YWRmN2Q4MWJlMDk0MTYyZTUzYTFkZmUzOWZhN2NiZGM2YmRlNGQwMQ==
+    ZTYxZjIzZDNjMjdiNDRjM2Q5NDY0YzhlYmEyZjBjNjJmMzIwNDRiOA==
 SHA512:
   metadata.gz: !binary |-
-    YzQzYmYwODQ1NzU1OTZiYmRkMDFlOTc1MzEzYzg2MjgzN2I0ZTkwMDgyM2Mw
-    YjZhNmVjMGFlYjEzYzJlODk3MDkxZTI0YzBlN2EzOTI4YTc3OGYwMjRlYmRi
-    ZTY5MDQxZTQ0ZWMyN2IwYmRmZDIzMDY3MzBkNzRkYTEwMjYwNWU=
+    NDMwYzJkZjQ2ZWM2NDYxZjk1MGVlZGJjOGIxM2Q4ZjUxNDczNDcwYWRhODJi
+    ZTgxYmMwNjlkMWE4OWFiMDZiNjI0OGU4NjNmMWMyZDU5Y2NiODA3ZDFlOWFi
+    NmJkYjVkOTM1MzQ0MmZiNjRlNGVlOTQ1YTM5MWU5YjZhY2IzNTQ=
   data.tar.gz: !binary |-
-    M2E1Njk3M2Q4YWMzNGRhMGY0ZmRmZjk2ZGJmY2Q0YzEzZDc5ZmY1MmRkNjQy
-    ZDc0NzIyNDE1YWI0YmQzMGU3OTc4NjJmZGU0ZTk1YjEyZTdmYzc3OGU2ZGMx
-    ZDM3Y2I5MjJlMzZlYTY2MzQzM2NhZGZjZDk1YTQ1MTU3NWQ4YzM=
+    NjA0YzQyOTlmZjVkODc2MjBkZDRiODNjNmQ5OTQ5NmMyOTE3YjU0NjhkMjc1
+    YzkzNzllNjcxYTMwNDUzMzc0NDgxMDBkMTgwNGU3ZWIyNDBkNmM4ZjBiMTRj
+    ZDVhYjcxMTUyZDc5YzAzNDFhZjNkMmJhNDA5MjU5NTJmZjJmOTE=

data/app/models/festivity_event_list.rb

@@ -78,13 +78,21 @@ class FestivityEventList
   # - The event ids returned, if any, are added to the where clause for the next query
   # - Any category ids passed are added to the where clause as well.
   def self.parse_criteria(criteria)
-    where_clause = {}
     event_ids = event_ids_for_dates(criteria[:dates]) if criteria[:dates]
-    where_clause["site_id"] = Page.current_site.id
-    where_clause["event_id"] = event_ids if event_ids
-    where_clause["festivity_categories.id"] = criteria[:categories].split(",") if criteria[:categories]
+    where_clause = "site_id = #{ Page.current_site.id}"
+    where_clause += " AND event_id IN (#{event_ids.join(",")})" if event_ids
+    where_clause += " AND #{parse_categories(criteria[:categories].split(","))}" if criteria[:categories]
     where_clause
   end
 
+  def self.parse_categories(category_ids)
+    grouped_ids = FestivityCategory.find(category_ids).group_by {|category| category.festivity_category_type}
+    category_clauses = grouped_ids.map do |categories|
+      "page_id IN (SELECT page_id FROM festivity_page_categories WHERE festivity_category_id IN (#{categories[1].map {|category| category.id}.join(",")}))"
+    end
+    "(#{category_clauses.join(" AND ")})"
+
+  end
+
 
 end

data/lib/trusty-festivity-extension.rb

@@ -1,5 +1,5 @@
 module TrustyFestivityExtension
-  VERSION     = "2.0.7"
+  VERSION     = "2.1.0"
   SUMMARY     = "Festival microsite engine for Trusty CMS"
   DESCRIPTION = "Event management for arts festivals."
   URL         = "http://github.com/pgharts/trusty-festivity-extension"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-festivity-extension
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.1.0
 platform: ruby
 authors:
 - Eric Sipple
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trusty-cms