wagn 1.16.3 → 1.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7e2d9d01c35b78795669c2b84b2d55b0ad7fb0b
-  data.tar.gz: 4861c0153a993c85dcf1ae6764ec97ba20348fbf
+  metadata.gz: b994654d5455a17be2d4964721aa5a375fff357d
+  data.tar.gz: 1813186fec88f14a7f7cfdf2a4240348878408f2
 SHA512:
-  metadata.gz: 97e0b8eb2f9bbb194163c2632ae57915703b1c849eb4956f605bda17be48ed392ce15653484eecf591b3d0514ad12a9ec9e0e496edded2961eaeb03fea7e0114
-  data.tar.gz: 6a863fb25d8df6e19f10033148f9c9d41274100691b0857671a27ad9ea5b3980f5aec370ce2bc1dc9a313c69927bce09b3eee947cf7e223ee781aa8d4c92aadc
+  metadata.gz: 79ca207fd0ebb9c1e1b0a7ff371a0601fd1c22b87a08e77e488a33af61f942fe9bd08087390fc1964eca25a9bdb53736b96cf62152d9b135443f4efc804bf31d
+  data.tar.gz: 622f2bb924ab6657523bf1dd6f7e13e8f700c27076165304dd186175f4587905d6b3439e82ee5ad2e43f5ff0fea2cb3c298ea43ee614ad67cbb34f98a4bced90

data/features/attach.feature

@@ -0,0 +1,44 @@
+@javascript
+Feature: Conflict
+  I want to be able to upload files and images.
+
+  Background:
+    Given I am signed in as Joe Admin
+
+  Scenario: Uploading a file
+    When I go to new File
+    And I upload the file "file.txt"
+    And I wait a sec
+    Then I should see "file.txt 9 Bytes"
+    When I press "Delete"
+    Then I should see "Add file..."
+    When I upload the file "file.txt"
+    And I wait a sec
+    And I fill in "card_name" with "a test file"
+    And I press "Submit"
+    Then I should see "Download a test file"
+
+  Scenario: Uploading and changing an image
+    When I go to new Image
+    And I upload the image "image.png"
+    And I wait a sec
+    Then I should see "image.png 34.3 KB"
+    And I fill in "card_name" with "a test image"
+    And I press "Submit"
+    Then I should see an image of size "large" and type "png"
+    And I edit "a test image"
+    And I upload the image "image2.jpg"
+    And I wait a sec
+    Then I should see "image2.jpg 69.8 KB"
+    And I press "Submit"
+    Then I should see an image of size "large" and type "jpg"
+
+  Scenario: Changing a mod image
+    When I edit "*logo"
+    And I upload the image "image2.jpg"
+    And I wait a sec
+    Then I should see "image2.jpg 69.8 KB"
+    And I press "Submit"
+    Then I should see an image of size "large" and type "jpg"
+
+

data/features/step_definitions/wagn_steps.rb

@@ -125,6 +125,12 @@ When /^(?:|I )enter "([^"]*)" into "([^"]*)"$/ do |value, field|
   find( selector ).set value
 end
 
+When /^(?:|I )upload the (.+) "(.+)"$/ do |attachment_name, filename|
+  script = "$('input[type=file]').css('opacity','1');"
+  page.driver.browser.execute_script(script)
+  attach_file("card_#{attachment_name}", File.join(Wagn.gem_root,'features', 'support', filename))
+end
+
 Given /^(.*) (is|am) watching "([^\"]+)"$/ do |user, verb, cardname|
   user = Card::Auth.current.name if user == "I"
   signed_in_as user do
@@ -312,6 +318,14 @@ Then /^I should see$/ do |text|
   expect(page).to have_content(text)
 end
 
+Then /^I should see a preview image of size (.+)$/ do |size|
+  find("span.preview img[src*='#{size}.png']")
+end
+
+Then /^I should see an image of size "(.+)" and type "(.+)"$/ do |size, type|
+  find("img[src*='#{size}.#{type}']")
+end
+
 Then /^I should see "([^\"]*)" in color (.*)$/ do |text, css_class|
   page.has_css?(".diff-#{css_class}", text: text)
 end

data/features/step_definitions/web_steps.rb

@@ -46,6 +46,7 @@ When /^(?:|I )select "([^"]*)" from "([^"]*)"$/ do |value, field|
   select(value, :from => field)
 end
 
+
 # Use this step in conjunction with Rail's datetime_select helper. For example:
 # When I select "December 25, 2008 10:00" as the date and time
 When /^(?:|I )select "([^"]*)" as the date and time$/ do |time|

data/features/support/file.txt

@@ -0,0 +1 @@
+test file

data/lib/wagn/application.rb

@@ -20,15 +20,6 @@ module Wagn
       end
     end
 
-=begin
-    initializer :load_wagn_config_initializers,  :before => :load_config_initializers do
-      add_path paths, 'lib/wagn/config/initializers', :glob => "**/*.rb"
-      config.paths['lib/wagn/config/initializers'].existent.sort.each do |initializer|
-        load(initializer)
-      end
-    end
-=end
-
     class << self
       def inherited(base)
         super

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

@@ -214,7 +214,9 @@ class WagnGenerator < Rails::Generators::AppBase
       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'."
+      puts "Now:
+1. Run `wagn seed` to seed your database (see db configuration in config/database.yml).
+2. Run `wagn server` to start your server"
     end
   end
 

data/lib/wagn/tasks/wagn.rake

@@ -73,6 +73,7 @@ namespace :wagn do
 
   desc "update wagn gems and database"
   task :update do
+    ENV['NO_RAILS_CACHE'] = 'true'
     #system 'bundle update'
     if Wagn.paths["tmp"].existent
       FileUtils.rm_rf Wagn.paths["tmp"].first, :secure=>true
@@ -100,6 +101,7 @@ namespace :wagn do
 
   desc "migrate structure and cards"
   task :migrate => :environment do
+    ENV['NO_RAILS_CACHE'] = 'true'
     ENV['SCHEMA'] ||= "#{Cardio.gem_root}/db/schema.rb"
 
     stamp = ENV['STAMP_MIGRATIONS']
@@ -321,7 +323,7 @@ namespace :wagn do
       # mark mod files as mod files
       Card::Auth.as_bot do
         Card.search( :type=>['in', 'Image', 'File'], :ne=>'' ).each do |card|
-          if card.mod_file?
+          if card.mod_file? || card.codename == 'new_file' || card.codename == 'new_image'
             puts "skipping #{card.name}: already in code"
             next
           else

data/rails/controllers/card_controller.rb

@@ -19,10 +19,14 @@ class CardController < ActionController::Base
   before_filter :load_id, :only => [ :read ]
   before_filter :load_card, :except => [:asset]
   before_filter :refresh_card, :only=> [ :create, :update, :delete, :rollback ]
+  before_filter :init_success_object, :only => [ :create, :update, :delete ]
+
+
 
   layout nil
 
   attr_reader :card
+  attr_accessor :success
 
 
 
@@ -44,7 +48,9 @@ class CardController < ActionController::Base
 
   def delete
     discard_locations_for card #should be an event
-    params[:success] ||= 'REDIRECT: *previous'
+    if @success.target == card
+      @success.target = :previous
+    end
     handle { card.delete }
   end
 
@@ -119,15 +125,19 @@ class CardController < ActionController::Base
       end
     raise Card::NotFound unless @card
 
-    card.select_action_by_params params
+    @card.select_action_by_params params
     Card::Env[:main_name] = params[:main] || (card && card.name) || ''
 
     render_errors if card.errors.any?
     true
   end
 
+  def init_success_object
+    @success = Card::Env[:success] = Card::Success.new(@card.cardname, params[:success])
+  end
+
   def refresh_card
-    @card =  card.refresh
+    @card = card.refresh
   end
 
   def request_logger
@@ -184,50 +194,23 @@ class CardController < ActionController::Base
   end
 
   def handle
-    yield ? success : render_errors
+    yield ? render_success : render_errors
   end
 
-
-
-  # success param:
-  # if nothing card is self
-  def success
-    redirect, new_params = !ajax?, {}
-
-    target = case params[:success]
-      when nil  ;  '_self'
-      when Hash
-        new_params = params[:success]
-        redirect ||= !!(new_params.delete :redirect)
-        new_params.delete :id
-      when /^REDIRECT:\s*(.+)/
-        redirect=true
-        $1
-      else      ;   params[:success]
-      end
-
-    target = case target
-      when '*previous'     ;  previous_location #could do as *previous
-      when /^(http|\/)/    ;  target
-      when /^TEXT:\s*(.+)/ ;  $1
-      when ''              ;  ''
-      else                 ;  Card.fetch target.to_name.to_absolute(card.cardname), :new=>{}
-      end
-
-    case
-    when redirect
-      target = page_path target.cardname, new_params if Card === target
-      card_redirect target
-    when String===target
-      render :text => target
+  def render_success
+    @success.name_context = @card.cardname
+    if !ajax? || @success.hard_redirect?
+      card_redirect @success.to_url
+    elsif String === @success.target
+      render :text => @success.target
     else
-      @card = target
-      #Card::Env[:params] =
-      if new_params.delete :soft_redirect
-        self.params = new_params
+      if @success.soft_redirect?
+        self.params = @success.params
       else
-        self.params.merge! new_params # #need tests. insure we get slot, main...
+        self.params.merge! @success.params # #need tests. insure we get slot, main...
       end
+      @card = @success.target
+      @card.select_action_by_params params
       show
     end
   end

data/spec/controllers/card_controller_spec.rb

@@ -279,6 +279,7 @@ describe CardController do
         get :read, :id=>'mao2', :format=>'jpg'
         assert_response 200
       end
+
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wagn
 version: !ruby/object:Gem::Version
-  version: 1.16.3
+  version: 1.16.4
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-23 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -33,14 +33,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.16.3
+        version: 1.16.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.16.3
+        version: 1.16.4
 description: a wiki approach to stuctured data, dynamic interaction, and web design
 email:
 - info@wagn.org
@@ -77,6 +77,7 @@ files:
 - app/assets/javascripts/jquery.iframe-transport.js
 - app/assets/javascripts/jquery.ui.autocomplete.html.js
 - bin/wagn
+- features/attach.feature
 - features/autonaming.feature
 - features/conflict.feature
 - features/flexmail.feature
@@ -98,6 +99,9 @@ files:
 - features/step_definitions/window_steps.rb
 - features/structure.feature
 - features/support/env.rb
+- features/support/file.txt
+- features/support/image.png
+- features/support/image2.jpg
 - features/support/paths.rb
 - features/support/scopes.rb
 - features/support/wagn_env.rb
@@ -754,6 +758,7 @@ signing_key:
 specification_version: 4
 summary: structured wiki web platform
 test_files:
+- features/attach.feature
 - features/autonaming.feature
 - features/conflict.feature
 - features/flexmail.feature
@@ -775,6 +780,9 @@ test_files:
 - features/step_definitions/window_steps.rb
 - features/structure.feature
 - features/support/env.rb
+- features/support/file.txt
+- features/support/image.png
+- features/support/image2.jpg
 - features/support/paths.rb
 - features/support/scopes.rb
 - features/support/wagn_env.rb