card 1.17.4 → 1.18.0

data/mod/05_standard/spec/set/type/user_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Type::User do
-
 end

data/mod/06_bootstrap/set/all/bootstrap/form.rb

@@ -1,12 +1,12 @@
 format :html do
-  def button_tag content_or_options = nil, options = {}, &block
-    bootstrapify_button( block_given? ? content_or_options : options )
+  def button_tag content_or_options=nil, options={}, &block
+    bootstrapify_button(block_given? ? content_or_options : options)
     super(content_or_options, options, &block)
   end
 
   def bootstrapify_button options
     situation = options.delete(:situation) || 'default'
-    options[:class] = [ options[:class], 'btn', "btn-#{situation}" ].compact*' '
+    options[:class] = [options[:class], 'btn', "btn-#{situation}"].compact * ' '
   end
 
   def type_field args={}
@@ -21,15 +21,14 @@ format :html do
     options
   end
 
-  FIELD_HELPERS = %w{hidden_field color_field date_field datetime_field datetime_local_field
-    email_field month_field number_field password_field phone_field
-    range_field search_field telephone_field text_area text_field time_field
-    url_field week_field file_field}
-
+  FIELD_HELPERS = %w(hidden_field color_field date_field datetime_field datetime_local_field
+                     email_field month_field number_field password_field phone_field
+                     range_field search_field telephone_field text_area text_field time_field
+                     url_field week_field file_field).freeze
 
   FIELD_HELPERS.each do |method_name|
-    define_method(method_name) do |name, options = {}|
-      form.send(method_name, name, bootstrap_options(options) )
+    define_method(method_name) do |name, options={}|
+      form.send(method_name, name, bootstrap_options(options))
     end
   end
 end

data/mod/06_bootstrap/set/all/bootstrap/helper.rb

@@ -1,6 +1,6 @@
 format :html do
   def glyphicon icon_type, extra_class=''
-    content_tag(:span, '', class: "glyphicon glyphicon-#{icon_type} #{extra_class}", 'aria-hidden'=>true)
+    content_tag(:span, '', class: "glyphicon glyphicon-#{icon_type} #{extra_class}", 'aria-hidden' => true)
   end
 
   def button_link link_text, target, html_args={}
@@ -11,40 +11,36 @@ format :html do
   end
 
   def dropdown_button name, opts={}
-    %{
+    %(
       <div class="btn-group" role="group">
         <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" title="#{name}" aria-expanded="false" aria-haspopup="true">
           #{glyphicon opts[:icon] if opts[:icon]} #{name}
           <span class="caret"></span>
         </button>
-        #{ dropdown_list yield, opts[:class], opts[:active] }
+        #{dropdown_list yield, opts[:class], opts[:active]}
       </div>
-    }
+    )
   end
 
   def dropdown_list items, extra_css_class=nil, active=nil
     item_list =
       case items
       when Array
-        items.map.with_index do |item,index|
-          if item
-            "<li #{'class=\'active\'' if index == active}>#{item}</li>"
-          end
+        items.map.with_index do |item, index|
+          "<li #{'class=\'active\'' if index == active}>#{item}</li>" if item
         end.compact.join "\n"
       when Hash
-        items.map do |key,item|
-          if item
-            "<li #{'class=\'active\'' if key == active}>#{item}</li>"
-          end
+        items.map do |key, item|
+          "<li #{'class=\'active\'' if key == active}>#{item}</li>" if item
         end.compact.join "\n"
       else
         items
       end
-    %{
+    %(
       <ul class="dropdown-menu #{extra_css_class}" role="menu">
         #{item_list}
       </ul>
-    }
+    )
   end
 
   def separator
@@ -75,14 +71,14 @@ format :html do
       [
         navbar_header(id, header_opts.delete(:content), header_opts.reverse_merge(toggle: opts[:toggle])),
         (content_tag(:div, opts[:collapsed_content].html_safe, class: 'container-fluid') if opts[:collapsed_content]),
-        content_tag(:div, output(yield).html_safe, class: "collapse navbar-collapse", id: "navbar-collapse-#{id}"),
+        content_tag(:div, output(yield).html_safe, class: 'collapse navbar-collapse', id: "navbar-collapse-#{id}")
       ]
     end
   end
 
   def navbar_header id, content='', opts={}
     brand = if opts[:brand]
-              if opts[:brand].kind_of? String
+              if opts[:brand].is_a? String
                 "<a class='navbar-brand' href='#'>#{opts[:brand]}</a>"
               else
                 link = opts[:brand][:href] || '#'
@@ -99,17 +95,17 @@ format :html do
   end
 
   def navbar_toggle id, content=nil, css_class=''
-    content ||= %{
+    content ||= %(
                   <span class="icon-bar"></span>
                   <span class="icon-bar"></span>
                   <span class="icon-bar"></span>
-                }
-    %{
+                )
+    %(
       <button type="button" class="navbar-toggle collapsed #{css_class}" data-toggle="collapse" data-target="#navbar-collapse-#{id}">
         <span class="sr-only">Toggle navigation</span>
         #{content}
       </button>
-    }
+    )
   end
 
   def split_button button, args={}
@@ -119,21 +115,21 @@ format :html do
     wrap_with :div, class: 'btn-group' do
       [
         button,
-        button_tag(situation: args[:situation], class: 'dropdown-toggle', 'data-toggle'=>'dropdown', 'aria-haspopup'=>'true', 'aria-expanded'=>'false') do
-          %{
+        button_tag(situation: args[:situation], class: 'dropdown-toggle', 'data-toggle' => 'dropdown', 'aria-haspopup' => 'true', 'aria-expanded' => 'false') do
+          %(
             <span class="caret"></span>
             <span class="sr-only">Toggle Dropdown</span>
-          }
+          )
         end,
         dropdown_list(items, nil, args[:active_item])
       ]
     end
   end
 
-  def list_tag content_or_options = nil, options = {}, &block
+  def list_tag content_or_options=nil, options={}, &_block
     options = content_or_options if block_given?
     content = block_given? ? yield : content_or_options
-    content = [content] unless content.kind_of? Array
+    content = [content] unless content.is_a? Array
     item_options = options.delete(:items) || {}
     wrap_with :ul, options  do
       content.map do |item|
@@ -141,5 +137,4 @@ format :html do
       end.join "\n"
     end
   end
-
-end
+end

data/mod/06_bootstrap/set/all/bootstrap/wrapper.rb

@@ -1,6 +1,5 @@
 format :html do
-
-  def frame args={}, &block
+  def frame args={}, &_block
     args.reverse_merge!(
       panel_class:  'panel panel-default',
       header_class: 'panel-heading',

data/mod/06_bootstrap/set/all/rich_bootstrap.rb

@@ -1,8 +1,6 @@
 format :html do
-
   view :closed do |args|
-    args.merge! body_class: 'closed-content'
+    args[:body_class] = 'closed-content'
     super args
   end
-
 end

data/mod/06_bootstrap/set/self/bootstrap_cards.rb

@@ -1,9 +1,9 @@
-view :raw do |args|
+view :raw do |_args|
   File.read "#{Cardio.gem_root}/mod/06_bootstrap/lib/stylesheets/#{card.codename}.scss"
 end
 
 format :html do
-  view :editor do |args|
+  view :editor do |_args|
     "Content is stored in file and can't be edited."
   end
 end

data/mod/06_bootstrap/set/self/bootstrap_js.rb

@@ -1,5 +1,5 @@
-view :raw do |args|
-  [ "bootstrap.js", "bootstrap_modal_wagn.js" ].map do |name|
+view :raw do |_args|
+  ['bootstrap.js', 'bootstrap_modal_wagn.js'].map do |name|
     File.read "#{Cardio.gem_root}/mod/06_bootstrap/lib/javascript/#{name}"
   end.join("\n")
 end

data/mod/06_bootstrap/set/self/bootswatch_shared.rb

@@ -1,32 +1,32 @@
-view :raw do |args|
+view :raw do |_args|
   bootstrap_path = "#{Cardio.gem_root}/mod/06_bootstrap/lib/stylesheets/bootstrap"
 
   # variables
   content = File.read("#{bootstrap_path}/_variables.scss")
-  content += %{
+  content += %(
       $bootstrap-sass-asset-helper: false;
       $icon-font-path: "#{card_path 'assets/fonts/'}";
-    }
+    )
   # mixins
   content += Dir.glob("#{bootstrap_path}/mixins/*.scss").map do |name|
-               File.read name
-             end.join("\n")
+    File.read name
+  end.join("\n")
   content += [
-      # Reset and dependencies
-      %w(normalize print glyphicons),
-      # Core CSS
-      %w(scaffolding type code grid tables forms buttons),
-      # Components
-      %w(component-animations dropdowns button-groups input-groups navs navbar breadcrumbs pagination pager labels badges jumbotron thumbnails alerts progress-bars media list-group panels responsive-embed wells close),
-      # Components w/ JavaScript
-      %w(modals tooltip popovers carousel),
-      # Utility classes
-      %w(utilities responsive-utilities)
-    ].map do |names|
-      names.map do |name|
-        File.read File.join(bootstrap_path, "_#{name}.scss")
-      end.join "\n"
+    # Reset and dependencies
+    %w(normalize print glyphicons),
+    # Core CSS
+    %w(scaffolding type code grid tables forms buttons),
+    # Components
+    %w(component-animations dropdowns button-groups input-groups navs navbar breadcrumbs pagination pager labels badges jumbotron thumbnails alerts progress-bars media list-group panels responsive-embed wells close),
+    # Components w/ JavaScript
+    %w(modals tooltip popovers carousel),
+    # Utility classes
+    %w(utilities responsive-utilities)
+  ].map do |names|
+    names.map do |name|
+      File.read File.join(bootstrap_path, "_#{name}.scss")
     end.join "\n"
+  end.join "\n"
 
   content
 end

data/mod/06_bootstrap/set/self/smartmenu_css.rb

@@ -1,7 +1,7 @@
-view :raw do |args|
+view :raw do |_args|
   File.read "#{Cardio.gem_root}/mod/06_bootstrap/lib/stylesheets/smartmenu.css"
 end
 
-view :editor do |args|
+view :editor do |_args|
   "Content is stored in file and can't be edited."
 end

data/mod/06_bootstrap/set/self/smartmenu_js.rb

@@ -1,7 +1,7 @@
-view :raw do |args|
+view :raw do |_args|
   File.read "#{Cardio.gem_root}/mod/06_bootstrap/lib/javascript/smartmenu.js"
 end
 
-view :editor do |args|
+view :editor do |_args|
   "Content is stored in file and can't be edited."
-end
+end

data/mod/06_bootstrap/spec/set/all/bootstrap/form_spec.rb

@@ -1,13 +1,13 @@
 describe Card::Set::All::Bootstrap::Form  do
   describe 'input' do
-    it "has form-group css class" do
-	    assert_view_select render_editor('Phrase'), 'input[type="text"][class~="form-control"]'
+    it 'has form-group css class' do
+      assert_view_select render_editor('Phrase'), 'input[type="text"][class~="form-control"]'
     end
   end
-  
+
   describe 'textarea' do
-    it "has form-group css class" do
+    it 'has form-group css class' do
       assert_view_select render_editor('Plain Text'), 'textarea[class~="form-control"]'
     end
   end
-end
+end

data/spec/lib/card/action_spec.rb

@@ -4,11 +4,11 @@ describe Card::Action do
   describe '#delete_old_actions' do
     it 'puts all changes on one action' do
       a = Card['A']
-      a.update_attributes!(name: "New A")
-      a.update_attributes!(content: "New content")
+      a.update_attributes!(name: 'New A')
+      a.update_attributes!(content: 'New content')
       a.delete_old_actions
       expect(a.actions.count).to eq(1)
-      expect(a.actions(true).last.new_values[:name]).to eq("New A")
+      expect(a.actions(true).last.new_values[:name]).to eq('New A')
     end
   end
-end
+end

data/spec/lib/card/cache_spec.rb

@@ -35,7 +35,7 @@ describe Card::Cache do
     end
 
     it '#fetch' do
-      block = Proc.new { 'hi' }
+      block = proc { 'hi' }
       expect(@hard).to receive(:fetch).with('prefix/foo', &block)
       @cache.fetch('foo', &block)
     end
@@ -57,7 +57,7 @@ describe Card::Cache do
     @hard = ActiveSupport::Cache::MemoryStore.new
     @cache = Card::Cache.new store: @hard, prefix: 'prefix'
     expect(@cache.hard.prefix).to eq('prefix/')
-    @cache.write('foo','bar')
+    @cache.write('foo', 'bar')
     expect(@cache.read('foo')).to eq('bar')
 
     # reset
@@ -72,9 +72,7 @@ describe Card::Cache do
   describe 'with file store' do
     before do
       cache_path = "#{Wagn.root}/tmp/cache"
-      unless File.directory?(cache_path)
-        FileUtils.mkdir_p(cache_path)
-      end
+      FileUtils.mkdir_p(cache_path) unless File.directory?(cache_path)
       @hard = ActiveSupport::Cache::FileStore.new cache_path
 
       @hard.clear

data/spec/lib/card/chunk_spec.rb

@@ -1,17 +1,15 @@
 # -*- encoding : utf-8 -*-
 require 'card/chunk'
 
-describe Card::Chunk, "Chunk" do
-  context "Class" do
-    it "should populate prefix map on load" do
+describe Card::Chunk, 'Chunk' do
+  context 'Class' do
+    it 'should populate prefix map on load' do
       expect(Card::Chunk.prefix_map.keys.size).to be > 0
       expect(Card::Chunk.prefix_map['{'][:class]).to eq(Card::Chunk::Include)
     end
-    
-    it "should find Chunk classes using matched prefix" do
+
+    it 'should find Chunk classes using matched prefix' do
       expect(Card::Chunk.find_class_by_prefix('{{')).to eq(Card::Chunk::Include)
     end
-    
   end
-  
-end
+end

data/spec/lib/card/codename_spec.rb

@@ -1,19 +1,18 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Codename, "Codename" do
-
+describe Card::Codename, 'Codename' do
   before do
     @codename = :default
   end
 
-  it "should be sane" do    
-    expect(Card[@codename].codename).to eq(@codename.to_s) #would prefer Symbol eventually
+  it 'should be sane' do
+    expect(Card[@codename].codename).to eq(@codename.to_s) # would prefer Symbol eventually
     card_id = Card::Codename[@codename]
     expect(card_id).to be_a_kind_of Integer
     expect(Card::Codename[card_id]).to eq(@codename)
   end
 
-  it "should make cards indestructable" do
+  it 'should make cards indestructable' do
     Card::Auth.as_bot do
       card = Card[@codename]
       card.delete
@@ -21,5 +20,4 @@ describe Card::Codename, "Codename" do
       expect(Card[@codename]).to be
     end
   end
-  
 end

data/spec/lib/card/content_spec.rb

@@ -145,12 +145,12 @@ EXAMPLES = {
   },
 
   single_nest: {
-    content: '{{one inclusion|size;large}}',
+    content: '{{one nest|size;large}}',
     classes: [:Include]
   },
 
   css: {
-    content: %~
+    content: %(
      /* body text */
      body {
        color: #444444;
@@ -177,29 +177,26 @@ EXAMPLES = {
      h2.page-header {
        color: #222299;
      }
-   ~
+   )
   }
-}
+}.freeze
 
 EXAMPLES.each_value do |val|
-  if val[:classes]
-    val[:classes] = val[:classes].map do |klass|
-      Class === klass ? klass : Card::Chunk.const_get(klass)
-    end
+  next unless val[:classes]
+  val[:classes] = val[:classes].map do |klass|
+    Class === klass ? klass : Card::Chunk.const_get(klass)
   end
 end
 
 describe Card::Content do
   context 'instance' do
     before do
-      @check_proc = Proc.new do |m, v|
+      @check_proc = proc do |m, v|
         if Array === m
           wrong_class = m[0] != v.class
           expect(wrong_class).to be_falsey
           is_last = m.size == 1
-          if !wrong_class
-            is_last ? true : m[1..-1]
-          end
+          is_last ? true : m[1..-1] unless wrong_class
         end
       end
 
@@ -207,11 +204,9 @@ describe Card::Content do
       @card = card
 
       # non-nil valued opts only ...
-      @render_block = Proc.new do |opts|
+      @render_block = proc do |opts|
         options = opts.inject({}) do |i, v|
-          if !v[1].nil? && (i[v[0]] = v[1])
-            i
-          end
+          i if !v[1].nil? && (i[v[0]] = v[1])
         end
         { options: options }
       end
@@ -331,7 +326,7 @@ describe Card::Content do
                     ' so is http://foo.bar.come//',
                     ' and foo="my attr, not int a tag" <not a=tag ',
                     ' p class"foobar"> and more'
-                   ]
+                   ].freeze
 
   context 'class' do
     describe '#clean!' do