wagn 1.18.6 → 1.19.0

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

@@ -7,21 +7,21 @@ class WagnGenerator
   #  - run server
   class Interactive
     def initialize options, destination_root
-      @dev = options['core-dev'] || options['mod-dev']
+      @dev = options["core-dev"] || options["mod-dev"]
       @destination_root = destination_root
     end
 
     def run
-      require config_path('application') # need this for Rails.env
+      require config_path("application") # need this for Rails.env
       @menu = ActiveSupport::OrderedHash.new
       add_config_options
       add_seed_options
       add_exit_option
-      while (answer = ask(build_menu)) != 'x'
+      while (answer = ask(build_menu)) != "x"
         if @menu.key? answer
           @menu[answer][:code].call
         else
-          puts 'invalid choice'
+          puts "invalid choice"
         end
       end
     end
@@ -33,7 +33,7 @@ class WagnGenerator
     end
 
     def config_path file
-      File.join destination_root, 'config', file
+      File.join destination_root, "config", file
     end
 
     def bundle_exec command, opts={}
@@ -42,26 +42,26 @@ class WagnGenerator
     end
 
     def build_menu
-      lines = ['What would you like to do next?']
+      lines = ["What would you like to do next?"]
       lines += @menu.map { |key, v|  build_option key, v[:desc], v[:command] }
       lines << "[#{@menu.keys.join}]"
       "\n#{lines.join("\n")}\n"
     end
 
     def build_option key, desc, command
-      command &&= ' ' * (65 - desc.size) + '[' + command + ']'
+      command &&= " " * (65 - desc.size) + "[" + command + "]"
       "  #{key} - #{desc}#{command if command}"
     end
 
     def add_config_options
-      @menu['d'] = {
-        desc: 'edit database configuration file',
-        command: 'nano config/database.yml',
+      @menu["d"] = {
+        desc: "edit database configuration file",
+        command: "nano config/database.yml",
         code: proc { system "nano #{config_path 'database.yml'}" }
       }
-      @menu['c'] = {
-        desc: 'configure Wagn (e.g. email settings)',
-        command: 'nano config/application.rb',
+      @menu["c"] = {
+        desc: "configure Wagn (e.g. email settings)",
+        command: "nano config/application.rb",
         code: proc { system "nano #{config_path 'application.rb'}" }
       }
     end
@@ -72,24 +72,24 @@ class WagnGenerator
     end
 
     def add_common_seed_option
-      @menu['s'] = {
+      @menu["s"] = {
         desc: "seed #{Rails.env}#{' and test' if dev_options?} database",
-        command: 'wagn seed',
+        command: "wagn seed",
         code: proc do
-          bundle_exec 'rake wagn:seed'
-          bundle_exec 'rake wagn:seed', rails_env: 'test' if dev_options?
+          bundle_exec "rake wagn:seed"
+          bundle_exec "rake wagn:seed", rails_env: "test" if dev_options?
           add_after_seed_options
         end
       }
     end
 
     def add_seed_all_option
-      @menu['a'] = {
-        desc: 'seed all databases (production, development, and test)',
-        command: 'wagn seed --all',
+      @menu["a"] = {
+        desc: "seed all databases (production, development, and test)",
+        command: "wagn seed --all",
         code: proc do
-          %w( production development test ).each do |env|
-            bundle_exec 'rake wagn:seed', rails_env: env
+          %w(production development test).each do |env|
+            bundle_exec "rake wagn:seed", rails_env: env
           end
           add_after_seed_options
         end
@@ -97,17 +97,17 @@ class WagnGenerator
     end
 
     def add_exit_option
-      @menu['x'] = {
+      @menu["x"] = {
         desc: "exit (run 'wagn seed' to complete the installation later)"
       }
     end
 
     def add_after_seed_options
-      @menu['x'][:desc] = 'exit'
-      @menu['r'] = {
-        desc:    'run wagn server',
-        command: 'wagn server',
-        code:    proc { bundle_exec 'wagn server' }
+      @menu["x"][:desc] = "exit"
+      @menu["r"] = {
+        desc:    "run wagn server",
+        command: "wagn server",
+        code:    proc { bundle_exec "wagn server" }
       }
     end
   end

data/lib/wagn/mods_spec_helper.rb

@@ -1,30 +1,30 @@
 # -*- encoding : utf-8 -*-
 # require 'codeclimate-test-reporter'
 # CodeClimate::TestReporter.start
-require 'spork'
+require "spork"
 
-ENV['RAILS_ENV'] = 'test'
+ENV["RAILS_ENV"] = "test"
 
 Spork.prefork do
-  if ENV['RAILS_ROOT']
-    require File.join(ENV['RAILS_ROOT'], '/config/environment')
+  if ENV["RAILS_ROOT"]
+    require File.join(ENV["RAILS_ROOT"], "/config/environment")
   else
-    require File.expand_path('../../config/environment', __FILE__)
+    require File.expand_path("../../config/environment", __FILE__)
   end
-  require File.join Cardio.gem_root, 'lib', 'card', 'simplecov_helper.rb'
+  require File.join Cardio.gem_root, "config", "simplecov_helper.rb"
 
   if defined?(Bundler)
     Bundler.require(:test)   # if simplecov is activated in the Gemfile, it has to be required here
   end
 
-  require 'rspec/rails'
+  require "rspec/rails"
 
   # Requires supporting ruby files with custom matchers and macros, etc,
   # in spec/support/ and its subdirectories.
   #  Dir[ File.join(Wagn.gem_root, "spec/support/**/*.rb") ].each { |f| require f }
 
   #  FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures'
-  JOE_USER_ID = Card['joe_user'].id
+  JOE_USER_ID = Card["joe_user"].id
 
   RSpec.configure do |config|
     config.include RSpec::Rails::Matchers::RoutingMatchers,        file_path: /\bspec\/controllers\//
@@ -60,6 +60,6 @@ Spork.each_run do
   # This code will be run each time you run your specs.
 end
 
-require File.join Cardio.gem_root, 'lib', 'card', 'spec_helper.rb'
+require File.join Cardio.gem_root, "spec", "card_spec_helper.rb"
 
 RSpec::Core::ExampleGroup.send :include, Card::SpecHelper

data/lib/wagn/parser.rb

@@ -8,21 +8,21 @@ module Wagn
           parser.banner = "Usage: wagn #{command} [options]\n\n" \
                           "Run wagn:#{command} task on the production "\
                           " database specified in config/database.yml\n\n"
-          parser.on('--production', '-p',
+          parser.on("--production", "-p",
                     "#{command} production database (default)") do
-            opts[:envs] = ['production']
+            opts[:envs] = ["production"]
           end
-          parser.on('--test', '-t',
+          parser.on("--test", "-t",
                     "#{command} test database") do
-            opts[:envs] = ['test']
+            opts[:envs] = ["test"]
           end
-          parser.on('--development', '-d',
+          parser.on("--development", "-d",
                     "#{command} development database") do
-            opts[:envs] = ['development']
+            opts[:envs] = ["development"]
           end
-          parser.on('--all', '-a',
+          parser.on("--all", "-a",
                     "#{command} production, test, and development database") do
-            opts[:envs] = %w( production development test)
+            opts[:envs] = %w(production development test)
           end
         end
       end
@@ -30,7 +30,7 @@ module Wagn
       def rspec opts
         OptionParser.new do |parser|
           parser.banner = "Usage: wagn rspec [WAGN ARGS] -- [RSPEC ARGS]\n\n" \
-                          'RSPEC ARGS'
+                          "RSPEC ARGS"
           parser.separator <<-WAGN
 
       WAGN ARGS
@@ -43,46 +43,46 @@ module Wagn
 
       WAGN
 
-          parser.on('-d', '--spec FILENAME(:LINE)',
-                    'Run spec for a Wagn deck file') do |file|
+          parser.on("-d", "--spec FILENAME(:LINE)",
+                    "Run spec for a Wagn deck file") do |file|
             opts[:files] = find_spec_file(file, "#{Wagn.root}/mod")
           end
-          parser.on('-c', '--core-spec FILENAME(:LINE)',
-                    'Run spec for a Wagn core file') do |file|
+          parser.on("-c", "--core-spec FILENAME(:LINE)",
+                    "Run spec for a Wagn core file") do |file|
             opts[:files] = find_spec_file(file, Cardio.gem_root)
           end
-          parser.on('-m', '--mod MODNAME',
-                    'Run all specs for a mod or matching a mod') do |file|
+          parser.on("-m", "--mod MODNAME",
+                    "Run all specs for a mod or matching a mod") do |file|
             opts[:files] =
               if File.exist?("mod/#{file}")
                 "#{Cardio.gem_root}/mod/#{file}"
               elsif File.exist?("#{Cardio.gem_root}/mod/#{file}")
                 "#{Cardio.gem_root}/mod/#{file}"
-              elsif (files = find_spec_file(file, 'mod')) && files.present?
+              elsif (files = find_spec_file(file, "mod")) && files.present?
                 files
               else
                 find_spec_file(file, "#{Cardio.gem_root}/mod")
               end
           end
-          parser.on('-s', '--[no-]simplecov', 'Run with simplecov') do |s|
-            opts[:simplecov] = s ? '' : 'COVERAGE=false'
+          parser.on("-s", "--[no-]simplecov", "Run with simplecov") do |s|
+            opts[:simplecov] = s ? "" : "COVERAGE=false"
           end
-          parser.on('--rescue', 'Run with pry-rescue') do
-            if opts[:executer] == 'spring'
-              puts 'Disabled pry-rescue. Not compatible with spring.'
+          parser.on("--rescue", "Run with pry-rescue") do
+            if opts[:executer] == "spring"
+              puts "Disabled pry-rescue. Not compatible with spring."
             else
-              opts[:rescue] = 'rescue '
+              opts[:rescue] = "rescue "
             end
           end
-          parser.on('--[no-]spring', 'Run with spring') do |spring|
+          parser.on("--[no-]spring", "Run with spring") do |spring|
             if spring
-              opts[:executer] = 'spring'
+              opts[:executer] = "spring"
               if opts[:rescue]
-                opts[:rescue] = ''
-                puts 'Disabled pry-rescue. Not compatible with spring.'
+                opts[:rescue] = ""
+                puts "Disabled pry-rescue. Not compatible with spring."
               end
             else
-              opts[:executer] = 'bundle exec'
+              opts[:executer] = "bundle exec"
             end
           end
           parser.separator "\n"

data/lib/wagn/response.rb

@@ -0,0 +1,106 @@
+module Wagn
+  # methods for managing wagn responses
+  module Response
+    private
+
+    def card_redirect url
+      url = card_url url # make sure we have absolute url
+      if Card::Env.ajax?
+        # lets client reset window location
+        # (not just receive redirected response)
+        # formerly used 303 response, but that gave IE the fits
+        render json: { redirect: url }
+      else
+        redirect_to url
+      end
+    end
+
+    def deliver format, result, status
+      if format == :file && status == 200
+        send_file(*result)
+      elsif status == 302
+        card_redirect result
+      else
+        args = { text: result, status: status }
+        args[:content_type] = "text/text" if format == :file
+        render args
+      end
+    end
+
+    def reset_card new_card
+      @card = new_card
+      update_params_for_success
+      @card.select_action_by_params params
+    end
+
+    def update_params_for_success
+      success = Card::Env.success
+      if success.soft_redirect?
+        self.params = success.params
+      else
+        # need tests. insure we get slot, main...
+        params.merge! success.params
+      end
+    end
+
+    def send_deprecated_asset
+      filename = [params[:filename], params[:format]].join(".")
+      # for security, block relative paths
+      raise Wagn::BadAddress if filename.include? "../"
+      path = Decko::Engine.paths["gem-assets"].existent.first
+      send_file File.join(path, filename), x_sendfile: true
+    end
+
+    def page_opts_from_params
+      (params[:slot] || {}).deep_symbolize_keys
+    end
+
+    def format_from_params
+      return :file if params[:explicit_file]
+      format = request.parameters[:format]
+      # unknown format
+      return :file unless Card::Format.registered.member?(format)
+      format.to_sym
+    end
+
+    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
+      end
+    end
+
+    def determine_id
+      case
+      when prompt_setup?
+        prepare_setup_card!
+      when params[:card] && params[:card][:name]
+        params[:card][:name]
+      when Card::Format.tagged(params[:view], :unknown_ok)
+        ""
+      else
+        Card.global_setting(:home) || "Home"
+      end
+    end
+
+    def prompt_setup?
+      Card::Auth.needs_setup? && Card::Env.html?
+    end
+
+    def prepare_setup_card!
+      params[:card] = { type_id: Card.default_accounted_type_id }
+      params[:view] = "setup"
+      ""
+    end
+
+    def validate_id_encoding id
+      # we should find the place where we produce these bad urls
+      id.valid_encoding? ? id : id.force_encoding("ISO-8859-1").encode("UTF-8")
+    end
+
+    def use_draft?
+      params[:edit_draft] && card.drafts.present?
+    end
+  end
+end

data/lib/wagn/script_wagn_loader.rb

@@ -1,15 +1,15 @@
-require 'pathname'
+require "pathname"
 
 module Wagn
   module ScriptWagnLoader
-    RUBY = File.join(*RbConfig::CONFIG.values_at('bindir', 'ruby_install_name')) + RbConfig::CONFIG['EXEEXT']
-    SCRIPT_WAGN = File.join('script', 'wagn')
+    RUBY = File.join(*RbConfig::CONFIG.values_at("bindir", "ruby_install_name")) + RbConfig::CONFIG["EXEEXT"]
+    SCRIPT_WAGN = File.join("script", "wagn")
 
     def self.exec_script_wagn!
       cwd = Dir.pwd
       return unless in_wagn_application? || in_wagn_application_subdirectory?
       exec RUBY, SCRIPT_WAGN, *ARGV if in_wagn_application?
-      Dir.chdir('..') do
+      Dir.chdir("..") do
         # Recurse in a chdir block: if the search fails we want to be sure
         # the application is generated in the original working directory.
         exec_script_wagn! unless cwd == Dir.pwd

data/lib/wagn/simplecov_helper.rb

@@ -1,7 +1,7 @@
 def card_simplecov_filters
-  add_filter 'spec/'
-  add_filter '/config/'
-  add_filter '/tasks/'
+  add_filter "spec/"
+  add_filter "/config/"
+  add_filter "/tasks/"
 
   # filter all card mods
   add_filter do |src_file|
@@ -9,7 +9,7 @@ def card_simplecov_filters
   end
 
   # add group for each deck mod
-  Dir['mod/*'].map { |path| path.sub('mod/', '') }.each do |mod|
+  Dir["mod/*"].map { |path| path.sub("mod/", "") }.each do |mod|
     add_group mod.capitalize do |src_file|
       src_file.filename =~ /mod\/#{mod}\// ||
         (
@@ -19,18 +19,18 @@ def card_simplecov_filters
     end
   end
 
-  add_group 'Sets' do |src_file|
+  add_group "Sets" do |src_file|
     src_file.filename =~ /tmp\/set\// &&
       /\d+-(.+\.rb)/.match(src_file.filename) { |m| Dir["mod/**/#{m[1]}"].present? }
   end
-  add_group 'Set patterns' do |src_file|
+  add_group "Set patterns" do |src_file|
     src_file.filename =~ /tmp\/set_pattern\// &&
       /\d+-(.+\.rb)/.match(src_file.filename) { |m| Dir["mod/**/#{m[1]}"].present? }
   end
-  add_group 'Formats' do |src_file|
+  add_group "Formats" do |src_file|
     src_file.filename =~ /mod\/[^\/]+\/formats/
   end
-  add_group 'Chunks' do |src_file|
+  add_group "Chunks" do |src_file|
     src_file.filename =~ /mod\/[^\/]+\/chunks/
   end
 end
@@ -41,20 +41,20 @@ def card_core_dev_simplecov_filters
     !(src.filename =~ /^#{SimpleCov.root}/) unless src.filename =~ /wagn/
   end
 
-  add_filter '/spec/'
-  add_filter '/features/'
-  add_filter '/config/'
-  add_filter '/tasks/'
-  add_filter '/generators/'
-  add_filter 'lib/card'
+  add_filter "/spec/"
+  add_filter "/features/"
+  add_filter "/config/"
+  add_filter "/tasks/"
+  add_filter "/generators/"
+  add_filter "lib/card"
 
-  add_group 'Card', 'lib/card'
-  add_group 'Set Patterns', 'tmp/set_pattern/'
-  add_group 'Sets',         'tmp/set/'
-  add_group 'Formats' do |src_file|
+  add_group "Card", "lib/card"
+  add_group "Set Patterns", "tmp/set_pattern/"
+  add_group "Sets",         "tmp/set/"
+  add_group "Formats" do |src_file|
     src_file.filename =~ /mod\/[^\/]+\/format/
   end
-  add_group 'Chunks' do |src_file|
+  add_group "Chunks" do |src_file|
     src_file.filename =~ /mod\/[^\/]+\/chunk/
   end
 end