decko 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 953bbfc987bc5b3777a2aa3eac096a7637eb2248
-  data.tar.gz: 51d1f2f8032fbd00f56b97beb53076a5387aa751
+  metadata.gz: 0f31a12ba7a6495597a0110b4bd3427436405fde
+  data.tar.gz: 0c3295aa6f2590ab5ebaffe3fa056dd79cc5092d
 SHA512:
-  metadata.gz: 564a3f49721deba98ae3de3c0f326da1861aaf8800bef5ebfc624d6b855e927cb4ec970b77096dae606237004258b204d9f1c8bc9dd248869e0d83ec281bdef6
-  data.tar.gz: 732ee8bebbedfd297aad152c368c5ca4bf478e66629f96dfcbe80b030126aac4c8b8a9e0fad5d099236edccac685d0dbeb74f9689a15364c7c2ee0039659e144
+  metadata.gz: 6fa275be3e7a70a2276fee62bd79a3544c9aff73fae7a50a22061e21431faf579cc17532ad413fd214be85a2e1777605a7385c89dd341df6b1f4c83144292455
+  data.tar.gz: 484a92215a837fdfdf946deba1b899bc4015d1b861109b15eb782469e63764f9d3b6ced77d8c227ce4c58e9aa8cf58de767f66ce05e25838a7b4a4ddab0b81b4

data/features/reference.feature

@@ -5,7 +5,6 @@ Feature: Reference
 
   Background:
     Given I am signed in as Joe Admin
-    And I wait for ajax response
 
   Scenario: Renaming a embed card
     When I create PlainText card "Vignesh" with content "Indian"

data/features/step_definitions/wagn_steps.rb

@@ -87,7 +87,7 @@ When /^(.*) edits? "([^\"]*)" with plusses:/ do |username, cardname, plusses|
   signed_in_as(username) do
     visit "/card/edit/#{cardname.to_name.url_key}"
     plusses.hashes.first.each do |name, content|
-      set_content "card[subcards][#{cardname}+#{name}][content]", content
+      set_content "card[subcards][+#{name}][content]", content
     end
     click_button "Submit"
     wait_for_ajax

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

@@ -80,7 +80,7 @@ Decko.application.class.configure do
 
   config.action_mailer.perform_deliveries = false
 
-
+  # config.active_job.queue_adapter = :delayed_job
 
   # Use Pry instead of IRB
   silence_warnings do

data/lib/decko/generators/decko/decko_generator.rb

@@ -137,14 +137,6 @@ class DeckoGenerator < Rails::Generators::AppBase
   def database_gemfile_entry
     return [] if options[:skip_active_record]
     gem_name, gem_version = gem_for_database
-    if gem_name == "mysql2"
-      # && Gem.loaded_specs['rails'].version < Gem::Version.new('4.2.5')
-      # Rails update from 4.2.4 to 4.2.5 didn't help.
-      # Current mysql2 gem (0.4.1) is still causing trouble.
-      # Maybe with the next Rails release?
-      # Could also be that ruby 1.9.3 is the problem.
-      gem_version = "0.3.20"
-    end
     msg = "Use #{options[:database]} as the database for Active Record"
     GemfileEntry.version gem_name, gem_version, msg
   end

data/lib/decko/generators/decko/templates/Gemfile

@@ -1,31 +1,33 @@
 source 'http://rubygems.org'
 
 <% if @gem_path.present? %>
-gem 'decko',    :path=>"<%= @gemfile_gem_path %>/decko"
-gem 'card',     :path=>"<%= @gemfile_gem_path %>/card", :require => false
-gem 'cardname', :path=>"<%= @gemfile_gem_path %>/cardname", :require => false
+path "<%= @gemfile_gem_path %>" do
+  gem 'decko'
+  gem 'card', :require => false
+  gem 'cardname', :require => false
+end
 <% else %>
 gem 'decko'
 <% end %>
 
 gem '<%= database_gemfile_entry.name %>'<%= %(, '#{database_gemfile_entry.version}') if database_gemfile_entry.version %>
 
-# Use Unicorn or Thin as server
+# WEBSERVER
+# To run a simple deck at localhost:3000, you can use thin (recommended), unicorn, or (Rails' default) Webrick
+gem 'thin'
 # gem 'unicorn'
-# gem 'thin'
-
-# Use Delayed::Job for the Active Job queue to run tasks like
-# sending in notifications in a background process.
-# 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 bin/delayed_job start
-# gem 'delayed_job_active_record', '~> 4.1'
+
+# To set up a production webserver, see http://wagn.org/wagn_in_production
+
+
+# BACKGROUNDING
+# The daemons gem is needed to run tasks like sending notifications in a background process.
+# See config/application.rb for configuration details.
 # gem 'daemons'
 
 
 <% if options['mod-dev'] || options['core-dev'] -%>
 group :test do
-  gem 'rails-controller-testing'
   gem 'rspec'
   gem 'rspec-rails', '~>3.6.1'         # behavior-driven-development suite
   gem 'spork', '>=0.9'
@@ -113,6 +115,8 @@ group :debug do
 end
 <% end %>
 
+# load gems needed in Gemfiles
+# You may need to alter this code if you move your mod(s) to an unconventional location.
 Dir.glob( 'mod/**{,/*/**}/Gemfile' ).each do |gemfile|
   instance_eval File.read(gemfile)
 end

data/lib/decko/generators/decko/templates/bin/delayed_job

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-
+ENV["RAILS_ENV"] ||= "production"
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "config", "environment"))
 require "delayed/command"
 Delayed::Command.new(ARGV).daemonize

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

@@ -19,19 +19,14 @@ module <%= app_const_base %>
     # config.action_mailer.smtp_settings = { address: "localhost", port: 1025 }
 
 
-    # Delayed jobs
-    # Moves time-consuming minor tasks that are part of a card update
-    # (like sending notifications to followers) to a background process.
-    # To activate it add the gems 'delayed_job_active_record' and 'daemons'
-    # to the Gemfile, uncomment the two lines below and run
-    # 'RAILS_ENV=production bin/delayed_job start' to start the background process.
+    # Background jobs
+    # Moves time-consuming minor tasks that are part of a card transaction (like sending notifications
+    # to followers) to a background process. To activate it add the 'daemons' gem to the Gemfile, uncomment
+    # the line below and run 'bin/delayed_job start' to start the background process.
     # See https://github.com/collectiveidea/delayed_job#running-jobs for more information
     #
-    # config.active_job.queue_adapter = :delayed_job
     # Delayed::Worker.delay_jobs = true
 
-    # The below keys are fine for testing but should not be used in production sites.
-
     # config.read_only = true
     # defaults to false
     # disallows creating, updating, and deleting cards.
@@ -44,7 +39,7 @@ module <%= app_const_base %>
     # config.cache_store = :dalli_store, []
 
     # config.paths['files'] = 'files'
-    # where uploaded files are actually stored. (eg Image and File cards)
+    # directory in which uploaded files are actually stored. (eg Image and File cards)
 
     # config.file_storage = :local
     # File storage options (see http://decko.org/file_storage_options)
@@ -64,7 +59,7 @@ module <%= app_const_base %>
     #        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
+    #        endpoint: 'https://s3.example.com:8080'  # optional, defaults to nil
     #     },
     #     attributes: { "Cache-Control" => "max-age=#{365.day.to_i}" },
     #     public: true,

data/lib/decko/mods_spec_helper.rb

@@ -12,7 +12,7 @@ CardSpecLoader.prefork do
     Bundler.require(:test)
     # if simplecov is activated in the Gemfile, it has to be required here
   end
-  #  FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures'
+  #  CARD_TEST_SEED_PATH = File.dirname(__FILE__) + '/../fixtures'
   CardSpecLoader.rspec_config
 end
 

data/lib/decko/tasks/decko.rake

@@ -39,7 +39,7 @@ decko_namespace = namespace :decko do
     conn = ActiveRecord::Base.connection
 
     puts "delete all data in bootstrap tables"
-    DECKO_SEED_TABLES.each do |table|
+    CARD_SEED_TABLES.each do |table|
       conn.delete "delete from #{table}"
     end
   end
@@ -62,7 +62,7 @@ decko_namespace = namespace :decko do
       Rake::Task["db:fixtures:load"].invoke
     else
       puts "loading bootstrap"
-      decko_namespace["bootstrap:load"].invoke
+      Rake::Task["db:seed"].invoke
     end
 
     puts "set symlink for assets"
@@ -92,7 +92,6 @@ decko_namespace = namespace :decko do
     end
   end
 
-
   alias_task :migrate, "card:migrate"
 
   desc "insert existing card migrations into schema_migrations_cards to avoid re-migrating"

data/lib/decko/tasks/decko/bootstrap.rake

@@ -1,124 +1,176 @@
 namespace :decko do
   namespace :bootstrap do
-    desc "rid template of unneeded cards, acts, actions, changes, " \
-         "and references"
+    desc "reseed, migrate, re-clean, and re-dump"
+    task update: :environment do
+      ENV["STAMP_MIGRATIONS"] = "true"
+      ENV["GENERATE_FIXTURES"] = "true"
+      %w[reseed update bootstrap:clean bootstrap:supplement bootstrap:dump].each do |task|
+        Rake::Task["decko:#{task}"].invoke
+      end
+    end
+
+    desc "remove unneeded cards, acts, actions, changes, and references"
     task clean: :environment do
       Card::Cache.reset_all
+      clean_cards
+      clean_acts_and_actions
+      Card::Cache.reset_all
+    end
 
-      delete_unwanted_cards
+    def clean_cards
+      puts "clean cards"
+      # change actors so we can delete unwanted user cards that made changes
+      Card::Act.update_all actor_id: Card::WagnBotID
+      delete_ignored_cards
+      clean_machines
       Card.empty_trash
-      Rake::Task["decko:bootstrap:copy_mod_files"].invoke
-      make_machine_output_coded
-      clear_history
-      correct_time_and_user_stamps
-      Card::Cache.reset_all
     end
 
-    desc "dump db to bootstrap fixtures"
-    task dump: :environment do
-      Card::Cache.reset_all
+    def delete_ignored_cards
+      return unless (ignore = Card["*ignore"])
+      Card::Auth.as_bot do
+        ignore.item_cards.each(&:delete!)
+      end
+    end
+
+    task clean_machines: :environment do
+      clean_machines
+    end
 
-      # 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
-      # # support Psych, which dumps with slashes that syck can't understand
+    def clean_machines
+      puts "clean machines"
+      Card.reset_all_machines
+      reseed_machine_output
+      clean_inputs_and_outputs
+    end
 
-      DECKO_SEED_TABLES.each do |table|
-        i = "000"
-        data = ActiveRecord::Base.connection.select_all "select * from #{table}"
-
-        File.open(File.join(DECKO_SEED_PATH, "#{table}.yml"), "w") do |file|
-          file.write YAML.dump(data.each_with_object({}) do |record, hash|
-            record["trash"] = false if record.key? "trash"
-            record["draft"] = false if record.key? "draft"
-            # if record.key? "content"
-            #   record["content"] = record["content"].gsub(/\u00A0/, " ")
-            #   # sych was handling nonbreaking spaces oddly.
-            #   # would not be needed with psych.
-            # end
-            hash["#{table}_#{i.succ!}"] = record
-          end)
-        end
+    def reseed_machine_output
+      machine_seed_names.each do |name|
+        puts "coding machine output for #{name}"
+        Card[name].make_machine_output_coded
       end
     end
 
-    desc "copy files from template database to standard mod and update cards"
-    task copy_mod_files: :environment do
-      # mark mod files as mod files
-      Card::Auth.as_bot do
-        each_file_card  do |card|
-          # make card a mod file card
-          mod_name =
-            card.left&.type_id == Card::SkinID ? "bootstrap" : "standard"
-          card.update_attributes! storage_type: :coded,
-                                  mod: mod_name,
-                                  empty_ok: true
+    def clean_inputs_and_outputs
+      # FIXME: can this be associated with the machine module somehow?
+      %w(machine_input machine_output).each do |codename|
+        Card.search(right: { codename: codename }).each do |card|
+          FileUtils.rm_rf File.join("files", card.id.to_s), secure: true#
+          next if reserved_output? card.name
+          card.delete!
         end
       end
     end
 
-    desc "load bootstrap fixtures into db"
-    task load: :environment do
-      # FIXME: shouldn't we be more standard and use seed.rb for this code?
-      Rake.application.options.trace = true
-      puts "bootstrap load starting #{DECKO_SEED_PATH}"
-      Rake::Task["db:seed"].invoke
+    def reserved_output? name
+      (machine_seed_names.member? name.left_name.key) && (name.right_name.key == :machine_output.cardname.key)
     end
-  end
 
-  def each_file_card
-    Card.search(type: %w(in Image File), ne: "").each do |card|
-      if card.coded? || card.codename == "new_file" ||
-         card.codename == "new_image"
-        puts "skipping #{card.name}: already in code"
-      else
-        puts "working on #{card.name}"
-        yield card
-      end
+    def machine_seed_names
+      @machine_seed_names ||=
+        [[:all, :script], [:all, :style], [:script_html5shiv_printshiv]].map do |name|
+          Card::Name[*name]
+        end
     end
-  end
 
-  def correct_time_and_user_stamps
-    conn = ActiveRecord::Base.connection
-    who_and_when = [Card::WagnBotID, Time.now.utc.to_s(:db)]
-    card_sql = "update cards set creator_id=%1$s, created_at='%2$s', " \
-             "updater_id=%1$s, updated_at='%2$s'"
-    conn.update(card_sql % who_and_when)
-    conn.update("update card_acts set actor_id=%s, acted_at='%s'" % who_and_when)
-  end
+    # def clean_files
+    #   puts "clean files"
+    #   Card::Cache.reset_all
+    #   # TODO: generalize to all unnecessary files
+    #   remove_old_machine_files
+    # end
 
-  def delete_unwanted_cards
-    # we have to change the actors so that
-    # we can delete unwanted user cards that made changes
-    Card::Act.update_all actor_id: Card::WagnBotID
-    Card::Auth.as_bot do
-      if (ignoramus = Card["*ignore"])
-        ignoramus.item_cards.each(&:delete!)
-      end
+    def clean_acts_and_actions
+      clean_history
+      clean_time_and_user_stamps
+    end
+
+    def clean_history
+      puts "clean history"
+      act = Card::Act.create! actor_id: Card::WagnBotID, card_id: Card::WagnBotID
+      Card::Action.make_current_state_the_initial_state act
+      #conn.execute("truncate card_acts")
+      ActiveRecord::Base.connection.execute("truncate sessions")
+    end
+
+    def clean_time_and_user_stamps
+      puts "clean time and user stamps"
+      conn = ActiveRecord::Base.connection
+      who_and_when = [Card::WagnBotID, Time.now.utc.to_s(:db)]
+      conn.update "UPDATE cards SET " \
+                  "creator_id=%1$s, created_at='%2$s', " \
+                  "updater_id=%1$s, updated_at='%2$s'" % who_and_when
+      conn.update "UPDATE card_acts SET actor_id=%s, acted_at='%s'" % who_and_when
+    end
+
+    desc "add test data"
+    task supplement: :environment do
+      add_test_data
+    end
+
+    def add_test_data
+      return unless Rails.env == "test"
+      load File.join(TEST_SEED_PATH, "seed.rb")
+      SharedData.add_test_data
+    end
+
+    desc "dump db to bootstrap fixtures"
+    task dump: :environment do
       Card::Cache.reset_all
-      # FIXME: can this be associated with the machine module somehow?
-      %w(machine_input machine_output).each do |codename|
-        Card.search(right: { codename: codename }).each do |card|
-          FileUtils.rm_rf File.join("files", card.id.to_s), secure: true
-          card.delete!
+      CARD_SEED_TABLES.each do |table|
+        i = "000"
+        write_seed_file table do
+          yamlize_records table do |record, hash|
+            hash["#{table}_#{i.succ!}"] = record
+          end
         end
       end
     end
-  end
 
-  def make_machine_output_coded
-    [[:all, :script], [:all, :style], [:script_html5shiv_printshiv]].each do |name|
-      Card[*name].make_machine_output_coded
+    def write_seed_file table
+      path = Rails.env == "test" ? CARD_TEST_SEED_PATH : CARD_SEED_PATH
+      filename = File.join path, "#{table}.yml"
+      File.open filename, "w" do |file|
+        file.write yield
+      end
     end
-  end
 
-  def clear_history
-    puts "clearing history"
-    act = Card::Act.create! actor_id: Card::WagnBotID,
-                            card_id: Card::WagnBotID
-    Card::Action.make_current_state_the_initial_state act
-    #conn.execute("truncate card_acts")
-    ActiveRecord::Base.connection.execute("truncate sessions")
+    def yamlize_records table
+      data = ActiveRecord::Base.connection.select_all "select * from #{table}"
+      YAML.dump(
+        data.each_with_object({}) do |record, hash|
+          record["trash"] = false if record.key? "trash"
+          record["draft"] = false if record.key? "draft"
+          yield record, hash
+        end
+      )
+    end
   end
 end
 
+# desc "copy files from template database to standard mod and update cards"
+# task copy_mod_files: :environment do
+#   # mark mod files as mod files
+#   Card::Auth.as_bot do
+#     each_file_card  do |card|
+#       # make card a mod file card
+#       mod_name =
+#         card.left&.type_id == Card::SkinID ? "bootstrap" : "standard"
+#       card.update_attributes! storage_type: :coded,
+#                               mod: mod_name,
+#                               empty_ok: true
+#     end
+#   end
+# # end
 
+# def each_file_card
+#   Card.search(type: %w(in Image File), ne: "").each do |card|
+#     if card.coded? || card.codename == "new_file" ||
+#        card.codename == "new_image"
+#       puts "skipping #{card.name}: already in code"
+#     else
+#       puts "working on #{card.name}"
+#       yield card
+#     end
+#   end
+# end

data/spec/controllers/card_controller_spec.rb

@@ -282,7 +282,7 @@ RSpec.describe CardController, type: :controller do
       before do
         Card::Auth.as_bot do
           Card.create! name: "mao2", type_code: "image",
-                       image: File.new(File.join(FIXTURES_PATH, "mao2.jpg"))
+                       image: File.new(File.join(CARD_TEST_SEED_PATH, "mao2.jpg"))
           Card.create! name: "mao2+*self+*read", content: "[[Administrator]]"
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decko
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2017-11-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.93.0
+        version: 1.93.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.93.0
+        version: 1.93.1
 description: a wiki approach to stuctured data, dynamic interaction,  and web design
 email:
 - info@decko.org
@@ -172,7 +172,6 @@ files:
 - lib/decko/tasks/db.rake
 - lib/decko/tasks/decko.rake
 - lib/decko/tasks/decko/bootstrap.rake
-- lib/decko/tasks/test.rake
 - rails/application-routes.rb
 - rails/assets/ace/ext-searchbox.js
 - rails/assets/ace/mode-coffee.js

data/lib/decko/tasks/test.rake

@@ -1,75 +0,0 @@
-TEST_SEED_PATH = File.join(
-  ENV["DECKO_SEED_REPO_PATH"] || [Cardio.gem_root, "db", "seed"], "test"
-)
-
-namespace :test do
-  task all: :environment do
-    puts "This is not yet working; only first invocation takes effect"
-    Rake::Task["test:functionals"].invoke
-    puts "put 2"
-    Rake::Task["test:functionals"].invoke
-    puts "put 3"
-
-    #    Rake::Task['test'].invoke
-    #    Rake::Task['spec'].invoke
-    #    Rake::Task['cucumber'].invoke
-  end
-
-  ## FIXME: this generates an "Adminstrator links" card with the wrong reader_id, I have been
-  ##  setting it by hand after fixture generation.
-  desc "recreate test fixtures from fresh db"
-  task generate_fixtures: :environment do
-    ENV["GENERATE_FIXTURES"] = "true"
-    raise "must be test env" unless Rails.env == "test"
-
-    Rake::Task["test:repopulate_database"].invoke
-
-    puts ">>extracting to fixtures"
-    puts `rake test:extract_fixtures --trace`
-  end
-
-  desc "seeds database and populates it with test data"
-  task repopulate_database: :environment do
-    raise "must be test env" unless Rails.env == "test"
-    Rake::Task["decko:reset_cache"]
-
-    puts "reseed test db"
-    Rake::Task["decko:seed"].invoke
-
-    puts ">>populating test data"
-    puts `rake test:populate_template_database --trace`
-  end
-
-
-  desc "dump current db to test fixtures"
-  task extract_fixtures: :environment do
-    raise "must be test env" unless Rails.env == "test"
-    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 support Psych,
-    # which dumps with slashes that syck can't understand (also !!null stuff)
-
-    sql = "SELECT * FROM %s"
-    tables = %w(cards card_acts card_actions card_changes card_references)
-    ActiveRecord::Base.establish_connection
-    tables.each do |table_name|
-      i = "000"
-      File.open("#{TEST_SEED_PATH}/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.key? "trash"
-          record["draft"] = false if record.key? "draft"
-          hash["#{table_name}_#{i.succ!}"] = record
-          hash
-        }.to_yaml
-      end
-    end
-  end
-
-  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 "#{TEST_SEED_PATH}/seed.rb"
-    SharedData.add_test_data
-  end
-end