card 1.16.6 → 1.16.7

data/lib/card/spec_helper.rb

@@ -15,7 +15,7 @@ module Card::SpecHelper
 
   def newcard name, content=""
     #FIXME - misleading name; sounds like it doesn't save.
-    Card.create! :name=>name, :content=>content
+    Card.create! name: name, content: content
   end
 
   def assert_view_select(view_html, *args, &block)
@@ -44,7 +44,7 @@ module Card::SpecHelper
   end
 
   def render_editor(type)
-    card = Card.create(:name=>"my favority #{type} + #{rand(4)}", :type=>type)
+    card = Card.create(name: "my favority #{type} + #{rand(4)}", type: type)
     card.format.render(:edit)
   end
 
@@ -53,7 +53,7 @@ module Card::SpecHelper
   end
 
   def render_content_with_args content, format_args={}, view_args={}
-    @card ||= Card.new :name=>"Tempo Rary 2"
+    @card ||= Card.new name: "Tempo Rary 2"
     @card.content = content
     @card.format(format_args)._render :core, view_args
   end
@@ -65,9 +65,9 @@ module Card::SpecHelper
   def render_card_with_args view, card_args={}, format_args={}, view_args={}
     card = begin
       if card_args[:name]
-        Card.fetch card_args[:name], :new=>card_args
+        Card.fetch card_args[:name], new: card_args
       else
-        Card.new card_args.merge( :name=> 'Tempo Rary' )
+        Card.new card_args.merge( name: 'Tempo Rary' )
       end
     end
     card.format(format_args)._render(view, view_args)

data/lib/card/success.rb

@@ -81,7 +81,7 @@ class Card
       elsif @id
         Card.find @id
       elsif @name
-        Card.fetch @name.to_name.to_absolute(name_context), :new=>@new_args
+        Card.fetch @name.to_name.to_absolute(name_context), new: @new_args
       end
     end
 

data/lib/cardio.rb

@@ -8,7 +8,7 @@ module Cardio
   CARD_GEM_ROOT = File.expand_path('../..', __FILE__)
 
   ActiveSupport.on_load :card do
-    if Card.count > 0
+    if Card.take
       Card::Loader.load_mods
     else
       Rails.logger.warn "empty database"
@@ -65,18 +65,18 @@ module Cardio
 
     def set_paths paths
       @@paths = paths
-      add_path 'tmp/set', :root => root
-      add_path 'tmp/set_pattern', :root => root
+      add_path 'tmp/set', root: root
+      add_path 'tmp/set_pattern', root: root
 
       add_path 'mod'
 
       add_path "db"
       add_path 'db/migrate'
       add_path "db/migrate_core_cards"
-      add_path "db/migrate_deck_cards", :root => root, :with => 'db/migrate_cards'
-      add_path "db/seeds", :with => "db/seeds.rb"
+      add_path "db/migrate_deck_cards", root: root, with: 'db/migrate_cards'
+      add_path "db/seeds", with: "db/seeds.rb"
 
-      add_path 'config/initializers',  :glob => '**/*.rb'
+      add_path 'config/initializers',  glob: '**/*.rb'
 
     end
 
@@ -141,7 +141,7 @@ module Cardio
     def delete_tmp_files id=nil
       dir = Cardio.paths['files'].existent.first + '/tmp'
       dir += "/#{id}" if id
-      FileUtils.rm_rf dir, :secure=>true
+      FileUtils.rm_rf dir, secure: true
     rescue
       Rails.logger.info "failed to remove tmp files"
     end

data/lib/generators/card/format/format_generator.rb

@@ -7,9 +7,9 @@ class Card
     class FormatGenerator < NamedBase
       source_root File.expand_path('../templates', __FILE__)
 
-      argument :module_name, :required => true
-      class_option 'core', :type => :boolean, aliases: '-c', :default => false, :group => :runtime, 
-       :desc=>'create format files in Card gem'
+      argument :module_name, required: true
+      class_option 'core', type: :boolean, aliases: '-c', default: false, group: :runtime,
+       desc: 'create format files in Card gem'
 
       def create_files
         mod_path = if options.core?

data/lib/generators/card/migration/migration_generator.rb

@@ -6,8 +6,8 @@ class Card
   module Generators
     class MigrationGenerator < MigrationBase
       source_root File.expand_path('../templates', __FILE__)
-  
-      class_option 'core', :type => :boolean, aliases: '-c', :default => false, :group => :runtime, 
+
+      class_option 'core', type: :boolean, aliases: '-c', default: false, group: :runtime,
         desc: "Create card migration for card core"
 
       def create_migration_file
@@ -17,11 +17,11 @@ class Card
         set_local_assigns!
         migration_template @migration_template, File.join( mig_paths.first, "#{file_name}.rb")
       end
-  
+
     protected
-  
+
       # sets the default migration template that is being used for the generation of the migration
-      # depending on the arguments which would be sent out in the command line, the migration template 
+      # depending on the arguments which would be sent out in the command line, the migration template
       # and the table name instance variables are setup.
 
       def set_local_assigns!

data/lib/generators/card/set/set_generator.rb

@@ -7,10 +7,10 @@ class Card
     class SetGenerator < NamedBase
       source_root File.expand_path('../templates', __FILE__)
 
-      argument :set_pattern, :required => true
-      argument :anchors, :required=>true, :type=>:array
-      class_option 'core', :type => :boolean, aliases: '-c', :default => false, :group => :runtime, 
-       :desc=>'create set files in Card gem'
+      argument :set_pattern, required: true
+      argument :anchors, required: true, type: :array
+      class_option 'core', type: :boolean, aliases: '-c', default: false, group: :runtime,
+       desc: 'create set files in Card gem'
 
       def create_files
         mod_path = if options.core?

data/mod/01_core/chunk/include.rb

@@ -9,9 +9,9 @@ module Card::Chunk
     attr_reader :options
 
     Card::Chunk.register_class self, {
-      :prefix_re => '\\{\\{',
-      :full_re   =>  /^\{\{([^\}]*)\}\}/,
-      :idx_char  => '{'
+      prefix_re: '\\{\\{',
+      full_re:    /^\{\{([^\}]*)\}\}/,
+      idx_char:  '{'
     }
 
     def interpret match, content
@@ -27,7 +27,7 @@ module Card::Chunk
           @options = @opt_lists.to_s.split('|').reverse.inject(nil) do |prev_level, level_options|
             process_options level_options, prev_level
           end || {}
-          @options.merge! :inc_name => name, :inc_syntax => in_brackets
+          @options.merge! inc_name: name, inc_syntax: in_brackets
           @name = name
         end
 

data/mod/01_core/chunk/link.rb

@@ -8,9 +8,9 @@ module Card::Chunk
     word = /\s*([^\]\|]+)\s*/
     # Groups: $1, [$2]: [[$1]] or [[$1|$2]] or $3, $4: [$3][$4]
     Card::Chunk.register_class self, {
-      :prefix_re => '\\[',
-      :full_re   => /^\[\[([^\]]+)\]\]/,
-      :idx_char  => '['
+      prefix_re: '\\[',
+      full_re:   /^\[\[([^\]]+)\]\]/,
+      idx_char:  '['
     }
 
     def interpret match, content
@@ -60,9 +60,9 @@ module Card::Chunk
 
       if @explicit_link
         @explicit_link = render_obj @explicit_link
-        format.web_link @explicit_link, :text=> @link_text
+        format.web_link @explicit_link, text: @link_text
       elsif @name
-        format.card_link referee_name, :text=>@link_text, :known=>referee_card.send_if(:known?)
+        format.card_link referee_name, text: @link_text, known: referee_card.send_if(:known?)
       end
     end
 

data/mod/01_core/chunk/literal.rb

@@ -8,8 +8,8 @@ module Card::Chunk
   class EscapedLiteral < Abstract
     FULL_RE = { '[' => /^\\\[\[[^\]]*\]\]/, '{' => /^\\\{\{[^\}]*\}\}/ }
     Card::Chunk.register_class self, {
-      :prefix_re => '\\\\(?:\\[\\[|\\{\\{)',
-      :idx_char  => '\\'
+      prefix_re: '\\\\(?:\\[\\[|\\{\\{)',
+      idx_char:  '\\'
     }
 
     def self.full_re prefix

data/mod/01_core/chunk/query_reference.rb

@@ -20,29 +20,29 @@ module Card::Chunk
       (
         Card::Query::MODIFIERS.keys                +
         Card::Query::OPERATORS.keys                +
-        Card::Query::CardClause::ATTRIBUTES.keys   +
-        Card::Query::CardClause::CONJUNCTIONS.keys +
+        Card::Query::ATTRIBUTES.keys   +
+        Card::Query::CONJUNCTIONS.keys +
         ['desc', 'asc', 'count']
       ).map(&:to_name)
     )
     word = /\s*([^"]+)\s*/
 
     Card::Chunk.register_class self, {
-      :prefix_re => '(?<=[:,\\[])\\s*"',  # we check for colon, comma or square bracket before a quote
+      prefix_re: '(?<=[:,\\[])\\s*"',  # we check for colon, comma or square bracket before a quote
                                           # we have to use a lookbehind, otherwise
                                           # if the colon matches it would be
                                           # identified mistakenly as an URI chunk
-      :full_re   => /"([^"]+)"/,
-      :idx_char  => '"'
+      full_re:   /"([^"]+)"/,
+      idx_char:  '"'
     }
     # OPTIMIZE: instead of comma or square bracket check for operator followed by comma or "plus_right"|"plus_left"|"plus" followed by square bracket
     # something like
     # prefix_patterns = [
     #     "\"\\s*(?:#{Card::Query::OPERATORS.keys.join('|')})\"\\s*,",
-    #     "\"\\s*(?:#{Card::Query::CardClause::PLUS_ATTRIBUTES}.keys.join('|')})\\s*:\\s*\\[\\s*",
-    #     "\"\\s*(?:#{(QUERY_KEYWORDS - Card::Query::CardClause::PLUS_ATTRIBUTES).join('|')})\"\\s*:",
+    #     "\"\\s*(?:#{Card::Query::PLUS_ATTRIBUTES}.keys.join('|')})\\s*:\\s*\\[\\s*",
+    #     "\"\\s*(?:#{(QUERY_KEYWORDS - Card::Query::PLUS_ATTRIBUTES).join('|')})\"\\s*:",
     #   ]
-    # :prefix_re => '(?<=#{prefix_patterns.join('|')})\\s*"'
+    # prefix_re: '(?<=#{prefix_patterns.join('|')})\\s*"'
     # But: What do we do with the "in" operator? After the first value there is no prefix which we can use to detect the following values as QueryReference chunks
 
     class << self

data/mod/01_core/chunk/uri.rb

@@ -24,14 +24,14 @@ module Card::Chunk
     REJECTED_PREFIX_RE = %w{ ! ": " ' ]( }.map{|s|Regexp.escape s} * '|'
 
     attr_reader :uri, :link_text
-    delegate :to, :scheme, :host, :port, :path, :query, :fragment, :to => :uri
+    delegate :to, :scheme, :host, :port, :path, :query, :fragment, to: :uri
 
     Card::Chunk.register_class self, {
-      :prefix_re => "(?:(?!#{REJECTED_PREFIX_RE})(?:#{SCHEMES * '|'})\\:)",
-      :full_re    => /^#{::URI.regexp( SCHEMES )}/,
-      :idx_char  => ':'
+      prefix_re: "(?:(?!#{REJECTED_PREFIX_RE})(?:#{SCHEMES * '|'})\\:)",
+      full_re:    /^#{::URI.regexp( SCHEMES )}/,
+      idx_char:  ':'
     }
-    
+
     class << self
       def full_match content, prefix
         prepend_str = if prefix[-1,1] != ':' && config[:prepend_str]
@@ -49,7 +49,7 @@ module Card::Chunk
         !( preceding_string =~ /(?:#{REJECTED_PREFIX_RE})$/ )
       end
     end
-    
+
     def interpret match, content
       chunk = match[0]
       last_char = chunk[-1,1]
@@ -67,7 +67,7 @@ module Card::Chunk
       #warn "uri parse[#{match.inspect}]"
       @uri = ::URI.parse( chunk )
       @process_chunk = "#{format.web_link(@link_text)}#{@trailing_punctuation}"
-    rescue ::URI::Error=>e
+    rescue ::URI::Error => e
       #warn "rescue parse #{chunk_class}: '#{m}' #{e.inspect} #{e.backtrace*"\n"}"
       Rails.logger.warn "rescue parse #{self.class}: #{e.inspect}"
     end
@@ -80,18 +80,18 @@ module Card::Chunk
 
     PREPEND_STR = 'mailto:'
     EMAIL = "[a-zA-Z\d](?:[-a-zA-Z\d]*[a-zA-Z\d])?\\@"
-        
+
     Card::Chunk.register_class self, {
-      :prefix_re => "(?:(?!#{REJECTED_PREFIX_RE})#{EMAIL})\\b",
-      :full_re    => /^#{::URI.regexp( SCHEMES )}/,
-      :prepend_str => PREPEND_STR,
-      :idx_char  => '@'
+      prefix_re: "(?:(?!#{REJECTED_PREFIX_RE})#{EMAIL})\\b",
+      full_re:    /^#{::URI.regexp( SCHEMES )}/,
+      prepend_str: PREPEND_STR,
+      idx_char:  '@'
     }
 
     def interpret match, content
       super
       @text = @text.sub(/^mailto:/,'')  # this removes the prepended string from the unchanged match text
-      @process_chunk = "#{format.web_link(@link_text, :text=> @text)}#{@trailing_punctuation}"
+      @process_chunk = "#{format.web_link(@link_text, text: @text)}#{@trailing_punctuation}"
     end
   end
 
@@ -118,18 +118,18 @@ module Card::Chunk
 
     PREPEND_STR = 'http://'
     HOST = "(?:[a-zA-Z\d](?:[-a-zA-Z\d]*[a-zA-Z\d])?\\.)+#{TLDS}"
-    
+
     Card::Chunk.register_class self, {
-      :prefix_re => "(?:(?!#{REJECTED_PREFIX_RE})#{HOST})\\b",
-      :full_re    => /^#{::URI.regexp( SCHEMES )}/,
-      :prepend_str => PREPEND_STR
+      prefix_re: "(?:(?!#{REJECTED_PREFIX_RE})#{HOST})\\b",
+      full_re:    /^#{::URI.regexp( SCHEMES )}/,
+      prepend_str: PREPEND_STR
     }
 
     def interpret match, content
       super
       @text = @text.sub(/^http:\/\//,'')  # this removes the prepended string from the unchanged match text
       #warn "huri t:#{@text}, #{match}, #{params.inspect}"
-      @process_chunk = "#{format.web_link(@link_text, :text=>@text)}#{@trailing_punctuation}"
+      @process_chunk = "#{format.web_link(@link_text, text: @text)}#{@trailing_punctuation}"
     end
   end
 end

data/mod/01_core/format/html_format.rb

@@ -24,16 +24,16 @@ class Card
     end
 
     def layout_from_rule
-      if rule = card.rule_card(:layout) and rule.type_id==Card::PointerID and layout_name=rule.item_names.first
+      if (rule = card.rule_card(:layout)) && rule.type_id == Card::PointerID && (layout_name = rule.item_names.first)
         layout_from_card_or_code layout_name
       end
     end
 
     def layout_from_card_or_code name
-      layout_card = Card.fetch name.to_s, :skip_virtual=>true, :skip_modules=>true
+      layout_card = Card.fetch name.to_s, skip_virtual: true, skip_modules: true
       if layout_card and layout_card.ok? :read
         layout_card.content
-      elsif hardcoded_layout = LAYOUTS[name]
+      elsif (hardcoded_layout = LAYOUTS[name])
         hardcoded_layout
       else
         "<h1>Unknown layout: #{name}</h1>Built-in Layouts: #{LAYOUTS.keys.join(', ')}"
@@ -41,7 +41,7 @@ class Card
     end
 
     def get_inclusion_defaults nested_card
-      {:view => (nested_card.rule( :default_html_view ) || :titled) }
+      {view: (nested_card.rule( :default_html_view ) || :titled) }
     end
 
     def default_item_view

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

@@ -29,7 +29,7 @@ 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/mod/01_core/set/all/collection.rb

@@ -1,12 +1,7 @@
 
 module ClassMethods
-  def search spec, &block
-    query = ::Card::Query.new(spec)
-    execute_query query, &block
-  end
-
-  def execute_query query
-    results = query.run
+  def search spec
+    results = ::Card::Query.run(spec)
     if block_given? and Array===results
       results.each { |result| yield result }
     end
@@ -16,7 +11,7 @@ module ClassMethods
   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 +83,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 +109,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 +137,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 +163,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 +245,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 +263,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 +290,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 +310,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