card 1.16.11 → 1.16.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87ac13203770cb0105dca6d10755c9f442425230
-  data.tar.gz: 4f27287e05a9cb4ed93e0dd18a64585d47b9f044
+  metadata.gz: 8d1990615b92a108f5e31de742a36bd9e24775c3
+  data.tar.gz: 630821350bd6c6cf9292bca1ad6e8dc0ed0f0891
 SHA512:
-  metadata.gz: 94d18bfbd1b5ffc9ae65f3cc503006571569b9a2b483bfe2b412b7d73d760e121d34dacd23e36bd21930e03145e943e9e29863f8fedbe96884d6b204e4ce5a0b
-  data.tar.gz: 6d01d13ce7cd4e0c3e0a88414ee9f384e1ce9641189a54bcf0e032dae75f3decfb2371a7e3bba8e77a3546cb026bbdbc0a8998b5a48e53162e8b44eb7c6e3581
+  metadata.gz: 90603078c14e9931ae8ac6822da2afccd0a70bb6bd6578128beb0ee9ea55eddb45f31c1d766cd18cafe560c29f4793c1bd2d23b53f37255fa4fd7a204ad08485
+  data.tar.gz: 37c9f45c93cfa6f134085f599dd949cc3be996a19f4857b93e9146ea459961ae3098f7570c0c957aadc5f4c787933aea1d97e0d7b82f2eb09a8bd8d14e63f1f3

data/VERSION

@@ -1 +1 @@
-1.16.11
+1.16.12

data/lib/card/cache.rb

@@ -54,13 +54,11 @@ class Card
       end
 
       def generate_cache_id
-        ((Time.now.to_f * 100).to_i).to_s +
-          ('a'..'z').to_a[rand(26)] +
-          ('a'..'z').to_a[rand(26)]
+        ((Time.now.to_f * 100).to_i).to_s + ('a'..'z').to_a[rand(26)] + ('a'..'z').to_a[rand(26)]
       end
 
       def reset_global
-        cache_by_class.each do |_klass, cache|
+        cache_by_class.each do |klass, cache|
           cache.reset hard=true
         end
         Card::Codename.reset_cache
@@ -69,11 +67,9 @@ class Card
 
       def reset_local
         cache_by_class.each do |cc, cache|
-          if Card::Cache === cache
+          if Card::Cache===cache
             cache.reset_local
-          else
-            warn "reset class #{cc}, #{cache.class} #{caller[0..8] * "\n"} ???"
-          end
+          else warn "reset class #{cc}, #{cache.class} #{caller[0..8]*"\n"} ???" end
         end
       end
 
@@ -95,16 +91,20 @@ class Card
       private
 
       def prepopulate
-        return unless @@prepopulating
-        @@rule_cache ||= Card.rule_cache
-        @@user_ids_cache ||= Card.user_ids_cache
-        @@read_rule_cache ||= Card.read_rule_cache
-        @@rule_keys_cache ||= Card.rule_keys_cache
-        Card.cache.write_local 'RULES', @@rule_cache
-        Card.cache.write_local 'READRULES', @@read_rule_cache
-        Card.cache.write_local 'USER_IDS', @@user_ids_cache
-        Card.cache.write_local 'RULE_KEYS', @@rule_keys_cache
+        if @@prepopulating
+          @@rule_cache      ||= Card.rule_cache
+          @@read_rule_cache ||= Card.read_rule_cache
+          @@user_ids_cache  ||= Card.user_ids_cache
+          @@rule_keys_cache ||= Card.rule_keys_cache
+          Card.cache.write_local 'RULES', @@rule_cache
+          Card.cache.write_local 'READRULES', @@read_rule_cache
+          Card.cache.write_local 'USER_IDS', @@user_ids_cache
+          Card.cache.write_local 'RULE_KEYS', @@rule_keys_cache
+        end
       end
+
+
+
     end
 
     attr_reader :prefix, :store, :klass
@@ -179,7 +179,7 @@ class Card
 
     def delete key
       @store.delete(@prefix + key) if @store
-      delete_local key
+      @local.delete key
     end
 
     def delete_local key

data/mod/01_core/set/all/subcards.rb

@@ -67,4 +67,4 @@ event :store_subcards, after: :store do
   # eg. <user> creates <user+*account> creates <user+*account+*status>
   # <user> changes <user+*account+*status> in event activate_account
   Card.write_to_local_cache self
-end
+end

data/mod/01_core/set/all/trash.rb

@@ -28,10 +28,7 @@ event :validate_delete, before: :approve, on: :delete do
     errors.add :delete, "#{name} is is a system card. (#{codename})"
   end
 
-  undeletable_all_rules_tags =
-    %w{ default style layout create read update delete }
-  # FIXME: HACK! should be configured in the rule
-
+  undeletable_all_rules_tags = %w{ default style layout create read update delete }
   if junction? && (l = left) && l.codename == 'all' &&
      undeletable_all_rules_tags.member?(right.codename)
     errors.add :delete, "#{name} is an indestructible rule"

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

@@ -21,8 +21,8 @@ format :html do
     args.merge!(
       title: 'Invite',
       buttons: button_tag('Send Invitation', situation: 'primary'),
-      hidden: { success: '_self' }
     )
+    args[:hidden][:success] = '_self'
   end
 
   view :new do |args|

metadata

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