decko 0.1 → 0.2

data/lib/decko/commands/cucumber_command/parser.rb

@@ -25,6 +25,14 @@ module Decko
             parser.on("-s", "--step", "Pause after each step") do |a|
               opts[:env] << "STEP=1" if a
             end
+            parser.on("--[no-]spring", "Run with spring") do |spring|
+              opts[:executer] =
+                if spring
+                 "spring"
+                else
+                 "bundle exec"
+                end
+            end
           end
         end
       end

data/lib/decko/commands/rspec_command.rb

@@ -13,9 +13,9 @@ module Decko
       end
 
       def command
-        "#{env_args} #{@opts[:executer]} " \
-          " #{@opts[:rescue]} rspec #{@rspec_args.shelljoin} #{@opts[:files]} "\
-          " --exclude-pattern \"./card/vendor/**/*\""
+        "#{env_args} #{@opts[:executer]} #{@opts[:rescue]}" \
+          "rspec #{@rspec_args.shelljoin} #{@opts[:files]} "\
+          "--exclude-pattern \"./card/vendor/**/*\""
       end
 
       private

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

@@ -40,7 +40,6 @@ Decko.application.class.configure do
   # See everything in the log (default is :info)
   config.log_level = :debug
 
-  config.active_record.raise_in_transactional_callbacks = true
 
   # config.performance_logger = {
   #     methods:   [:event, :search, :fetch, :view],  # choose methods to log
@@ -79,11 +78,13 @@ Decko.application.class.configure do
 
   config.action_mailer.perform_deliveries = false
 
+
+
   # Use Pry instead of IRB
   silence_warnings do
     begin
       require "pry"
-      IRB = Pry
+      config.console = Pry
     rescue LoadError
     end
   end

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

@@ -4,6 +4,10 @@ Decko.application.class.configure do
 
   config.eager_load = true
 
+  # temporary fix for formerly autoloaded files that stopped autoloading in Rails 5
+  # TODO: configure eager_load_paths explicitly (and remove this)
+  config.enable_dependency_loading = true
+
   # Code is not reloaded between requests
   config.cache_classes = true
 

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

@@ -58,13 +58,13 @@ Decko.application.class.configure do
   # true in your test
   Delayed::Worker.delay_jobs = false
 
-  config.active_record.raise_in_transactional_callbacks = true
+
 
   # Use Pry instead of IRB
   silence_warnings do
     begin
       require "pry"
-      IRB = Pry
+      config.console = Pry
     rescue LoadError
     end
   end

data/lib/decko/config/initializers/sedate_parser.rb

@@ -0,0 +1,7 @@
+# Hack to get rid of annoying parser warnings
+module Parser
+  def self.warn msg
+    return if msg =~ %r{^warning: (?:parser/current|[\d\.]+-compliant syntax|please see)}
+    super
+  end
+end

data/lib/decko/engine.rb

@@ -8,7 +8,7 @@ require "recaptcha"
 require "coderay"
 require "haml"
 require "kaminari"
-require "bootstrap-kaminari-views"
+require "bootstrap4-kaminari-views"
 require "diff/lcs"
 require "builder"
 

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

@@ -1,10 +1,11 @@
 source 'http://rubygems.org'
 
 <% if @gem_path.present? %>
-gem 'wagn',        :path=>"<%= @gemfile_gem_path %>/decko"
-gem 'card',        :path=>"<%= @gemfile_gem_path %>/card", :require => false
+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
 <% else %>
-gem 'wagn'
+gem 'decko'
 <% end %>
 
 gem '<%= database_gemfile_entry.name %>'<%= %(, '#{database_gemfile_entry.version}') if database_gemfile_entry.version %>
@@ -24,7 +25,8 @@ gem '<%= database_gemfile_entry.name %>'<%= %(, '#{database_gemfile_entry.versio
 
 <% if options['mod-dev'] || options['core-dev'] -%>
 group :test do
-  gem 'rspec', '~> 3.4'
+  gem 'rails-controller-testing'
+  gem 'rspec'
   gem 'rspec-rails'         # behavior-driven-development suite
   gem 'spork', '>=0.9'
   gem 'rubocop'
@@ -38,7 +40,6 @@ group :test, :development do
   gem 'jasmine-jquery-rails'
   gem 'sprockets' # just so above works
   gem 'phantomjs', '1.9.7.1' #locked because 1.9.8.0 is breaking
-  gem 'test_after_commit'
   gem 'colorize'
   gem 'delayed_job_active_record', '~> 4.1'
 
@@ -55,19 +56,15 @@ group :debug do
   gem 'pry-rails'
   gem 'pry-rescue'
   gem 'pry-stack_explorer'
-  if RUBY_VERSION =~ /^2/
-    gem 'pry-byebug'
-  else
-    gem 'debugger'
-  end
+  gem 'pry-byebug'
 end
 <% end -%>
 
 <% if options['core-dev'] -%>
 group :assets do
-  gem 'jquery-rails',  '~> 3.1'                # main js framework, along with rails-specific unobtrusive lib
-  gem 'jquery-ui-rails',  '~> 4.2'             # main js framework, along with rails-specific unobtrusive lib
-  gem "jquery_mobile_rails", "~> 1.4.1"
+  gem 'jquery-rails',  '~> 4.3'                # main js framework, along with rails-specific unobtrusive lib
+  gem 'jquery-ui-rails',  '~> 6.0'             # main js framework, along with rails-specific unobtrusive lib
+  gem "jquery_mobile_rails", "~> 1.4.5"
 
   gem 'tinymce-rails', '~> 3.4'                # wysiwyg editor
 end
@@ -75,7 +72,8 @@ end
 group :test do
   gem 'fog'
   gem 'fog-aws'
-  gem 'rspec-html-matchers', '0.8.1' # 0.9 requires ruby >= 2.1
+  gem 'rails-controller-testing'
+  gem 'rspec-html-matchers', '0.9.1'
   gem 'rr' #, '=1.0.0'
 	gem 'simplecov', '~> 0.7.1', :require => false  #test coverage
   gem 'codeclimate-test-reporter', require: nil
@@ -88,10 +86,10 @@ group :test do
   end
 
   # CUKES see features dir
-  gem 'cucumber-rails', '~> 1.4', :require=>false # feature-driven-development suite
-  gem 'capybara', '~> 2.7'
+  gem 'cucumber-rails', '~> 1.5', :require=>false # feature-driven-development suite
+  gem 'capybara', '~> 2.14'
   gem 'selenium-webdriver', '~> 3.3'
-  gem 'chromedriver-helper', '~> 1.0.0'
+  gem 'chromedriver-helper', '~> 1.1.0'
   # gem 'capybara-webkit'
   gem 'launchy'                                # lets cucumber launch browser windows
 
@@ -104,11 +102,7 @@ group :test do
   gem 'turn', :require => false      # Pretty printed test output.  (version constraint is to avoid minitest requirement)
   gem 'minitest'
 
-  if RUBY_VERSION =~ /^(1|2\.0)/
-    puts "Warning: Can't install i18-tasks without Ruby 2.1+: will not be able to test if I18n keys are missing"
-  else
-    gem 'i18n-tasks', '~> 0.9.5'       # See if I18n keys are missing or unused
-  end
+  gem 'i18n-tasks', '~> 0.9.5'       # See if I18n keys are missing or unused
 end
 
 gem 'ruby-prof', :group=>:profile  # profiling

data/lib/decko/mods_spec_helper.rb

@@ -4,7 +4,6 @@
 
 require "decko" # only for card_gem_root
 require File.join Decko.card_gem_root, "spec/support/card_spec_loader.rb"
-require File.join Decko.card_gem_root, "spec/support/matchers.rb"
 
 CardSpecLoader.init
 

data/lib/decko/response.rb

@@ -2,7 +2,6 @@ module Decko
   # methods for managing decko responses
   module Response
     private
-
     def card_redirect url
       url = card_url url # make sure we have absolute url
       if Card::Env.ajax?
@@ -16,14 +15,14 @@ module Decko
     end
 
     def deliver format, result, status
-      if format == :file && status == 200
-        send_file(*result)
-      elsif status == 302
+      if status == 302
         card_redirect result
+      elsif format.is_a?(Card::Format::FileFormat) && status == 200
+        send_file(*result)
       else
-        args = { text: result, status: status }
-        args[:content_type] = "text/text" if format == :file
-        render args
+        render body: result.html_safe,
+               status: status,
+               content_type: format.mime_type
       end
     end
 
@@ -39,7 +38,7 @@ module Decko
         self.params = success.params
       else
         # need tests. insure we get slot, main...
-        params.merge! success.params
+        self.params = params.merge success.params
       end
     end
 
@@ -51,7 +50,11 @@ module Decko
       send_file File.join(path, filename), x_sendfile: true
     end
 
-    def format_from_params
+    def format_from_params card
+      card.format format_name_from_params
+    end
+
+    def format_name_from_params
       return :file if params[:explicit_file]
       format = request.parameters[:format]
       # unknown format
@@ -61,9 +64,12 @@ module Decko
 
     def interpret_id id
       case id
-      when "*previous" then return card_redirect(Card::Env.previous_location)
-      when nil         then determine_id
-      else                  validate_id_encoding id
+      when "*previous" then
+        return card_redirect(Card::Env.previous_location)
+      when nil then
+        determine_id
+      else
+        validate_id_encoding id
       end
     end
 

data/lib/decko/tasks/alias.rb

@@ -0,0 +1,31 @@
+def alias_task name, old_name
+  t = Rake::Task[old_name]
+  desc t.full_comment if t.full_comment
+  task name, *t.arg_names do |_, args|
+    # values_at is broken on Rake::TaskArguments
+    args = t.arg_names.map { |a| args[a] }
+    t.invoke(args)
+  end
+end
+
+def append_to_namespace namespace, part
+  [namespace, part].compact.join(":")
+end
+
+def link_task task, from: nil, to: nil, namespace: nil
+  case task
+  when Hash
+    task.each do |key, val|
+      link_task val, from: from, to: to ,
+                  namespace: append_to_namespace(namespace, key)
+
+    end
+  when Array
+    task.each do |t|
+     link_task t, from: from, to: to, namespace: namespace
+    end
+  else
+    shared_part = append_to_namespace namespace, task
+    alias_task "#{from}:#{shared_part}", "#{to}:#{shared_part}"
+  end
+end

data/lib/decko/tasks/decko.rake

@@ -1,10 +1,15 @@
 require "decko/application"
+require_relative "alias"
+require_relative "../../../../card/db/seed_consts"
 
-DECKO_SEED_TABLES = %w( cards card_actions card_acts card_changes
-                       card_references ).freeze
-DECKO_SEED_PATH = File.join(
-  ENV["DECKO_SEED_REPO_PATH"] || [Cardio.gem_root, "db", "seed"], "new"
-)
+CARD_TASKS =
+  [
+    :migrate,
+    { migrate: [:cards, :structure, :core_cards, :deck_cards, :redo, :stamp] },
+    :reset_cache
+  ]
+
+link_task CARD_TASKS, from: :decko, to: :card
 
 namespace :decko do
   desc "create a decko database from scratch, load initial data"
@@ -72,61 +77,29 @@ namespace :decko do
   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
+    if Decko.paths["tmp"].existent
+      FileUtils.rm_rf Decko.paths["tmp"].first, secure: true
     end
-    Dir.mkdir Wagn.paths["tmp"].first
+    Dir.mkdir Decko.paths["tmp"].first
     Rake::Task["decko:migrate"].invoke
     # FIXME: remove tmp dir / clear cache
     puts "set symlink for assets"
     Rake::Task["decko:update_assets_symlink"].invoke
   end
 
-  desc "reset cache"
-  task reset_cache: :environment do
-    Card::Cache.reset_all
-    Card.reset_all_machines
-  end
+
 
   desc "set symlink for assets"
   task :update_assets_symlink do
     assets_path = File.join(Rails.public_path, "assets")
-    if Rails.root.to_s != Wagn.gem_root && !File.exist?(assets_path)
+    if Rails.root.to_s != Decko.gem_root && !File.exist?(assets_path)
       FileUtils.rm assets_path if File.symlink? assets_path
       FileUtils.ln_s(Decko::Engine.paths["gem-assets"].first, assets_path)
     end
   end
 
-  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"]
 
-    puts "migrating structure"
-    Rake::Task["decko:migrate:structure"].invoke
-    Rake::Task["decko:migrate:stamp"].invoke :structure if stamp
-
-    puts "migrating core cards"
-    Card::Cache.reset_all
-    # not invoke because we don't want to reload environment
-    Rake::Task["decko:migrate:core_cards"].execute
-    if stamp
-      Rake::Task["decko:migrate:stamp"].reenable
-      Rake::Task["decko:migrate:stamp"].invoke :core_cards
-    end
-
-    puts "migrating deck cards"
-    # not invoke because we don't want to reload environment
-    Rake::Task["decko:migrate:deck_cards"].execute
-    if stamp
-      Rake::Task["decko:migrate:stamp"].reenable
-      Rake::Task["decko:migrate:stamp"].invoke :deck_cards
-    end
-
-    Card::Cache.reset_all
-  end
+  alias_task :migrate, "card:migrate"
 
   desc "insert existing card migrations into schema_migrations_cards to avoid re-migrating"
   task :assume_card_migrations do

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

@@ -4,9 +4,12 @@ namespace :decko do
          "and references"
     task clean: :environment do
       Card::Cache.reset_all
-      clear_history
+
       delete_unwanted_cards
       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
@@ -15,30 +18,23 @@ namespace :decko do
     task dump: :environment do
       Card::Cache.reset_all
 
-      # FIXME: temporarily taking this out!!
-      Rake::Task["decko:bootstrap:copy_mod_files"].invoke
-      Card[:all, :script].make_machine_output_coded
-      Card[:all, :style].make_machine_output_coded
-      Card[:script_html5shiv_printshiv].make_machine_output_coded
-
-      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
+      # 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
 
       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|
-          data = ActiveRecord::Base.connection.select_all(
-            "select * from #{table}"
-          )
           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
+            # 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
@@ -49,21 +45,10 @@ namespace :decko do
     task copy_mod_files: :environment do
       # mark mod files as mod files
       Card::Auth.as_bot do
-        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"
-            next
-          else
-            puts "working on #{card.name}"
-          end
-
+        each_file_card  do |card|
           # make card a mod file card
-          mod_name = if (l = card.left) && l.type_id == Card::SkinID
-                       "bootstrap"
-                     else
-                       "standard"
-                     end
+          mod_name =
+            card.left&.type_id == Card::SkinID ? "bootstrap" : "standard"
           card.update_attributes! storage_type: :coded,
                                   mod: mod_name,
                                   empty_ok: true
@@ -79,43 +64,61 @@ namespace :decko do
       Rake::Task["db:seed"].invoke
     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', " \
+  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
+
+  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
+    conn.update(card_sql % who_and_when)
+    conn.update("update card_acts set actor_id=%s, acted_at='%s'" % who_and_when)
+  end
 
-def delete_unwanted_cards
-  Card::Auth.as_bot do
-    if (ignoramus = Card["*ignore"])
-      ignoramus.item_cards.each(&:delete!)
-    end
-    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!
+  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
+      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!
+        end
       end
     end
   end
-end
 
-def clear_history
-  Card::Action.delete_old
-  Card::Change.delete_actionless
+  def make_machine_output_coded
+    [[:all, :script], [:all, :style], [:script_html5shiv_printshiv]].each do |name|
+      Card[*name].make_machine_output_coded
+    end
+  end
 
-  conn = ActiveRecord::Base.connection
-  conn.execute("truncate card_acts")
-  conn.execute("truncate sessions")
-  act = Card::Act.create! actor_id: Card::WagnBotID,
-                          card_id: Card::WagnBotID
-  Card::Action.find_each do |action|
-    action.update_attributes!(card_act_id: act.id)
+  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")
   end
 end
+
+