card 1.16.5 → 1.16.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bac89305ac339879278dba238d03e42b6f23ee48
-  data.tar.gz: 1c92961bd981e632e33aec1688c555fcbf2a2d33
+  metadata.gz: fa16afa179644ed93610916824415dc0f335f98a
+  data.tar.gz: 4be27d6a8d2009ccdfe4f0eab560384f7d994031
 SHA512:
-  metadata.gz: 930912c69ec9ecec592e821ee0fff42d62dc6bbd5ead2ee821d3a115b389f78b017d7ac77a7efc03d082c2d7bd355b4ededb58abdb4eb93c23c8c89e7f3583ee
-  data.tar.gz: af32720632194cbfda4e0479195dc10d8b9748d19bd2f2bf8a89d5b7427315646d5de409486d523851d7e8ef09c538230d4e201aa6ec37a3f73abd45170dce26
+  metadata.gz: 1c10b84e81e83247a8c9edc39f69dedc3491db92966d50423488322acc16d4e840fd23480a3cfe97439963c2e64fa9500303bbaf7d41bdcc4d2275e8fa862614
+  data.tar.gz: 8e50aad38512790c0197d36be90e5788d22c1b263c927c605d6a3613f68e165cd1a635c8a1e06a36a25ec80e673de0412e64bda37a28cc46884e443c41997a90

data/VERSION

@@ -1 +1 @@
-1.16.5
+1.16.6

data/db/migrate_core_cards/20150429090551_search_card_context.rb

@@ -13,17 +13,17 @@ class SearchCardContext < Card::CoreMigration
       ['',       'left'],
     ]
     Card.search(:type_id=>['in', Card::SearchTypeID, Card::SetID]).each do |card|
-      if card.cardname.junction?
+      if card.cardname.junction? && !card.virtual?
         content = card.content
         replace.each do |key, val|
-          content.gsub!(/(?<=#{sep})_(#{key})(?=#{sep})/, "_#{val}")
+          content.gsub!(/(#{sep})_(#{key})(?=#{sep})/, "\\1_#{val}")
         end
         card.update_column :db_content, content
         card.actions.each do |action|
           if (content_change = action.change_for(:db_content).first)
             content = content_change.value
             replace.each do |key, val|
-              content.gsub!(/(?<=#{sep})_(#{key})(?=#{sep})/, "_#{val}")
+              content.gsub!(/(#{sep})_(#{key})(?=#{sep})/, "\\1_#{val}")
             end
             content_change.update_column :value, content
           end

data/mod/05_standard/set/type/search_type.rb

@@ -29,7 +29,7 @@ def get_query params={}
   query = Auth.as_bot do ## why is this a wagn_bot thing?  can't deny search content??
     query_content = params.delete(:query) || raw_content
     #warn "get_query #{name}, #{query_content}, #{params.inspect}"
-    raise("Error in card '#{self.name}':can't run search with empty content") if query_content.empty?
+    raise(JSON::ParserError, "Error in card '#{self.name}':can't run search with empty content") if query_content.empty?
     String === query_content ? JSON.parse( query_content ) : query_content
   end
   query.symbolize_keys!.merge! params.symbolize_keys
@@ -81,7 +81,7 @@ format do
         v[:query] = card.query( search_params )
         v[:item]  = set_inclusion_opts args.merge( :query_view=>v[:query][:view] )
         v
-      rescue =>e
+      rescue JSON::ParserError => e
         { :error => e }
       end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.16.5
+  version: 1.16.6
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-19 00:00:00.000000000 Z
+date: 2015-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartname