wagn 1.14.4 → 1.14.5

data/db/migrate_core_cards/20141208132416_partial_reference_type.rb

@@ -0,0 +1,7 @@
+# -*- encoding : utf-8 -*-
+
+class PartialReferenceType < Wagn::CoreMigration
+  def up
+    Card::Reference.repair_all
+  end
+end

data/db/migrate_core_cards/20141208162106_add_ace_script.rb

@@ -0,0 +1,12 @@
+# -*- encoding : utf-8 -*-
+
+class AddAceScript < Wagn::CoreMigration
+  def up
+    all_script = Card[:all].fetch :trait=>:script
+    all_script.add_item "script: ace"
+    all_script.save!
+    
+    Card.create! :name=>"script: ace",:codename=>"script_ace",:type=>"JavaScript"
+
+  end
+end

data/db/migrate_core_cards/20141230204340_uri_codename.rb

@@ -0,0 +1,13 @@
+# -*- encoding : utf-8 -*-
+
+class UriCodename < Wagn::Migration
+  def up
+    contentedly do
+      cardname = 'URI'
+      codename = cardname.to_name.key
+      okname = Wagn::Migration.find_unused_name(cardname)
+      Card.create! :type_id=>Card::CardtypeID, :name=>okname, :codename=>codename
+      puts "Name #{cardname} was taken, used #{okname}" if okname != cardname
+    end
+  end
+end

data/db/version_core_cards.txt

@@ -1 +1 @@
-20141204061304
+20141230204340

data/features/history.feature

@@ -8,7 +8,8 @@ Feature: History
     Then the card First should not contain "chicken"
     
   Scenario: view history and rollback 
-    When I go to url "/First?view=history" 
+    When I go to url "/First?view=history"
+    Then show me the page
     Then In the main card content I should see a del with content "egg"
     
     When I expand act 2

data/features/layouts.feature

@@ -1,3 +1,4 @@
+@javascript
 Feature: Layouts
   In order to have greater control over the look and feel of my website
   As a User
@@ -6,9 +7,12 @@ Feature: Layouts
   Background:
     Given I am signed in as Joe Admin
     And I create HTML card "simple layout" with content "Simple Header {{_main}} Simple Footer"
+    And I wait a sec
     And the card "*all+*layout" contains "[[simple layout]]"
     And I create Pointer card "User+*type+*layout" with content "[[user layout]]"
+    And I wait a sec
     And I create HTML card "user layout" with content "User Header {{_main}}"
+    And I wait a sec  
 
   Scenario: I visit a Basic card with the simple layout
     When I go to card "*account links"

data/features/navbox.feature

@@ -13,5 +13,6 @@ Feature: Navbox
     Then I press enter to search
 #When I follow "search: Joe" 
 # fixme: unable to click link so far...
+    And I wait a sec
     Then I should see "Search results"
   

data/features/step_definitions/wagn_steps.rb

@@ -94,7 +94,12 @@ end
 
 When /^(.*) creates?\s*a?\s*([^\s]*) card "(.*)" with content "(.*)"$/ do |username, cardtype, cardname, content|
   create_card(username, cardtype, cardname, content) do
-    fill_in("card[content]", :with=>content)
+    normal_textarea_card_type = ["JavaScript","CoffeeScript","HTML","CSS","SCS","Search"]
+    if not normal_textarea_card_type.include? cardtype or not page.evaluate_script "typeof ace != 'undefined'"
+      fill_in("card[content]", :with=>content)
+    else
+      page.execute_script %{ace.edit($('.ace_editor').get(0)).getSession().setValue('#{content}')}
+    end
   end
 end
 

data/features/support/env.rb

@@ -3,7 +3,7 @@ ENV['RAILS_ENV'] = "cucumber"
 
 require File.expand_path( '../../../lib/wagn/simplecov_helper.rb', __FILE__ )
 require 'simplecov'
-
+require 'minitest/autorun'
 
 # IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
 # It is recommended to regenerate this file in the future when you upgrade to a

data/lib/card/env.rb

@@ -4,7 +4,7 @@ class Card
   module Env
     class << self
       def reset args={}
-        @@env = { :main_name => nil }
+        @@env = {}
       
         if c = args[:controller]
           self[:controller] = c

data/lib/card/format.rb

@@ -2,7 +2,6 @@
 
 class Card
   class Format
-    include Wagn::Location
 
     DEPRECATED_VIEWS = { :view=>:open, :card=>:open, :line=>:closed, :bare=>:core, :naked=>:core }
     INCLUSION_MODES  = { :closed=>:closed, :closed_content=>:closed, :edit=>:edit,
@@ -468,68 +467,56 @@ class Card
       :name
     end
 
-    def path opts={}
-      pcard = opts.delete(:card) || card
-      base = opts[:action] ? "card/#{ opts.delete :action }/" : ''
-      if pcard && !pcard.name.empty? && !opts.delete(:no_id) && ![:new, :create].member?(opts[:action]) #generalize. dislike hardcoding views/actions here
-        base += ( opts[:id] ? "~#{ opts.delete :id }" : pcard.cardname.url_key )
-      end
-      query = opts.empty? ? '' : "?#{opts.to_param}"
-      wagn_path( base + query )
-    end
+
     #
     # ------------ LINKS ---------------
     #
 
-    def final_link href, opts
-      if text = opts[:text]
-        "#{text}[#{href}]"
-      else
-        href
-      end
-    end
 
-    def build_link href, text=nil
-      opts = {:text => text }
+  
 
-      opts[:class] = case href.to_s
-        when /^https?:/                      ; 'external-link'
-        when /^mailto:/                      ; 'email-link'
-        when /^([a-zA-Z][\-+.a-zA-Z\d]*):/   ; $1 + '-link'
-        when /^\//
-          href = internal_url href[1..-1]    ; 'internal-link'
+  
+    def add_class options, klass
+      options[:class] = [ options[:class], klass ].flatten.compact * ' '
+    end
+    
+    module Location
+      #
+      # page_path    takes a Card::Name, adds the format and query string to url_key (site-absolute)
+      # wagn_path    makes a relative path site-absolute (if not already)
+      # wagn_url     makes it a full url (if not already)
+
+      # TESTME
+      def page_path title, opts={}
+        Rails.logger.warn "Pass only Card::Name to page_path #{title.class}, #{title}" unless Card::Name===title
+        format = opts[:format] ? ".#{opts.delete(:format)}"  : ''
+        query  = opts.present? ? "?#{opts.to_param}"         : ''
+        wagn_path "#{title.to_name.url_key}#{format}#{query}"
+      end
+
+      def wagn_path rel_path
+        Rails.logger.warn "Pass only strings to wagn_path: #{rel_path.class}, #{rel_path}" unless String===rel_path
+        if rel_path =~ /^\//
+          rel_path
         else
-          return href
-          Rails.logger.debug "build_link mistakenly(?) called on #{href}, #{text}"
+          "#{ Wagn.config.relative_url_root }/#{ rel_path }"
         end
-        
-      final_link href, opts
-    end
+      end
 
-    def card_link name, text, known, type=nil
-      text ||= name
-      linkname = name.to_name.url_key
-      opts = {
-        :class => ( known ? 'known-card' : 'wanted-card' ),
-        :text  => ( text.to_name.to_show @context_names  )
-      }
-      if !known
-        link_params = {}
-        link_params['name'] = name.to_s if name.to_s != linkname
-        link_params['type'] = type      if type
-        linkname += "?#{ { :card => link_params }.to_param }" if !link_params.empty?
+      def wagn_url rel
+        if rel =~ /^https?\:/
+          rel
+        else
+          "#{ Card::Env[:protocol] }#{ Card::Env[:host] }#{ wagn_path rel }"
+        end
       end
-      final_link internal_url( linkname ), opts
     end
-  
+    include Location
+
     def unique_id
       "#{card.key}-#{Time.now.to_i}-#{rand(3)}" 
     end
 
-    def internal_url relative_path
-      wagn_path relative_path
-    end
-
     def format_date date, include_time = true
       # Must use DateTime because Time doesn't support %e on at least some platforms
       if include_time

data/lib/card/loader.rb

@@ -90,7 +90,7 @@ class Card
             load_implicit_sets_from_source set_pattern
           end
           if Dir.exists? pattern_tmp_dir
-            load_dir "#{pattern_tmp_dir}/*.rb"
+            load_dir "#{pattern_tmp_dir}/**/*.rb"
           end
         end    
       end
@@ -100,16 +100,16 @@ class Card
         mod_dirs.each do |mod_dir|
           dirname = [mod_dir, 'set', set_pattern] * '/'
           next unless File.exists?( dirname )
-
-          #FIXME support multiple anchors!
-          Dir.entries( dirname ).sort.each do |anchor_filename|
-            next if anchor_filename =~ /^\./
-            anchor = anchor_filename.gsub /\.rb$/, ''
-
-            filename = [dirname, anchor_filename] * '/'
-            Set.write_tmp_file set_pattern, anchor, filename, seq
+          
+          old_pwd = Dir.pwd
+          Dir.chdir dirname
+          Dir.glob( "**/*.rb" ).sort.each do |anchor_path|
+            path_parts = anchor_path.gsub(/\.rb/,'').split(File::SEPARATOR)
+            filename = File.join dirname, anchor_path
+            Set.write_tmp_file set_pattern, path_parts, filename, seq
             seq = seq + 1
           end
+          Dir.chdir old_pwd
         end
       end
 

data/lib/card/mailer.rb

@@ -11,8 +11,6 @@ class Card
     @@defaults[:charset] ||= 'utf-8'
     default @@defaults
 
-    include Wagn::Location
-        
     class << self
       def new_mail(*args, &block)
         mail = Mail.new(args, &block)

data/lib/card/query.rb

@@ -2,10 +2,10 @@
 
 
 class Card::Query
-  require_dependency 'card/query/spec'
-  require_dependency 'card/query/card_spec'
-  require_dependency 'card/query/value_spec'  
-  require_dependency 'card/query/ref_spec'
+  require_dependency 'card/query/clause'
+  require_dependency 'card/query/card_clause'
+  require_dependency 'card/query/value_clause'  
+  require_dependency 'card/query/ref_clause'
 
   MODIFIERS = {};  %w{ conj return sort sort_as group dir limit offset }.each{|key| MODIFIERS[key.to_sym] = nil }
 
@@ -15,19 +15,19 @@ class Card::Query
   }.stringify_keys)
 
   def initialize query
-    @card_spec = CardSpec.build query
+    @card_clause = CardClause.build query
   end
   
   def query
-    @card_spec.query
+    @card_clause.query
   end
   
   def sql
-    @sql ||= @card_spec.to_sql
+    @sql ||= @card_clause.to_sql
   end
 
   def run
-#    puts "~~~~~~~~~~~~~~\nCARD SPEC =\n#{@card_spec.rawspec}\n\n-----\n\nSQL=\n#{sql}"
+#    puts "~~~~~~~~~~~~~~\nCARD SPEC =\n#{@card_clause.rawclause}\n\n-----\n\nSQL=\n#{sql}"
     rows = ActiveRecord::Base.connection.select_all( sql )
     retrn = query[:return].present? ? query[:return].to_s : 'card'
     case retrn 

data/lib/card/query/{card_spec.rb → card_clause.rb}

@@ -1,7 +1,7 @@
 
 class Card
   class Query
-    class CardSpec < Spec
+    class CardClause < Clause
     
       ATTRIBUTES = {
         :basic           => %w{ name type_id content id key updater_id left_id right_id creator_id updater_id codename }, 
@@ -16,19 +16,19 @@ class Card
       DEFAULT_ORDER_DIRS =  { :update => "desc", :relevance => "desc" }
       CONJUNCTIONS = { :any=>:or, :in=>:or, :or=>:or, :all=>:and, :and=>:and }
     
-      attr_reader :sql, :query, :rawspec, :selfname
+      attr_reader :sql, :query, :rawclause, :selfname
       attr_accessor :joins, :join_count
 
       class << self
         def build query
-          cardspec = self.new query
-          cardspec.merge cardspec.rawspec
+          cardclause = self.new query
+          cardclause.merge cardclause.rawclause
         end
       end
 
       def initialize query
         @mods = MODIFIERS.clone
-        @spec, @joins = {}, {}
+        @clause, @joins = {}, {}
         @selfname, @parent = '', nil
         @sql = SqlStatement.new
 
@@ -37,7 +37,7 @@ class Card
         @vars = @query.delete(:vars) || {}
         @vars.symbolize_keys!
         @query = clean(@query)
-        @rawspec = @query.deep_clone
+        @rawclause = @query.deep_clone
 
         self
       end
@@ -91,7 +91,7 @@ class Card
         s = hashify s
         translate_to_attributes s
         ready_to_sqlize s
-        @spec.merge! s
+        @clause.merge! s
         self
       end
   
@@ -100,41 +100,41 @@ class Card
           when String;   { :key => s.to_name.key }
           when Integer;  { :id => s              }
           when Hash;     s
-          else; raise BadQuery, "Invalid cardspec args #{s.inspect}"
+          else; raise BadQuery, "Invalid cardclause args #{s.inspect}"
         end
       end
 
-      def translate_to_attributes spec
+      def translate_to_attributes clause
         content = nil
-        spec.each do |key,val|
+        clause.each do |key,val|
           if key == :_parent
-            @parent = spec.delete(key)
+            @parent = clause.delete(key)
           elsif OPERATORS.has_key?(key.to_s) && !ATTRIBUTES[key]
-            spec.delete(key)
+            clause.delete(key)
             content = [key,val]
           elsif MODIFIERS.has_key?(key)
-            next if spec[key].is_a? Hash
-            val = spec.delete key
+            next if clause[key].is_a? Hash
+            val = clause.delete key
             @mods[key] = Array === val ? val : val.to_s
           end
         end
-        spec[:content] = content if content
+        clause[:content] = content if content
       end
 
 
-      def ready_to_sqlize spec
-        spec.each do |key,val|
+      def ready_to_sqlize clause
+        clause.each do |key,val|
           keyroot = field_root(key).to_sym
           if keyroot==:cond                            # internal SQL cond (already ready)
           elsif ATTRIBUTES[keyroot] == :basic          # sqlize knows how to handle these keys; just process value
-            spec[key] = ValueSpec.new(val, self)
+            clause[key] = ValueClause.new(val, self)
           else                                         # keys need additional processing
-            val = spec.delete key
+            val = clause.delete key
             is_array = Array===val
             case ATTRIBUTES[keyroot]
               when :ignore                               #noop         
               when :relational, :special, :conjunction ; relate is_array, keyroot, val, :send
-              when :ref_relational                     ; relate is_array, keyroot, val, :refspec
+              when :ref_relational                     ; relate is_array, keyroot, val, :refclause
               when :plus_relational
                 # Arrays can have multiple interpretations for these, so we have to look closer...
                 subcond = is_array && ( Array===val.first || conjunction(val.first) )
@@ -160,8 +160,8 @@ class Card
         end
       end
 
-      def refspec key, val        
-        add_join :ref, RefSpec.new( key, val, self ).to_sql, :id, :ref_id
+      def refclause key, val        
+        add_join :ref, RefClause.new( key, val, self ).to_sql, :id, :ref_id
       end
 
 
@@ -198,11 +198,11 @@ class Card
       end
       
       def editor_of val
-        action_spec :actor_id, "card_actions.card_id", val
+        action_clause :actor_id, "card_actions.card_id", val
       end
 
       def edited_by val
-        action_spec "card_actions.card_id", :actor_id, val
+        action_clause "card_actions.card_id", :actor_id, val
       end
       
       def last_editor_of val
@@ -245,8 +245,8 @@ class Card
       end
       
       def junction side, val
-        part_spec, junction_spec = val.is_a?(Array) ? val : [ val, {} ]
-        restrict_by_join :id, junction_spec, side=>part_spec, :return=>"#{ side==:left ? :right : :left}_id"
+        part_clause, junction_clause = val.is_a?(Array) ? val : [ val, {} ]
+        restrict_by_join :id, junction_clause, side=>part_clause, :return=>"#{ side==:left ? :right : :left}_id"
       end
     
     
@@ -279,12 +279,12 @@ class Card
           unless c && [SearchTypeID,SetID].include?(c.type_id)
             raise BadQuery, %{"found_by" value needs to be valid Search, but #{c.name} is a #{c.type_name}}
           end
-          restrict_by_join :id, CardSpec.new(c.get_spec).rawspec
+          restrict_by_join :id, CardClause.new(c.get_query).rawclause
         end
       end
   
       def not val
-        subselect = CardSpec.build(:return=>:id, :_parent=>self).merge(val).to_sql
+        subselect = CardClause.build(:return=>:id, :_parent=>self).merge(val).to_sql
         join_alias = add_join :not, subselect, :id, :id, :side=>'LEFT'        
         merge field(:cond) => SqlCond.new("#{join_alias}.id is null")
       end
@@ -300,7 +300,7 @@ class Card
           case item
           when 'referred_to'
             join_field = 'id'
-            cs = CardSpec.build cs_args.merge( field(:cond)=>SqlCond.new("referer_id in #{CardSpec.build( val.merge(:return=>'id')).to_sql}") )
+            cs = CardClause.build cs_args.merge( field(:cond)=>SqlCond.new("referer_id in #{CardClause.build( val.merge(:return=>'id')).to_sql}") )
             cs.add_join :wr, :card_references, :id, :referee_id
           else
             raise BadQuery, "count with item: #{item} not yet implemented"
@@ -311,7 +311,7 @@ class Card
             when 'right' ; 'right_id'
             else         ;  raise BadQuery, "sort item: #{item} not yet implemented"
           end
-          cs = CardSpec.build(val)
+          cs = CardClause.build(val)
         end
 
         cs.sql.fields << "#{cs.table_alias}.#{join_field} as sort_join_field"
@@ -395,27 +395,27 @@ class Card
 
       def subcondition(val, args={})
         args = { :return=>:condition, :_parent=>self }.merge(args)
-        cardspec = CardSpec.build( args )
-        merge field(:cond) => cardspec.merge(val)
-        self.joins.merge! cardspec.joins
+        cardclause = CardClause.build( args )
+        merge field(:cond) => cardclause.merge(val)
+        self.joins.merge! cardclause.joins
       end      
       
-      def action_spec(field, linkfield, val)
-        card_select = CardSpec.build(:_parent=>self, :return=>'id').merge(val).to_sql
+      def action_clause(field, linkfield, val)
+        card_select = CardClause.build(:_parent=>self, :return=>'id').merge(val).to_sql
         sql =  "(SELECT DISTINCT #{field} AS join_card_id FROM card_acts INNER JOIN card_actions ON card_acts.id = card_act_id "
         sql += " JOIN (#{card_select}) AS ss ON #{linkfield}=ss.id AND (draft is not true))"
         add_join :ac, sql, :id, :join_card_id
       end
 
-      def id_from_spec spec
-        case spec
-        when Integer ; spec
-        when String  ; Card.fetch_id(spec)
+      def id_from_clause clause
+        case clause
+        when Integer ; clause
+        when String  ; Card.fetch_id(clause)
         end
       end
             
       def restrict id_field, val, opts={}
-        if id = id_from_spec(val)
+        if id = id_from_clause(val)
           merge field(id_field) => id
         else
           restrict_by_join id_field, val, opts
@@ -424,7 +424,7 @@ class Card
       
       def restrict_by_join id_field, val, opts={}
         opts.reverse_merge!(:return=>:id, :_parent=>self)
-        subselect = CardSpec.build(opts).merge(val).to_sql
+        subselect = CardClause.build(opts).merge(val).to_sql
         add_join "card_#{id_field}", subselect, id_field, opts[:return]
       end
     
@@ -464,7 +464,7 @@ class Card
       end
   
       def basic_conditions
-        @spec.map { |key, val| val.to_sql field_root(key) }.compact.join " #{ current_conjunction } "
+        @clause.map { |key, val| val.to_sql field_root(key) }.compact.join " #{ current_conjunction } "
       end
   
       def current_conjunction