wagn 1.16.4 → 1.16.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b994654d5455a17be2d4964721aa5a375fff357d
-  data.tar.gz: 1813186fec88f14a7f7cfdf2a4240348878408f2
+  metadata.gz: c07eb758befe1e7d6b8faf991be470719b28a635
+  data.tar.gz: 630f8cfff554b2613a3f1de298e635244b690c6a
 SHA512:
-  metadata.gz: 79ca207fd0ebb9c1e1b0a7ff371a0601fd1c22b87a08e77e488a33af61f942fe9bd08087390fc1964eca25a9bdb53736b96cf62152d9b135443f4efc804bf31d
-  data.tar.gz: 622f2bb924ab6657523bf1dd6f7e13e8f700c27076165304dd186175f4587905d6b3439e82ee5ad2e43f5ff0fea2cb3c298ea43ee614ad67cbb34f98a4bced90
+  metadata.gz: fd70f04d06d46e0ee24dfd1f9dfb0d9f01ebcf65fc9d2d0385b5fdecae05fe46ddc652d53c8bd3c06227cb8e1d0ced3eac4078378f630e96ee840353a01cf115
+  data.tar.gz: 9fab68ab8e304d554a5decc9186425a76b35e0f7f6cdbe9c470c02e036e7a8e2db3d451bf5d0461026dd5684b49120936d1d7c0e9712d245908cb3582abdd5b9

data/lib/wagn/commands.rb

@@ -1,5 +1,5 @@
 require 'optparse'
-require 'active_support/core_ext/object/inclusion' # adds method in? to Object class 
+require 'active_support/core_ext/object/inclusion' # adds method in? to Object class
 
 def load_rake_tasks
   require './config/environment'
@@ -158,8 +158,7 @@ WAGN
     rspec_args.shift
 
     parser.parse!(wagn_args)
-
-    rspec_command = "RAILS_ROOT=. #{opts[:simplecov]} #{opts[:executer]} #{opts[:rescue]} rspec #{rspec_args*' '} #{opts[:files]} 2>&1" 
+    rspec_command = "RAILS_ROOT=. #{opts[:simplecov]} #{opts[:executer]} #{opts[:rescue]} rspec #{rspec_args*' '} #{opts[:files]} 2>&1"
     unless system rspec_command
       exit $?.exitstatus
     end

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

@@ -220,6 +220,14 @@ class WagnGenerator < Rails::Generators::AppBase
     end
   end
 
+  def database_gemfile_entry
+    return [] if options[:skip_active_record]
+    gem_name = gem_for_database
+    gem_version =  gem_name == 'mysql2' ? '0.3.20' : nil
+    GemfileEntry.version gem_name, gem_version,
+                        "Use #{options[:database]} as the database for Active Record"
+  end
+
   protected
   def self.banner
      "wagn new #{self.arguments.map(&:usage).join(' ')} [options]"

data/lib/wagn/tasks/test.rake

@@ -1,14 +1,4 @@
-def set_database( db )
-  y = YAML.load_file("#{Wagn.root}/config/database.yml")
-  y["development"]["database"] = db if y["development"]
-  y["production"]["database"] = db if y["production"]
-
-  File.open( "#{Wagn.root}/config/database.yml", 'w' ) do |out|
-    YAML.dump( y, out )
-  end
-end
-
-
+TEST_SEED_PATH = ENV['DECKO_SEED_REPO_PATH']
 
 namespace :test do
   task :all => :environment do
@@ -27,44 +17,25 @@ namespace :test do
   ##  setting it by hand after fixture generation.
   desc "recreate test fixtures from fresh db"
   task :generate_fixtures => :environment do
-    Rake::Task['wagn:reset_cache']
-    # env gets auto-set to 'test' somehow.
-    # but we need development to get the right schema dumped.
-    ENV['RAILS_ENV'] = 'development'
-
-    abcs = ActiveRecord::Base.configurations
-    config = ENV['RAILS_ENV'] || 'development'
-    olddb = abcs[config]["database"]
-    abcs[config]["database"] = "wagn_test_template"
+    ENV['GENERATE_FIXTURES'] = 'true'
+    raise "must be test env" unless Rails.env == 'test'
 
-  #=begin
-    begin
-      # assume we have a good database, ie. just migrated dev db.
-      puts "setting database to wagn_test_template"
-      set_database 'wagn_test_template'
-      Rake::Task['wagn:seed'].invoke
+    Rake::Task['wagn:reset_cache']
 
-      # I spent waay to long trying to do this in a less hacky way--
-      # Basically initial database setup/migration breaks your models and you really
-      # need to start rails over to get things going again I tried ActiveRecord::Base.reset_subclasses etc. to no avail. -LWH
-      puts ">>populating test data"
-      puts `rake test:populate_template_database --trace`
-      puts ">>extracting to fixtures"
-      puts `rake test:extract_fixtures --trace`
-    ensure
-      set_database olddb
-    end
-    # go ahead and load the fixtures into the test database
-    puts ">> preparing test database"
-    puts `env RELOAD_TEST_DATA=true rake db:test:prepare --trace`
+    puts "reseed test db"
+    Rake::Task['wagn:seed'].invoke
 
-    Rake::Task['wagn:assume_card_migrations'].invoke
+    puts ">>populating test data"
+    puts `rake test:populate_template_database --trace`
 
+    puts ">>extracting to fixtures"
+    puts `rake test:extract_fixtures --trace`
   end
 
 
   desc "dump current db to test fixtures"
   task :extract_fixtures => :environment do
+    raise "must be test env" unless Rails.env == 'test'
     if RUBY_VERSION !~ /^(2|1\.9)/
       YAML::ENGINE.yamler = 'syck'
     end
@@ -76,7 +47,7 @@ namespace :test do
     ActiveRecord::Base.establish_connection
     tables.each do |table_name|
       i = "000"
-      File.open("#{Cardio.gem_root}/db/seed/test/fixtures/#{table_name}.yml", 'w') do |file|
+      File.open("#{ TEST_SEED_PATH }/test/fixtures/#{table_name}.yml", 'w') do |file|
         data = ActiveRecord::Base.connection.select_all(sql % table_name)
         file.write data.inject({}) { |hash, record|
           record['trash'] = false if record.has_key? 'trash'
@@ -90,8 +61,9 @@ namespace :test do
 
   desc "create sample data for testing"
   task :populate_template_database => :environment do
+    raise "must be test env" unless Rails.env == 'test'
     puts "populate test data\n"
-    load "#{Cardio.gem_root}/db/seed/test/seed.rb"
+    load "#{ TEST_SEED_PATH }/test/seed.rb"
     SharedData.add_test_data
   end
 

data/lib/wagn/tasks/wagn.rake

@@ -1,8 +1,8 @@
-
 require 'wagn/application'
 
 WAGN_SEED_TABLES = %w{ cards card_actions card_acts card_changes card_references }
-WAGN_SEED_PATH   = File.join( Cardio.gem_root, 'db/seed/new')
+WAGN_SEED_PATH   = "#{ ENV['DECKO_SEED_REPO_PATH'] }/new"
+
 
 def prepare_migration
   Card::Cache.reset_global
@@ -16,7 +16,6 @@ namespace :wagn do
   desc "create a wagn database from scratch, load initial data"
   task :seed do
     ENV['SCHEMA'] ||= "#{Cardio.gem_root}/db/schema.rb"
-
     puts "dropping"
     #fixme - this should be an option, but should not happen on standard creates!
     begin
@@ -59,7 +58,7 @@ namespace :wagn do
     puts "update card_migrations"
     Rake::Task['wagn:assume_card_migrations'].invoke
 
-    if Rails.env == 'test'
+    if Rails.env == 'test' && !ENV['GENERATE_FIXTURES']
       puts "loading test fixtures"
       Rake::Task['db:fixtures:load'].invoke
     else
@@ -288,6 +287,7 @@ namespace :wagn do
     task :dump => :environment do
       Card::Cache.reset_global
 
+      # FIXME temporarily taking this out!!
       Rake::Task['wagn:bootstrap:copy_mod_files'].invoke
 
       if RUBY_VERSION !~ /^(2|1\.9)/
@@ -345,8 +345,9 @@ namespace :wagn do
           card = Card.fetch card.name
 
           target_dir = card.store_dir
-          FileUtils.remove_dir target_dir, force=true if Dir.exists? target_dir
-          FileUtils.mkdir_p target_dir
+
+          #FileUtils.remove_dir target_dir, force=true if Dir.exists? target_dir
+          #FileUtils.mkdir_p target_dir
 
           files.each do |version, path|
             FileUtils.cp path, card.attachment.path(version)

data/rails/controllers/card_controller.rb

@@ -7,27 +7,17 @@ require_dependency 'card/mailer'  #otherwise Net::SMTPError rescues can cause pr
 
 class CardController < ActionController::Base
 
-  include Card::Format::Location
-  include Card::HtmlFormat::Location
+  include Card::Location
   include Recaptcha::Verify
 
-  before_filter :start_performance_logger
-  after_filter  :stop_performance_logger
-  after_filter  :request_logger            if Wagn.config.request_logger
-
   before_filter :per_request_setup, :except => [:asset]
   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
-
 
 
   #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -38,7 +28,6 @@ class CardController < ActionController::Base
   end
 
   def read
-    save_location # should be an event!
     show
   end
 
@@ -47,16 +36,14 @@ class CardController < ActionController::Base
   end
 
   def delete
-    discard_locations_for card #should be an event
-    if @success.target == card
-      @success.target = :previous
-    end
     handle { card.delete }
   end
 
   def asset
     Rails.logger.info "Routing assets through Card. Recommend symlink from Deck to Card gem using 'rake wagn:update_assets_symlink'"
-    send_file_inside Decko::Engine.paths['gem-assets'].existent.first, [ params[:filename], params[:format] ].join('.'), :x_sendfile => true
+    asset_path = Decko::Engine.paths['gem-assets'].existent.first
+    filename   = [ params[:filename], params[:format] ].join('.')
+    send_file_inside asset_path, filename , :x_sendfile => true
   end
 
 
@@ -107,7 +94,7 @@ class CardController < ActionController::Base
   def load_card
     @card = case params[:id]
       when '*previous'
-        return card_redirect( previous_location )
+        return card_redirect( Card::Env.previous_location )
       else  # get by name
         opts = params[:card] ? params[:card].clone : {}   # clone so that original params remain unaltered.  need deeper clone?
         opts[:type] ||= params[:type] if params[:type]    # for /new/:type shortcut.  we should fix and deprecate this.
@@ -132,43 +119,10 @@ class CardController < ActionController::Base
     true
   end
 
-  def init_success_object
-    @success = Card::Env[:success] = Card::Success.new(@card.cardname, params[:success])
-  end
-
   def refresh_card
     @card = card.refresh
   end
 
-  def request_logger
-    Card::Log::Request.write_log_entry self
-  end
-
-  def start_performance_logger
-    if params[:performance_log]
-      @old_log_level = Wagn.config.log_level
-      if params[:performance_log].kind_of?(Hash) && params[:performance_log][:output] == 'console'
-        Wagn.config.log_level = :wagn
-      end
-      Card::Log::Performance.load_config params[:performance_log]
-    end
-
-    if Wagn.config.performance_logger || params[:performance_log]
-      Card::Log::Performance.start :method=>env["REQUEST_METHOD"], :message=>env["PATH_INFO"]
-    end
-  end
-
-  def stop_performance_logger
-    if Wagn.config.performance_logger || params[:performance_log]
-      Card::Log::Performance.stop
-    end
-    if params[:perfomance_log]
-      Wagn.config.log_level = @old_log_level
-      if Wagn.config.performance_logger
-        Card::Log::Performance.load_config Wagn.config.performance_logger
-      end
-    end
-  end
 
   protected
 
@@ -176,8 +130,8 @@ class CardController < ActionController::Base
     Card::Env.ajax?
   end
 
-  def html?
-    [nil, 'html'].member?(params[:format])
+  def success
+    Card::Env[:success]
   end
 
   # ----------( rendering methods ) -------------
@@ -194,22 +148,24 @@ class CardController < ActionController::Base
   end
 
   def handle
-    yield ? render_success : render_errors
+    card.run_callbacks :handle do
+      yield ? render_success : render_errors
+    end
   end
 
   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
+    success.name_context = @card.cardname
+    if !ajax? || success.hard_redirect?
+      card_redirect success.to_url
+    elsif String === success.target
+      render :text => success.target
     else
-      if @success.soft_redirect?
-        self.params = @success.params
+      if success.soft_redirect?
+        self.params = success.params
       else
-        self.params.merge! @success.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 = success.target
       @card.select_action_by_params params
       show
     end
@@ -228,6 +184,7 @@ class CardController < ActionController::Base
 
   def show view = nil, status = 200
 #    ActiveSupport::Notifications.instrument('card', message: 'CardController#show') do
+    card.action = :read
     format = request.parameters[:format]
     format = :file if params[:explicit_file] or !Card::Format.registered.member? format #unknown format
 
@@ -238,9 +195,16 @@ class CardController < ActionController::Base
       card.content = card.drafts.last.card_changes.last.value
     end
     formatter = card.format(format.to_sym)
-    result = formatter.show view, opts
+    result = card.run_callbacks :show do
+      formatter.show view, opts
+    end
     status = formatter.error_status || status
 
+    deliver format, result, status
+  end
+
+
+  def deliver format, result, status
     if format==:file && status==200
       send_file *result
     elsif status == 302
@@ -250,10 +214,8 @@ class CardController < ActionController::Base
       args[:content_type] = 'text/text' if format == :file
       render args
     end
-#    end
   end
 
-
   rescue_from StandardError do |exception|
     Rails.logger.info "exception = #{exception.class}: #{exception.message}"
 
@@ -294,3 +256,5 @@ class CardController < ActionController::Base
 
 end
 
+
+

data/spec/controllers/card_controller_spec.rb

@@ -246,7 +246,7 @@ describe CardController do
         @all_style.reset_machine_output!
       end
 
-      it 'should create missing machine output file' do
+      it 'creates missing machine output file' do
         args = { :id=>@all_style.machine_output_card.name, :format=>'css', :explicit_file=>true }
         get :read, args
         output_card = Card[ "#{ Card[:all].name }+#{ Card[:style].name }+#{ Card[:machine_output].name}" ]
@@ -337,14 +337,36 @@ describe CardController do
     end
 
 
+    describe "delete" do
+      it "works" do
+        c = Card.create( :name=>"Boo", :content=>"booya")
+        post :delete, :id=>"~#{c.id}"
+        assert_response :redirect
+        expect(Card["Boo"]).to eq(nil)
+      end
+
+      # FIXME: this should probably be files in the spot for a delete test
+      it "returns to previous undeleted card after deletion" do
+        t1 = t2 = nil
+        Card::Auth.as_bot do
+          t1 = Card.create! :name => "Testable1", :content => "hello"
+          t2 = Card.create! :name => "Testable1+bandana", :content => "world"
+        end
 
-    it "delete" do
-      c = Card.create( :name=>"Boo", :content=>"booya")
-      post :delete, :id=>"~#{c.id}"
-      assert_response :redirect
-      expect(Card["Boo"]).to eq(nil)
+        get :read, :id => t1.key
+        get :read, :id => t2.key
+
+        post :delete, :id=> '~'+t2.id.to_s
+        assert_nil Card[ t2.name ]
+        assert_redirected_to "/#{t1.name}"
+
+        post :delete, :id => '~'+t1.id.to_s
+        assert_redirected_to '/'
+        assert_nil Card[ t1.name ]
+      end
     end
 
+
     it "should comment" do
       Card::Auth.as_bot do
         Card.create :name => 'basicname+*self+*comment', :content=>'[[Anyone Signed In]]'

data/spec/controllers/location_spec.rb

@@ -10,42 +10,21 @@ describe CardController, "location test from old integration" do
     login_as 'joe_user'
   end
 
-  it "should test_previous_location_should_be_assigned_after_viewing" do
-    get :read, :id=>"Joe_User"
-    assert_equal "/Joe_User", assigns['previous_location']
-  end
-
-  it "should test_previous_location_should_not_be_updated_by_nonexistent_card" do
-    get :read, :id=>"Joe_User"
-    get :read, :id=>"Not_Me"
-    get :read, :id=>'*previous'
-    assert_redirected_to '/Joe_User'
-  end
-
-  it "should test_return_to_special_url_when_logging_in_after_visit" do
-    # not sure this still tests the case, controller tests do not test routes
-    get :read, :id=>'*recent'
-    assert_equal "/*recent",  assigns['previous_location']
-  end
+  describe 'previous location'do
+    it "gets updated after viewing" do
+      get :read, :id=>"Joe_User"
+      assert_equal "/Joe_User", Card::Env.previous_location
+    end
 
-  # FIXME: this should probably be files in the spot for a delete test
-  it "should test_removal_and_return_to_previous_undeleted_card_after_deletion" do
-    t1 = t2 = nil
-    Card::Auth.as_bot do
-      t1 = Card.create! :name => "Testable1", :content => "hello"
-      t2 = Card.create! :name => "Testable1+bandana", :content => "world"
+    it "doesn't link to nonexistent cards" do
+      get :read, :id=>"Joe_User"
+      get :read, :id=>"Not_Me"
+      get :read, :id=>'*previous'
+      assert_redirected_to '/Joe_User'
     end
 
-    get :read, :id => t1.key
-    get :read, :id => t2.key
+  end
 
-    post :delete, :id=> '~'+t2.id.to_s
-    assert_nil Card[ t2.name ]
-    assert_redirected_to "/#{t1.name}"
 
-    post :delete, :id => '~'+t1.id.to_s
-    assert_redirected_to '/'
-    assert_nil Card[ t1.name ]
-  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wagn
 version: !ruby/object:Gem::Version
-  version: 1.16.4
+  version: 1.16.5
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2015-09-19 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.4
+        version: 1.16.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.16.4
+        version: 1.16.5
 description: a wiki approach to stuctured data, dynamic interaction, and web design
 email:
 - info@wagn.org