wagn 1.16.1 → 1.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 562986691cb64b35396b1ce5d0a90d98e08fb75b
-  data.tar.gz: 3f575bbdf992ef2e12ff84cc32b569460fb3a9b2
+  metadata.gz: ec97a5af91ccb5f9349031a4435c97aa14abdb77
+  data.tar.gz: 8e31f2ad73047d4e3d2d3f4f954aa5584c3e0922
 SHA512:
-  metadata.gz: 9ee03f9ff2d54e4b164444e7546702979662a076792649424ff068643b5bff73b0d94cee6e3165acb44149159b9a08e843036e077554dd06254f5b4416c0ed88
-  data.tar.gz: 6657ceb84e467ce75c60b941e687757609a31170ef88892f52cca2e678f7197d1b1e654e60221cb8e3ef96cb63782bffb54e16aaa84c0e6b6aed463806fb2484
+  metadata.gz: 7b3f2734bbf8c10be7b3f0ecb54262dcf4a871a6e312bd261a4cd1b618e897ce634d3a3fc17df4e2fdbedcec0e64f6f6e137add16341173f18e77c5a9609361b
+  data.tar.gz: b3376aac12150272e1cc8758b94e5e0ea3eef88bd74e5a60ab837ec3cb4271ef2964f58226d0e8a2c9672c41460ad6175a4fe2a288dd448d6e1bce8615286a83

data/README.rdoc

@@ -0,0 +1,104 @@
+=Wagn: how pioneers roll
+
+==Basics
+
+Wagn is serious web development made fun.
+
+"Wagneers" have used Wagn to create open community sites, private knowledge management sites, public proposal submission sites with private back-ends for review, project management systems, wikis, blogs, journals, forums, and more.
+
+Install Wagn, open a webpage, and get started. With Wagn's wiki-inspired building blocks, you can collaborate from day one on content, design, and structure create elegant web systems on the fly.  And ruby developers can take these creations even further with Wagn's development framework. Wagn's innovative Mods API supports boundless creativity while integrating seamlessly with structures created on the site.
+
+Try it out with automated setup at Cloudstore[https://cldstr.com/wagn.org/wagn] (free hosting for one trial month) or set it up yourself following the instructions below.
+
+
+==System Requirements
+
+Ruby[http://www.ruby-lang.org/en/]:: version 1.9.3 or higher
+Bundler[http://gembundler.com/]:: version 1.0 or higher
+ImageMagick[http://www.imagemagick.org/]::
+A database engine:: Either MySQL[http://www.mysql.com/] or PostgreSQL[http://www.postgresql.org/]
+Node.js[https://nodejs.org/]:: or another {JavaScript runtime}[https://github.com/sstephenson/execjs]
+
+==Installation
+
+===1. install the gem
+
+ gem install wagn
+
+Watch carefully for errors!
+
+
+===2. create a new wagn application
+
+  wagn new mysite
+
+
+===3. create / seed database
+
+Edit the config/database.yml file as necessary. More about database configuration at http://www.wagn.org/database_configuration.
+
+Then run
+
+  cd mysite
+  wagn seed
+
+..to create and seed the database
+
+
+===4. start your server
+
+To fire up the default, built-in WEBrick server, just run:
+
+  wagn server
+
+...and point your browser to http://localhost:3000 (unless otherwise configured).
+
+WEBrick is great for a quick test run.  To run a production website, see http://www.wagn.org/wagn_in_production.
+
+
+==Upgrading
+
+===Standard Upgrades
+
+====1. Backups
+Always back up your database and uploaded files.
+
+====2. Update Libraries
+
+From your wagn root directory run:
+
+  bundle update
+
+====3. Update Database
+
+Run the following:
+
+  wagn update
+
+====4. Restart your server.
+
+===Upgrading pre-gem Wagn sites
+
+First check the Wagn version of your existing site.
+
+====Version 1.10 or newer
+
+1. Create a new Wagn app using steps 1 and 2 from the installation section above.
+2. Copy config/database.yml from the old site to the new one.
+3. Copy the old local/files contents to the new "files" directory.
+4. If you have edited wagn.yml in your old site, make the corresponding changes to the new config/application.rb file.
+5. Follow the standard upgrade procedure above.
+
+====Older than Version 1.10
+
+First update your Wagn to version 1.10 via the old update mechanisms, and then follow the directions above.
+
+
+==More Resources
+
+If you're new to Wagn, you'll find lots more info at http://wagn.org
+
+If you're looking to go deep into the code, start with this introduction
+
+
+

data/features/follow.feature

@@ -50,6 +50,7 @@ Feature: Follow interface
     And I go to card Joe User
     And I open the main card menu
     Then In the main card menu I should see "(following)|unfollow"
+    And I wait a sec
 
 #too long for menu
 #

data/features/history.feature

@@ -1,21 +1,22 @@
 @javascript
 Feature: History
-  As an editor 
+  As an editor
   I want to be able to browse through the history and save an old version as current.
-  
+
   Background:
     Given I am signed in as Joe Admin
     Then the card First should not contain "chicken"
-    
-  Scenario: view history and rollback 
+
+  Scenario: view history and rollback
     When I go to url "/First?view=history"
     Then In the main card content I should see a del with content "egg"
-    
+
     When I expand act 2
     And In the main card content I click "Hide changes"
     Then In the main card content I should not see a del with content "egg"
 
     When In the main card content I click "Save as current"
     Then the card First should contain "chicken"
-    
-    
+    Then I wait a sec
+
+

data/features/step_definitions/wagn_steps.rb

@@ -206,6 +206,17 @@ When /^In (.*) I find link with class "(.*)" and click it$/ do |section, css_cla
   end
 end
 
+When /^In (.*) I find link with icon "(.*)" and click it$/ do |section, icon|
+  within scope_of(section) do
+    find("a > span.glyphicon-#{icon}").click
+  end
+end
+When /^In (.*) I find button with icon "(.*)" and click it$/ do |section, icon|
+  within scope_of(section) do
+    find("button > span.glyphicon-#{icon}").click
+  end
+end
+
 Then /I submit$/ do
     click_button("Submit")
 end

data/features/support/env.rb

@@ -5,6 +5,8 @@ require File.expand_path( '../../../lib/wagn/simplecov_helper.rb', __FILE__ )
 require 'simplecov'
 require 'minitest/autorun'
 
+require 'pry'
+
 # 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
 # newer version of cucumber-rails. Consider adding your own code to a new file

data/features/support/scopes.rb

@@ -15,6 +15,12 @@ module ScopeHelpers
     when /main card menu/
       '#main > .card-slot > .menu-slot > .card-menu'
 
+    when /main card toolbar/
+      '#main > .card-slot > .card-frame > nav.toolbar'
+
+    when /main card frame/
+      '#main > .card-slot > .card-frame'
+
     else
       raise "Can't find mapping from \"#{section}\" to a scope.\n" +
         "Now, go and add a mapping in #{__FILE__}"

data/features/toolbar.feature

@@ -0,0 +1,30 @@
+@javascript
+Feature: Toolbar
+  In order to edit a card
+  As a Wagneer
+  I want to be able to use the toolbar
+
+  Background:
+    Given I am signed in as Joe Admin
+    And I go to card "Home"
+    And I open the main card menu
+    And I follow "edit"
+
+ Scenario: close toolbar
+   Then In main card frame I should see a nav with class "toolbar"
+   When In main card toolbar I find link with icon "remove" and click it
+   Then In main card frame I should not see a nav with class "toolbar"
+
+ Scenario: pin and unpin toolbar
+   When In main card toolbar I find button with icon "pushpin" and click it
+   And I go to card "Home"
+   Then In main card frame I should see a nav with class "toolbar"
+   And In main card toolbar I should see a button with class "toolbar-pin.active"
+
+   When In main card toolbar I find button with icon "pushpin" and click it
+   And I go to card "Home"
+   Then In main card frame I should not see a nav with class "toolbar"
+
+
+
+

data/lib/wagn.rb

@@ -1,25 +1,24 @@
-# should be able to move these to more appropriate places
-WAGN_GEM_ROOT = File.expand_path('../..', __FILE__)
 
 module Wagn
+  WAGN_GEM_ROOT = File.expand_path('../..', __FILE__)
 
-  class << self    
+  class << self
     def root
       Rails.root
     end
-  
+
     def application
       Rails.application
     end
-    
+
     def config
       application.config
     end
-    
+
     def paths
       application.paths
     end
-    
+
     def gem_root
       WAGN_GEM_ROOT
     end

data/lib/wagn/application.rb

@@ -78,14 +78,16 @@ module Wagn
         paths = super
         Cardio.set_paths paths
 
+        paths['mod'] << 'mod'
         paths.add 'files'
 
-        paths['mod'] << 'mod'
         paths['app/models'] = []
         paths['app/mailers'] = []
 
         add_path paths, 'config/routes.rb', :with => 'rails/application-routes.rb'
 
+        Cardio.set_mod_paths  #really this should happen later
+
         paths
       end
     end

data/lib/wagn/tasks/db.rake

@@ -39,7 +39,7 @@ namespace :db do
       fixture_path = File.join(Cardio.gem_root, 'db','seed', 'test', 'fixtures')
       ActiveRecord::Base.establish_connection(::Rails.env.to_sym)
       (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(fixture_path, '*.{yml,csv}'))).each do |fixture_file|
-        ActiveRecord::Fixtures.create_fixtures(fixture_path, File.basename(fixture_file, '.*'))
+        ActiveRecord::FixtureSet.create_fixtures(fixture_path, File.basename(fixture_file, '.*'))
       end
     end
   end

data/lib/wagn/tasks/test.rake

@@ -65,7 +65,9 @@ namespace :test do
 
   desc "dump current db to test fixtures"
   task :extract_fixtures => :environment do
-    YAML::ENGINE.yamler = 'syck'
+    if RUBY_VERSION !~ /^(2|1\.9)/
+      YAML::ENGINE.yamler = 'syck'
+    end
       # use old engine while we're supporting ruby 1.8.7 because it can't support Psych,
       # which dumps with slashes that syck can't understand (also !!null stuff)
 

data/lib/wagn/tasks/wagn.rake

@@ -288,7 +288,9 @@ namespace :wagn do
 
       Rake::Task['wagn:bootstrap:copy_mod_files'].invoke
 
-      YAML::ENGINE.yamler = 'syck'
+      if RUBY_VERSION !~ /^(2|1\.9)/
+        YAML::ENGINE.yamler = 'syck'
+      end
       # use old engine while we're supporting ruby 1.8.7 because it can't support Psych,
       # which dumps with slashes that syck can't understand
 
@@ -315,45 +317,39 @@ namespace :wagn do
     task :copy_mod_files => :environment do
 
       source_files_dir = "#{Wagn.root}/files"
-      # add a fourth line to the raw content of each image (or file) to identify it as a mod file
+
+      # mark mod files as mod files
       Card::Auth.as_bot do
         Card.search( :type=>['in', 'Image', 'File'], :ne=>'' ).each do |card|
-
-          if card.attach_mod
-#            puts "skipping #{card.name}: already in code"
+          if card.mod_file?
+            puts "skipping #{card.name}: already in code"
             next
           else
-#            puts "working on #{card.name}"
+            puts "working on #{card.name}"
           end
 
-          base_card = card.cardname.junction? ? card.left : card
-          raise "need codename for file" unless base_card.codename.present?
+          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
 
-          mod_name = base_card.type_id==Card::SkinID ? '06_bootstrap' : '05_standard'
-          source_dir =  "#{source_files_dir}/#{card.id}"
+          # make card a mod file card
+          mod_name = (l = card.left) && l.type_id==Card::SkinID ? '06_bootstrap' : '05_standard'
+          card.update_column :db_content, card.attachment.db_content(:mod=>mod_name)
+          card.last_action.change_for(2).first.update_column :value, card.attachment.db_content(:mod=>mod_name)
+          card.expire
+          card = Card.fetch card.name
 
-          target_dir = "#{Cardio.gem_root}/mod/#{mod_name}/file/#{base_card.codename}"
+          target_dir = card.store_dir
           FileUtils.remove_dir target_dir, force=true if Dir.exists? target_dir
           FileUtils.mkdir_p target_dir
 
-#          if card.name =~ /icon/
-#            require 'pry'; binding.pry
-#          end
-          Dir.entries( source_dir ).each do |filename|
-            next if filename =~ /^\./
-            next if filename !~ (Regexp.new card.last_content_action_id.to_s)
-
-            target_filename = filename.gsub /\d+/, card.type_code.to_s
-            FileUtils.cp "#{source_dir}/#{filename}", "#{target_dir}/#{target_filename}"
+          files.each do |version, path|
+            FileUtils.cp path, card.attachment.path(version)
           end
 
-
-          unless card.db_content.split(/\n/).last == mod_name
-            new_content = card.db_content + "\n#{mod_name}"
-            card.update_column :db_content, new_content
-            card.last_action.change_for(2).first.update_column :value, new_content
-            #FIXME - should technically update the change as well...
-          end
         end
       end
     end

data/rails/engine-routes.rb

@@ -5,8 +5,10 @@ Decko::Engine.routes.draw do
 
   #most common
   root 'card#read'
+  get "#{ Decko::Engine.config.files_web_path }/:id/:rev_id(-:size).:format" =>
+                                 'card#read', :id => /[^-]+/, :rev_id=> /[^-]+/, :explicit_file=>true
   get "#{ Decko::Engine.config.files_web_path }/:id(-:size)-:rev_id.:format" =>
-                                 'card#read', :id => /[^-]+/, :explicit_file=>true
+                                 'card#read', :id => /[^-]+/, :explicit_file=>true  # deprecated
   get "assets/*filename"      => 'card#asset'
   get "javascripts/*filename" => 'card#asset'
   get "jasmine/*filename"     => 'card#asset'

data/spec/controllers/card_controller_spec.rb

@@ -260,7 +260,7 @@ describe CardController do
     context "file" do
       before do
         Card::Auth.as_bot do
-          Card.create :name => "mao2", :type_code=>'image', :attach=>File.new( File.join FIXTURES_PATH, 'mao2.jpg' )
+          Card.create :name => "mao2", :type_code=>'image', :image=>File.new( File.join FIXTURES_PATH, 'mao2.jpg' )
           Card.create :name => 'mao2+*self+*read', :content=>'[[Administrator]]'
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wagn
 version: !ruby/object:Gem::Version
-  version: 1.16.1
+  version: 1.16.2
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-08-15 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.1
+        version: 1.16.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.16.1
+        version: 1.16.2
 description: a wiki approach to stuctured data, dynamic interaction, and web design
 email:
 - info@wagn.org
@@ -53,6 +53,7 @@ files:
 - GPL
 - Guardfile
 - LICENSE
+- README.rdoc
 - app/assets/images/body-bg.bmp
 - app/assets/images/body-bg.png
 - app/assets/images/external_link.png
@@ -101,6 +102,7 @@ files:
 - features/support/scopes.rb
 - features/support/wagn_env.rb
 - features/table_of_contents.feature
+- features/toolbar.feature
 - features/update_includers.feature
 - lib/decko/engine.rb
 - lib/wagn.rb
@@ -747,7 +749,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: structured wiki web platform
@@ -777,6 +779,7 @@ test_files:
 - features/support/scopes.rb
 - features/support/wagn_env.rb
 - features/table_of_contents.feature
+- features/toolbar.feature
 - features/update_includers.feature
 - spec/controllers/card_controller_spec.rb
 - spec/controllers/location_spec.rb
@@ -794,4 +797,3 @@ test_files:
 - test/script/run_engine_deck.sh
 - test/script/run_mig.sh
 - test/test_helper.rb
-has_rdoc: