wagn 1.19.0 → 1.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f5def697ca9071dc1eb8fbb857b6f3b9f7b9d62
-  data.tar.gz: 18c4adb2308e3b2793d98daaf210d02b746ac804
+  metadata.gz: 14f55b768309e605aca4a4f0c764fd1b55576648
+  data.tar.gz: 5c3a73ba0701952db18eda8cf23957f0b609f937
 SHA512:
-  metadata.gz: 18bed7fa63837c98a67740861e9d9461774faddc0052a1f915ea2438c7524ef9b607283ae86c002725b22151aa9a5167ba1b2b60f04c644bd5610e916624b38a
-  data.tar.gz: d8df098265a6e02e6e3e1b98afa07dfea4e32ee1ec9609a429bfceaa75ded1777c43e5af756817f03ac42b31247b6577534454bf939b6a45933bd74175c9e821
+  metadata.gz: 7eebe084324ca959722a74a31bc8ee0fd9001a1edc616a9191d26912c0a5f0c4a8fa9bb936df526a5fe88ce44ab0fc559e2636bce62b3714d6d2de4fb9b34d7f
+  data.tar.gz: a44126e1377445612b1a1a5037a0fd76f07b71c2df9275820b5e8fc2069bebdb93194536e52da452d97479b98cb6f4e2cbcb67b146b7c3645c7ff9885da3e412

data/features/attach.feature

@@ -42,14 +42,14 @@ Feature: File Upload
     Then I should see an image of size "large" and type "jpg"
     And I wait until ajax response done
 
-  Scenario: Changing a mod image
+  Scenario: Changing a coded image
     When I edit "*logo"
     And I upload the image "image2.jpg"
     And I wait until ajax response done
     Then I should see "image2.jpg 69.8 KB"
     And I press "Submit"
     And I wait until ajax response done
-    Then I should see a non-mod image of size "large" and type "jpg"
+    Then I should see a non-coded image of size "large" and type "jpg"
 
   Scenario: uploading a file as a field in a form
     When I go to  "/new Cardtype"

data/features/step_definitions/wagn_steps.rb

@@ -384,7 +384,7 @@ Then img_sld do |selector, size, type|
   end
 end
 
-img_should = /^I should see a non-mod image of size "(.+)" and type "(.+)"$/
+img_should = /^I should see a non-coded image of size "(.+)" and type "(.+)"$/
 Then img_should do |size, type|
   element = find("img[src*='#{size}.#{type}']")
   expect(element[:src]).to match(%r{/~\d+/})

data/lib/wagn/application.rb

@@ -76,7 +76,10 @@ module Wagn
         paths["app/models"] = []
         paths["app/mailers"] = []
 
-        add_path paths, "config/routes.rb", with: "rails/application-routes.rb"
+        unless paths["config/routes.rb"].existent.present?
+          add_path paths, "config/routes.rb",
+                   with: "rails/application-routes.rb"
+        end
 
         Cardio.set_mod_paths # really this should happen later
 

data/lib/wagn/commands.rb

@@ -90,7 +90,8 @@ else
 
     rspec_command =
       "RAILS_ROOT=. #{opts[:simplecov]} #{opts[:executer]} " \
-      " #{opts[:rescue]} rspec #{rspec_args.shelljoin} #{opts[:files]}"
+      " #{opts[:rescue]} rspec #{rspec_args.shelljoin} #{opts[:files]} "\
+      " --exclude-pattern \"./card/vendor/**/*\""
     exit_with_child_status rspec_command
   when "--version", "-v"
     puts "Wagn #{Card::Version.release}"

data/lib/wagn/generators/wagn/templates/Gemfile

@@ -18,8 +18,8 @@ gem '<%= database_gemfile_entry.name %>'<%= %(, '#{database_gemfile_entry.versio
 # To activate it you have to set config.active_job.queue_adapter to :delayed_job
 # in your config file and start the background process with
 # RAILS_ENV=production script/delayed_job start
-gem 'delayed_job_active_record', '~> 4.1'
-gem 'daemons'
+# gem 'delayed_job_active_record', '~> 4.1'
+# gem 'daemons'
 
 
 <% if options['mod-dev'] || options['core-dev'] -%>
@@ -71,6 +71,8 @@ group :assets do
 end
 
 group :test do
+  gem 'fog'
+  gem 'fog-aws'
   gem 'rspec-html-matchers'
   gem 'rr' #, '=1.0.0'
 	gem 'simplecov', '~> 0.7.1', :require => false  #test coverage

data/lib/wagn/generators/wagn/templates/config/application.rb

@@ -46,6 +46,33 @@ module <%= app_const_base %>
     # config.paths['files'] = 'files'
     # where uploaded files are actually stored. (eg Image and File cards)
 
+    # config.file_storage = :local
+    # File storage options (see http://wagn.org/file_storage_options)
+    # options include: local, cloud, web, coded
+    # defaults to local
+    # For cloud storage use the following config options and add the gems
+    # "fog" and "fog-aws" to your Gemfile.
+    # config.file_default_bucket = :my_bucket
+    # config.file_buckets = {
+    #   my_bucket: {
+    #     provider: "fog/aws",
+    #     directory: "bucket-name",
+    #     subdirectory: "files",
+    #     credentials: {
+    #        provider: 'AWS',                         # required
+    #        aws_access_key_id: 'key',                # required
+    #        aws_secret_access_key: 'secret-key',     # required
+    #        region: 'eu-central-1',                  # optional, defaults to 'us-east-1'
+    #        host: 's3.example.com',                  # optional, defaults to nil
+    #        endpoint: 'https://s3.example.com:8080' # optional, defaults to nil
+    #     },
+    #     attributes: { "Cache-Control" => "max-age=#{365.day.to_i}" },
+    #     public: true,
+    #     authenticated_url_expiration: 180  # if public is set to false this
+    #                                        # option is needed
+    #   }
+    # }
+
     # config.paths['mod'] << 'my-mod-dir'
     # add a new directory for code customizations, or "mods"
 

data/lib/wagn/tasks/wagn.rake

@@ -50,7 +50,7 @@ namespace :wagn do
   end
 
   desc "clear and load fixtures with existing tables"
-  task :reseed do
+  task reseed: :environment do
     ENV["SCHEMA"] ||= "#{Cardio.gem_root}/db/schema.rb"
 
     Rake::Task["wagn:clear"].invoke
@@ -255,6 +255,9 @@ namespace :wagn do
 
       # FIXME: temporarily taking this out!!
       Rake::Task["wagn:bootstrap:copy_mod_files"].invoke
+      Card[:all, :script].make_machine_output_coded
+      Card[:all, :style].make_machine_output_coded
+      Card[:script_html5shiv_printshiv].make_machine_output_coded
 
       YAML::ENGINE.yamler = "syck" if RUBY_VERSION !~ /^(2|1\.9)/
       # use old engine while we're supporting ruby 1.8.7 because it can't
@@ -287,7 +290,7 @@ namespace :wagn do
       # mark mod files as mod files
       Card::Auth.as_bot do
         Card.search(type: %w(in Image File), ne: "").each do |card|
-          if card.mod_file? || card.codename == "new_file" ||
+          if card.coded? || card.codename == "new_file" ||
              card.codename == "new_image"
             puts "skipping #{card.name}: already in code"
             next
@@ -295,31 +298,15 @@ namespace :wagn do
             puts "working on #{card.name}"
           end
 
-          raise "need codename for file" unless card.codename.present?
-
-          files = { original: card.attachment.path }
-          card.attachment.versions.each_key do |version|
-            files[version] = card.attachment.path(version)
-          end
-
           # make card a mod file card
           mod_name = if (l = card.left) && l.type_id == Card::SkinID
                        "bootstrap"
                      else
                        "standard"
                      end
-          card.update_column :db_content,
-                             card.attachment.db_content(mod: mod_name)
-          card.last_action.change(:content)
-              .update_column :value, card.attachment.db_content(mod: mod_name)
-          card.expire
-          card = Card.fetch card.name
-
-          target_dir = card.store_dir
-
-          files.each do |version, path|
-            FileUtils.cp path, card.attachment.path(version)
-          end
+          card.update_attributes! storage_type: :coded,
+                                  mod: mod_name,
+                                  empty_ok: true
         end
       end
     end
@@ -329,8 +316,7 @@ namespace :wagn do
       # FIXME: shouldn't we be more standard and use seed.rb for this code?
       Rake.application.options.trace = true
       puts "bootstrap load starting #{WAGN_SEED_PATH}"
-      require "active_record/fixtures"
-      ActiveRecord::FixtureSet.create_fixtures WAGN_SEED_PATH, WAGN_SEED_TABLES
+      Rake::Task["db:seed"].invoke
     end
   end
 end

data/rails/engine-routes.rb

@@ -36,8 +36,8 @@ Decko::Engine.routes.draw do
   get "account/accept"             => "card#read",   view: "edit", card: { type_code: :signup }
   # use type_code rather than id because in some cases (eg populating test data) routes must get loaded without loading Card
 
-  get "admin/stats"                => "card#read",   id: ":stats"
-  get "admin/:task"                => "card#update", id: ":all"
+  get "admin/stats"                => "card#read",   id: ":admin"
+  get "admin/:task"                => "card#update", id: ":admin"
   # ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
   # standard non-RESTful

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wagn
 version: !ruby/object:Gem::Version
-  version: 1.19.0
+  version: 1.19.1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -33,14 +33,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.19.1
 description: a wiki approach to stuctured data, dynamic interaction,  and web design
 email:
 - info@wagn.org
@@ -71,11 +71,6 @@ files:
 - app/assets/images/smoothness/ui-icons_454545_256x240.png
 - app/assets/images/smoothness/ui-icons_888888_256x240.png
 - app/assets/images/smoothness/ui-icons_cd0a0a_256x240.png
-- app/assets/javascripts/application.js
-- app/assets/javascripts/jquery.autosize.js
-- app/assets/javascripts/jquery.fileupload.js
-- app/assets/javascripts/jquery.iframe-transport.js
-- app/assets/javascripts/jquery.ui.autocomplete.html.js
 - bin/wagn
 - features/attach.feature
 - features/autonaming.feature
@@ -759,7 +754,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: structured wiki web platform

data/app/assets/javascripts/application.js

@@ -1,25 +0,0 @@
-// This is a manifest file that'll be compiled into including all the files listed below.
-// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
-// be included in the compiled file accessible from http://example.com/assets/application.js
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-//= require jquery
-//= require tinymce
-
-//= !require jquery.mobile    
-    /* jquery.mobile must be after wagn to avoid mobileinit nastiness */
-//= require jquery.ui.all
-    /* jquery.ui.all must be after jquery.mobile to override dialog weirdness */
-//= require jquery.ui.autocomplete.html.js
-    /* this autocomplete must be after jquery.ui stuff */
-//= require jquery.autosize
-//= require jquery.fileupload.js
-//= require jquery.iframe-transport.js
-//= require jquery_ujs
-
-/*
-Note: I attempted to get tinymce up with tinymce-jquery,
-but it overrode val() in ways that broke our filed updating / autosave
-*/
-

data/app/assets/javascripts/jquery.autosize.js

@@ -1,254 +0,0 @@
-/*!
-	Autosize v1.17.7 - 2013-09-03
-	Automatically adjust textarea height based on user input.
-	(c) 2013 Jack Moore - http://www.jacklmoore.com/autosize
-	license: http://www.opensource.org/licenses/mit-license.php
-*/
-(function (factory) {
-	if (typeof define === 'function' && define.amd) {
-		// AMD. Register as an anonymous module.
-		define(['jquery'], factory);
-	} else {
-		// Browser globals: jQuery or jQuery-like library, such as Zepto
-		factory(window.jQuery || window.$);
-	}
-}(function ($) {
-	var
-	defaults = {
-		className: 'autosizejs',
-		append: '',
-		callback: false,
-		resizeDelay: 10
-	},
-
-	// border:0 is unnecessary, but avoids a bug in FireFox on OSX
-	copy = '<textarea tabindex="-1" style="position:absolute; top:-999px; left:0; right:auto; bottom:auto; border:0; padding: 0; -moz-box-sizing:content-box; -webkit-box-sizing:content-box; box-sizing:content-box; word-wrap:break-word; height:0 !important; min-height:0 !important; overflow:hidden; transition:none; -webkit-transition:none; -moz-transition:none;"/>',
-
-	// line-height is conditionally included because IE7/IE8/old Opera do not return the correct value.
-	typographyStyles = [
-		'fontFamily',
-		'fontSize',
-		'fontWeight',
-		'fontStyle',
-		'letterSpacing',
-		'textTransform',
-		'wordSpacing',
-		'textIndent'
-	],
-
-	// to keep track which textarea is being mirrored when adjust() is called.
-	mirrored,
-
-	// the mirror element, which is used to calculate what size the mirrored element should be.
-	mirror = $(copy).data('autosize', true)[0];
-
-	// test that line-height can be accurately copied.
-	mirror.style.lineHeight = '99px';
-	if ($(mirror).css('lineHeight') === '99px') {
-		typographyStyles.push('lineHeight');
-	}
-	mirror.style.lineHeight = '';
-
-	$.fn.autosize = function (options) {
-		options = $.extend({}, defaults, options || {});
-
-		if (mirror.parentNode !== document.body) {
-			$(document.body).append(mirror);
-		}
-
-		return this.each(function () {
-			var
-			ta = this,
-			$ta = $(ta),
-			maxHeight,
-			minHeight,
-			boxOffset = 0,
-			callback = $.isFunction(options.callback),
-			originalStyles = {
-				height: ta.style.height,
-				overflow: ta.style.overflow,
-				overflowY: ta.style.overflowY,
-				wordWrap: ta.style.wordWrap,
-				resize: ta.style.resize
-			},
-			timeout,
-			width = $ta.width();
-
-			if ($ta.data('autosize')) {
-				// exit if autosize has already been applied, or if the textarea is the mirror element.
-				return;
-			}
-			$ta.data('autosize', true);
-
-			if ($ta.css('box-sizing') === 'border-box' || $ta.css('-moz-box-sizing') === 'border-box' || $ta.css('-webkit-box-sizing') === 'border-box'){
-				boxOffset = $ta.outerHeight() - $ta.height();
-			}
-
-			// IE8 and lower return 'auto', which parses to NaN, if no min-height is set.
-			minHeight = Math.max(parseInt($ta.css('minHeight'), 10) - boxOffset || 0, $ta.height());
-
-			$ta.css({
-				overflow: 'hidden',
-				overflowY: 'hidden',
-				wordWrap: 'break-word', // horizontal overflow is hidden, so break-word is necessary for handling words longer than the textarea width
-				resize: ($ta.css('resize') === 'none' || $ta.css('resize') === 'vertical') ? 'none' : 'horizontal'
-			});
-
-			// The mirror width must exactly match the textarea width, so using getBoundingClientRect because it doesn't round the sub-pixel value.
-			function setWidth() {
-				var style, width;
-
-				if ('getComputedStyle' in window) {
-					style = window.getComputedStyle(ta);
-					width = ta.getBoundingClientRect().width;
-
-					$.each(['paddingLeft', 'paddingRight', 'borderLeftWidth', 'borderRightWidth'], function(i,val){
-						width -= parseInt(style[val],10);
-					});
-
-					mirror.style.width = width + 'px';
-				}
-				else {
-					// window.getComputedStyle, getBoundingClientRect returning a width are unsupported and unneeded in IE8 and lower.
-					mirror.style.width = Math.max($ta.width(), 0) + 'px';
-				}
-			}
-
-			function initMirror() {
-				var styles = {};
-
-				mirrored = ta;
-				mirror.className = options.className;
-				maxHeight = parseInt($ta.css('maxHeight'), 10);
-
-				// mirror is a duplicate textarea located off-screen that
-				// is automatically updated to contain the same text as the
-				// original textarea.  mirror always has a height of 0.
-				// This gives a cross-browser supported way getting the actual
-				// height of the text, through the scrollTop property.
-				$.each(typographyStyles, function(i,val){
-					styles[val] = $ta.css(val);
-				});
-				$(mirror).css(styles);
-
-				setWidth();
-
-				// Chrome-specific fix:
-				// When the textarea y-overflow is hidden, Chrome doesn't reflow the text to account for the space
-				// made available by removing the scrollbar. This workaround triggers the reflow for Chrome.
-				if (window.chrome) {
-					var width = ta.style.width;
-					ta.style.width = '0px';
-					var ignore = ta.offsetWidth;
-					ta.style.width = width;
-				}
-			}
-
-			// Using mainly bare JS in this function because it is going
-			// to fire very often while typing, and needs to very efficient.
-			function adjust() {
-				var height, original;
-
-				if (mirrored !== ta) {
-					initMirror();
-				} else {
-					setWidth();
-				}
-
-				mirror.value = ta.value + options.append;
-				mirror.style.overflowY = ta.style.overflowY;
-				original = parseInt(ta.style.height,10);
-
-				// Setting scrollTop to zero is needed in IE8 and lower for the next step to be accurately applied
-				mirror.scrollTop = 0;
-
-				mirror.scrollTop = 9e4;
-
-				// Using scrollTop rather than scrollHeight because scrollHeight is non-standard and includes padding.
-				height = mirror.scrollTop;
-
-				if (maxHeight && height > maxHeight) {
-					ta.style.overflowY = 'scroll';
-					height = maxHeight;
-				} else {
-					ta.style.overflowY = 'hidden';
-					if (height < minHeight) {
-						height = minHeight;
-					}
-				}
-
-				height += boxOffset;
-
-				if (original !== height) {
-					ta.style.height = height + 'px';
-					if (callback) {
-						options.callback.call(ta,ta);
-					}
-				}
-			}
-
-			function resize () {
-				clearTimeout(timeout);
-				timeout = setTimeout(function(){
-					var newWidth = $ta.width();
-
-					if (newWidth !== width) {
-						width = newWidth;
-						adjust();
-					}
-				}, parseInt(options.resizeDelay,10));
-			}
-
-			if ('onpropertychange' in ta) {
-				if ('oninput' in ta) {
-					// Detects IE9.  IE9 does not fire onpropertychange or oninput for deletions,
-					// so binding to onkeyup to catch most of those occasions.  There is no way that I
-					// know of to detect something like 'cut' in IE9.
-					$ta.on('input.autosize keyup.autosize', adjust);
-				} else {
-					// IE7 / IE8
-					$ta.on('propertychange.autosize', function(){
-						if(event.propertyName === 'value'){
-							adjust();
-						}
-					});
-				}
-			} else {
-				// Modern Browsers
-				$ta.on('input.autosize', adjust);
-			}
-
-			// Set options.resizeDelay to false if using fixed-width textarea elements.
-			// Uses a timeout and width check to reduce the amount of times adjust needs to be called after window resize.
-
-			if (options.resizeDelay !== false) {
-				$(window).on('resize.autosize', resize);
-			}
-
-			// Event for manual triggering if needed.
-			// Should only be needed when the value of the textarea is changed through JavaScript rather than user input.
-			$ta.on('autosize.resize', adjust);
-
-			// Event for manual triggering that also forces the styles to update as well.
-			// Should only be needed if one of typography styles of the textarea change, and the textarea is already the target of the adjust method.
-			$ta.on('autosize.resizeIncludeStyle', function() {
-				mirrored = null;
-				adjust();
-			});
-
-			$ta.on('autosize.destroy', function(){
-				mirrored = null;
-				clearTimeout(timeout);
-				$(window).off('resize', resize);
-				$ta
-					.off('autosize')
-					.off('.autosize')
-					.css(originalStyles)
-					.removeData('autosize');
-			});
-
-			// Call adjust in case the textarea already contains text.
-			adjust();
-		});
-	};
-}));