wagn 1.14.4 → 1.14.5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wagn
 version: !ruby/object:Gem::Version
-  version: 1.14.4
+  version: 1.14.5
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-02 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -315,6 +315,9 @@ files:
 - db/migrate_core_cards/20141119001955_make_symlinks_relative.rb
 - db/migrate_core_cards/20141120120605_fix_notification_html_message.rb
 - db/migrate_core_cards/20141204061304_watchers_to_following.rb
+- db/migrate_core_cards/20141208132416_partial_reference_type.rb
+- db/migrate_core_cards/20141208162106_add_ace_script.rb
+- db/migrate_core_cards/20141230204340_uri_codename.rb
 - db/migrate_core_cards/data/1.11_help_text.json
 - db/migrate_core_cards/data/1.12_stylesheets/classic_cards.scss
 - db/migrate_core_cards/data/1.12_stylesheets/common.scss
@@ -390,10 +393,10 @@ files:
 - lib/card/mailer.rb
 - lib/card/name.rb
 - lib/card/query.rb
-- lib/card/query/card_spec.rb
-- lib/card/query/ref_spec.rb
-- lib/card/query/spec.rb
-- lib/card/query/value_spec.rb
+- lib/card/query/card_clause.rb
+- lib/card/query/clause.rb
+- lib/card/query/ref_clause.rb
+- lib/card/query/value_clause.rb
 - lib/card/reference.rb
 - lib/card/set.rb
 - lib/card/set_pattern.rb
@@ -446,9 +449,10 @@ files:
 - lib/wagn/generators/wagn/templates/rspec
 - lib/wagn/generators/wagn/templates/script/wagn
 - lib/wagn/generators/wagn/templates/simplecov
+- lib/wagn/generators/wagn/templates/spec/javascripts/support/deck_jasmine.yml
+- lib/wagn/generators/wagn/templates/spec/javascripts/support/wagn_jasmine.yml
 - lib/wagn/generators/wagn/templates/spec/spec_helper.rb
 - lib/wagn/generators/wagn/wagn_generator.rb
-- lib/wagn/location.rb
 - lib/wagn/log.rb
 - lib/wagn/migration.rb
 - lib/wagn/mods_spec_helper.rb
@@ -533,6 +537,7 @@ files:
 - mod/02_basic_types/spec/set/pointer_spec.rb
 - mod/03_machines/lib/card/machine.rb
 - mod/03_machines/lib/card/machine_input.rb
+- mod/03_machines/lib/javascript/ace.js
 - mod/03_machines/lib/javascript/html5shiv-printshiv.js
 - mod/03_machines/lib/javascript/jquery-ui.js
 - mod/03_machines/lib/javascript/jquery.autosize.js
@@ -542,6 +547,7 @@ files:
 - mod/03_machines/lib/javascript/jquery.ui.autocomplete.html.js
 - mod/03_machines/lib/javascript/jquery_ujs.js
 - mod/03_machines/lib/javascript/jquerymobile.js
+- mod/03_machines/lib/javascript/theme-textmate.js
 - mod/03_machines/lib/javascript/tinymce.js
 - mod/03_machines/lib/javascript/wagn.js.coffee
 - mod/03_machines/lib/javascript/wagn_menu.js
@@ -550,6 +556,7 @@ files:
 - mod/03_machines/lib/stylesheets/jquery-ui-smoothness.css
 - mod/03_machines/lib/stylesheets/standard.scss
 - mod/03_machines/set/right/machine_output.rb
+- mod/03_machines/set/self/script_ace.rb
 - mod/03_machines/set/self/script_card_menu.rb
 - mod/03_machines/set/self/script_html5shiv_printshiv.rb
 - mod/03_machines/set/self/script_jquery.rb
@@ -564,8 +571,8 @@ files:
 - mod/03_machines/set/type/java_script.rb
 - mod/03_machines/set/type/scss.rb
 - mod/03_machines/set/type/skin.rb
-- mod/03_machines/spec/lib/machine_input_spec.rb
-- mod/03_machines/spec/lib/machine_spec.rb
+- mod/03_machines/spec/lib/shared_machine_examples.rb
+- mod/03_machines/spec/lib/shared_machine_input_examples.rb
 - mod/03_machines/spec/set/right/machine_output_spec.rb
 - mod/03_machines/spec/set/self/style_functional_spec.rb
 - mod/03_machines/spec/set/self/style_jquery_ui_smoothness_spec.rb
@@ -662,15 +669,21 @@ files:
 - mod/05_standard/set/all/attach.rb
 - mod/05_standard/set/all/base.rb
 - mod/05_standard/set/all/comment.rb
+- mod/05_standard/set/all/editing.rb
+- mod/05_standard/set/all/error.rb
 - mod/05_standard/set/all/event_viz.rb
 - mod/05_standard/set/all/file.rb
 - mod/05_standard/set/all/follow.rb
+- mod/05_standard/set/all/form.rb
+- mod/05_standard/set/all/header.rb
 - mod/05_standard/set/all/history.rb
 - mod/05_standard/set/all/json.rb
+- mod/05_standard/set/all/links.rb
 - mod/05_standard/set/all/observer.rb
 - mod/05_standard/set/all/rich_html.rb
 - mod/05_standard/set/all/rss.rb
 - mod/05_standard/set/all/text.rb
+- mod/05_standard/set/all/wrapper.rb
 - mod/05_standard/set/right/account.rb
 - mod/05_standard/set/right/email.rb
 - mod/05_standard/set/right/password.rb
@@ -706,6 +719,7 @@ files:
 - mod/05_standard/set/type/set.rb
 - mod/05_standard/set/type/signup.rb
 - mod/05_standard/set/type/toggle.rb
+- mod/05_standard/set/type/uri.rb
 - mod/05_standard/set/type/user.rb
 - mod/05_standard/spec/chunk/include_spec.rb
 - mod/05_standard/spec/chunk/link_spec.rb
@@ -769,7 +783,21 @@ files:
 - mod/05_standard/spec/set/type/set_spec.rb
 - mod/05_standard/spec/set/type/signup_spec.rb
 - mod/05_standard/spec/set/type/toggle_spec.rb
+- mod/05_standard/spec/set/type/uri_spec.rb
 - mod/05_standard/spec/set/type/user_spec.rb
+- public/assets/ace/mode-coffee.js
+- public/assets/ace/mode-css.js
+- public/assets/ace/mode-html.js
+- public/assets/ace/mode-javascript.js
+- public/assets/ace/mode-json.js
+- public/assets/ace/mode-scss.js
+- public/assets/ace/theme-github.js
+- public/assets/ace/theme-textmate.js
+- public/assets/ace/worker-coffee.js
+- public/assets/ace/worker-css.js
+- public/assets/ace/worker-html.js
+- public/assets/ace/worker-javascript.js
+- public/assets/ace/worker-json.js
 - public/assets/body-bg-660b752b44b87594071f3d0851ac5360.png
 - public/assets/body-bg-d031f29b6ba7399a6862382c3552f44c.bmp
 - public/assets/body-bg.bmp
@@ -1306,8 +1334,7 @@ files:
 - spec/controllers/card_controller_spec.rb
 - spec/controllers/location_spec.rb
 - spec/javascripts/helpers/.gitkeep
-- spec/javascripts/helpers/jasmine-config.js
-- spec/javascripts/helpers/jasmine-jquery-1.3.1.js
+- spec/javascripts/helpers/jasmine-jquery.js
 - spec/javascripts/support/jasmine.yml
 - spec/javascripts/support/jasmine_config.rb
 - spec/javascripts/support/jasmine_runner.rb
@@ -1404,8 +1431,7 @@ test_files:
 - spec/controllers/card_controller_spec.rb
 - spec/controllers/location_spec.rb
 - spec/javascripts/helpers/.gitkeep
-- spec/javascripts/helpers/jasmine-config.js
-- spec/javascripts/helpers/jasmine-jquery-1.3.1.js
+- spec/javascripts/helpers/jasmine-jquery.js
 - spec/javascripts/support/jasmine.yml
 - spec/javascripts/support/jasmine_config.rb
 - spec/javascripts/support/jasmine_runner.rb

data/lib/card/query/ref_spec.rb

@@ -1,37 +0,0 @@
-class Card::Query
-  class RefSpec < Spec
-    REFERENCE_DEFINITIONS = {
-      :refer_to => [ :out      ],   :referred_to_by => [ :in      ],
-      :link_to  => [ :out, 'L' ],   :linked_to_by   => [ :in, 'L' ],
-      :include  => [ :out, 'I' ],   :included_by    => [ :in, 'I' ]
-    }
-    
-    REFERENCE_FIELDS = {
-      :out => [ :referer_id, :referee_id ],
-      :in  => [ :referee_id, :referer_id ]
-    }
-        
-    def initialize key, val, parent
-      @key, @val, @parent = key, val, parent
-    end
-
-    def to_sql *args
-      dir, type = REFERENCE_DEFINITIONS[ @key.to_sym ]
-      field1, field2 = REFERENCE_FIELDS[ dir ]
-      cond = type ? ["ref_type='#{type}'"] : []
-
-      sql =  %[select #{field1} as ref_id from card_references]
-      if @val == '_none'
-        cond << "present = 0"
-      else
-        cardspec = CardSpec.build(:return=>'id', :_parent=>@parent).merge(@val)
-        sql << %[ join #{ cardspec.to_sql } as c on #{field2} = c.id]
-      end
-      sql << %[ where #{ cond * ' and ' }] if cond.any?
-      
-      "(#{sql})"
-    end
-  end
-end
-
-

data/lib/card/query/value_spec.rb

@@ -1,65 +0,0 @@
-class Card::Query
-  class ValueSpec < Spec
-    def initialize spec, cardspec
-      @cardspec = cardspec
-
-      # bare value shortcut
-      @spec = case spec
-        when ValueSpec; spec.instance_variable_get('@spec')  # FIXME what a hack (what's this for?)
-        when Array;     spec
-        when String;    ['=', spec]
-        when Integer;   ['=', spec]
-        else raise("Invalid Condition Spec #{spec.inspect}")
-      end
-
-      # operator aliases
-      @spec[0] = @spec[0].to_s
-      if target = OPERATORS[@spec[0]]
-        @spec[0] = target
-      end
-
-      # check valid operator
-      raise("Invalid Operator #{@spec[0]}") unless OPERATORS.has_key?(@spec[0])
-
-      # handle IN  #FIXME -- shouldn't this handle "not in", too?
-      if @spec[0]=='in' and !@spec[1].is_a?(CardSpec) and !@spec[1].is_a?(RefSpec)
-        @spec = [@spec[0], @spec[1..-1]]
-      end
-    end
-
-    def op
-      @spec[0]
-    end
-
-    def sqlize(v)
-      case v
-        when CardSpec, RefSpec, SqlCond; v.to_sql
-        when Array;    "(" + v.flatten.collect {|x| sqlize(x)}.join(',') + ")"
-        else quote(v.to_s)
-      end
-    end
-
-    def to_sql field
-      op,v = @spec
-      #warn "to_sql(#{field}), #{op}, #{v}, #{@cardspec.inspect}"
-      v=@cardspec.selfname if v=='_self'
-      table = @cardspec.table_alias
-
-      #warn "to_sql #{field}, #{v} (#{op})"
-      field, v = case field
-        when "cond";     return "(#{sqlize(v)})"
-        when "name";     ["#{table}.key",      [v].flatten.map(&:to_name).map(&:key)]
-        when "content";  ["#{table}.db_content", v]
-        else;            ["#{table}.#{safe_sql(field)}", v]
-        end
-
-      v = v[0] if Array===v && v.length==1 && op != 'in'
-      if op=='~'
-        cxn, v = match_prep(v,@cardspec)
-        %{#{field} #{cxn.match(sqlize(v))}}
-      else
-        "#{field} #{op} #{sqlize(v)}"
-      end
-    end
-  end
-end

data/lib/wagn/location.rb

@@ -1,93 +0,0 @@
-# -*- encoding : utf-8 -*-
-# helper for urls, links, redirects, and other location related things.
-#  note: i'm sure this isn't the optimal name..
-
-module Wagn::Location
-
-  # we keep a history stack so that in the case of card removal
-  # we can crawl back up to the last un-removed location
-
-  #
-  def location_history
-    #warn "sess #{session.class}, #{session.object_id}"
-    session[:history] ||= [wagn_path('')]
-    if session[:history]
-      session[:history].shift if session[:history].size > 5
-      session[:history]
-    end
-  end
-
-  def save_location
-    return if ajax? || !html? || !@card.known? || (@card.codename == 'signin')
-    discard_locations_for @card
-    @previous_location = wagn_path @card
-    location_history.push @previous_location
-  end
-
-  def previous_location
-    @previous_location ||= location_history.last if location_history
-  end
-
-  def discard_locations_for(card)
-    # quoting necessary because cards have things like "+*" in the names..
-    session[:history] = location_history.reject do |loc|
-      if url_key = url_key_for_location(loc)
-        url_key.to_name.key == card.key
-      end
-    end.compact
-    @previous_location = nil
-  end
-
-  def url_key_for_location(location)
-    location.match( /\/([^\/]*$)/ ) ? $1 : nil
-  end
-  
-  def save_interrupted_action uri
-    uri = path(uri) if Hash === uri
-    session[:interrupted_action] = uri
-  end
-  
-  def interrupted_action
-    session.delete :interrupted_action
-  end
-
-   # -----------( urls and redirects from application.rb) ----------------
-
-
-  # TESTME
-  def page_path title, opts={}
-    
-    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 #should be in smartname?
-    rel_path = Card===rel ? rel.cardname.url_key : rel.to_s
-    if rel_path =~ /^\//
-      rel_path
-    else
-      "#{ Wagn.config.relative_url_root }/#{ rel_path }"
-    end
-  end
-
-  def wagn_url rel #should be in smartname?
-    if rel =~ /^https?\:/
-      rel
-    else
-      "#{ Card::Env[:protocol] }#{ Card::Env[:host] }#{ wagn_path rel }"
-    end
-  end
-
-
-  # Links ----------------------------------------------------------------------
-
-  def link_to_page( text, title=nil, options={})
-    title ||= text
-    url_options = {}
-    [:type, :view].each { |k| url_options[k] = options.delete(k) if options[k] }
-    url = page_path( title, url_options )
-    link_to text, url, options
-  end
-
-end

data/spec/javascripts/helpers/jasmine-config.js

@@ -1,2 +0,0 @@
-jasmine.getFixtures().fixturesPath = 'jasmine/';
-alert("loaded config thing");

data/spec/javascripts/helpers/jasmine-jquery-1.3.1.js

@@ -1,295 +0,0 @@
-
-var readFixtures = function() {
-  return jasmine.getFixtures().proxyCallTo_('read', arguments);
-};
-
-var preloadFixtures = function() {
-  jasmine.getFixtures().proxyCallTo_('preload', arguments);
-};
-
-var loadFixtures = function() {
-  jasmine.getFixtures().proxyCallTo_('load', arguments);
-};
-
-var setFixtures = function(html) {
-  jasmine.getFixtures().set(html);
-};
-
-var sandbox = function(attributes) {
-  return jasmine.getFixtures().sandbox(attributes);
-};
-
-var spyOnEvent = function(selector, eventName) {
-  jasmine.JQuery.events.spyOn(selector, eventName);
-}
-
-jasmine.getFixtures = function() {
-  return jasmine.currentFixtures_ = jasmine.currentFixtures_ || new jasmine.Fixtures();
-};
-
-jasmine.Fixtures = function() {
-  this.containerId = 'jasmine-fixtures';
-  this.fixturesCache_ = {};
-  this.fixturesPath = 'spec/javascripts/fixtures';
-};
-
-jasmine.Fixtures.prototype.set = function(html) {
-  this.cleanUp();
-  this.createContainer_(html);
-};
-
-jasmine.Fixtures.prototype.preload = function() {
-  this.read.apply(this, arguments);
-};
-
-jasmine.Fixtures.prototype.load = function() {
-  this.cleanUp();
-  this.createContainer_(this.read.apply(this, arguments));
-};
-
-jasmine.Fixtures.prototype.read = function() {
-  var htmlChunks = [];
-
-  var fixtureUrls = arguments;
-  for(var urlCount = fixtureUrls.length, urlIndex = 0; urlIndex < urlCount; urlIndex++) {
-    htmlChunks.push(this.getFixtureHtml_(fixtureUrls[urlIndex]));
-  }
-
-  return htmlChunks.join('');
-};
-
-jasmine.Fixtures.prototype.clearCache = function() {
-  this.fixturesCache_ = {};
-};
-
-jasmine.Fixtures.prototype.cleanUp = function() {
-  jQuery('#' + this.containerId).remove();
-};
-
-jasmine.Fixtures.prototype.sandbox = function(attributes) {
-  var attributesToSet = attributes || {};
-  return jQuery('<div id="sandbox" />').attr(attributesToSet);
-};
-
-jasmine.Fixtures.prototype.createContainer_ = function(html) {
-  var container;
-  if(html instanceof jQuery) {
-    container = jQuery('<div id="' + this.containerId + '" />');
-    container.html(html);
-  } else {
-    container = '<div id="' + this.containerId + '">' + html + '</div>'
-  }
-  jQuery('body').append(container);
-};
-
-jasmine.Fixtures.prototype.getFixtureHtml_ = function(url) {  
-  if (typeof this.fixturesCache_[url] == 'undefined') {
-    this.loadFixtureIntoCache_(url);
-  }
-  return this.fixturesCache_[url];
-};
-
-jasmine.Fixtures.prototype.loadFixtureIntoCache_ = function(relativeUrl) {
-  var self = this;
-  var url = this.fixturesPath.match('/$') ? this.fixturesPath + relativeUrl : this.fixturesPath + '/' + relativeUrl;
-  jQuery.ajax({
-    async: false, // must be synchronous to guarantee that no tests are run before fixture is loaded
-    cache: false,
-    dataType: 'html',
-    url: url,
-    success: function(data) {
-      self.fixturesCache_[relativeUrl] = data;
-    },
-    error: function(jqXHR, status, errorThrown) {
-        throw Error('Fixture could not be loaded: ' + url + ' (status: ' + status + ', message: ' + errorThrown.message + ')');
-    }
-  });
-};
-
-jasmine.Fixtures.prototype.proxyCallTo_ = function(methodName, passedArguments) {
-  return this[methodName].apply(this, passedArguments);
-};
-
-
-jasmine.JQuery = function() {};
-
-jasmine.JQuery.browserTagCaseIndependentHtml = function(html) {
-  return jQuery('<div/>').append(html).html();
-};
-
-jasmine.JQuery.elementToString = function(element) {
-  return jQuery('<div />').append(element.clone()).html();
-};
-
-jasmine.JQuery.matchersClass = {};
-
-(function(namespace) {
-  var data = {
-    spiedEvents: {},
-    handlers:    []
-  };
-
-  namespace.events = {
-    spyOn: function(selector, eventName) {
-      var handler = function(e) {
-        data.spiedEvents[[selector, eventName]] = e;
-      };
-      jQuery(selector).bind(eventName, handler);
-      data.handlers.push(handler);
-    },
-
-    wasTriggered: function(selector, eventName) {
-      return !!(data.spiedEvents[[selector, eventName]]);
-    },
-
-    cleanUp: function() {
-      data.spiedEvents = {};
-      data.handlers    = [];
-    }
-  }
-})(jasmine.JQuery);
-
-(function(){
-  var jQueryMatchers = {
-    toHaveClass: function(className) {
-      return this.actual.hasClass(className);
-    },
-
-    toBeVisible: function() {
-      return this.actual.is(':visible');
-    },
-
-    toBeHidden: function() {
-      return this.actual.is(':hidden');
-    },
-
-    toBeSelected: function() {
-      return this.actual.is(':selected');
-    },
-
-    toBeChecked: function() {
-      return this.actual.is(':checked');
-    },
-
-    toBeEmpty: function() {
-      return this.actual.is(':empty');
-    },
-
-    toExist: function() {
-      return this.actual.size() > 0;
-    },
-
-    toHaveAttr: function(attributeName, expectedAttributeValue) {
-      return hasProperty(this.actual.attr(attributeName), expectedAttributeValue);
-    },
-
-    toHaveId: function(id) {
-      return this.actual.attr('id') == id;
-    },
-
-    toHaveHtml: function(html) {
-      return this.actual.html() == jasmine.JQuery.browserTagCaseIndependentHtml(html);
-    },
-
-    toHaveText: function(text) {
-      if (text && jQuery.isFunction(text.test)) {
-        return text.test(this.actual.text());
-      } else {
-        return this.actual.text() == text;
-      }
-    },
-
-    toHaveValue: function(value) {
-      return this.actual.val() == value;
-    },
-
-    toHaveData: function(key, expectedValue) {
-      return hasProperty(this.actual.data(key), expectedValue);
-    },
-
-    toBe: function(selector) {
-      return this.actual.is(selector);
-    },
-
-    toContain: function(selector) {
-      return this.actual.find(selector).size() > 0;
-    },
-
-    toBeDisabled: function(selector){
-      return this.actual.is(':disabled');
-    },
-
-    // tests the existence of a specific event binding
-    toHandle: function(eventName) {
-      var events = this.actual.data("events");
-      return events && events[eventName].length > 0;
-    },
-    
-    // tests the existence of a specific event binding + handler
-    toHandleWith: function(eventName, eventHandler) {
-      var stack = this.actual.data("events")[eventName];
-      var i;
-      for (i = 0; i < stack.length; i++) {
-        if (stack[i].handler == eventHandler) {
-          return true;
-        }
-      }
-      return false;
-    }
-  };
-
-  var hasProperty = function(actualValue, expectedValue) {
-    if (expectedValue === undefined) {
-      return actualValue !== undefined;
-    }
-    return actualValue == expectedValue;
-  };
-
-  var bindMatcher = function(methodName) {
-    var builtInMatcher = jasmine.Matchers.prototype[methodName];
-
-    jasmine.JQuery.matchersClass[methodName] = function() {
-      if (this.actual instanceof jQuery) {
-        var result = jQueryMatchers[methodName].apply(this, arguments);
-        this.actual = jasmine.JQuery.elementToString(this.actual);
-        return result;
-      }
-
-      if (builtInMatcher) {
-        return builtInMatcher.apply(this, arguments);
-      }
-
-      return false;
-    };
-  };
-
-  for(var methodName in jQueryMatchers) {
-    bindMatcher(methodName);
-  }
-})();
-
-beforeEach(function() {
-  this.addMatchers(jasmine.JQuery.matchersClass);
-  this.addMatchers({
-    toHaveBeenTriggeredOn: function(selector) {
-      this.message = function() {
-        return [
-          "Expected event " + this.actual + " to have been triggered on" + selector,
-          "Expected event " + this.actual + " not to have been triggered on" + selector
-        ];
-      };
-      return jasmine.JQuery.events.wasTriggered(selector, this.actual);
-    }
-  })
-});
-
-afterEach(function() {
-  jasmine.getFixtures().cleanUp();
-  jasmine.JQuery.events.cleanUp();
-});
-
-
-//HACKED IN BY ETHAN
-jasmine.getFixtures().fixturesPath = 'jasmine/';
-
-