decko 0.9.3 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05a8d491e994dc90730abbcfb162bedc6b1e30950b00e3ee62cc01bcd9421fdf
-  data.tar.gz: ee98d6512689e0ba436229d838cd71d856e34ac90b363143b03c1fc6c509685a
+  metadata.gz: 7224a35bbfe70eb0161da009005fed740cc35ee689af6adfa980b3ed0f2170df
+  data.tar.gz: 289ac9de6b45e6eda87c7e4348eafc92d08c8fb7d8b83702f15c1c3ad4b74f51
 SHA512:
-  metadata.gz: ad07bc82020a54fa5bdfccc8c93c2a7e362623a29807cfb1bed460c76345a50f4daaa252ffc872b8e2e71eccd24db8800828b2de6d56683cce39343e1bab9e02
-  data.tar.gz: d939edebebf8095b86281abea809abee816501fbac3773acd2f5a0907ed7db3559b517c83f778cb2a21703b11ca353cd8115f52f048f3f14de1d51f4a32305a8
+  metadata.gz: cc0b3db286b9c49e7011d6be0a5392203393eb95621ee3b19abdc06bec656be1820fb7f845e2e2fddb3d03fae7c21710dcd9f7a38a9dcbb2b3190adb10a72644
+  data.tar.gz: f2bfe942fed37c30724f92f7bd7048af9445de4dcb8a41b66491c52016b0192974e24b674010022f51b341fdbd847479e595ac774b4685de7138403d97865329

data/lib/decko.rb

@@ -22,20 +22,5 @@ module Decko
     def gem_root
       DECKO_GEM_ROOT
     end
-
-    def card_gem_root
-      @card_gem_root ||= locate_gem "card"
-    end
-
-    private
-
-    def locate_gem name
-      spec = Bundler.load.specs.find { |s| s.name == name }
-      unless spec
-        raise GemNotFound, "Could not find gem '#{name}' in the current bundle."
-      end
-      return File.expand_path("../../../", __FILE__) if spec.name == "bundler"
-      spec.full_gem_path
-    end
   end
 end

data/lib/decko/application.rb

@@ -3,12 +3,7 @@
 require "decko/engine"
 require_relative "config/initializers/sedate_parser"
 
-if defined?(Bundler)
-  # If you precompile assets before deploying to production, use this line
-  Bundler.require *Rails.groups(assets: %w[development test cypress])
-  # If you want your assets lazily compiled in production, use this line
-  # Bundler.require(:default, :assets, Rails.env)
-end
+Bundler.require :default, *Rails.groups
 
 module Decko
   class Application < Rails::Application

data/lib/decko/commands/application.rb

@@ -1,5 +1,5 @@
 require "rails/generators"
-require File.expand_path("../../generators/decko/decko_generator", __FILE__)
+require File.expand_path("../../generators/deck/deck_generator", __FILE__)
 
 if ARGV.first != "new"
   ARGV[0] = "--help"
@@ -7,4 +7,4 @@ else
   ARGV.shift
 end
 
-DeckoGenerator.start
+Decko::Generators::Deck::DeckGenerator.start

data/lib/decko/commands/cucumber_command.rb

@@ -13,17 +13,14 @@ module Decko
 
       def command
         @cmd ||=
-          "#{env_args} #{@opts[:executer] || "bundle exec"} cucumber #{require_args} #{feature_args}"
+          "#{env_args} #{@opts[:executer] || 'bundle exec'} " \
+          "cucumber #{require_args} #{feature_args}"
       end
 
       private
 
       def env_args
-        env_args = @opts[:env].join " "
-        # turn coverage off if not all cukes run
-        env_args << " COVERAGE=false" if @cucumber_args.present?
-        env_args << " RAILS_GROUPS=test,debug"
-        env_args
+        @opts[:env].join " "
       end
 
       def feature_args
@@ -40,7 +37,7 @@ module Decko
       end
 
       def feature_paths
-        Card::Mod.dirs.map do |p|
+        Cardio::Mod.dirs.map do |p|
           Dir.glob "#{p}/features"
         end.flatten
       end

data/lib/decko/commands/rspec_command.rb

@@ -14,8 +14,7 @@ module Decko
 
       def command
         "#{env_args} #{@opts[:executer]} #{@opts[:rescue]}" \
-          "rspec #{@rspec_args.shelljoin} #{@opts[:files]} "\
-          "--exclude-pattern \"./card/vendor/**/*\""
+          "rspec #{@rspec_args.shelljoin} #{@opts[:files]}"
       end
 
       private
@@ -26,10 +25,9 @@ module Decko
 
       def coverage
         # no coverage if rspec was started with file argument
-        if (@opts[:files] || @rspec_args.present?) && !@opts[:simplecov]
-          @opts[:simplecov] = "COVERAGE=false"
-        end
-        @opts[:simplecov]
+        return unless @opts[:files] || @rspec_args.present?
+
+        "COVERAGE=false"
       end
     end
   end

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

@@ -5,21 +5,22 @@ module Decko
   module Commands
     class RspecCommand
       class Parser < OptionParser
-        def initialize opts
-          super() do |parser|
-            parser.banner = "Usage: decko rspec [DECKO ARGS] -- [RSPEC ARGS]\n\n" \
-                            "RSPEC ARGS"
-            parser.separator <<-EOT
+        RSPEC_PATH_MESSAGE = <<-EOT
 
             DECKO ARGS
 
-            You don't have to give a full path for FILENAME, the basename is enough
-              If FILENAME does not include '_spec' rspec searches for the
-              corresponding spec file.
-              The line number always referes to example in the (corresponding) spec
-              file.
+            You don't have to give a full path for FILENAME; the basename is enough.
+            If FILENAME does not include '_spec', then rspec searches for the
+            corresponding spec file.
+            The line number always refers to the example in the spec file.
+
+        EOT
 
-            EOT
+        def initialize opts
+          super() do |parser|
+            parser.banner = "Usage: decko rspec [DECKO ARGS] -- [RSPEC ARGS]\n\n" \
+                            "RSPEC ARGS"
+            parser.separator RSPEC_PATH_MESSAGE
 
             parser.on("-d", "--spec FILENAME(:LINE)",
                       "Run spec for a Decko deck file") do |file|
@@ -31,42 +32,53 @@ module Decko
             end
             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?
-                  files
-                else
-                  find_spec_file(file, "#{Cardio.gem_root}/mod")
-                end
+              opts[:files] = find_mod_file(file, Cardio.gem_root)
             end
             parser.on("-s", "--[no-]simplecov", "Run with simplecov") do |s|
-              opts[:simplecov] = s ? "" : "COVERAGE=false"
+              opts[:simplecov] = s ? "TMPSETS=true" : ""
             end
             parser.on("--rescue", "Run with pry-rescue") do
-              if opts[:executer] == "spring"
-                puts "Disabled pry-rescue. Not compatible with spring."
-              else
-                opts[:rescue] = "rescue "
-              end
+              process_rescue_opts opts
             end
             parser.on("--[no-]spring", "Run with spring") do |spring|
-              if spring
-                opts[:executer] = "spring"
-                if opts[:rescue]
-                  opts[:rescue] = ""
-                  puts "Disabled pry-rescue. Not compatible with spring."
-                end
-              else
-                opts[:executer] = "bundle exec"
-              end
+              process_spring_opts spring, opts
             end
             parser.separator "\n"
           end
         end
 
+        private
+
+        def process_rescue_opts opts
+          if opts[:executer] == "spring"
+            puts "Disabled pry-rescue. Not compatible with spring."
+          else
+            opts[:rescue] = "rescue "
+          end
+        end
+
+        def process_spring_opts spring, opts
+          if spring
+            opts[:executer] = "spring"
+            if opts[:rescue]
+              opts[:rescue] = ""
+              puts "Disabled pry-rescue. Not compatible with spring."
+            end
+          else
+            opts[:executer] = "bundle exec"
+          end
+        end
+
+        def find_mod_file filename, base_dir
+          if File.exist?("mod/#{filename}") || File.exist?("#{base_dir}/mod/#{filename}")
+            "#{base_dir}/mod/#{filename}"
+          elsif (files = find_spec_file(filename, "mod"))&.present?
+            files
+          else
+            find_spec_file(file, "#{base_dir}/mod")
+          end
+        end
+
         def find_spec_file filename, base_dir
           file, line = filename.split(":")
           if file.include?("_spec.rb") && File.exist?(file)

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

@@ -88,8 +88,6 @@ 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
     require "pry"

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

@@ -1,11 +1,9 @@
-
+# -*- encoding : utf-8 -*-
 
 Decko::Engine.configure do
   config.cache_classes = false
 end
 
-# -*- encoding : utf-8 -*-
-
 Decko.application.class.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
@@ -22,16 +20,6 @@ Decko.application.class.configure do
   config.cache_classes = false
   config.reload_classes_only_on_change = true
 
-  config.reload_sets = true
-
-  # if defined?(RailsDevTweaks)
-  #   config.dev_tweaks.autoload_rules do
-  #     skip "/files"
-  #     skip "/favicon.ico"
-  #     skip /view\=status/
-  #   end
-  # end
-
   # Log error messages when you accidentally call methods on nil.
   config.whiny_nils = true
 
@@ -57,9 +45,9 @@ Decko.application.class.configure do
 
   # config.performance_logger = {
   #     methods:   [:event, :search, :fetch, :view],  # choose methods to log
-  #     min_time:  100,                              # show only method calls that are slower than 100ms
-  #     max_depth: 3,                               # show nested method calls only up to depth 3
-  #     details:   true                                # show method arguments and sql
+  #     min_time:  100,               # show only method calls that are slower than 100ms
+  #     max_depth: 3,                 # show nested method calls only up to depth 3
+  #     details:   true               # show method arguments and sql
   #     log_level: :info
   # }
 
@@ -72,11 +60,13 @@ Decko.application.class.configure do
   #   # Expands the lines which load the assets
   #   config.assets.debug = false
   #
-  #   # This needs to be on for tinymce to work, because several important files (themes, etc) are only served statically
+  #   # This needs to be on for tinymce to work, because several important files
+  #     (themes, etc) are only served statically
   #   config.serve_static_files = ENV['STATIC_ASSETS'] || true
   #
   #   # Setting a bogus directory so rails won't find public/assets in dev mode.
-  #   # Normally you could skip that by not serving static assets, but that breaks tinymce (see above)
+  #   # Normally you could skip that by not serving static assets, but that breaks
+  #     tinymce (see above)
   #   config.assets.prefix = "dynamic-assets"
 
   # Log the query plan for queries taking more than this (works
@@ -92,14 +82,13 @@ 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
     require "pry"
     config.console = Pry
   rescue LoadError
   end
+
   #config.session_store :cookie_store
 end
 

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

@@ -64,4 +64,7 @@ Decko.application.class.configure do
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
+
+  # cache the list of set module objects on card objects
+  config.cache_set_module_list = true
 end

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

@@ -10,7 +10,7 @@ Decko.application.class.configure do
   # test suite.  You never need to work with it otherwise.  Remember that
   # your test database is "scratch space" for the test suite and is wiped
   # and recreated between test runs.  Don't rely on the data there!
-  config.cache_classes = true
+  config.cache_classes = false
 
   config.assets.enabled = true if Object.const_defined?(:JasmineRails)
 
@@ -58,13 +58,6 @@ Decko.application.class.configure do
 
   config.raise_all_rendering_errors = true
 
-  config.active_job.queue_adapter = :delayed_job
-  # Note: With delay_jobs set to false integrate_with_delay events don't run
-  # in a separate process and hence can behave differently from a real
-  # environment. To test integrate_with_delay events properly set delay_jobs to
-  # true in your test
-  Delayed::Worker.delay_jobs = false
-
   config.rescue_all_in_controller = false
   # Use Pry instead of IRB
   silence_warnings do

data/lib/decko/engine.rb

@@ -4,7 +4,6 @@ require "cardio"
 
 # TODO: Move these to modules that use them
 require "htmlentities"
-require "recaptcha"
 require "coderay"
 require "haml"
 require "kaminari"

data/lib/decko/generators/deck/deck_generator.rb

@@ -0,0 +1,132 @@
+require "rails/generators/app_base"
+
+module Decko
+  module Generators
+    module Deck
+      # Create new Decks (Decko Applications)
+      class DeckGenerator < Rails::Generators::AppBase
+        require "decko/generators/deck/deck_generator/rails_overrides"
+        require "decko/generators/deck/deck_generator/deck_helper"
+
+        include RailsOverrides
+        include DeckHelper
+
+        source_root File.expand_path("../templates", __FILE__)
+
+        # All but the first aliases should be considered deprecated
+        class_option "monkey",
+                     type: :boolean, aliases: %w[-M --mod-dev],
+                     default: false, group: :runtime,
+                     desc: "Prepare deck for monkey (mod developer)"
+
+        class_option "platypus",
+                     type: :boolean, aliases: %w[-P --core-dev -c],
+                     default: false, group: :runtime,
+                     desc: "Prepare deck for platypus (core development)"
+
+        class_option "repo-path",
+                     type: :string, aliases: %w[-R -g --gem-path],
+                     default: "", group: :runtime,
+                     desc: "Path to local decko repository " \
+                           "(Default, use env DECKO_REPO_PATH)"
+
+        class_option :database,
+                     type: :string, aliases: %w[-D -d], default: "mysql",
+                     desc: "Preconfigure for selected database " \
+                           "(options: #{DATABASES.join('/')})"
+
+        class_option "interactive",
+                     type: :boolean, aliases: %w[-I -i], default: false, group: :runtime,
+                     desc: "Prompt with dynamic installation options"
+
+        public_task :set_default_accessors!
+        public_task :create_root
+
+        def self.banner
+          "decko new #{arguments.map(&:usage).join(' ')} [options]"
+        end
+
+        # Generator works its way through each public method below
+
+        def core_files
+          erb_template "config.ru"
+          erb_template "Gemfile"
+          erb_template "Rakefile"
+        end
+
+        def empty_dirs
+          %w[mod log files tmp].each { |dirname| empty_directory_with_keep_file dirname }
+        end
+
+        def dotfiles
+          copy_file "pryrc", ".pryrc"
+          copy_file "gitignore", ".gitignore"
+          template "rspec.erb", ".rspec"
+          template "simplecov.rb.erb", ".simplecov"
+        end
+
+        def config
+          inside "config" do
+            erb_template "application.rb"
+            erb_template "routes.rb"
+            erb_template "environment.rb"
+            erb_template "boot.rb"
+            template "databases/#{options[:database]}.yml", "database.yml"
+            template "cucumber.yml"
+            template "initializers/cypress.rb" if platypus?
+            template "puma.rb"
+          end
+        end
+
+        def public
+          inside "public" do
+            template "robots.txt"
+            inside("files") { template "htaccess", ".htaccess" }
+          end
+        end
+
+        def spring
+          inside("bin") { erb_template "spring" }
+        end
+
+        def script
+          directory("script") { |content| "#{shebang}\n" + content }
+          chmod "script", 0o755 & ~File.umask, verbose: false
+        end
+
+        def spec
+          inside "spec" do
+            if platypus?
+              jasmine_yml :decko
+            else
+              jasmine_yml :deck
+              template "spec_helper.rb"
+            end
+          end
+        end
+
+        public_task :run_bundle
+
+        def seed_data
+          if options["interactive"]
+            Interactive.new(destination_root, (monkey? || platypus?)).run
+          else
+            puts "Now:
+      1. Run `cd #{File.basename(destination_root)}` to enter your new deck directory
+      2. Run `decko seed` to seed your database (see config/database.yml).
+      3. Run `decko server` to start your server"
+          end
+        end
+
+        protected
+
+        def database_gemfile_entry
+          return [] if options[:skip_active_record]
+          gem_name, gem_version = gem_for_database
+          msg = "Use #{options[:database]} as the database for Active Record"
+          GemfileEntry.version gem_name, gem_version, msg
+        end
+      end
+    end
+  end
+end