card 1.15.2 → 1.15.3

data/db/version_core_cards.txt

@@ -1 +1 @@
-20150510031118
+20150528084659

data/lib/card/core_ext.rb

@@ -28,24 +28,28 @@ class Object
   def send_if     method, *args, &block
     ( block_given? ? yield : self ) and 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 ]
     if const_defined? *args
       const_get *args
     end
   end
-  
+
   def const_get_or_set const
     const_get_if_defined const or const_set const, yield
   end
@@ -79,13 +83,13 @@ class Kaminari::Helpers::Tag
     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}
@@ -97,7 +101,7 @@ class Kaminari::Helpers::Tag
       #   (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

data/lib/card/format.rb

@@ -367,7 +367,7 @@ class Card
 
     def canonicalize_view view
       unless view.blank?
-        view_key = view.to_name.key.to_sym
+        view_key = view.to_viewname.key.to_sym
         DEPRECATED_VIEWS[view_key] || view_key
       end
     end

data/lib/card/name.rb

@@ -37,7 +37,7 @@ class Card
       name = trait_name( tag_code )
       name ? name.s : ( raise Card::NotFound, "unknown codename: #{tag_code}" )
     end
-    
+
     def code
       Card::Codename[ Card.fetch_id self ]
     end

data/lib/card/set.rb

@@ -4,11 +4,11 @@ class Card
   #remove_const :Set if const_defined?(:Set, false)
 
   module Set
-   
+
     mattr_accessor :modules, :traits
     @@modules = { :base=>[], :base_format=>{}, :nonbase=>{}, :nonbase_format=>{} }
-   
-    
+
+
 =begin
     A "Set" is a group of cards to which "Rules" may be applied.  Sets can be as specific as
     a single card, as general as all cards, or anywhere in between.
@@ -21,49 +21,49 @@ class Card
     "Code rules" can be defined in a "set file" within any "Mod" (short for both "module" and
     "modification"). In accordance with Wagn's "MoVE" architecture, there are two main kinds of
     code rules you can create in a set file: Views, and Events.  Events are associated with the
-    Card class, and Views are associated with a Format class.  You can also use set files to 
+    Card class, and Views are associated with a Format class.  You can also use set files to
     add or override Card and/or Format methods directly.  The majority of Card code is contained
     in these files.
-    
+
         (FIXME - define mod, add generator)
 
     Whenever you fetch or instantiate a card, it will automatically include all the
-    set modules defined in set files associated with sets of which it is a member.  This 
+    set modules defined in set files associated with sets of which it is a member.  This
     entails both simple model methods and "events", which are special methods explored
     in greater detail below.
-    
+
     For example, say you have a Plaintext card named "Philipp+address", and you have set files
     for the following sets:
-    
+
         * all cards
         * all Plaintext cards
         * all cards ending in +address
-    
+
     When you run this:
-    
+
         mycard = Card.fetch 'Philipp+address'
-    
+
     ...then mycard will include the set modules associated with each of those sets in the above
     order.  (The order is determined by the set pattern; see lib/card/set_pattern.rb for more
     information about set_ptterns and mod/core/set/all/fetch.rb for more about fetching.)
 
     Similarly, whenever a Format object is instantiated for a card, it includes all views
-    associated with BOTH (a) sets of which the card is a member and (b) the current format or 
+    associated with BOTH (a) sets of which the card is a member and (b) the current format or
     its ancestors.  More on defining views below.
 
- 
+
     In order to have a set file associated with "all cards ending in +address", you could create
     a file in mywagn/mod/mymod/set/right/address.rb.  The recommended mechanism for doing so
     is running `wagn generate set modname set_pattern set_anchor`. In the current example, this
-    would translate to `wagn generate set mymod right address`. Note that both the set_pattern 
+    would translate to `wagn generate set mymod right address`. Note that both the set_pattern
     and the set_anchor must correspond to the codename of a card in the database to function
-    correctly but you can add arbitrary subdirectories to organize your code rules. The rule above 
+    correctly but you can add arbitrary subdirectories to organize your code rules. The rule above
     for example could be saved in mywagn/mod/mymod/set/right/address/america/north/canada.rb.
 
-    
+
     When a Card application loads, it uses these files to autogenerate a tmp_file that uses this set file to
     createa Card::Set::Right::Address module which itself is extended with Card::Set. A set file
-    is "just ruby" but is generally quite concise because Card uses its file location to 
+    is "just ruby" but is generally quite concise because Card uses its file location to
     autogenerate ruby module names and then uses Card::Set module to provide additional API.
 
 
@@ -85,9 +85,9 @@ class Card
     module Format
       mattr_accessor :views
       @@views = {}
-      
+
       def view view, *args, &block
-        view = view.to_name.key.to_sym
+        view = view.to_viewname.key.to_sym
         views[self] ||= {}
         view_block = views[self][view] = if block_given?
           Card::Format.extract_class_vars view, args[0]
@@ -97,7 +97,7 @@ class Card
         end
         define_method "_view_#{ view }", view_block
       end
-      
+
       def alias_block view, args
         opts = Hash===args[0] ? args.shift : { :view => args.shift }
         opts[:mod]  ||= self
@@ -106,10 +106,10 @@ class Card
       rescue
         raise "cannot find #{ opts[:view] } view in #{ opts[:mod] }; failed to alias #{view} in #{self}"
       end
-      
+
     end
 
-    
+
     def format *format_names, &block
       if format_names.empty?
         format_names = [:base]
@@ -120,7 +120,7 @@ class Card
         define_on_format f, &block
       end
     end
-    
+
     def define_on_format format_name=:base, &block
       klass = Card::Format.format_class_name format_name   # format class name, eg. HtmlFormat
       mod = const_get_or_set klass do                      # called on current set module, eg Card::Set::Type::Pointer
@@ -128,7 +128,7 @@ class Card
         register_set_format Card.const_get(klass), m
         m.extend Card::Set::Format
         m
-      end                                             
+      end
       mod.class_eval &block
     end
 
@@ -137,7 +137,7 @@ class Card
         view *args, &block
       end
     end
-    
+
 
     def event event, opts={}, &final
       opts[:on] = [:create, :update ] if opts[:on] == :save
@@ -156,12 +156,12 @@ class Card
           end
         end
       end
-    
+
       set_event_callbacks event, opts
     end
 
 
-    
+
     #
     # ActiveCard support: accessing plus cards as attributes
     #
@@ -186,30 +186,30 @@ class Card
 
 
     # the set loading process has two main phases:
-    
+
     #  1. Definition: interpret each set file, creating/defining set and set_format modules
     #  2. Organization: have base classes include modules associated with the "all" set, and
     #     clean up the other modules
-       
+
     class << self
 
       #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
       # Definition Phase
-    
+
       # each set file calls `extend Card::Set` when loaded
       def extended mod
         register_set mod
       end
-  
+
       def register_set set_module
         if set_module.all_set?
           modules[ :base ] << set_module
         else
           modules[ :nonbase ][ set_module.shortname ] ||= []
           modules[ :nonbase ][ set_module.shortname ] << set_module
-        end      
+        end
       end
-      
+
       def write_tmp_file set_pattern, anchors, from_file, seq
         # FIXME - this does not properly handle anchorless sets
         # There are special hacks for *all, but others (like *rstar) will not be found by
@@ -233,8 +233,8 @@ EOF
         File.write to_file, file_content
         to_file
       end
-      
-      
+
+
       #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
       # Organization Phase
 
@@ -248,7 +248,7 @@ EOF
         modules.delete :base
         modules.delete :base_format
       end
-      
+
       def process_base_module_list list, klass
         list.each do |mod|
           if mod.instance_methods.any?
@@ -259,21 +259,21 @@ EOF
           end
         end
       end
-    
+
       def clean_empty_modules
         clean_empty_module_from_hash modules[ :nonbase ]
         modules[ :nonbase_format ].values.each do |hash|
           clean_empty_module_from_hash hash
         end
       end
-      
+
       def clean_empty_module_from_hash hash
         hash.each do |mod_name, modlist|
           modlist.delete_if { |x| x.instance_methods.empty? }
           hash.delete mod_name if modlist.empty?
         end
       end
-      
+
     end
 
 
@@ -292,7 +292,7 @@ EOF
       parts = name.split '::'
       first = 2 # shortname eliminates Card::Set
       set_class = Card::SetPattern.find parts[first].underscore
-      
+
       last = first + set_class.anchor_parts_count
       parts[first..last].join '::'
     end
@@ -302,8 +302,8 @@ EOF
     end
 
     private
-    
-    
+
+
     def set_event_callbacks event, opts
       [:before, :after, :around].each do |kind|
         if object_method = opts.delete(kind)
@@ -326,11 +326,11 @@ EOF
       mod = self
   #    raise "Can't define card traits on all set" if mod == Card
       mod_traits = get_traits mod
-    
+
       new_opts = options[:type] ? {:type=>options[:type]} : {}
       new_opts.merge!( {:content => options[:default]} ) if options[:default]
-    
-      args.each do |trait|   
+
+      args.each do |trait|
         define_trait_card trait, new_opts
         define_trait_reader trait if options[:reader]
         define_trait_writer trait if options[:writer]
@@ -338,7 +338,7 @@ EOF
         mod_traits[trait.to_sym] = options
       end
     end
-  
+
     def define_trait_card trait, opts
       define_method "#{trait}_card" do
         trait_var "@#{trait}_card" do
@@ -346,7 +346,7 @@ EOF
         end
       end
     end
-  
+
     def define_trait_reader trait
       define_method trait do
         trait_var "@#{trait}" do

data/lib/card/simplecov_helper.rb

@@ -6,7 +6,7 @@ def card_simplecov_filters
 	# filter all card mods
   add_filter do |src_file|
     src_file.filename =~ /tmp\// and not
-    /\d+-(.+\.rb)/.match(src_file.filename) { |m| Dir["mod/**/#{m[1]}"].present? }
+    /\d+-(.+\.rb)/.match(src_file.filename) { |m| Dir["mod/**/#{m[1].gsub("-","/")}"].present? }
   end
 	
 	# add group for each deck mod
@@ -15,7 +15,7 @@ def card_simplecov_filters
       src_file.filename =~ /mod\/#{mod}\// or 
         (
           src_file.filename =~ /tmp\// and
-          /\d+-(.+\.rb)/.match(src_file.filename) { |m| Dir["mod/#{mod}/**/#{m[1]}"].present? } 
+          /\d+-(.+\.rb)/.match(src_file.filename) { |m| Dir["mod/#{mod}/**/#{m[1].gsub("-","/")}"].present? } 
         )
     end
   end

data/lib/card/spec_helper.rb

@@ -4,7 +4,7 @@ module Card::SpecHelper
 
   include ActionDispatch::Assertions::SelectorAssertions
   #~~~~~~~~~  HELPER METHODS ~~~~~~~~~~~~~~~#
-  
+
   def login_as user
     Card::Auth.current_id = (uc=Card[user.to_s] and uc.id)
     if @request
@@ -12,7 +12,7 @@ module Card::SpecHelper
     end
     #warn "(ath)login_as #{user.inspect}, #{Card::Auth.current_id}, #{@request.session[:user]}"
   end
-  
+
   def newcard name, content=""
     #FIXME - misleading name; sounds like it doesn't save.
     Card.create! :name=>name, :content=>content
@@ -26,9 +26,19 @@ module Card::SpecHelper
       assert_select node, *args
     end
   end
-  
+
   def debug_assert_view_select(view_html, *args, &block)
-    Rails.logger.rspec "<pre>#{CGI.escapeHTML Nokogiri::XML(view_html,&:noblanks).to_s}</pre>" 
+    Rails.logger.rspec %(
+      #{CodeRay.scan(Nokogiri::XML(view_html,&:noblanks).to_s, :html).div}
+      <style>
+        .CodeRay {
+          background-color: #FFF;
+          border: 1px solid #CCC;
+          padding: 1em 0px 1em 1em;
+        }
+        .CodeRay .code pre { overflow: auto }
+      </style>
+    )
     assert_view_select view_html, *args, &block
   end
 
@@ -40,7 +50,7 @@ module Card::SpecHelper
   def render_content content, format_args={}
     render_content_with_args( content, format_args )
   end
-  
+
   def render_content_with_args content, format_args={}, view_args={}
     @card ||= Card.new :name=>"Tempo Rary 2"
     @card.content = content
@@ -50,7 +60,7 @@ module Card::SpecHelper
   def render_card view, card_args={}, format_args={}
     render_card_with_args view, card_args, format_args
   end
-  
+
   def render_card_with_args view, card_args={}, format_args={}, view_args={}
     card = begin
       if card_args[:name]
@@ -61,7 +71,7 @@ module Card::SpecHelper
     end
     card.format(format_args)._render(view, view_args)
   end
-  
+
   def users
     SharedData::USERS.sort
   end

data/lib/card/view_name.rb

@@ -0,0 +1,44 @@
+# -*- encoding : utf-8 -*-
+require_dependency 'card/env'
+
+require 'smart_name'
+
+class Card
+  class ViewName < SmartName
+    @@name2viewnameobject = {}
+
+    class << self
+      def new obj
+        return obj if self.class===obj
+        str = Array===obj ? obj*joint : obj.to_s
+        if known_name = @@name2viewnameobject[str]
+          known_name
+        else
+          super str.strip
+        end
+      end
+    end
+
+    def initialize str
+      @s = str.to_s.strip
+      @s = @s.encode('UTF-8') if RUBYENCODING
+      @key = if @s.index(self.class.joint)
+          @parts = @s.split(/\s*#{JOINT_RE}\s*/)
+          @parts << '' if @s[-1,1] == self.class.joint
+          @simple = false
+          @parts.map { |p| p.to_name.key } * self.class.joint
+        else
+          @parts = [str]
+          @simple = true
+          str.empty? ? '' : simple_key
+        end
+      @@name2viewnameobject[str] = self
+    end
+
+    def simple_key
+      decoded.underscore.gsub(/[^#{OK4KEY_RE}]+/,'_').split(/_+/).reject(&:empty?)*'_'
+    end
+
+    def to_viewname() self end
+  end
+end