card 1.17.0 → 1.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b598a640ef114a0aa9f6333233a40327ba8be8a
-  data.tar.gz: ee0435e5572b9452ba47191d7372b40586a65c65
+  metadata.gz: a4f48d47748a3722b990ce46cf124c029ab739c0
+  data.tar.gz: e75894912cdeedb1503358bcf5debe5c85bb3019
 SHA512:
-  metadata.gz: bf919458360717f7c3177a8a3f17925cfe48c2cd5834934f87b9929371ec6b28293a228619cb3e69c5242396b338e67c2fdfa8b3f8500c6c7108344858337487
-  data.tar.gz: feac07b98bcc01bb58b24c44f31699999e66f5c7742c1c65af0c0b632c92f4fcfa05abca048878dc5514e286e57d1c507cc24d22a692481a70b3777d2902cf68
+  metadata.gz: d70cba85ffa764ea15973673238a89d8d19afcd50b2ec46d3eacf13e71ae617def616d83a044bf6150f1d636fd496c0061127cb708bbe87125957d676a12fcba
+  data.tar.gz: 5b0d8f08cc4dfee2cf0e28ad804e9f61b6c3365041421be40b582506300177a6abf29845b61f834a76345b7a7cc943abdb0b84f9b0d26f47f5150b3e1c95e77e

data/VERSION

@@ -1 +1 @@
-1.17.0
+1.17.1

data/lib/card/cache.rb

@@ -22,7 +22,7 @@ class Card
 
     class << self
       def [] klass
-        raise 'nil klass' if klass.nil?
+        fail 'nil klass' if klass.nil?
         cache_type = (@@no_rails_cache ? nil : Cardio.cache)
         cache_by_class[klass] ||= new class: klass,
                                       store: cache_type
@@ -30,17 +30,20 @@ class Card
 
       def renew
         cache_by_class.keys do |klass|
-          if klass.cache
-            cache_by_class[klass].system_prefix = system_prefix(klass)
-          else
-            raise "renewing nil cache: #{klass}"
-          end
+          fail "renewing nil cache: #{klass}" unless klass.cache
+          cache_by_class[klass].system_prefix = system_prefix(klass)
         end
         reset_soft
       end
 
+      def database_name
+        @database_name ||= (cfg = Cardio.config) &&
+                           (dbcfg = cfg.database_configuration) &&
+                           dbcfg[Rails.env]['database']
+      end
+
       def system_prefix klass
-        "#{Rails.env}/#{klass}"
+        "#{database_name}/#{klass}"
       end
 
       def restore

data/lib/card/reference.rb

@@ -51,7 +51,7 @@ class Card::Reference < ActiveRecord::Base
       joins(
         'LEFT JOIN cards ON card_references.referer_id = cards.id'
       ).where(
-        'cards.id IS NULL OR cards.trash IS TRUE'
+        'cards.id IS NULL'
       ).delete_all
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.17.1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartname