card 1.18.4 → 1.18.5

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

@@ -22,6 +22,7 @@ module Card::Content::Chunk
       :variant     #
     ]
     attr_reader :options
+    DEFAULT_OPTION = :view # a value without a key is interpreted as view
 
     Card::Content::Chunk.register_class(
       self, prefix_re: '\\{\\{',
@@ -68,7 +69,7 @@ module Card::Content::Chunk
     end
 
     def option_string_to_hash list_string, options_hash, style_hash
-      Hash.new_from_semicolon_attr_list(list_string).each do |key, value|
+      each_option(list_string) do |key, value|
         key = key.to_sym
         if key == :item
           options_hash[:items] ||= {}
@@ -115,5 +116,16 @@ module Card::Content::Chunk
         @text.sub! '}}', "|#{view}}}"
       end
     end
+
+    private
+
+    def each_option attr_string
+      return if attr_string.blank?
+      attr_string.strip.split(';').each do |pair|
+        value, key = pair.split(':').reverse
+        key ||= self.class::DEFAULT_OPTION.to_s
+        yield key.strip, value.strip
+      end
+    end
   end
 end

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

@@ -15,6 +15,20 @@ end
 
 private
 
+def wrong_stage opts
+  return false if director.stage_ok? opts
+  if !stage
+    "phase method #{method} called outside of event phases"
+  else
+    "#{opts.inspect} method #{method} called in stage #{stage}"
+  end
+end
+
+def wrong_action action
+  return false if on_condition_applies? action
+  "on: #{action} method #{method} called on #{@action}"
+end
+
 def on_condition_applies? action
   if action
     Array.wrap(action).member? @action

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

@@ -15,6 +15,8 @@ module ClassMethods
   #    1. a numeric id (Integer)
   #    2. a name/key (String or Card::Name)
   #    3. a codename (Symbol)
+  #   or any combination of those. If you pass more then one mark they get
+  #   joined with a '+'
   # @param [Hash] opts ({})
   #   Options:
   #     :skip_virtual               Real cards only
@@ -23,10 +25,9 @@ module ClassMethods
   #     :local_only                 Use only local cache for lookup and storing
   #     new: {  card opts }      Return a new card when not found
   #
-  def fetch mark, opts={}
+  def fetch *args
+    mark, opts = normalize_fetch_args args
     validate_fetch_opts! opts
-    mark = normalize_mark mark, opts
-
     card, needs_caching = fetch_existing mark, opts
 
     if (new_card = new_for_cache card, mark, opts)
@@ -76,8 +77,8 @@ module ClassMethods
     fetch mark, opts.merge(local_only: true)
   end
 
-  def fetch_id mark, opts={}
-    mark = normalize_mark mark, opts
+  def fetch_id *args
+    mark, _opts = normalize_fetch_args args
     if mark.is_a?(Integer)
       mark
     else
@@ -99,8 +100,8 @@ module ClassMethods
     end
   end
 
-  def [] mark
-    fetch mark, skip_virtual: true
+  def [] *marks
+    fetch(*marks, skip_virtual: true)
   end
 
   def exists? mark
@@ -224,6 +225,19 @@ module ClassMethods
     Card.cache.soft.write "~#{card.id}", card.key if card.id && card.id != 0
   end
 
+  def compose_mark parts, opts
+    return normalize_mark(parts.first, opts) if parts.size == 1
+    parts.map do |p|
+      normalized = normalize_mark p, {}
+      normalized.is_a?(Integer) ? fetch(normalized).name : normalized.to_s
+    end.join('+').to_name
+  end
+
+  def normalize_fetch_args args
+    opts = args.last.is_a?(Hash) ? args.pop : {}
+    [compose_mark(args, opts), opts]
+  end
+
   def normalize_mark mark, opts
     case mark
     when Symbol        then Card::Codename[mark]

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

@@ -18,5 +18,7 @@ end
 
 def pristine?
   # has not been edited directly by human users.  bleep blorp.
-  new_card? || !actions.joins(:act).where('card_acts.actor_id != ?', Card::WagnBotID).exists?
+  new_card? || !actions.joins(:act).where(
+    'card_acts.actor_id != ?', Card::WagnBotID
+  ).exists?
 end

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

@@ -21,13 +21,15 @@ def add_subfield name_or_card, args=nil
   subcards.add_field name_or_card, args
 end
 
-def remove_subcard name_or_card
+def detach_subcard name_or_card
   subcards.remove name_or_card
 end
+alias_method :remove_subcard, :detach_subcard
 
-def remove_subfield name_or_card
+def detach_subfield name_or_card
   subcards.remove_field name_or_card
 end
+alias_method :remove_subfield, :detach_subfield
 
 def clear_subcards
   subcards.clear

data/mod/01_core/spec/set/all/fetch_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::All::Fetch do
-  describe '.fetch' do
+  describe '#fetch' do
     it 'returns and caches existing cards' do
       card_double = class_double('Card')
       expect(Card.fetch('A')).to be_instance_of(Card)
@@ -72,6 +72,18 @@ describe Card::Set::All::Fetch do
         .to eq('Yomama')
     end
 
+    it 'fetches junction of names' do
+      card = Card.fetch 'A', 'B'
+      expect(card).to be_instance_of(Card)
+      expect(card.name).to eq 'A+B'
+    end
+
+    it 'fetches junction of name, id, and codename' do
+      card = Card.fetch 'Book', Card.fetch_id(:type), :structure
+      expect(card).to be_instance_of(Card)
+      expect(card.name).to eq 'Book+*type+*structure'
+    end
+
     it 'does not recurse infinitely on template templates' do
       expect(Card.fetch('*structure+*right+*structure')).to be_nil
     end
@@ -104,6 +116,7 @@ describe Card::Set::All::Fetch do
         a.save!
       end
     end
+
     describe 'default option' do
       context "when card doesn't exist" do
         it 'initializes new cards' do

data/mod/02_basic_types/set/abstract/code_file.rb

@@ -38,6 +38,12 @@ def find_file filename
   nil
 end
 
+def existing_source_paths
+  Array.wrap(source_files).map do |filename|
+    find_file(filename)
+  end.compact
+end
+
 view :raw do |_args|
   Array.wrap(card.source_files).map do |filename|
     if (source_path = card.find_file(filename))

data/mod/04_settings/set/type/setting.rb

@@ -12,6 +12,16 @@ def self.member_names
   end
 end
 
+format :data do
+  view :core do |_args|
+    wql = { left:  { type: Card::SetID },
+            right: card.id,
+            limit: 0
+          }
+    Card.search(wql).compact.map { |c| nest c }
+  end
+end
+
 view :core do |args|
   klasses = Card.set_patterns.reverse.map do |set_class|
     wql = { left:  { type: Card::SetID },

data/mod/05_standard/set/all/rich_html/wrapper.rb

@@ -99,7 +99,7 @@ format :html do
 
   def frame_and_form action, args={}, form_opts={}
     form_opts.merge! args.delete(:form_opts) if args[:form_opts]
-    form_opts[:hidden] = args.delete(:hidden)
+    form_opts[:hidden] = args.delete(:hidden) if args[:hidden]
     frame args do
       card_form action, form_opts do
         output(yield args)

data/mod/05_standard/spec/chunk/include_spec.rb

@@ -85,6 +85,16 @@ describe Card::Content::Chunk::Include, 'Inclusion' do
       expect(options[:view]).to eq('link')
       expect(options[:items][:view]).to eq('name')
     end
+
+    it '#each_option should work' do
+      @chunk = '{{}}'
+      expect { |b| instance.send(:each_option, '', &b) }.not_to yield_control
+      expect { |b| instance.send(:each_option, nil, &b) }.not_to yield_control
+      expect { |b| instance.send(:each_option, 'a:b;c:4', &b) }
+        .to yield_successive_args(%w(a b), %w(c 4))
+      expect { |b| instance.send(:each_option, 'd:b;e:4; ', &b) }
+        .to yield_successive_args(%w(d b), %w(e 4))
+    end
   end
 
   context 'rendering' do
@@ -189,15 +199,5 @@ describe Card::Content::Chunk::Include, 'Inclusion' do
         assert_select 'div[class~="card-content"]', 'Pooey'
       end
     end
-
-    # FIXME: should move code and test to core_ext or some such
-    it 'Hash.new_from_semicolon_attr_list should work' do
-      expect(Hash.new_from_semicolon_attr_list('')).to eq({})
-      expect(Hash.new_from_semicolon_attr_list(nil)).to eq({})
-      expect(Hash.new_from_semicolon_attr_list('a:b;c:4'))
-        .to eq(a: 'b', c: '4')
-      expect(Hash.new_from_semicolon_attr_list('d:b;e:4; '))
-        .to eq(d: 'b', e: '4')
-    end
   end
 end

data/spec/config/initializers/core_extensions_spec.rb

@@ -0,0 +1,15 @@
+describe Hash do
+  describe 'new_nested' do
+    it 'creates nested hashes' do
+      nested_hash = Hash.new_nested Hash, Hash
+      expect(nested_hash[:a]).to be_instance_of Hash
+      expect(nested_hash[:a][:b]).to be_instance_of Hash
+      expect(nested_hash[:d][:c]).to be_instance_of Hash
+    end
+
+    it 'creates set in hash' do
+      nested_hash = Hash.new_nested ::Set
+      expect(nested_hash[:a]).to be_instance_of ::Set
+    end
+  end
+end

data/spec/lib/card/stage_director_spec.rb

@@ -100,7 +100,7 @@ describe Card::StageDirector do
     end
     let(:create_card_with_junction) do
       Card.create name: '1+2',
-                  subcards: { '11' => 'A'}
+                  subcards: { '11' => 'A' }
     end
     let(:preorder) { %w(1 11 111 12 121) }
     let(:postorder) { %w(111 11 121 12 1) }
@@ -312,6 +312,30 @@ describe Card::StageDirector do
         expect(Card['main1+main2+sub2+sub3'].content).to eq('content')
       end
     end
+
+    it 'adds subsubcard to correct subdirector' do
+      Card::Auth.as_bot do
+        in_stage :prepare_to_store,
+                 on: :create,
+                 trigger: -> { Card.create! name: 'main' } do
+          case  name
+          when 'main'
+            add_subcard 'subby', '+sub2' => {
+              subcards: { 'AARGH' => { '+sub4' => 'more content' } }
+            }
+            in_subdirectors = director.subdirectors.any? do |subdir|
+              subdir.card.name == 'AARGH'
+            end
+            expect(in_subdirectors).to be_falsey
+          when 'subby+sub2'
+            in_subsubdirectors = director.subdirectors.any? do |subdir|
+              subdir.card.name == 'AARGH'
+            end
+            expect(in_subsubdirectors).to be_truthy
+          end
+        end
+      end
+    end
   end
 
   describe 'creating and updating cards in stages' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.18.4
+  version: 1.18.5
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartname
@@ -45,16 +45,16 @@ dependencies:
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -242,7 +242,13 @@ files:
 - README_Developers.rdoc
 - VERSION
 - card.gemspec
-- config/initializers/01_init_ruby_extensions.rb
+- config/initializers/01_core_extensions/array.rb
+- config/initializers/01_core_extensions/hash.rb
+- config/initializers/01_core_extensions/module.rb
+- config/initializers/01_core_extensions/object.rb
+- config/initializers/02_extensions/kaminari.rb
+- config/initializers/core_extensions.rb
+- config/initializers/extensions.rb
 - config/initializers/inflections.rb
 - config/initializers/mime_types.rb
 - config/initializers/notification.rb
@@ -395,7 +401,6 @@ files:
 - lib/card/content.rb
 - lib/card/content/chunk.rb
 - lib/card/content/parser.rb
-- lib/card/core_ext.rb
 - lib/card/core_migration.rb
 - lib/card/diff.rb
 - lib/card/diff/lcs.rb
@@ -415,13 +420,21 @@ files:
 - lib/card/query.rb
 - lib/card/query/attributes.rb
 - lib/card/query/clause.rb
+- lib/card/query/conjunctions.rb
+- lib/card/query/helpers.rb
+- lib/card/query/interpretation.rb
 - lib/card/query/join.rb
 - lib/card/query/reference.rb
+- lib/card/query/relational_attributes.rb
+- lib/card/query/sorting.rb
 - lib/card/query/sql_statement.rb
 - lib/card/query/value.rb
 - lib/card/reference.rb
 - lib/card/set.rb
 - lib/card/set/event.rb
+- lib/card/set/format.rb
+- lib/card/set/helpers.rb
+- lib/card/set/loader.rb
 - lib/card/set/trait.rb
 - lib/card/set_pattern.rb
 - lib/card/simplecov_helper.rb
@@ -736,6 +749,7 @@ files:
 - mod/05_standard/set/self/admin_info.rb
 - mod/05_standard/set/self/alerts.rb
 - mod/05_standard/set/self/all.rb
+- mod/05_standard/set/self/codenames.rb
 - mod/05_standard/set/self/foot.rb
 - mod/05_standard/set/self/head.rb
 - mod/05_standard/set/self/navbox.rb
@@ -990,6 +1004,7 @@ files:
 - mod/06_bootstrap/set/self/smartmenu_css.rb
 - mod/06_bootstrap/set/self/smartmenu_js.rb
 - mod/06_bootstrap/spec/set/all/bootstrap/form_spec.rb
+- spec/config/initializers/core_extensions_spec.rb
 - spec/lib/card/action_spec.rb
 - spec/lib/card/auth_spec.rb
 - spec/lib/card/cache_spec.rb
@@ -1223,6 +1238,7 @@ signing_key:
 specification_version: 4
 summary: an atomic, set-driven content engine
 test_files:
+- spec/config/initializers/core_extensions_spec.rb
 - spec/lib/card/action_spec.rb
 - spec/lib/card/auth_spec.rb
 - spec/lib/card/cache_spec.rb
@@ -1250,3 +1266,4 @@ test_files:
 - spec/models/card/validation_spec.rb
 - spec/models/card_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/config/initializers/01_init_ruby_extensions.rb

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

data/lib/card/core_ext.rb

@@ -1,107 +0,0 @@
-class Object
-  # FIXME: move this, mixin, don't extend Object
-  def deep_clone
-    case self
-    when Fixnum, Bignum, Float, NilClass, FalseClass, TrueClass, Symbol
-      klone = self
-    when Hash
-      klone = clone
-      each { |k, v| klone[k] = v.deep_clone }
-    when Array
-      klone = clone
-      klone.clear
-      each { |v| klone << v.deep_clone }
-    else
-      klone = clone
-    end
-    klone.instance_variables.each do |v|
-      klone.instance_variable_set(v,
-                                  klone.instance_variable_get(v).deep_clone)
-    end
-    klone
-  end
-
-  def send_unless method, *args, &_block
-    (block_given? ? yield : self) || send(method, *args)
-  end
-
-  def send_if     method, *args, &_block
-    (block_given? ? yield : self) && send(method, *args)
-  end
-
-  def to_name
-    Card::Name.new self
-  end
-
-  def to_viewname
-    Card::ViewName.new self
-  end
-end
-
-class Module
-  RUBY_VERSION_18 = !!(RUBY_VERSION =~ /^1\.8/)
-
-  def const_get_if_defined const
-    args = RUBY_VERSION_18 ? [const] : [const, false]
-    const_get *args if const_defined? *args
-  end
-
-  def const_get_or_set const
-    const_get_if_defined(const) || const_set(const, yield)
-  end
-end
-
-class Hash
-  # FIXME: this is too ugly and narrow for a core extension.
-  class << self
-    def new_from_semicolon_attr_list attr_string
-      return {} if attr_string.blank?
-      attr_string.strip.split(';').inject({}) do |result, pair|
-        value, key = pair.split(':').reverse
-        key ||= 'view'
-        key.strip!; value.strip!
-        result[key.to_sym] = value
-        result
-      end
-    end
-  end
-end
-
-class Array
-  def to_pointer_content
-    map do |item|
-      "[[#{item}]]"
-    end.join "\n"
-  end
-end
-
-class Kaminari::Helpers::Tag
-  def page_url_for page
-    p = params_for(page)
-    p.delete :controller
-    p.delete :action
-    card = Card[p.delete('id')]
-    card.format.path p
-  end
-
-  private
-
-  def params_for page
-    page_params = Rack::Utils.parse_nested_query("#{@param_name}=#{page}")
-    page_params = @params.with_indifferent_access.deep_merge(page_params)
-
-    if Kaminari.config.respond_to?(:params_on_first_page) && !Kaminari.config.params_on_first_page && page <= 1
-      # This converts a hash:
-      #   from: {other: "params", page: 1}
-      #     to: {other: "params", page: nil}
-      #   (when @param_name == "page")
-      #
-      #   from: {other: "params", user: {name: "yuki", page: 1}}
-      #     to: {other: "params", user: {name: "yuki", page: nil}}
-      #   (when @param_name == "user[page]")
-      @param_name.to_s.scan(/\w+/)[0..-2].inject(page_params) { |h, k| h[k] }[$&] = nil
-    end
-
-    page_params
-  end
-end