decko 0.6.8 → 0.7.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a01cd6c3dc6acfb1c1182149a45b0e25925f5dea
-  data.tar.gz: 6dec91fd8fd9b21cc9490ed976d0a060f5db8fb2
+  metadata.gz: a79047a348903dd9793edf85cb5d9bbdd6f63308
+  data.tar.gz: cac43ee279c0c466df819d890afa02671253de16
 SHA512:
-  metadata.gz: 1f041ce2aa0ebf5e1f64976355d5b25ba411c73ce42e684ac6da068804dac02205b4eb2002b86f2cf36354128d47cee1b4a8829253393e9310a616a0368f1088
-  data.tar.gz: 5fee480118e6d2cf34b5db84889ec64781b8bd5a42cd645b5ca1d908b898cad254a1e289585ade20787b7846437d95df7aeb80d8b044327b33b5504a6d8f6e56
+  metadata.gz: 65102a60f9db30535b9229e73c57bc47a9ba442453251fda1ea4b6e2c81e961aa884f08a0ec3747653208e4a546df2a73f0361f7afe7ba81ff28b8001893f1d7
+  data.tar.gz: 45a4f71dbc6cd4cfac8ff1b9329c65a28124e3d8eb5a55cc89a4ef8beee46cc821c77918daee03d207c5a16495012375562bd18ae0e150ef7c8fc7ec0faf46c7

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

@@ -24,6 +24,7 @@ Decko.application.class.configure do
   if defined?(RailsDevTweaks)
     config.dev_tweaks.autoload_rules do
       skip "/files"
+      skip "/favicon.ico"
       skip /view\=status/
     end
   end
@@ -98,6 +99,7 @@ Decko.application.class.configure do
     rescue LoadError
     end
   end
+  #config.session_store :cookie_store
 end
 
 # Paperclip.options[:command_path] = "/opt/local/bin"

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

@@ -88,6 +88,7 @@ class DeckoGenerator < Rails::Generators::AppBase
       template "boot.rb"
       template "databases/#{options[:database]}.yml", "database.yml"
       template "cucumber.yml" if options["core-dev"]
+      template "initializers/cypress_dev.rb" if options["core-dev"]
     end
   end
 

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

@@ -28,14 +28,19 @@ gem 'thin'
 
 <% if options['mod-dev'] || options['core-dev'] -%>
 group :test do
+  gem 'capybara-puma'
   gem 'rspec'
   gem 'rspec-rails', '~>3.6.1'         # behavior-driven-development suite
   gem 'spork', '>=0.9'
   gem 'rubocop'
   gem 'rubocop-decko'
+  gem 'nokogumbo'
 end
 
 group :test, :development do
+  gem 'colorize'
+  gem 'cypress-on-rails', '~> 1.2'
+  gem 'delayed_job_active_record', '~> 4.1'
   gem 'html2haml'
   gem 'rails-dev-tweaks'
   # gem 'jasmine'
@@ -43,8 +48,9 @@ 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 'colorize'
-  gem 'delayed_job_active_record', '~> 4.1'
+
+  gem 'better_errors'
+  gem 'binding_of_caller'
 
   <%- if spring_install? %>
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
@@ -73,6 +79,7 @@ group :assets do
 end
 
 group :test do
+  gem 'capybara-select2', :git=>'https://github.com/brunocavalcante/capybara-select2'
   gem 'fog'
   gem 'fog-aws'
   gem 'rails-controller-testing'
@@ -89,10 +96,10 @@ group :test do
   end
 
   # CUKES see features dir
-  gem 'cucumber-rails', '~> 1.5', :require=>false # feature-driven-development suite
-  gem 'capybara', '~> 2.14'
-  gem 'selenium-webdriver', '3.6.0'
-  gem 'chromedriver-helper', '~> 1.1.0'
+  gem 'cucumber-rails', '~> 1.6', :require=>false # feature-driven-development suite
+  gem 'capybara', '~> 3.12'
+  gem 'selenium-webdriver', '3.141.0'
+  gem 'chromedriver-helper', '~> 2.1.0'
   # gem 'capybara-webkit'
   gem 'launchy'                                # lets cucumber launch browser windows
 
@@ -109,11 +116,6 @@ group :test do
 end
 
 gem 'ruby-prof', :group=>:profile  # profiling
-
-group :debug do
-  gem 'better_errors'
-  gem 'binding_of_caller'
-end
 <% end %>
 
 # load gems needed in Gemfiles

data/lib/decko/generators/decko/templates/config/initializers/cypress_dev.rb

@@ -0,0 +1,9 @@
+if defined?(CypressDev)
+  CypressDev.configure do |c|
+    c.cypress_folder = File.join Decko.gem_root, "spec", "cypress"
+    # WARNING!! CypressDev can execute arbitrary ruby code
+    # please use with extra caution if enabling on hosted servers or starting your local server on 0.0.0.0
+    c.use_middleware = Rails.env.test? || ENV["CYPRESS_DEV"]
+    c.logger = Rails.logger
+  end
+end

data/lib/decko/response.rb

@@ -53,11 +53,20 @@ module Decko
 
     # (obviously) deprecated
     def send_deprecated_asset
-      filename = [params[:mark], params[:format]].join(".")
-      # for security, block relative paths
-      raise Card::Error::BadAddress if filename.include? "../"
+      filename = [params[:mark], params[:format]].compact.join(".")
+      send_file asset_file_path(filename), x_sendfile: true
+    end
+
+    def asset_file_path filename
       path = Decko::Engine.paths["gem-assets"].existent.first
-      send_file File.join(path, filename), x_sendfile: true
+      path = File.join path, filename
+      validate_path filename, path
+      path
+    end
+
+    def validate_path filename, path
+      # for security, block relative paths
+      raise Card::Error::BadAddress if filename.include?("../") || !::File.exist?(path)
     end
 
     # TODO: everything below should go in a separate file

data/rails/controllers/card_controller.rb

@@ -116,20 +116,29 @@ class CardController < ActionController::Base
   end
 
   def render_page format, view
-    view ||= params[:view]
+    view ||= view_from_params
     card.act do
       format.page self, view, Card::Env.slot_opts
     end
   end
 
+  def view_from_params
+    params[:view] || params[:v]
+  end
+
   def handle_exception exception
+    raise exception if debug_exception?(exception)
     @card ||= Card.new
-    Card::Error.current = exception
-    error = Card::Error.cardify_exception exception, card
-    error.report
+    error = Card::Error.report exception, card
     show error.class.view, error.class.status_code
   end
 
+  def debug_exception? e
+    !e.is_a?(Card::Error::UserError) &&
+      !e.is_a?(ActiveRecord::RecordInvalid) &&
+      Card[:debugger]&.content =~ /on/  # && !Card::Env.ajax?
+  end
+
   class << self
     def rescue_from_class klass
       rescue_from(klass) { |exception| handle_exception exception }
@@ -141,5 +150,6 @@ class CardController < ActionController::Base
   end
 
   rescue_from_class ActiveRecord::RecordInvalid
-  rescue_from_class(rescue_all? ? StandardError : Card::Error::UserError)
+  rescue_from_class Card::Error::UserError
+  rescue_from_class StandardError if rescue_all?
 end

data/rails/engine-routes.rb

@@ -44,6 +44,9 @@ Decko::Engine.routes.draw do
   match "(card)/update(/:mark(.:format))" => "card#update", via: %i[post put patch]
   match "(card)/delete(/:mark(.:format))" => "card#delete", via: :delete
 
+  # for super-lazy under-achievers
+  get ":mark/:view(.:format)" => "card#read"
+
   # Wildcard for bad addresses
   get "*mark" => "card#read", view: "bad_address"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decko
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.7.0.pre
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-25 00:00:00.000000000 Z
+date: 2019-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.96.8
+        version: 1.97.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.96.8
+        version: 1.97.0
 description: a wiki approach to stuctured data, dynamic interaction,  and web design
 email:
 - info@decko.org
@@ -101,6 +101,7 @@ files:
 - lib/decko/generators/decko/templates/config/databases/sqlite3.yml
 - lib/decko/generators/decko/templates/config/deck.yml
 - lib/decko/generators/decko/templates/config/environment.rb
+- lib/decko/generators/decko/templates/config/initializers/cypress_dev.rb
 - lib/decko/generators/decko/templates/config/routes.erb
 - lib/decko/generators/decko/templates/gitignore
 - lib/decko/generators/decko/templates/public/files/htaccess
@@ -145,12 +146,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: 2.4.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.13