card 1.16.6 → 1.16.7

data/spec/models/card_spec.rb

@@ -11,7 +11,7 @@ describe Card do
   describe "creation" do
     before(:each) do
       Card::Auth.as_bot do
-        @b = Card.create! :name=>"New Card", :content=>"Great Content"
+        @b = Card.create! name: "New Card", content: "Great Content"
         @c = Card.find(@b.id)
       end
     end
@@ -37,7 +37,7 @@ describe Card do
     before do
       Card::Auth.as_bot do
         @c = Card['basicname']
-        @c.update_attributes! :content=>'foo'
+        @c.update_attributes! content: 'foo'
       end
     end
 
@@ -54,7 +54,7 @@ describe Card do
 
   describe "created a virtual card when missing and has a template" do
     it "should be flagged as virtual" do
-      expect(Card.new(:name=>'A+*last edited').virtual?).to be_truthy
+      expect(Card.new(name: 'A+*last edited').virtual?).to be_truthy
     end
   end
 end
@@ -83,14 +83,14 @@ describe "basic card tests" do
   end
 
   it 'should remove cards' do
-    forba = Card.create! :name=>"Forba"
-    torga = Card.create! :name=>"TorgA"
-    torgb = Card.create! :name=>"TorgB"
-    torgc = Card.create! :name=>"TorgC"
+    forba = Card.create! name: "Forba"
+    torga = Card.create! name: "TorgA"
+    torgb = Card.create! name: "TorgB"
+    torgc = Card.create! name: "TorgC"
 
-    forba_torga = Card.create! :name=>"Forba+TorgA";
-    torgb_forba = Card.create! :name=>"TorgB+Forba";
-    forba_torga_torgc = Card.create! :name=>"Forba+TorgA+TorgC";
+    forba_torga = Card.create! name: "Forba+TorgA";
+    torgb_forba = Card.create! name: "TorgB+Forba";
+    forba_torga_torgc = Card.create! name: "Forba+TorgA+TorgC";
 
     Card['Forba'].delete!
 
@@ -100,21 +100,21 @@ describe "basic card tests" do
     expect(Card["Forba+TorgA+TorgC"]).to be_nil
 
     # FIXME: this is a pretty dumb test and it takes a loooooooong time
-    #while card = Card.find(:first,:conditions=>["type not in (?,?,?) and trash=?", 'AccountRequest','User','Cardtype',false] )
+    #while card = Card.find(:first,conditions: ["type not in (?,?,?) and trash=?", 'AccountRequest','User','Cardtype',false] )
     #  card.delete!
     #end
     #assert_equal 0, Card.find_all_by_trash(false).size
   end
 
   #test test_attribute_card
-  #  alpha, beta = Card.create(:name=>'alpha'), Card.create(:name=>'beta')
+  #  alpha, beta = Card.create(name: 'alpha'), Card.create(name: 'beta')
   #  assert_nil alpha.attribute_card('beta')
-  #  Card.create :name=>'alpha+beta'
+  #  Card.create name: 'alpha+beta'
   #   alpha.attribute_card('beta').should be_instance_of(Card)
   #end
 
   it 'should create cards' do
-    alpha = Card.new :name=>'alpha', :content=>'alpha'
+    alpha = Card.new name: 'alpha', content: 'alpha'
     expect(alpha.content).to eq('alpha')
     alpha.save
     expect(alpha.name).to eq('alpha')
@@ -129,8 +129,8 @@ describe "basic card tests" do
 
 
   it 'update_should_create_subcards' do
-    banana = Card.create! :name=>'Banana'
-    Card.update banana.id, :subcards=>{ "+peel" => { :content => "yellow" }}
+    banana = Card.create! name: 'Banana'
+    Card.update banana.id, subcards: { "+peel" => { content: "yellow" }}
 
     peel = Card['Banana+peel']
     expect(peel.content).       to eq("yellow")
@@ -138,12 +138,12 @@ describe "basic card tests" do
   end
 
   it 'update_should_create_subcards_as_wagn_bot_if_missing_subcard_permissions' do
-    Card.create :name=>'peel'
+    Card.create name: 'peel'
     Card::Auth.current_id = Card::AnonymousID
     expect(Card['Banana']).not_to be
     expect(Card['Basic'].ok?(:create)).to be_falsey, "anon can't creat"
 
-    Card.create! :type=>"Fruit", :name=>'Banana', :subcards=>{ "+peel" => { :content => "yellow" }}
+    Card.create! type: "Fruit", name: 'Banana', subcards: { "+peel" => { content: "yellow" }}
     expect(Card['Banana']).to be
     peel = Card["Banana+peel"]
 
@@ -152,13 +152,13 @@ describe "basic card tests" do
   end
 
   it 'update_should_not_create_subcards_if_missing_main_card_permissions' do
-    b = Card.create!( :name=>'Banana' )
+    b = Card.create!( name: 'Banana' )
     Card::Auth.as Card::AnonymousID do
-      b.update_attributes :subcards=>{ "+peel" => { :content => "yellow" }}
+      b.update_attributes subcards: { "+peel" => { content: "yellow" }}
       expect(b.errors[:permission_denied]).not_to be_empty
-      
-      
-      c = Card.update(b.id, :subcards=>{ "+peel" => { :content => "yellow" }})
+
+
+      c = Card.update(b.id, subcards: { "+peel" => { content: "yellow" }})
       expect(c.errors[:permission_denied]).not_to be_empty
       expect(Card['Banana+peel']).to be_nil
     end
@@ -166,7 +166,7 @@ describe "basic card tests" do
 
 
   it 'create_without_read_permission' do
-    c = Card.create!({:name=>"Banana", :type=>"Fruit", :content=>"mush"})
+    c = Card.create!({name: "Banana", type: "Fruit", content: "mush"})
     Card::Auth.as Card::AnonymousID do
       assert_raises Card::PermissionDenied do
         c.ok! :read

data/spec/spec_helper.rb

@@ -31,7 +31,7 @@ Spork.prefork do
   RSpec.configure do |config|
 
     config.include RSpec::Rails::Matchers::RoutingMatchers,  {
-      :file_path => /\bspec\/controllers\//
+      file_path: /\bspec\/controllers\//
     }
 
     # format_index = ARGV.find_index {|arg| arg =~ /--format|-f/ }
@@ -40,7 +40,7 @@ Spork.prefork do
 
     config.infer_spec_type_from_file_location!
     #config.include CustomMatchers
-    #config.include ControllerMacros, :type=>:controllers
+    #config.include ControllerMacros, type: :controllers
 
     # == Mock Framework
     # If you prefer to mock with mocha, flexmock or RR, uncomment the appropriate symbol:
@@ -85,14 +85,14 @@ class Card
       if c = Card.fetch(name)
         c.update_attributes!(args)
       else
-        Card.create! args.merge({:name=>name})
+        Card.create! args.merge({name: name})
       end
     end
   end
 
   def self.gimme! name, args = {}
     Card::Auth.as_bot do
-      c = Card.fetch( name, :new => args )
+      c = Card.fetch( name, new: args )
       c.putty args
       Card.fetch name
     end
@@ -100,7 +100,7 @@ class Card
 
   def self.gimme name, args = {}
     Card::Auth.as_bot do
-      c = Card.fetch( name, :new => args )
+      c = Card.fetch( name, new: args )
       if args[:content] and c.content != args[:content]
         c.putty args
         c = Card.fetch name

data/tmpsets/set/mod001-01_core/all/active_card.rb

@@ -31,8 +31,8 @@ end
 
 #fixme -this needs a better home!
 def format opts={}
-  opts = { :format=>opts.to_sym } if [Symbol, String].member? opts.class
-   
+  opts = { format: opts.to_sym } if [Symbol, String].member? opts.class
+
   Card::Format.new self, opts
 end
 

data/tmpsets/set/mod001-01_core/all/collection.rb

@@ -3,20 +3,17 @@ class Card; module Set; module All; module Collection; extend Card::Set # ~~~~~~
 
 module ClassMethods
   def search spec
-    query = ::Card::Query.new(spec)
-    Card.with_logging :search, :message=>spec, :details=>query.sql.strip do
-      results = query.run
-      if block_given? and Array===results
-        results.each { |result| yield result }
-      end
-      results
+    results = ::Card::Query.run(spec)
+    if block_given? and Array===results
+      results.each { |result| yield result }
     end
+    results
   end
 
   def count_by_wql(spec)
     spec = spec.clone
     spec.delete(:offset)
-    search spec.merge(:return=>'count')
+    search spec.merge(return: 'count')
   end
 
   def find_each(options = {})
@@ -88,8 +85,8 @@ end
 
 def extended_item_cards context = nil
   context = (context ? context.cardname : self.cardname)
-  args={ :limit=>'' }
-  items = self.item_cards(args.merge(:context=>context))
+  args={ limit: '' }
+  items = self.item_cards(args.merge(context: context))
   extended_list = []
   already_extended = ::Set.new # avoid loops
 
@@ -114,8 +111,8 @@ end
 
 def extended_list context = nil
   context = (context ? context.cardname : self.cardname)
-  args={ :limit=>'' }
-  self.item_cards(args.merge(:context=>context)).map do |x|
+  args={ limit: '' }
+  self.item_cards(args.merge(context: context)).map do |x|
     x.item_cards(args)
   end.flatten.map do |x|
     x.item_cards(args)
@@ -142,7 +139,7 @@ format do
   end
 
   def item_args args
-    i_args = { :view => item_view(args)}
+    i_args = { view: item_view(args)}
     if type = card.item_type
       i_args[:type] = type
     end
@@ -168,7 +165,7 @@ format do
 
   def set_default_search_params overrides={}
     @default_search_params ||= begin
-      p = { :default_limit=> 100 }.merge overrides
+      p = { default_limit: 100 }.merge overrides
       set_search_params_variables! p
       p
     end
@@ -250,8 +247,8 @@ format do
     if chunk.kind_of? Card::Chunk::Include
       r_args.merge!(chunk.options)
     elsif chunk.kind_of? Card::Chunk::Link
-      r_args.reverse_merge!(:view=>:link)
-      r_args.reverse_merge!(:title=>chunk.link_text) if chunk.link_text
+      r_args.reverse_merge!(view: :link)
+      r_args.reverse_merge!(title: chunk.link_text) if chunk.link_text
     end
     r_args
   end
@@ -268,14 +265,14 @@ format :html do
     tab_buttons = ''
     tab_panes = ''
     active_tab = true
-    each_reference_with_args(:item=>:content) do |name, nest_args|
+    each_reference_with_args(item: :content) do |name, nest_args|
       id         = "#{card.cardname.safe_key}-#{name.to_name.safe_key}"
       url        = nest_path name, nest_args
       tab_name   = nest_args[:title] || name
-      tab_buttons += tab_button( "##{id}", tab_name, active_tab, 'data-url'=>url.html_safe, :class=>(active_tab ? nil : 'load'))
+      tab_buttons += tab_button( "##{id}", tab_name, active_tab, 'data-url'=>url.html_safe, class: (active_tab ? nil : 'load'))
 
       # only render the first active tab, other tabs get loaded via ajax
-      tab_content = active_tab ? nest(Card.fetch(name, :new=>{}), nest_args) : ''
+      tab_content = active_tab ? nest(Card.fetch(name, new: {}), nest_args) : ''
       tab_panes += tab_pane( id, tab_content, active_tab )
       active_tab = false
     end
@@ -295,7 +292,7 @@ format :html do
     page_path(name, path_args)
   end
 
-  view :pills, :view=>:tabs
+  view :pills, view: :tabs
   def default_pills_args args
     args[:tab_type] ||= 'pills'
   end
@@ -315,29 +312,29 @@ format :html do
     args[:tab_type] ||= 'tabs'
   end
 
-  view :pills_static, :view=>:tabs_static
+  view :pills_static, view: :tabs_static
   def default_tabs_static_args args
     args[:tab_type] ||= 'pills'
   end
 
   def tab_panel tab_buttons, tab_panes, tab_type='tabs'
-    wrap_with :div, :role=>"tabpanel" do
+    wrap_with :div, role: "tabpanel" do
       [
-        content_tag(:ul, tab_buttons.html_safe, :class=>"nav nav-#{tab_type}", :role=>"tablist"),
-        content_tag(:div, tab_panes.html_safe, :class=>'tab-content')
+        content_tag(:ul, tab_buttons.html_safe, class: "nav nav-#{tab_type}", role: "tablist"),
+        content_tag(:div, tab_panes.html_safe, class: 'tab-content')
       ]
     end
   end
 
   def tab_button target, text, active=false, link_attr={}
     link = link_to fancy_title(text), target, link_attr.merge('role'=>'tab','data-toggle'=>'tab')
-    li_args = { :role => :presentation }
+    li_args = { role: :presentation }
     li_args[:class] = 'active' if active
     content_tag :li, link, li_args
   end
 
   def tab_pane id, content, active=false
-    div_args = {:role => :tabpanel, :id=>id, :class=>"tab-pane #{'active' if active}"}
+    div_args = {role: :tabpanel, id: id, class: "tab-pane #{'active' if active}"}
     content_tag :div, content.html_safe, div_args
   end
 end

data/tmpsets/set/mod001-01_core/all/content.rb

@@ -50,13 +50,13 @@ def clear_drafts
   end
 end
 
-event :save_draft, :before=>:store, :on=>:update, :when=>proc{ |c| Env.params['draft'] == 'true' } do
+event :save_draft, before: :store, on: :update, when: proc{ |c| Env.params['draft'] == 'true' } do
   save_content_draft content
   abort :success
 end
 
 
-event :set_default_content, :on=>:create, :before=>:approve do
+event :set_default_content, on: :create, before: :approve do
   if !db_content_changed? && template && template.db_content.present?
     self.db_content = template.db_content
   end

data/tmpsets/set/mod001-01_core/all/fetch.rb

@@ -22,7 +22,7 @@ module ClassMethods
   #     :skip_virtual               Real cards only
   #     :skip_modules               Don't load Set modules
   #     :look_in_trash              Return trashed card objects
-  #     :new => {  card opts }      Return a new card when not found
+  #     new: {  card opts }      Return a new card when not found
   #
   def fetch mark, opts={}
     if String === mark
@@ -70,21 +70,21 @@ module ClassMethods
   end
 
   def fetch_id mark #should optimize this.  what if mark is int?  or codename?
-    card = fetch mark, :skip_virtual=>true, :skip_modules=>true
+    card = fetch mark, skip_virtual: true, skip_modules: true
     card and card.id
   end
 
   def [](mark)
-    fetch mark, :skip_virtual=>true
+    fetch mark, skip_virtual: true
   end
 
   def exists? mark
-    card = fetch mark, :skip_virtual=>true, :skip_modules=>true
+    card = fetch mark, skip_virtual: true, skip_modules: true
     card.present?
   end
 
   def known? mark
-    card = fetch mark, :skip_modules=>true
+    card = fetch mark, skip_modules: true
     card.present?
   end
 
@@ -172,7 +172,7 @@ module ClassMethods
   end
 
   def new_for_cache name, opts
-    new_args = { :name=>name, :skip_modules=>true }
+    new_args = { name: name, skip_modules: true }
     new_args[:type_id] = -1 unless clean_cache_opts? opts
     # The -1 type_id allows us to skip all the type lookup and flag the need for
     # reinitialization later.  *** It should NEVER be seen elsewhere ***

data/tmpsets/set/mod001-01_core/all/initialize.rb

@@ -18,9 +18,9 @@ def initialize args={}
 
   args.delete('type_id') if args['type_id'] == 0 # can come in as 0, '', or nil
   @type_args = {
-    :type      => args.delete('type'     ),
-    :type_code => args.delete('type_code'),
-    :type_id   => args[       'type_id'  ]
+    type:      args.delete('type'     ),
+    type_code: args.delete('type_code'),
+    type_id:   args[       'type_id'  ]
   }
 
   args['db_content'] = args.delete('content') if args['content']
@@ -50,7 +50,11 @@ def include_set_modules
   end
   self
 end
-
+
+
+event :initialize_success_object, before: :handle do
+  Env[:success] = Success.new(cardname, Env.params[:success])
+end
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/01_core/set/all/initialize.rb ~~~~~~~~~~~
 end;end;end;end;

data/tmpsets/set/mod001-01_core/all/name.rb

@@ -85,7 +85,7 @@ def tag *args
 end
 
 def left_or_new args={}
-  left args or Card.new args.merge(:name=>cardname.left)
+  left args or Card.new args.merge(name: cardname.left)
 end
 
 def children
@@ -136,17 +136,17 @@ rescue
 end
 
 
-event :permit_codename, :before=>:approve, :on=>:update, :changed=>:codename do
+event :permit_codename, before: :approve, on: :update, changed: :codename do
   errors.add :codename, 'only admins can set codename' unless Auth.always_ok?
 end
 
-event :validate_unique_codename, :after=>:permit_codename do
+event :validate_unique_codename, after: :permit_codename do
   if codename.present? and errors.empty? and Card.find_by_codename(codename).present?
     errors.add :codename, "codename #{codename} already in use"
   end
 end
 
-event :validate_name, :before=>:approve, :on=>:save do
+event :validate_name, before: :approve, on: :save do
   cdname = name.to_name
   if name.length > 255
     errors.add :name, "is too long (255 character maximum)"
@@ -159,7 +159,7 @@ event :validate_name, :before=>:approve, :on=>:save do
       errors.add :name, "may not contain any of the following characters: #{ Card::Name.banned_array * ' ' }"
     end
     # this is to protect against using a plus card as a tag
-    if cdname.junction? and simple? and id and Auth.as_bot { Card.count_by_wql :right_id=>id } > 0
+    if cdname.junction? and simple? and id and Auth.as_bot { Card.count_by_wql right_id: id } > 0
       errors.add :name, "#{name} in use as a tag"
     end
 
@@ -177,15 +177,15 @@ event :validate_name, :before=>:approve, :on=>:save do
 end
 
 
-event :set_autoname, :before=>:validate_name, :on=>:create do
+event :set_autoname, before: :validate_name, on: :create do
   if name.blank? and autoname_card = rule_card(:autoname)
     self.name = autoname autoname_card.content
-    Auth.as_bot { autoname_card.refresh.update_attributes! :content=>name }   #fixme, should give placeholder on new, do next and save on create
+    Auth.as_bot { autoname_card.refresh.update_attributes! content: name }   #fixme, should give placeholder on new, do next and save on create
   end
 end
 
 
-event :validate_key, :after=>:validate_name, :on=>:save do
+event :validate_key, after: :validate_name, on: :save do
   if key.empty?
     errors.add :key, "cannot be blank" if errors.empty?
   elsif key != cardname.key
@@ -193,7 +193,7 @@ event :validate_key, :after=>:validate_name, :on=>:save do
   end
 end
 
-event :set_name, :before=>:store, :changed=>:name do
+event :set_name, before: :store, changed: :name do
   Card.expire name
   Card.expire name_was
   if cardname.junction?
@@ -205,7 +205,7 @@ event :set_name, :before=>:store, :changed=>:name do
       suspend_name(sidename) if old_name_in_way
       send "#{side}_id=", begin
         if !sidecard || old_name_in_way
-          Card.create! :name=>sidename, :supercard => self
+          Card.create! name: sidename, supercard: self
         else
           sidecard
         end.id
@@ -217,7 +217,7 @@ event :set_name, :before=>:store, :changed=>:name do
 end
 
 
-event :rename, :after=>:set_name, :on=>:update do
+event :rename, after: :set_name, on: :update do
   if existing_card = Card.find_by_key_and_trash(cardname.key, true) and existing_card != self
     existing_card.name = existing_card.name+'*trash'
     existing_card.rename_without_callbacks
@@ -230,11 +230,11 @@ def suspend_name(name)
   # re-creating a card with the current name, ie.  A -> A+B
   Card.expire name
   tmp_name = "tmp:" + UUID.new.generate
-  Card.where(:id=>self.id).update_all(:name=>tmp_name, :key=>tmp_name)
+  Card.where(id: self.id).update_all(name: tmp_name, key: tmp_name)
 end
 
 
-event :cascade_name_changes, :after=>:store, :on=>:update, :changed=>:name do
+event :cascade_name_changes, after: :store, on: :update, changed: :name do
   #Rails.logger.info "------------------- #{name_was} CASCADE #{self.name} -------------------------------------"
 
   self.update_referencers = false if self.update_referencers == 'false' #handle strings from cgi
@@ -250,7 +250,7 @@ event :cascade_name_changes, :after=>:store, :on=>:update, :changed=>:name do
     Rails.logger.info "cascading name: #{dep.name}"
     Card.expire dep.name #old name
     newname = dep.cardname.replace_part name_was, name
-    Card.where( :id=> dep.id ).update_all :name => newname.to_s, :key => newname.key
+    Card.where( id: dep.id ).update_all name: newname.to_s, key: newname.key
     Card::Reference.update_on_rename dep, newname, update_referencers
     Card.expire newname
   end