card 1.18.3 → 1.18.4

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

@@ -258,7 +258,7 @@ format :html do
     %(<div class="search-no-results"></div>)
   end
 
-  view :paging do |_args|
+  view :paging do |args|
     s = card.query search_params
     offset = s[:offset].to_i
     limit = s[:limit].to_i
@@ -268,8 +268,11 @@ format :html do
     total = card.count search_params
     # should only happen if limit exactly equals the total
     return '' if limit >= total
-
-    @paging_path_args = { limit: limit, item: nest_defaults(card)[:view] }
+    @paging_path_args = { limit: limit,
+                          slot: {
+                            item: args[:item] || nest_defaults(card)[:view]
+                          } }
+    @paging_path_args[:view] = args[:home_view] if args[:home_view]
     @paging_limit = limit
 
     s[:vars].each { |key, value| @paging_path_args["_#{key}"] = value }

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

@@ -0,0 +1,55 @@
+format :html do
+  # @param [Array<Array,String>] content the content for the table. Accepts
+  # strings or arrays for each row.
+  # @param [Hash] opts
+  # @option opts [String, Array] :header use first row of content as header or
+  # value of this option if it is a string
+  # @return [HTML] bootstrap table
+  def table content, opts={}
+    add_class opts, 'table'
+    if opts[:header]
+      header = opts[:header].is_a?(Array) ? opts[:header] : content.shift
+    end
+    wrap_with :table, class: opts[:class] do
+      [
+        (table_header(header) if header),
+        table_body(content)
+      ]
+    end
+  end
+
+  def table_header entries
+    content_tag :thead do
+      content_tag :tr do
+        entries.map do |item|
+          content_tag :th, item
+        end.join "\n"
+      end
+    end
+  end
+
+  def table_body rows
+    content_tag :tbody do
+      rows.map do |row|
+        table_row row
+      end.join "\n"
+    end
+  end
+
+  def table_row row
+    row_content =
+      if row.is_a? Array
+        row.map do |item|
+          if item.is_a? Hash
+            content_tag :td, item.delete(:content), item
+          else
+            content_tag :td, item
+          end
+        end.join "\n"
+      else
+        row
+      end
+
+    content_tag :tr, row_content.html_safe
+  end
+end

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

@@ -0,0 +1,81 @@
+format :html do
+  # @param tab_type [String] 'tabs' or 'pills'
+  # @param tabs [Hash] keys are the labels, values the content for the tabs
+  # @param active_name [String] label of the tab that should be active at the
+  # beginning (default is the first)
+  # @return [HTML] bootstrap tabs element with all content preloaded
+  def static_tabs tabs, active_name=nil,  tab_type='tabs'
+    tab_buttons = ''
+    tab_panes = ''
+    tabs.each do |tab_name, tab_content|
+      active_name ||= tab_name
+      active_tab = (tab_name == active_name)
+      id = "#{card.cardname.safe_key}-#{tab_name.to_name.safe_key}"
+      tab_buttons += tab_button("##{id}", tab_name, active_tab)
+      tab_panes += tab_pane(id, tab_content, active_tab)
+    end
+    tab_panel tab_buttons, tab_panes, tab_type
+  end
+
+  # @param [Hash] tabs keys are the labels for the tabs, values the urls to
+  # load the content from
+  # @param [String] active_name label of the tab that should be active at the
+  # beginning
+  # @param [String] active_content content of the active tab
+  # @param [Hash] args options
+  # @option args [String] :type ('tabs') use pills or tabs
+  # @option args [Hash] :panel_args html args used for the panel div
+  # @option args [Hash] :pane_args html args used for the pane div
+  # @return [HTML] bootstrap tabs element with content only for the active
+  # tab; other tabs get loaded via ajax when selected
+  def lazy_loading_tabs tabs, active_name, active_content, args={}
+    tab_buttons = ''
+    tab_panes = ''
+    tabs.each do |tab_name, url|
+      active_tab = (active_name == tab_name)
+      id = "#{card.cardname.safe_key}-#{tab_name.to_name.safe_key}"
+      tab_buttons += tab_button(
+        "##{id}", tab_name, active_tab,
+        'data-url' => url.html_safe,
+        class: (active_tab ? nil : 'load')
+      )
+      tab_content = active_tab ? active_content : ''
+      tab_panes += tab_pane(id, tab_content, active_tab, args[:pane_args])
+    end
+    tab_type = args.delete(:type) || 'tabs'
+    tab_panel tab_buttons, tab_panes, tab_type, args[:panel_args]
+  end
+
+  def tab_panel tab_buttons, tab_panes, tab_type='tabs', args=nil
+    args ||= {}
+    add_class args, 'tabbable'
+    args.reverse_merge! role: 'tabpanel'
+    wrap_with :div, args 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')
+      ]
+    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[:class] = 'active' if active
+    content_tag :li, link, li_args
+  end
+
+  def tab_pane id, content, active=false, args=nil
+    args ||= {}
+    args.reverse_merge! role: :tabpanel,
+                        id: id
+    add_class args, 'tab-pane'
+    add_class args, 'active' if active
+    content_tag :div, content.html_safe, args
+  end
+end

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

@@ -1,9 +1 @@
-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|
-    "Content is stored in file and can't be edited."
-  end
-end
+include_set Abstract::CodeFile

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

@@ -1,7 +1,5 @@
-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
+include_set Abstract::CodeFile
 
-format(:html) { include BootstrapCards::HtmlFormat }
+def source_files
+  %w( bootstrap.js bootstrap_modal_wagn.js )
+end

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

@@ -1,5 +1,9 @@
+include_set Abstract::CodeFile
+
 view :raw do |_args|
-  bootstrap_path = "#{Cardio.gem_root}/mod/06_bootstrap/lib/stylesheets/bootstrap"
+  bootstrap_path = File.join Cardio.gem_root, 'mod',
+                             card.file_content_mod_name, 'lib',
+                             'stylesheets', 'bootstrap'
 
   # variables
   content = File.read("#{bootstrap_path}/_variables.scss")
@@ -17,14 +21,18 @@ view :raw do |_args|
     # 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),
+    %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")
+      path = File.join(bootstrap_path, "_#{name}.scss")
+      Rails.logger.info "reading file: #{path}"
+      File.read path
     end.join "\n"
   end.join "\n"
 

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

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

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

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

data/spec/lib/card/set/trait_spec.rb

@@ -0,0 +1,62 @@
+
+describe Card::Set::Trait do
+  class Card
+    module Set
+      module Type
+        module Phrase
+          extend Card::Set
+          card_accessor :write, type: :pointer
+          card_accessor :read, type_id: Card::PointerID
+        end
+      end
+
+      module TypePlusRight
+        module Phrase
+          module Write
+            extend Card::Set
+            def type_plus_right_module_loaded
+              true
+            end
+          end
+        end
+      end
+    end
+  end
+
+  subject do
+    Card::Auth.as_bot do
+      Card.create! name: 'joke',
+                   type_id: Card::PhraseID,
+                   '+*write' => 'some content',
+                   '+*read' => 'some content'
+    end
+  end
+
+  context 'if accessor type is defined by a string' do
+    it 'has left' do
+      in_stage :prepare_to_validate, on: :create,
+                                     trigger: -> { subject } do
+        # test API doesn't support sets for event
+        # so we check the name
+        return unless name == 'joke'
+        expect(write_card.left.class).to eq Card
+      end
+    end
+    it 'loads *type plus right set module' do
+      in_stage :prepare_to_validate, on: :create,
+                                     trigger: -> { subject } do
+        return unless name == 'joke'
+        expect(write_card).to respond_to?(:type_plus_right_module_loaded)
+      end
+    end
+  end
+  context 'if accessor type is defined by an id' do
+    it 'has left' do
+      in_stage :prepare_to_validate, on: :create,
+                                     trigger: -> { subject } do
+        return unless name == 'joke'
+        expect(read_card.left.class).to eq Card
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.18.3
+  version: 1.18.4
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartname
@@ -209,6 +209,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.99.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.99.1
 description: Cards are data atoms grouped into Sets to which Rules can apply. Cards
   can formatted with Views and transformed with Events.
 email:
@@ -408,6 +422,7 @@ files:
 - lib/card/reference.rb
 - lib/card/set.rb
 - lib/card/set/event.rb
+- lib/card/set/trait.rb
 - lib/card/set_pattern.rb
 - lib/card/simplecov_helper.rb
 - lib/card/spec_helper.rb
@@ -518,6 +533,7 @@ files:
 - mod/02_basic_types/format/json_format.rb
 - mod/02_basic_types/format/rss_format.rb
 - mod/02_basic_types/format/xml_format.rb
+- mod/02_basic_types/set/abstract/code_file.rb
 - mod/02_basic_types/set/all/all_css.rb
 - mod/02_basic_types/set/all/all_csv.rb
 - mod/02_basic_types/set/all/all_js.rb
@@ -964,6 +980,8 @@ files:
 - mod/06_bootstrap/lib/stylesheets/smartmenu.css
 - mod/06_bootstrap/set/all/bootstrap/form.rb
 - mod/06_bootstrap/set/all/bootstrap/helper.rb
+- mod/06_bootstrap/set/all/bootstrap/table.rb
+- mod/06_bootstrap/set/all/bootstrap/tabs.rb
 - mod/06_bootstrap/set/all/bootstrap/wrapper.rb
 - mod/06_bootstrap/set/all/rich_bootstrap.rb
 - mod/06_bootstrap/set/self/bootstrap_cards.rb
@@ -984,6 +1002,7 @@ files:
 - spec/lib/card/name_spec.rb
 - spec/lib/card/query_spec.rb
 - spec/lib/card/reference_spec.rb
+- spec/lib/card/set/trait_spec.rb
 - spec/lib/card/set_pattern_spec.rb
 - spec/lib/card/set_spec.rb
 - spec/lib/card/stage_director_spec.rb
@@ -1180,7 +1199,8 @@ files:
 - tmpsets/set_pattern/107-self.rb
 homepage: http://wagn.org
 licenses:
-- GPL
+- GPL-2.0
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -1215,6 +1235,7 @@ test_files:
 - spec/lib/card/name_spec.rb
 - spec/lib/card/query_spec.rb
 - spec/lib/card/reference_spec.rb
+- spec/lib/card/set/trait_spec.rb
 - spec/lib/card/set_pattern_spec.rb
 - spec/lib/card/set_spec.rb
 - spec/lib/card/stage_director_spec.rb