wagn 1.15.7 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f3588c3977600f8ff624293a399107540906264
-  data.tar.gz: c3924c308a7f3d3378e5ac10464ef215379593f8
+  metadata.gz: 93d49fa7d1579cf958f00854309f3e7997242523
+  data.tar.gz: 5532cef0c6bf94de50006763ede9d58457d9190e
 SHA512:
-  metadata.gz: b30cb5fff15f670cc4527dc2a5267ae79aea9bf7db6a4bb8a8859ffcafa988798de01be2257cc08aab2880b2dfd321bb7130e88388ee02f5f158248bc42ffce4
-  data.tar.gz: fe7288bf0791c922aece0d94afca8c318633a16d84f414f5599cb08e829218aa79c0b3dcf7a484626a3ab84ba5a91408115318b50b656011f0f4d41aae0dad45
+  metadata.gz: 6b0c051fede97df0360f153491992e1710e5e8c0aa86211a42d7e59f83cad055b67e8b85a10a743e8eb3951ee441cd7cdfbb0e02994ae0ef63586c73fd7be03f
+  data.tar.gz: 6282214671c13d7d32d0b8d494008b1ac91750ae93d9ade65d5606b28786afb715be51d381a7afbc72d9485569dcd9c5351ddc3701a2f06bd3c9a97e3beb495b

data/features/conflict.feature

@@ -6,7 +6,7 @@ Feature: Conflict
   Background:
     Given I am signed in as Joe Admin
     And I create Phrase card "Duck Soup" with content "Laurel and Hardy"
-  
+
   Scenario: Two edits on a card at the same time
     When I edit "Duck Soup" filling in "Stan Hardy"
     And I open a new window for Joe User
@@ -16,7 +16,7 @@ Feature: Conflict
     # We resign-in as Joe Admin in Joe User's window so that we submit Joe Admin's edit as Joe Admin
     And I am signed out
     And I wait a sec
-    And I am signed in as Joe Admin  
+    And I am signed in as Joe Admin
     And I close window
     And I submit
     Then I should see "Conflict!"
@@ -34,7 +34,7 @@ Feature: Conflict
     And I close window
     And I submit
     Then I should see "Conflict!"
-    And I should see "No difference between your changes and Joe User's version."
+    #And I should see "No difference between your changes and Joe User's version."
 
 
 

data/features/follow.feature

@@ -19,7 +19,8 @@ Feature: Follow interface
     And I open the main card menu
     And In the main card menu I should not see "unfollow"
     And In the main card menu I click "follow"
-    And I follow "Close"
+    And I wait a sec
+    And I close the modal window
     And I wait a sec
     And I open the main card menu
     Then In the main card menu I should see "unfollow"
@@ -31,7 +32,8 @@ Feature: Follow interface
     And I am on the homepage
     And I open the main card menu
     And In the main card menu I click "unfollow"
-    And I follow "Close"
+    And I wait a sec
+    And I close the modal window
     And I wait a sec
     And I open the main card menu
     Then In the main card menu I should see "follow"

data/features/layouts.feature

@@ -12,7 +12,7 @@ Feature: Layouts
     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  
+    And I wait a sec
 
   Scenario: I visit a Basic card with the simple layout
     When I go to card "*account links"

data/features/rules.feature

@@ -1,4 +1,4 @@
-Feature: Set-based Rules
+Feature: Set-based Rles
   In order to control settings in an efficient way
   As a Wagneer
   I want to be able to control rules for sets of cards
@@ -10,7 +10,7 @@ Feature: Set-based Rules
   Scenario: default setting and plus card override
     Given I create Phrase card "color+*right+*add help" with content "If colorblind, leave blank"
     And I am signed in as Joe User
-    When I go to new card "Test"
+    When I go to new card named "Test"
     Then I should see "spicy"
     When I go to new card "Test+color"
     Then I should see "colorblind"

data/features/signup.feature

@@ -10,7 +10,7 @@ Feature: Signing up
     Given Joe Admin creates Pointer card "User+*type+*create" with content "[[Anyone]]"
     And I am signed out
     #This is the needed permission configuration to allow signups without approval
-    
+
     When I go to the home page
     And I follow "Sign up"
     And I fill in "card_name" with "Wanna B"
@@ -19,20 +19,21 @@ Feature: Signing up
     And I press "Submit"
     Then I should see "Signup Success"
     And "wanna@wagn.org" should receive an email with subject "verification link for My Wagn"
-    
+
     When I open the email
     And I click the first link in the email
     Then I should see "Wanna B"
-    
-    When I follow "Sign out"
+
+    When I go to the home page
+    And I follow "Sign out"
     Then I should not see "Wanna B"
-    
+
     When I follow "Sign in"
     And I enter "wanna@wagn.org" into "*email"
     And I enter "wanna_pass" into "*password"
     And I press "Sign in"
     Then I should see "Wanna B"
-  
+
   Scenario: Signing up with approval
     #When I go to card "AccountRequest"
     #And In the main card content I click "Wanna B"
@@ -42,6 +43,6 @@ Feature: Signing up
     #Then I should see "Success"
     #When I go to card "Wanna B"
     #Then I should see "life story"
-    
+
     #Then I should see "sent"
 

data/features/step_definitions/wagn_steps.rb

@@ -68,7 +68,6 @@ When /^(.*) edits? "([^\"]*)" entering "([^\"]*)" into wysiwyg$/ do |username, c
   end
 end
 
-
 When /^(.*) edits? "([^\"]*)" setting (.*) to "([^\"]*)"$/ do |username, cardname, field, content|
   signed_in_as(username) do
     visit "/card/edit/#{cardname.to_name.url_key}"
@@ -94,7 +93,7 @@ end
 
 When /^(.*) creates?\s*a?\s*([^\s]*) card "(.*)" with content "(.*)"$/ do |username, cardtype, cardname, content|
   create_card(username, cardtype, cardname, content) do
-    normal_textarea_card_type = ["JavaScript","CoffeeScript","HTML","CSS","SCS","Search"]
+    normal_textarea_card_type = ["JavaScript","CoffeeScript","HTML","CSS","SCSS","Search"]
     if not normal_textarea_card_type.include? cardtype or not page.evaluate_script "typeof ace != 'undefined'"
       fill_in("card[content]", :with=>content)
     else
@@ -164,8 +163,6 @@ Then /debug/ do
   nil
 end
 
-
-
 def create_card(username,cardtype,cardname,content="")
   signed_in_as(username) do
     if cardtype=='Pointer'
@@ -218,6 +215,10 @@ When /^I open the main card menu$/ do
   page.find('#main .menu-slot .card-menu a').click
 end
 
+When /^I close the modal window$/ do
+  page.find('.modal-menu .close-modal').click
+end
+
 When /^I pick (.*)$/ do |menu_item|
 end
 

data/features/structure.feature

@@ -11,11 +11,10 @@ Feature: Structure Rules
 
   Scenario: New structured card
     When I edit "Movie+*type+*structure"
-    And I should see "{{+lead}}"
+    Then I should see "{{+lead}}"
     When I go to new Movie
     Then I should see "+director"
     And I should see "+lead"
-    #And I should see "[+lead]"
 
   Scenario: Create and edit templated card
     When I create Movie card "Star Wars" with plusses:

data/features/support/paths.rb

@@ -31,7 +31,7 @@ module NavigationHelpers
       "/card/new?card[name]=#{CGI.escape($1)}"
 
     when /edit (.*)$/
-   "/#{$1.to_name.url_key}?view=edit"
+      "/#{$1.to_name.url_key}?view=edit"
 
     when /new (.*)$/
       "/new/#{$1.to_name.url_key}"

data/lib/decko/engine.rb

@@ -1,5 +1,6 @@
 
 require 'rails/all'
+require 'activerecord/session_store'
 require 'cardio'
 
 # TODO: Move these to modules that use them
@@ -20,7 +21,7 @@ module Decko
 
     paths.add "app/controllers", :with => 'rails/controllers', :eager_load => true
     paths.add 'gem-assets',      :with => 'rails/assets'
-    paths.add 'config/routes',   :with => 'rails/engine-routes.rb'
+    paths.add 'config/routes.rb',   :with => 'rails/engine-routes.rb'
     paths.add 'lib/tasks',       :with => "#{::Wagn.gem_root}/lib/wagn/tasks", :glob => '**/*.rake'
     paths.add 'lib/wagn/config/initializers',
               :with => File.join( Wagn.gem_root, 'lib/wagn/config/initializers' ), :glob => "**/*.rb"
@@ -42,7 +43,7 @@ module Decko
 
     initializer :connect_on_load do
       ActiveSupport.on_load(:active_record) do
-        ActiveRecord::Base.establish_connection(::Rails.env)
+        ActiveRecord::Base.establish_connection(::Rails.env.to_sym)
       end
       ActiveSupport.on_load(:after_initialize) do
           begin

data/lib/wagn/application.rb

@@ -9,14 +9,6 @@ if defined?(Bundler)
   # Bundler.require(:default, :assets, Rails.env)
 end
 
-module ActiveSupport::BufferedLogger::Severity
-  WAGN = UNKNOWN + 1
-  
-  def wagn progname, &block
-    add(WAGN, nil, progname, &block)
-  end
-end
-
 
 module Wagn
   class Application < Rails::Application
@@ -39,19 +31,18 @@ module Wagn
 
     class << self
       def inherited(base)
-        Rails.application = base.instance
-        Rails.application.add_lib_to_load_path!
+        super
+        Rails.app_class = base
+        add_lib_to_load_path!(find_root(base.called_from))
         ActiveSupport.run_load_hooks(:before_configuration, base.instance)
       end
     end
 
     def add_path paths, path, options={}
       root = options.delete(:root) || Wagn.gem_root
-      gem_path = File.join( root, path )
-      with = options.delete(:with)
-      with = with ? File.join(root, with) : gem_path
-      #warn "add gem path #{path}, #{with}, #{gem_path}, #{options.inspect}"
-      paths[path] = Rails::Paths::Path.new(paths, gem_path, with, options)
+      #gem_path = File.join( root, path )
+      options[:with] = File.join(root, (options[:with] || path) )
+      paths.add path, options
     end
 
 
@@ -62,7 +53,7 @@ module Wagn
         Cardio.set_config config
 
         config.i18n.enforce_available_locales = true
-
+        #config.active_record.raise_in_transactional_callbacks = true
 
         config.assets.enabled = false
         config.assets.version = '1.0'
@@ -81,7 +72,7 @@ module Wagn
         config
       end
     end
-    
+
     def paths
       @paths ||= begin
         paths = super
@@ -93,12 +84,11 @@ module Wagn
         paths['app/models'] = []
         paths['app/mailers'] = []
 
-        add_path paths, 'config/routes', :with => 'rails/application-routes.rb'
+        add_path paths, 'config/routes.rb', :with => 'rails/application-routes.rb'
 
         paths
       end
     end
-
   end
 end
 

data/lib/wagn/config/environments/cucumber.rb

@@ -3,6 +3,8 @@ Wagn.application.class.configure do
   # Edit at your own peril - it's recommended to regenerate this file
   # in the future when you upgrade to a newer version of Cucumber.
 
+  config.eager_load = false
+
   # IMPORTANT: Setting config.cache_classes to false is known to
   # break Cucumber's use_transactional_fixtures method.
   # For more information see https://rspec.lighthouseapp.com/projects/16211/tickets/165

data/lib/wagn/config/environments/development.rb

@@ -9,6 +9,8 @@ end
 Wagn.application.class.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
+  config.eager_load = false
+
   # In the development environment your application's code is reloaded on
   # every request.  This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
@@ -21,8 +23,8 @@ Wagn.application.class.configure do
       skip /view\=status/
     end
   end
-  
-  
+
+
   # Log error messages when you accidentally call methods on nil.
   config.whiny_nils = true
 
@@ -38,38 +40,37 @@ Wagn.application.class.configure do
 
   # See everything in the log (default is :info)
   config.log_level = :debug
-  
-  #change log_level to :wagn to activate performance logger
+
+  config.active_record.raise_in_transactional_callbacks = true
+
   # config.performance_logger = {
-  #     :methods => [:event, :search, :fetch, :view],  # choose methods to log
-  #     :min_time => 100,                              # show only method calls that are slower than 100ms
+  #     :methods   => [:event, :search, :fetch, :view],  # choose methods to log
+  #     :min_time  => 100,                              # show only method calls that are slower than 100ms
   #     :max_depth => 3,                               # show nested method calls only up to depth 3
-  #     :details=> true                                # show method arguments and sql
+  #     :details   => true                                # show method arguments and sql
+  #     :log_level => :info
   # }
-  
+
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
   # Do not compress assets
   # config.assets.compress = false
-# 
+#
 #   # Expands the lines which load the assets
 #   config.assets.debug = false
-# 
+#
 #   # This needs to be on for tinymce to work, because several important files (themes, etc) are only served statically
-#   config.serve_static_assets = ENV['STATIC_ASSETS'] || true
-# 
+#   config.serve_static_files = ENV['STATIC_ASSETS'] || true
+#
 #   # Setting a bogus directory so rails won't find public/assets in dev mode.
 #   # Normally you could skip that by not serving static assets, but that breaks tinymce (see above)
 #   config.assets.prefix = "dynamic-assets"
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
-  
+#  config.active_record.auto_explain_threshold_in_seconds = 0.5
+
 
   #  if File.exists?(File.join(Rails.root,'tmp', 'debug.txt'))
 #    require 'ruby-debug'
@@ -79,7 +80,7 @@ Wagn.application.class.configure do
 #  end
 
   config.action_mailer.perform_deliveries = false
-  
+
   # Use Pry instead of IRB
   silence_warnings do
     begin
@@ -91,4 +92,4 @@ Wagn.application.class.configure do
 end
 
 
-
+#Paperclip.options[:command_path] = "/opt/local/bin"

data/lib/wagn/config/environments/production.rb

@@ -2,6 +2,8 @@
 Wagn.application.class.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
+  config.eager_load = true
+
   # Code is not reloaded between requests
   config.cache_classes = true
 
@@ -10,7 +12,7 @@ Wagn.application.class.configure do
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = defined?( Rails::Server )
+  config.serve_static_files = defined?( Rails::Server )
 
   # Compress JavaScripts and CSS
   config.assets.compress = true
@@ -32,7 +34,7 @@ Wagn.application.class.configure do
   # config.force_ssl = true
 
   # See everything in the log (default is :info)
-  # config.log_level = :debug
+  config.log_level = :info
 
   # Use a different logger for distributed setups
   # config.logger = SyslogLogger.new

data/lib/wagn/config/environments/profile.rb

@@ -6,6 +6,8 @@ Wagn.application.class.configure do
   # approximation of performance.  However, it should
   # definitely not use the production databse!
 
+  config.eager_load = true
+
   # Cache classes - otherwise your code
   # will run approximately 5 times slower and the
   # profiling results will be overwhelmed by Rails

data/lib/wagn/config/environments/test.rb

@@ -2,6 +2,8 @@
 Wagn.application.class.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
+  config.eager_load = false
+
   # The test environment is used exclusively to run your application's
   # test suite.  You never need to work with it otherwise.  Remember that
   # your test database is "scratch space" for the test suite and is wiped
@@ -12,7 +14,7 @@ Wagn.application.class.configure do
   config.assets.enabled = true if Object.const_defined?( :JasmineRails )
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
+  config.serve_static_files = true
   config.static_cache_control = "public, max-age=3600"
 
   # Log error messages when you accidentally call methods on nil
@@ -34,10 +36,10 @@ Wagn.application.class.configure do
   config.action_mailer.delivery_method = :test
   config.action_mailer.perform_deliveries = true
   config.action_mailer.default :charset=>"utf-8"
-  
+
   #config.action_mailer.delivery_method = :smtp
   #config.action_mailer.smtp_settings = { :address => "localhost", :port => 1025 }
-  
+
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper,
   # like if you have constraints or database-specific column types
@@ -49,7 +51,7 @@ Wagn.application.class.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
-  
+
   # Use Pry instead of IRB
   silence_warnings do
     begin

data/lib/wagn/config/initializers/secret_token.rb

@@ -7,3 +7,4 @@
 # no regular words or you'll be exposed to dictionary attacks.
 
 Wagn.config.secret_token = '65632e048d6c80d1e63c911e1a40a51072413543f3182e0261b52e3812b2c9f0ee81828fa5688a34c13a78e438a4b56f497135dc079a4e4460733d555968a2f8'
+Wagn.config.secret_key_base = '65632e048d6c80d1e63c911e1a40a51072413543f3182e0261b52e3812b2c9f0ee81828fa5688a34c13a78e438a4b56f497135dc079a4e4460733d555968a2f8'

data/lib/wagn/config/initializers/session_store.rb

@@ -6,4 +6,4 @@ Wagn.config.session_store :active_record_store
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information
 # (create the session table with "rails generate session_migration")
-# Cardio.config.session_store :active_record_store
+Cardio.config.session_store :active_record_store

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

@@ -7,7 +7,11 @@ gem 'card',        :path=>"<%= @gemfile_gem_path %>/card", :require => false
 gem 'wagn'
 <% end %>
 
-<%= database_gemfile_entry -%>
+gem '<%= database_gemfile_entry.name %>'<%= %(, '#{database_gemfile_entry.version}') if database_gemfile_entry.version -%>
+
+# Use Unicorn or Thin as server
+# gem 'unicorn'
+# gem 'thin'
 
 <% if options['mod-dev'] -%>
 group :test do
@@ -22,9 +26,12 @@ group :test, :development do
   gem 'jasmine-rails', :git=>"https://github.com/chuenlok/jasmine-rails.git"
   gem 'jasmine-jquery-rails'
   gem 'sprockets' # just so above works
-  # gem 'spring'
-  # gem 'spring-commands-rspec'
-  # gem 'spring-commands-cucumber'
+  <%- if spring_install? %>
+  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+  gem 'spring'
+  gem 'spring-commands-rspec'
+  gem 'spring-commands-cucumber'
+  <% end -%>
   # gem 'pry-rails'
   # gem 'pry-rescue'
   # gem 'pry-stack_explorer'
@@ -64,7 +71,7 @@ group :test do
   if RUBY_PLATFORM =~ /darwin/
     # gem 'terminal-notifier-guard', '~> 1.5'    # use growler notifications on macs
     # gem 'rspec-legacy_formatters'
-    # gem 'wagn-rspec-formatter', :path=>'/opt/wagn-rspec-formatter'
+    # gem 'wagn-rspec-formatter', :git=>'https://github.com/xithan/wagn-rspec-formatter.git'
   end
 
   # CUKES see features dir
@@ -79,22 +86,25 @@ group :test do
 
 
   gem 'email_spec'                             #
-  gem 'database_cleaner', '~> 0.7'             # used by cucumber for db transactions
+  gem 'database_cleaner', '~> 1.4'             # used by cucumber for db transactions
 
-  gem 'turn', "~>0.8.3", :require => false      # Pretty printed test output.  (version constraint is to avoid minitest requirement)
-  gem 'minitest', "~>4.0"
+  gem 'turn', :require => false      # Pretty printed test output.  (version constraint is to avoid minitest requirement)
+  gem 'minitest'
 end
 
 gem 'ruby-prof', :group=>:profile  # profiling
 
 group :development, :test do
+  <%- if spring_install? %>
+  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
   gem 'spring-commands-rspec'
   gem 'spring-commands-cucumber'
   gem 'spring-watcher-listen'
+  <% end -%>
   gem 'pry-rails'
   gem 'pry-rescue'
-  gem 'pry-stack_explorer'
+  # gem 'pry-stack_explorer'
   gem 'jasmine'
   gem 'jasmine-rails', :git=>"https://github.com/chuenlok/jasmine-rails.git"
   gem 'jasmine-jquery-rails'
@@ -107,6 +117,8 @@ group :debug do
 	else
 		gem 'debugger'
 	end
+  gem 'better_errors', :git=>"https://github.com/xithan/better_errors.git"
+  gem 'binding_of_caller'
 end
 <% end %>
 

data/lib/wagn/generators/wagn/wagn_generator.rb

@@ -6,27 +6,29 @@ class WagnGenerator < Rails::Generators::AppBase
 #class WagnGenerator < Rails::Generators::AppGenerator
 
   source_root File.expand_path('../templates', __FILE__)
-  
+
   argument :deck_path, :required=>false
 
   class_option :database, :type => :string, :aliases => "-d", :default => "mysql",
     :desc => "Preconfigure for selected database (options: #{DATABASES.join('/')})"
-    
-  class_option 'core-dev', :type => :boolean, aliases: '-c', :default => false, :group => :runtime, 
+
+  class_option 'core-dev', :type => :boolean, aliases: '-c', :default => false, :group => :runtime,
     desc: "Prepare deck for wagn core testing"
-    
-  class_option 'gem-path', :type => :string, aliases: '-g', :default => false, :group => :runtime, 
+
+  class_option 'gem-path', :type => :string, aliases: '-g', :default => false, :group => :runtime,
     desc: "Path to local gem installation (Default, use env WAGN_GEM_PATH)"
-    
-  class_option 'mod-dev', :type => :boolean, aliases: '-m', :default => false, :group => :runtime, 
+
+  class_option 'mod-dev', :type => :boolean, aliases: '-m', :default => false, :group => :runtime,
     desc: "Prepare deck for mod testing"
-    
-  class_option 'interactive', :type => :boolean, aliases: '-i', :default => false, :group => :runtime, 
+
+  class_option 'interactive', :type => :boolean, aliases: '-i', :default => false, :group => :runtime,
     desc: "Prompt with dynamic installation options"
-                        
+
+
+  public_task :set_default_accessors!
   public_task :create_root
-  
-## should probably eventually use rails-like AppBuilder approach, but this is a first step.  
+
+## should probably eventually use rails-like AppBuilder approach, but this is a first step.
   def dev_setup
     # TODO: rename or split, gem_path points to the source repo, card and wagn gems are subdirs
     @gemfile_gem_path = @gem_path = options['gem-path']
@@ -35,7 +37,7 @@ class WagnGenerator < Rails::Generators::AppBase
       @gemfile_gem_path = %q{#{ENV['WAGN_GEM_PATH']}}
       @gem_path = env_gem_path
     end
-    
+
     @include_jasmine_engine = false
     if options['core-dev']
       unless @gem_path
@@ -49,7 +51,7 @@ class WagnGenerator < Rails::Generators::AppBase
       inside 'spec' do
         copy_file File.join('javascripts', 'support', 'wagn_jasmine.yml'), File.join('javascripts', 'support','jasmine.yml')
       end
-      
+
       @features_path = File.join @gem_path, 'wagn/features/'  # ending slash is important in order to load support and step folders
       @simplecov_config = "card_core_dev_simplecov_filters"
     elsif options['mod-dev']
@@ -62,7 +64,7 @@ class WagnGenerator < Rails::Generators::AppBase
         copy_file File.join(  'javascripts', 'support', 'deck_jasmine.yml'), File.join('javascripts', 'support','jasmine.yml')
       end
     end
-    
+
     if options['core-dev'] || options['mod-dev']
       template "rspec", ".rspec"
       template "simplecov", ".simplecov"
@@ -80,23 +82,23 @@ class WagnGenerator < Rails::Generators::AppBase
 #  def readme
 #    copy_file "README", "README.rdoc"
 #  end
-  
+
   def mod
-    empty_directory_with_gitkeep 'mod'
+    empty_directory_with_keep_file 'mod'
   end
-  
+
   def log
-    empty_directory_with_gitkeep 'log'
+    empty_directory_with_keep_file 'log'
   end
-  
+
   def files
-    empty_directory_with_gitkeep 'files'
+    empty_directory_with_keep_file 'files'
   end
-  
+
   def tmp
     empty_directory 'tmp'
   end
-    
+
   def gemfile
     template "Gemfile"
   end
@@ -104,11 +106,11 @@ class WagnGenerator < Rails::Generators::AppBase
   def configru
     template "config.ru"
   end
-  
+
   def gitignore
     copy_file "gitignore", ".gitignore"
   end
-  
+
   def config
     empty_directory "config"
 
@@ -117,41 +119,41 @@ class WagnGenerator < Rails::Generators::AppBase
       template 'routes.erb', "routes.rb"
       template "environment.rb"
       template "boot.rb"
-      template "databases/#{options[:database]}.yml", "database.yml"  
+      template "databases/#{options[:database]}.yml", "database.yml"
       if options['core-dev']
         template "cucumber.yml"
       end
     end
   end
-  
+
   def public
     empty_directory "public"
-    
+
     inside "public" do
       template "robots.txt"
       empty_directory "files"
-    
+
       inside "files" do
         template "htaccess", ".htaccess"
       end
     end
   end
-  
+
   def script
     directory "script" do |content|
       "#{shebang}\n" + content
     end
     chmod "script", 0755 & ~File.umask, :verbose => false
   end
-  
+
   public_task :run_bundle
-  
+
   def seed_data
     if options['interactive']
 
       require File.join destination_root, 'config', 'application'  # need this for Rails.env
       menu_options = ActiveSupport::OrderedHash.new()
-      
+
       database_seeded = proc do
         menu_options['x'][:desc] = "exit"
         menu_options['r'] = {
@@ -160,67 +162,67 @@ class WagnGenerator < Rails::Generators::AppBase
           :code    => proc { system "cd #{destination_root} && wagn server" }
         }
       end
-      
-      menu_options['d'] = { 
+
+      menu_options['d'] = {
           :desc    => 'edit database configuration file',
           :command => 'nano config/database.yml',
           :code    =>  proc { system "nano #{File.join destination_root, 'config', 'database.yml'}" }
         }
-      menu_options['c'] =  { 
+      menu_options['c'] =  {
           :desc    => 'configure Wagn (e.g. email settings)',
           :command => 'nano config/application.rb',
           :code    =>  proc { system "nano #{File.join destination_root, 'config', 'application.rb'}" }
         }
-      menu_options['s'] =  { 
+      menu_options['s'] =  {
           :desc    => "seed #{Rails.env}#{ " and test" if options['core-dev'] or options['mod-dev']} database",
           :command => 'wagn seed',
           :code    => proc do
-            system("cd #{destination_root} && bundle exec rake wagn:seed") 
+            system("cd #{destination_root} && bundle exec rake wagn:seed")
             if options['core-dev'] or options['mod-dev']
-              system("cd #{destination_root} && RAILS_ENV=test bundle exec rake wagn:seed")  
+              system("cd #{destination_root} && RAILS_ENV=test bundle exec rake wagn:seed")
             end
             database_seeded.call
           end
         }
-      menu_options['a'] = { 
+      menu_options['a'] = {
           :desc    => 'seed all databases (production, development, and test)',
           :command => 'wagn seed --all',
           :code    => proc do
             %w( production development test ).each do |env|
-              system("cd #{destination_root} && RAILS_ENV=#{env} bundle exec rake wagn:seed")  
+              system("cd #{destination_root} && RAILS_ENV=#{env} bundle exec rake wagn:seed")
             end
             database_seeded.call
           end
         }
-      menu_options['x'] =  { 
-          :desc    => "exit (run 'wagn seed' to complete the installation later)" 
+      menu_options['x'] =  {
+          :desc    => "exit (run 'wagn seed' to complete the installation later)"
         }
-      
-      
+
+
       def build_menu options
         lines = ["What would you like to do next?"]
-        lines += options.map do |key, v| 
-          command = ' '*(65-v[:desc].size) + '[' + v[:command] + ']' if v[:command] 
+        lines += options.map do |key, v|
+          command = ' '*(65-v[:desc].size) + '[' + v[:command] + ']' if v[:command]
           "  #{key} - #{v[:desc]}#{command if command}"
         end
         lines << "[#{options.keys.join}]"
         "\n#{lines.join("\n")}\n"
       end
-      
-      while  (answer = ask(build_menu(menu_options))) != 'x'      
-        menu_options[answer][:code].call       
+
+      while  (answer = ask(build_menu(menu_options))) != 'x'
+        menu_options[answer][:code].call
       end
-      
+
     else
       puts "Review the database configuration in config/database.yml and run 'wagn seed' to complete the installation.\nStart the server with 'wagn server'."
     end
   end
-  
+
   protected
   def self.banner
      "wagn new #{self.arguments.map(&:usage).join(' ')} [options]"
   end
-  
+
   def mysql_socket
     @mysql_socket ||= [
       "/tmp/mysql.sock",                        # default
@@ -234,11 +236,11 @@ class WagnGenerator < Rails::Generators::AppBase
       "/opt/lampp/var/mysql/mysql.sock"         # xampp for linux
     ].find { |f| File.exist?(f) } unless RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
   end
-  
+
   ### the following is straight from rails and is focused on checking the validity of the app name.
   ### needs wagn-specific tuning
-  
-  
+
+
   def app_name
     @app_name ||= defined_app_const_base? ? defined_app_name : File.basename(destination_root)
   end
@@ -253,12 +255,12 @@ class WagnGenerator < Rails::Generators::AppBase
   end
 
   alias :defined_app_const_base? :defined_app_const_base
-  
+
   def app_const_base
     @app_const_base ||= defined_app_const_base || app_name.gsub(/\W/, '_').squeeze('_').camelize
   end
   alias :camelized :app_const_base
-  
+
   def app_const
     @app_const ||= "#{app_const_base}::Application"
   end

data/lib/wagn/mods_spec_helper.rb

@@ -3,7 +3,6 @@ require 'spork'
 
 ENV["RAILS_ENV"] = 'test'
 
-
 Spork.prefork do
     
   if ENV["RAILS_ROOT"]

data/lib/wagn/tasks/wagn.rake

@@ -105,7 +105,7 @@ namespace :wagn do
     stamp = ENV['STAMP_MIGRATIONS']
 
     puts 'migrating structure'
-    Rake::Task['db:migrate'].invoke
+    Rake::Task['wagn:migrate:structure'].invoke
     if stamp
       Rake::Task['wagn:migrate:stamp'].invoke :structure
     end
@@ -118,6 +118,7 @@ namespace :wagn do
       Rake::Task['wagn:migrate:stamp'].invoke :core_cards
     end
 
+
     puts 'migrating deck cards'
     Rake::Task['wagn:migrate:deck_cards'].execute #not invoke because we don't want to reload environment
     if stamp
@@ -137,9 +138,9 @@ namespace :wagn do
 
   namespace :migrate do
     desc "migrate cards"
-    task :cards do
+    task :cards => :environment do
       Rake::Task['wagn:migrate:core_cards'].invoke
-      Rake::Task['wagn:migrate:deck_cards'].invoke
+      Rake::Task['wagn:migrate:deck_cards'].execute
     end
 
     desc "migrate structure"
@@ -160,8 +161,8 @@ namespace :wagn do
       ENV['SCHEMA'] ||= "#{Cardio.gem_root}/db/schema.rb"
       prepare_migration
       paths = ActiveRecord::Migrator.migrations_paths = Cardio.migration_paths(:core_cards)
+      Cardio.schema_mode :core_cards do
 
-      Card::CoreMigration.schema_mode :core_cards do
         ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
         ActiveRecord::Migrator.migrate paths, ENV["VERSION"] ? ENV["VERSION"].to_i : nil
       end

data/rails/controllers/card_controller.rb

@@ -27,6 +27,9 @@ class CardController < ActionController::Base
   attr_reader :card
 
 
+
+
+
   #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   #  CORE METHODS
 
@@ -54,6 +57,7 @@ class CardController < ActionController::Base
     send_file_inside Decko::Engine.paths['gem-assets'].existent.first, [ params[:filename], params[:format] ].join('.'), :x_sendfile => true
   end
 
+
   private
 
   # make sure that filename doesn't leave allowed_path using ".."
@@ -219,7 +223,12 @@ class CardController < ActionController::Base
       render :text => target
     else
       @card = target
-      self.params = self.params.merge new_params #need tests.  insure we get slot, main...
+      #Card::Env[:params] =
+      if new_params.delete :soft_redirect
+        self.params = new_params
+      else
+        self.params.merge! new_params # #need tests. insure we get slot, main...
+      end
       show
     end
   end
@@ -235,8 +244,6 @@ class CardController < ActionController::Base
     show view, status
   end
 
-
-
   def show view = nil, status = 200
 #    ActiveSupport::Notifications.instrument('card', message: 'CardController#show') do
     format = request.parameters[:format]
@@ -246,7 +253,7 @@ class CardController < ActionController::Base
     view ||= params[:view]
 
     if params[:edit_draft] && card.drafts.present?
-      card.content = card.drafts.last.changes.last.value
+      card.content = card.drafts.last.card_changes.last.value
     end
     formatter = card.format(format.to_sym)
     result = formatter.show view, opts

data/rails/engine-routes.rb

@@ -1,49 +1,52 @@
 # -*- encoding : utf-8 -*-
 
+
 Decko::Engine.routes.draw do
 
   #most common
-  root                      :to => 'card#read', :via=>:get
-  match "#{ Decko::Engine.config.files_web_path }/:id(-:size)-:rev_id.:format" => 
-                                   'card#read', :via=>:get, :id => /[^-]+/, :explicit_file=>true
-  match "assets/*filename"      => 'card#asset', :via=>:get
-  match "javascripts/*filename" => 'card#asset', :via=>:get
-  match "jasmine/*filename"     => 'card#asset', :via=>:get
-  
-  
-  match 'recent(.:format)'      => 'card#read', :via=>:get, :id => ':recent' #obviate by making links use codename
-#  match ':view:(:id(.:format))'          => 'card#read', :via=>:get  
-  match '(/wagn)/:id(.:format)' => 'card#read', :via=>:get  #/wagn is deprecated
-  
+  root 'card#read'
+  get "#{ Decko::Engine.config.files_web_path }/:id(-:size)-:rev_id.:format" =>
+                                 'card#read', :id => /[^-]+/, :explicit_file=>true
+  get "assets/*filename"      => 'card#asset'
+  get "javascripts/*filename" => 'card#asset'
+  get "jasmine/*filename"     => 'card#asset'
+
+  get 'recent(.:format)'      => 'card#read', :id => ':recent' #obviate by making links use codename
+#  match ':view:(:id(.:format))'          => 'card#read', :via=>:get
+  get '(/wagn)/:id(.:format)' => 'card#read'  #/wagn is deprecated
+
+
   # RESTful
-  root              :to => 'card#create', :via=>:post
-  root              :to => 'card#update', :via=>:put
-  root              :to => 'card#delete', :via=>:delete
-  
+  post   '/' => 'card#create'
+  put    '/' => 'card#update'
+  delete '/' => 'card#delete'
+
   match ':id(.:format)' => 'card#create', :via=>:post
   match ':id(.:format)' => 'card#update', :via=>:put
   match ':id(.:format)' => 'card#delete', :via=>:delete
 
   # ~~~~~~~~~~~~~~~~~~~~~~~~~~
-  # legacy                                         
-  match 'new/:type'                  => 'card#read',   :view=>'new'
-  match 'card/:view(/:id(.:format))' => 'card#read',   :view=> /new|options|edit/
-                                                     
-  match 'account/signin'             => 'card#read',   :id=>':signin'
-  match 'account/signout'            => 'card#delete', :id=>':signin'
-  match 'account/signup'             => 'card#read',   :view=>'new',  :card=>{ :type_code=>:signup }
-  match 'account/invite'             => 'card#read',   :view=>'new',  :card=>{ :type_code=>:signup }
-  match 'account/accept'             => 'card#read',   :view=>'edit', :card=>{ :type_code=>:signup }
+  # legacy
+  get 'new/:type'                  => 'card#read',   :view=>'new'
+  get 'card/:view(/:id(.:format))' => 'card#read',   :view=> /new|options|edit/
+
+  get 'account/signin'             => 'card#read',   :id=>':signin'
+  get 'account/signout'            => 'card#delete', :id=>':signin'
+  get 'account/signup'             => 'card#read',   :view=>'new',  :card=>{ :type_code=>:signup }
+  get 'account/invite'             => 'card#read',   :view=>'new',  :card=>{ :type_code=>:signup }
+  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
 
-  match 'admin/stats'                => 'card#read',   :id=>':stats'
-  match 'admin/:task'                => 'card#update', :id=>':all' 
+  get 'admin/stats'                => 'card#read',   :id=>':stats'
+  get 'admin/:task'                => 'card#update', :id=>':all'
   # ~~~~~~~~~~~~~~~~~~~~~~~~~~
-  
-  # standard non-RESTful
-  match '(card)/:action(/:id(.:format))' => 'card', :action => /create|read|update|delete|asset/
 
+  # standard non-RESTful
+  get '(card)/:action(/:id(.:format))'  => 'card', :action => /create|read|update|delete|asset/
+  match '(card)/create(/:id(.:format))' => 'card#create', :via=>[:post, :patch]
+  match '(card)/update(/:id(.:format))' => 'card#update', :via=>[:post, :put, :patch]
+  match '(card)/delete(/:id(.:format))' => 'card#delete', :via=>:delete
   # other
-  match '*id' => 'card#read', :view => 'bad_address'
+  get '*id' => 'card#read', :view => 'bad_address'
 
 end

data/wagn.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version       = version
   s.authors       = ["Ethan McCutchen", "Lewis Hoffman", "Gerry Gleason", "Philipp Kühl"]
   s.email         = ['info@wagn.org']
-                  
+
 #  s.date          = '2013-12-20'
   s.summary       = "structured wiki web platform"
   s.description   = "a wiki approach to stuctured data, dynamic interaction, and web design"
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.license       = 'GPL'
 
   s.files         = `git ls-files`.split($/)
-  
+
   s.bindir        = 'bin'
   s.executables   = [ 'wagn' ]
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
@@ -24,10 +24,10 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.8.7'
 
   [
-    [ 'rails', '3.2.16'  ],
+    [ 'rails', '~> 4.2'  ],
     [ 'card',   version  ]
   ].each do |dep|
     s.add_runtime_dependency *dep
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wagn
 version: !ruby/object:Gem::Version
-  version: 1.15.7
+  version: 1.16.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,36 +11,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-15 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.16
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.16
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: card
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.7
+        version: 1.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.7
+        version: 1.16.0
 description: a wiki approach to stuctured data, dynamic interaction, and web design
 email:
 - info@wagn.org
@@ -794,3 +794,4 @@ test_files:
 - test/script/run_engine_deck.sh
 - test/script/run_mig.sh
 - test/test_helper.rb
+has_rdoc: