card 1.17.4 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71d8c48249e77df2b401a40899bb6174cbafa0bc
-  data.tar.gz: 2214e2225cad7712ff1d7f93b32b812f392d15d0
+  metadata.gz: a8c446c5d4d4690dcdfd3dfec9e7ccd86eb8103d
+  data.tar.gz: 46449abad4c318e46f01f1785d37d755bbdbcac8
 SHA512:
-  metadata.gz: e77682bdebca32646c7dc1866d56e57b1aaca3496fcceaf028ba842313a1c667d0d178e6cda84213fbce9982abe12c016d1f78ecaf01954f75a4801114bfd052
-  data.tar.gz: 0d1db3905c69508ba95f54f75f5c61f3ee660f3ccca2f19cb48f22d6f14f5c71730e3bde023ad909fc951e357b3f12f19f5518caeaca36b63caf52d3d6b252fa
+  metadata.gz: ff2d853a9eb45e599c82338dc3b9b2bfae8674b38ff61129715bf2082311dc32aa323457d74cadee1ac87d0bad8d225787c403ed7bdbed94d69870b5f253af62
+  data.tar.gz: c3f805c9e1eea8148e9567ef8fa2f89281a401c9c63677e2a06c5820871be6933bc094f83e3edf4dd43ba57025e193764708331f301b98b14925aec5ebe1f544

data/VERSION

@@ -1 +1 @@
-1.17.4
+1.18.0

data/card.gemspec

@@ -2,56 +2,55 @@
 
 Gem::Specification.new do |s|
   s.name          = 'card'
-  s.version       = File.open(File.expand_path( '../VERSION', __FILE__ )).read.chomp
-  s.authors       = ["Ethan McCutchen", "Lewis Hoffman", "Gerry Gleason", "Philipp Kühl"]
+  s.version       = File.open(File.expand_path('../VERSION', __FILE__)).read.chomp
+  s.authors       = ['Ethan McCutchen', 'Lewis Hoffman', 'Gerry Gleason', "Philipp Kühl"]
   s.email         = ['info@wagn.org']
 
-#  s.date          = '2013-12-20'
-  s.summary       = "an atomic, set-driven content engine"
-  s.description   = "Cards are data atoms that are grouped into Sets to which Rules can apply. Cards can formatted with Views and transformed with Events."
+  #  s.date          = '2013-12-20'
+  s.summary       = 'an atomic, set-driven content engine'
+  s.description   = 'Cards are data atoms that are grouped into Sets to which Rules can apply. Cards can formatted with Views and transformed with Events.'
   s.homepage      = 'http://wagn.org'
   s.license       = 'GPL'
 
-  s.files         = `git ls-files`.split($/)
+  s.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
 
   # add submodule files (seed data)
-  `git submodule --quiet foreach pwd`.split($\).each do |submod_path|
+  `git submodule --quiet foreach pwd`.split($OUTPUT_RECORD_SEPARATOR).each do |submod_path|
     gem_root = File.expand_path File.dirname(__FILE__)
     relative_submod_path = submod_path.gsub "#{gem_root}/", ''
     Dir.chdir(submod_path) do
-      s.files += `git ls-files`.split($\).map do |filename|
+      s.files += `git ls-files`.split($OUTPUT_RECORD_SEPARATOR).map do |filename|
         "#{relative_submod_path}/#{filename}"
       end
     end
   end
 
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
   s.required_ruby_version = '>= 1.9.3'
 
   [
 
-    [ 'smartname',                  '0.2.3'   ],
+    ['smartname',                  '0.2.3'],
 
-    [ 'activerecord-session_store', '~> 0.1'  ],
-    [ 'uuid',                       '~> 2.3'  ],
-    [ 'carrierwave' ,               '~> 0.10' ],
-    [ 'htmlentities',               '~> 4.3'  ],
-    [ 'mini_magick',                '~> 4.2.10'  ],
-    [ 'recaptcha',                  '~> 0.4.0'],
-    [ 'coderay',                    '~> 1.0'  ],
-    [ 'sass',                       '~> 3.2'  ],
-    [ 'coffee-script',              '~> 2.2'  ],
-    [ 'uglifier',                   '~> 2.5'  ],
+    ['activerecord-session_store', '~> 0.1'],
+    ['uuid',                       '~> 2.3'],
+    ['carrierwave',               '~> 0.10'],
+    ['htmlentities',               '~> 4.3'],
+    ['mini_magick',                '~> 4.2.10'],
+    ['recaptcha',                  '~> 0.4.0'],
+    ['coderay',                    '~> 1.0'],
+    ['sass',                       '~> 3.2'],
+    ['coffee-script',              '~> 2.2'],
+    ['uglifier',                   '~> 2.5'],
 
-    [ 'haml',                       '~> 4.0'  ],
-    [ 'kaminari',                   '~> 0.16' ],
-    [ 'bootstrap-kaminari-views',   '~> 0.0.5'],
-    [ 'diff-lcs',                   '~> 1.2'  ],
+    ['haml',                       '~> 4.0'],
+    ['kaminari',                   '~> 0.16'],
+    ['bootstrap-kaminari-views',   '~> 0.0.5'],
+    ['diff-lcs',                   '~> 1.2']
 
   ].each do |dep|
     s.add_runtime_dependency *dep
   end
-
 end

data/config/initializers/01_init_ruby_extensions.rb

@@ -1,7 +1,3 @@
 # -*- encoding : utf-8 -*-
 
 require 'card/core_ext'
-
-
-
-

data/config/initializers/inflections.rb

@@ -5,7 +5,7 @@
 ActiveSupport::Inflector.inflections do |inflect|
   inflect.irregular 'grave', 'graveyard'
   inflect.uncountable 'this'
-#  inflect.uncountable 'plus'
+  #  inflect.uncountable 'plus'
   inflect.uncountable 'anonymous'
   inflect.uncountable 's'
   inflect.singular(/(ss)$/i, '\1')

data/config/initializers/notification.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
-ActiveSupport::Notifications.subscribe(/^card/) do |name, start, finish, id, payload|
-  Rails.logger.debug "#{ (finish - start) * 1000 }ms: #{ name }: #{ payload[:message] }"
+ActiveSupport::Notifications.subscribe(/^card/) do |name, start, finish, _id, payload|
+  Rails.logger.debug "#{(finish - start) * 1000}ms: #{name}: #{payload[:message]}"
 end

data/db/migrate/20110511221913_require_earlier_migrations.rb

@@ -3,17 +3,17 @@ require 'card/version'
 
 class RequireEarlierMigrations < ActiveRecord::Migration
   def self.up
-    fail %{
+    raise %(
 Your database is not ready to be migrated to #{Card::Version.release}.
 You will need to do incremental upgrades.
 Please first install version 1.6.1 and run `rake db:migrate`.
 Then install version 1.8.0 and run `rake db:migrate`.
 
 Sorry about this! We're working to minimize these hassles in the future.
-}
+)
   end
 
   def self.down
-    fail "Older migrations have been removed because of incompatibility."
+    raise 'Older migrations have been removed because of incompatibility.'
   end
 end

data/db/migrate/20120105203350_require_1_8_migrations.rb

@@ -1,15 +1,15 @@
 # -*- encoding : utf-8 -*-
 class Require18Migrations < ActiveRecord::Migration
   def self.up
-    fail %{
+    raise %(
 Your database is not ready to be migrated to #{Card::Version.release}.
 Please first install version 1.8.0 and run `rake db:migrate`.
 
 Sorry about this! We're working to minimize these hassles in the future.
-}
+)
   end
 
   def self.down
-    fail "Older migrations have been removed because of incompatibility."
+    raise 'Older migrations have been removed because of incompatibility.'
   end
 end

data/db/migrate/20121111025347_require_1_10_migrations.rb

@@ -1,15 +1,15 @@
 # -*- encoding : utf-8 -*-
 class Require110Migrations < ActiveRecord::Migration
   def self.up
-    fail %{
+    raise %(
 Your database is not ready to be migrated to #{Card::Version.release}.
 Please first install version 1.10.0 and run `rake db:migrate`.
 
 Sorry about this! We're working to minimize these hassles in the future.
-}
+)
   end
 
   def self.down
-    fail "Older migrations have been removed because of incompatibility."
+    raise 'Older migrations have been removed because of incompatibility.'
   end
 end

data/db/migrate/20130106052640_table_cleanup.rb

@@ -1,11 +1,11 @@
 # -*- encoding : utf-8 -*-
 class TableCleanup < ActiveRecord::Migration
-  def up  
+  def up
     drop_table :cardtypes
     drop_table :multihost_mappings
     drop_table :roles
     drop_table :roles_users
-    
+
     remove_column :cards, :typecode
     remove_column :cards, :extension_id
     remove_column :cards, :extension_type
@@ -13,9 +13,9 @@ class TableCleanup < ActiveRecord::Migration
     remove_column :cards, :updated_by
     remove_column :cards, :indexed_name
     remove_column :cards, :indexed_content
-    
+
     remove_column :card_revisions, :created_by
-    
+
     remove_column :card_references, :created_at
     remove_column :card_references, :updated_at
   end

data/db/migrate/20130411210957_update_codenames.rb

@@ -2,13 +2,13 @@
 class UpdateCodenames < ActiveRecord::Migration
   def up
     { content: :structure, edit_help: :help }.each do |oldname, newname|
-      execute %{update cards set codename = "#{newname}" where codename = "#{oldname}";}
+      execute %(update cards set codename = "#{newname}" where codename = "#{oldname}";)
     end
   end
 
   def down
     { content: :structure, edit_help: :help }.each do |oldname, newname|
-      execute %{update cards set codename = "#{oldname}" where codename = "#{newname}";}
+      execute %(update cards set codename = "#{oldname}" where codename = "#{newname}";)
     end
   end
 end

data/db/migrate/20141001105348_move_revisions_to_actions.rb

@@ -3,7 +3,7 @@ class MoveRevisionsToActions < ActiveRecord::Migration
     belongs_to :tmp_card, foreign_key: :card_id
     self.table_name = 'card_revisions'
     def self.delete_cardless
-      TmpRevision.where( TmpCard.where( id: arel_table[:card_id] ).exists.not ).delete_all
+      TmpRevision.where(TmpCard.where(id: arel_table[:card_id]).exists.not).delete_all
     end
   end
   class TmpAct < ActiveRecord::Base
@@ -28,7 +28,7 @@ class MoveRevisionsToActions < ActiveRecord::Migration
     created = Set.new
 
     TmpRevision.find_each do |rev|
-      TmpAct.create({id: rev.id, card_id: rev.card_id, actor_id: rev.creator_id, acted_at: rev.created_at}, without_protection: true)
+      TmpAct.create({ id: rev.id, card_id: rev.card_id, actor_id: rev.creator_id, acted_at: rev.created_at }, without_protection: true)
       if created.include? rev.card_id
         TmpAction.connection.execute "INSERT INTO card_actions (id, card_id, card_act_id, action_type) VALUES
                                                                ('#{rev.id}', '#{rev.card_id}', '#{rev.id}', 1)"
@@ -53,8 +53,8 @@ class MoveRevisionsToActions < ActiveRecord::Migration
       card.update_column(:db_content, card.tmp_revision.content) if card.tmp_revision
     end
 
-    #drop_table :card_revisions
-    #remove_column :cards, :current_revision
+    # drop_table :card_revisions
+    # remove_column :cards, :current_revision
   end
 
   def down

data/db/migrate/20141121172918_rename_card_migration_table.rb

@@ -3,8 +3,8 @@ class RenameCardMigrationTable < ActiveRecord::Migration
     if ActiveRecord::Base.connection.table_exists? :schema_migrations_cards
       rename_table :schema_migrations_cards, :schema_migrations_core_cards
     else
-      create_table "schema_migrations_core_cards", id: false, force: true do |t|
-        t.string "version", null: false
+      create_table 'schema_migrations_core_cards', id: false, force: true do |t|
+        t.string 'version', null: false
       end
     end
   end

data/db/migrate/20141208132159_remove_present_from_reference_table.rb

@@ -1,9 +1,9 @@
 class RemovePresentFromReferenceTable < ActiveRecord::Migration
   def up
-    #remove_column :card_references, :present
+    # remove_column :card_references, :present
   end
 
   def down
-    #add_column :card_references, :present, :integer
+    # add_column :card_references, :present, :integer
   end
 end

data/db/migrate/20141216053032_better_index_names.rb

@@ -2,21 +2,21 @@ class BetterIndexNames < ActiveRecord::Migration
   def up
     rename_index :card_acts, 'actor_id_index', 'card_acts_actor_id_index'
     rename_index :card_acts, 'card_id_index',  'card_acts_card_id_index'
-    
-    rename_index :card_actions, 'card_act_id_index', 'card_actions_card_act_id_index'  
+
+    rename_index :card_actions, 'card_act_id_index', 'card_actions_card_act_id_index'
     rename_index :card_actions, 'card_id_index',     'card_actions_card_id_index'
-    
+
     rename_index :card_changes, 'card_action_id_index', 'card_changes_card_action_id_index'
 
     rename_index :card_references, 'wiki_references_referenced_card_id', 'card_references_referee_id_index'
     rename_index :card_references, 'wiki_references_referenced_name',    'card_references_referee_key_index'
     rename_index :card_references, 'wiki_references_card_id',            'card_references_referer_id_index'
-    
-    rename_index :cards, "cards_key_uniq",              'cards_key_index'
-    rename_index :cards, "card_type_index",             'cards_type_id_index'
-    rename_index :cards, "index_cards_on_trunk_id",     'cards_left_id_index'
-    rename_index :cards, "index_cards_on_tag_id",       'cards_right_id_index'
-    rename_index :cards, "index_cards_on_read_rule_id", 'cards_read_rule_id_index'
+
+    rename_index :cards, 'cards_key_uniq',              'cards_key_index'
+    rename_index :cards, 'card_type_index',             'cards_type_id_index'
+    rename_index :cards, 'index_cards_on_trunk_id',     'cards_left_id_index'
+    rename_index :cards, 'index_cards_on_tag_id',       'cards_right_id_index'
+    rename_index :cards, 'index_cards_on_read_rule_id', 'cards_read_rule_id_index'
   end
 
   def down

data/db/migrate_core_cards/20120611203506_rails_inflection_updates.rb

@@ -1,23 +1,24 @@
 # -*- encoding : utf-8 -*-
 class RailsInflectionUpdates < Card::CoreMigration
   def word ar
-    return [/(?<=\W|_|^)#{ar[0]}(?=\W|_|$)/i, /(?<=\W|_|^)#{ar[1]}(?=\W|_|$)/i, ar[2]]
+    [/(?<=\W|_|^)#{ar[0]}(?=\W|_|$)/i, /(?<=\W|_|^)#{ar[1]}(?=\W|_|$)/i, ar[2]]
   end
+
   def word_end ar
-    return [/#{ar[0]}(?=\W|_|$)/i, /#{ar[1]}(?=\W|_|$)/i, ar[2]]
+    [/#{ar[0]}(?=\W|_|$)/i, /#{ar[1]}(?=\W|_|$)/i, ar[2]]
   end
 
   def keep_the_s word
-    return [ "#{word}s", word, "#{word}s" ]
+    ["#{word}s", word, "#{word}s"]
   end
 
   def unless_name_collision card
-    if (twin = Card.find_by_key(card.cardname.key) and twin.id != card.id)
+    if (twin = Card.find_by_key(card.cardname.key)) && twin.id != card.id
       if twin.trash
         twin.destroy
         yield
       elsif !card.trash
-        raise Card::Oops.new("Your deck has two different cards with names '#{card.name}' and '#{twin.name}'. After this update it's no longer possible to differentiate between those two names. Please rename or delete one of the two cards and run the update again." )
+        raise Card::Oops.new("Your deck has two different cards with names '#{card.name}' and '#{twin.name}'. After this update it's no longer possible to differentiate between those two names. Please rename or delete one of the two cards and run the update again.")
       end
     else
       yield
@@ -27,44 +28,42 @@ class RailsInflectionUpdates < Card::CoreMigration
   def up
     card_names = Card.pluck(:name)
     apply_to_content = ::Set.new
-    corrections =   [
-             # plural,     wrong singular,  correct singular
-      word([ '(\w+)lice',  '(\w+)louse',    '\1lice' ]),
-      word([ '(\w+)mice',  '(\w+)mouse',    '\1mice' ]),
-      word_end([ 'kine',   'cow',           'kine']),
-      word( keep_the_s('analysi') ),
-      word( keep_the_s('axi') )
+    corrections = [
+      # plural,     wrong singular,  correct singular
+      word(['(\w+)lice',  '(\w+)louse',    '\1lice']),
+      word(['(\w+)mice',  '(\w+)mouse',    '\1mice']),
+      word_end(%w(kine cow kine)),
+      word(keep_the_s('analysi')),
+      word(keep_the_s('axi'))
     ]
     %w( statu crisi alia bu octopu viru analysi basi diagnosi parenthesi prognosi synopsi thesi ).each do |word|
-      corrections << word_end( keep_the_s(word) )
+      corrections << word_end(keep_the_s(word))
     end
 
-
     corrections.each_with_index do |cors, i|
       plural, wrong_sing, correct_sing = cors
 
       card_names.reject! do |name|  # change a name only once
-        if name =~ plural
-          # can't use fetch, because it uses the wrong key
-          # find_by_name is case-insensitve and finds the wrong cards for camel case names
-          card = Card.where(name: name).select {|card| card.name == name}.first
+        next unless name =~ plural
+        # can't use fetch, because it uses the wrong key
+        # find_by_name is case-insensitve and finds the wrong cards for camel case names
+        card = Card.where(name: name).find { |card| card.name == name }
 
-          unless_name_collision(card) do
-            apply_to_content << i
-            new_key = name.to_name.key
-            if card.key == new_key
-              # noop.  probably means this was already migrated?
-            elsif Card.find_by_key new_key
-              puts "Could not update #{name}. Key '#{new_key}' already exists."
-            else
-              card.update_attributes! key: new_key
-            end
+        unless_name_collision(card) do
+          apply_to_content << i
+          new_key = name.to_name.key
+          if card.key == new_key
+            # noop.  probably means this was already migrated?
+          elsif Card.find_by_key new_key
+            puts "Could not update #{name}. Key '#{new_key}' already exists."
+          else
+            card.update_attributes! key: new_key
           end
         end
       end
     end
 
-    cards_with_css = Card.search type: ['in','html', 'css', 'scss']
+    cards_with_css = Card.search type: %w(in html css scss)
     cards_with_css.each do |card|
       new_content = card.content
       content_changed = false
@@ -76,9 +75,7 @@ class RailsInflectionUpdates < Card::CoreMigration
           new_content = new_content.gsub(wrong_sing, correct_sing)
         end
       end
-      if content_changed
-        card.update_attributes! content: new_content
-      end
+      card.update_attributes! content: new_content if content_changed
     end
   end
 end

data/db/migrate_core_cards/20130411191151_renaming_for_menu.rb

@@ -11,7 +11,7 @@ class RenamingForMenu < Card::CoreMigration
       '*includers'  => '*included by',
       '*plus cards' => '*children',
       '*plus parts' => '*mates',
-      '*editing'    => '*edited',
+      '*editing'    => '*edited'
     }
     renames.each do |oldname, newname|
       puts "updating: #{oldname}"
@@ -21,7 +21,7 @@ class RenamingForMenu < Card::CoreMigration
       c.save!
     end
 
-    codenames = %w{
+    codenames = %w(
       by_name
       by_update
       by_create
@@ -37,7 +37,7 @@ class RenamingForMenu < Card::CoreMigration
       discussion
       created
       edited
-    }
+    )
     codenames.each do |codename|
       name = codename =~ /^by|disc/ ? codename : '*' + codename
       c = Card[name]
@@ -45,5 +45,4 @@ class RenamingForMenu < Card::CoreMigration
       c.save!
     end
   end
-
 end