card 1.19.0 → 1.19.1

data/tmpsets/set/{mod013-carrierwave → mod015-carrierwave}/type/file.rb

@@ -11,8 +11,9 @@ module SelectedAction
   end
 
   def last_content_action_id
+    return super if temporary_storage_type_change?
     # find action id from content (saves lookups)
-    db_content.to_s.split(%r{[/\.]})[1]
+    db_content.to_s.split(%r{[/\.]})[-2]
   end
 end
 include SelectedAction
@@ -40,30 +41,29 @@ format :file do
   # returns send_file args.  not in love with this...
   view :core do |_args|
     # this means we only support known formats.  dislike.
-    if (_format = card.attachment_format(params[:format]))
-      if params[:explicit_file] && (r = controller.response)
-        r.headers["Expires"] = 1.year.from_now.httpdate
-        # currently using default "private", because proxy servers could block
-        # needed permission checks
-        # r.headers["Cache-Control"] = "public"
-      end
-
-      # formerly supported redirecting to correct file format
-      # elsif ![format, 'file'].member? params[:format]
-      #   path = request.fullpath.sub( /\.#{params[:format]}\b/, '.' + format )
-      #   return redirect_to(path) #card.attachment.url(style) )
-
-      file = selected_file_version
-      [file.path,
-       {
-         type: file.content_type,
-         filename:  "#{card.cardname.safe_key}#{file.extension}",
-         x_sendfile: true,
-         disposition: (params[:format] == "file" ? "attachment" : "inline")
-       }]
-    else
-      _render_not_found
+    attachment_format = card.attachment_format(params[:format])
+    return _render_not_found unless attachment_format
+    return card.format(:html).render_core(args) if card.remote_storage?
+
+    if params[:explicit_file] && (r = controller.response)
+      r.headers["Expires"] = 1.year.from_now.httpdate
+      # currently using default "private", because proxy servers could block
+      # needed permission checks
+      # r.headers["Cache-Control"] = "public"
     end
+
+    # formerly supported redirecting to correct file format
+    # elsif ![format, 'file'].member? params[:format]
+    #   path = request.fullpath.sub( /\.#{params[:format]}\b/, '.' + format )
+    #   return redirect_to(path) #card.attachment.url(style) )
+    file = selected_file_version
+    [file.path,
+     {
+       type: file.content_type,
+       filename:  "#{card.cardname.safe_key}#{file.extension}",
+       x_sendfile: true,
+       disposition: (params[:format] == "file" ? "attachment" : "inline")
+     }]
   end
 
   def selected_file_version
@@ -79,6 +79,9 @@ format :html do
   end
 
   view :editor do |args|
+    if card.web? || card.no_upload?
+      return text_field(:content, class: "card-content")
+    end
     file_chooser args
   end
 

data/tmpsets/set/{mod013-carrierwave → mod015-carrierwave}/type/image.rb

@@ -13,6 +13,7 @@ format do
   end
 
   view :source do |args|
+    return card.raw_content if card.web?
     style =
       case
       when @mode == :closed then :icon

data/tmpsets/set/mod016-standard/all/links.rb

@@ -43,7 +43,7 @@ format do
         "email-link"
       when /^([a-zA-Z][\-+\.a-zA-Z\d]*):/
         Regexp.last_match(1) + "-link"
-      when /^\//
+      when %r{^/}
         href = internal_url href[1..-1]
         "internal-link"
       else
@@ -156,7 +156,7 @@ end
 
 format :css do
   def link_to _text, href, _opts={}
-    interpret_href href
+    card_url interpret_href(href)
   end
 end
 

data/tmpsets/set/mod018-bootstrap/all/bootstrap/table.rb

@@ -43,7 +43,7 @@ format :html do
     if cell.is_a? Hash
       content_tag :td, cell.delete(:content).to_s.html_safe, cell
     else
-      content_tag :td, cell.html_safe
+      content_tag :td, String(cell).html_safe
     end
   end
 

data/tmpsets/set/mod018-bootstrap/self/bootswatch_shared.rb

@@ -12,7 +12,7 @@ view :raw do |_args|
   content = File.read("#{bootstrap_path}/_variables.scss")
   content += %(
       $bootstrap-sass-asset-helper: false;
-      $icon-font-path: "#{card_path 'assets/fonts/'}";
+      $icon-font-path: "#{card_url 'assets/fonts/'}";
     )
   # mixins
   content += Dir.glob("#{bootstrap_path}/mixins/*.scss").map do |name|

data/vendor/carrierwave/.gitignore

@@ -0,0 +1,19 @@
+doc
+.yardoc
+.DS_Store
+spec/public
+pkg
+doc
+more/activerecord/spec/db
+more/activerecord/spec/public
+more/datamapper/spec/public
+*.project
+spec/fixtures/*_copy.png
+spec/test.log
+spec/tmp
+*.swp
+.rvmrc
+.idea
+.bundle
+Gemfile.lock
+gemfiles/*.lock

data/vendor/carrierwave/.rubocop.yml

@@ -0,0 +1,262 @@
+Style/CollectionMethods:
+  Description: Preferred collection methods.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#map-find-select-reduce-size
+  Enabled: true
+  PreferredMethods:
+    collect: map
+    collect!: map!
+    find: detect
+    find_all: select
+    reduce: inject
+
+Style/DotPosition:
+  Description: Checks the position of the dot in multi-line method calls.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#consistent-multi-line-chains
+  Enabled: true
+  EnforcedStyle: trailing
+  SupportedStyles:
+  - leading
+  - trailing
+
+Style/PredicateName:
+  Description: Check the names of predicate methods.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#bool-methods-qmark
+  Enabled: true
+  NamePrefix:
+  - is_
+  - has_
+  - have_
+  NamePrefixBlacklist:
+  - is_
+  Exclude:
+  - spec/**/*
+
+Style/SingleLineMethods:
+  Description: Avoid single-line methods.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-single-line-methods
+  Enabled: true
+  AllowIfMethodIsEmpty: true
+
+Style/StringLiterals:
+  Description: Checks if uses of quotes match the configured preference.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#consistent-string-literals
+  Enabled: true
+  EnforcedStyle: double_quotes
+  SupportedStyles:
+  - single_quotes
+  - double_quotes
+
+Style/StringLiteralsInInterpolation:
+  Description: Checks if uses of quotes inside expressions in interpolated strings
+    match the configured preference.
+  Enabled: true
+  EnforcedStyle: single_quotes
+  SupportedStyles:
+  - single_quotes
+  - double_quotes
+
+Metrics/AbcSize:
+  Description: A calculated magnitude based on number of assignments, branches, and
+    conditions.
+  Enabled: false
+  Max: 15
+
+Metrics/ClassLength:
+  Description: Avoid classes longer than 100 lines of code.
+  Enabled: false
+  CountComments: false
+  Max: 100
+
+Metrics/ModuleLength:
+  CountComments: false
+  Max: 100
+  Description: Avoid modules longer than 100 lines of code.
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Description: A complexity metric that is strongly correlated to the number of test
+    cases needed to validate a method.
+  Enabled: false
+  Max: 6
+
+Metrics/MethodLength:
+  Description: Avoid methods longer than 10 lines of code.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#short-methods
+  Enabled: false
+  CountComments: false
+  Max: 10
+
+Metrics/ParameterLists:
+  Description: Avoid parameter lists longer than three or four parameters.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#too-many-params
+  Enabled: false
+  Max: 5
+  CountKeywordArgs: true
+
+Metrics/PerceivedComplexity:
+  Description: A complexity metric geared towards measuring complexity for a human
+    reader.
+  Enabled: false
+  Max: 7
+
+Lint/AssignmentInCondition:
+  Description: Don't use assignment in conditions.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#safe-assignment-in-condition
+  Enabled: false
+  AllowSafeAssignment: true
+
+Lint/EachWithObjectArgument:
+  Description: Check for immutable argument given to each_with_object.
+  Enabled: true
+
+Lint/HandleExceptions:
+  Description: Don't suppress exception.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#dont-hide-exceptions
+  Enabled: false
+
+Lint/LiteralInCondition:
+  Description: Checks of literals used in conditions.
+  Enabled: false
+
+Lint/LiteralInInterpolation:
+  Description: Checks for literals used in interpolation.
+  Enabled: false
+
+Style/InlineComment:
+  Description: Avoid inline comments.
+  Enabled: false
+
+Style/AccessorMethodName:
+  Description: Check the naming of accessor methods for get_/set_.
+  Enabled: false
+
+Style/Alias:
+  Description: Use alias_method instead of alias.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#alias-method
+  Enabled: false
+
+Style/Documentation:
+  Description: Document classes and non-namespace modules.
+  Enabled: false
+
+Style/DoubleNegation:
+  Description: Checks for uses of double negation (!!).
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-bang-bang
+  Enabled: false
+
+Style/EachWithObject:
+  Description: Prefer `each_with_object` over `inject` or `reduce`.
+  Enabled: false
+
+Style/EmptyLiteral:
+  Description: Prefer literals to Array.new/Hash.new/String.new.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#literal-array-hash
+  Enabled: false
+
+Style/ModuleFunction:
+  Description: Checks for usage of `extend self` in modules.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#module-function
+  Enabled: false
+
+Style/OneLineConditional:
+  Description: Favor the ternary operator(?:) over if/then/else/end constructs.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#ternary-operator
+  Enabled: false
+
+Style/PerlBackrefs:
+  Description: Avoid Perl-style regex back references.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-perl-regexp-last-matchers
+  Enabled: false
+
+Style/Send:
+  Description: Prefer `Object#__send__` or `Object#public_send` to `send`, as `send`
+    may overlap with existing methods.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#prefer-public-send
+  Enabled: false
+
+Style/SpecialGlobalVars:
+  Description: Avoid Perl-style global variables.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-cryptic-perlisms
+  Enabled: false
+
+Style/VariableInterpolation:
+  Description: Don't interpolate global, instance and class variables directly in
+    strings.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#curlies-interpolate
+  Enabled: false
+
+Style/WhenThen:
+  Description: Use when x then ... for one-line cases.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#one-line-cases
+  Enabled: false
+
+Style/RaiseArgs:
+  Description: Checks the arguments passed to raise/fail.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#exception-class-messages
+  Enabled: false
+  EnforcedStyle: exploded
+  SupportedStyles:
+  - compact
+  - exploded
+
+Style/SignalException:
+  Description: Checks for proper usage of fail and raise.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#fail-method
+  Enabled: false
+  EnforcedStyle: semantic
+  SupportedStyles:
+  - only_raise
+  - only_fail
+  - semantic
+
+Style/SingleLineBlockParams:
+  Description: Enforces the names of some block params.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#reduce-blocks
+  Enabled: false
+  Methods:
+  - reduce:
+    - a
+    - e
+  - inject:
+    - a
+    - e
+
+Style/GuardClause:
+  Description: Check for conditionals that can be replaced with guard clauses
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-nested-conditionals
+  Enabled: false
+  MinBodyLength: 1
+
+Style/IfUnlessModifier:
+  Description: Favor modifier if/unless usage when you have a single-line body.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#if-as-a-modifier
+  Enabled: false
+  MaxLineLength: 80
+
+Style/OptionHash:
+  Description: Don't use option hashes when you can use keyword arguments.
+  Enabled: false
+
+Style/PercentLiteralDelimiters:
+  Description: Use `%`-literal delimiters consistently
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#percent-literal-braces
+  Enabled: false
+  PreferredDelimiters:
+    "%": "()"
+    "%i": "()"
+    "%q": "()"
+    "%Q": "()"
+    "%r": "{}"
+    "%s": "()"
+    "%w": "()"
+    "%W": "()"
+    "%x": "()"
+
+Style/TrailingComma:
+  Description: Checks for trailing comma in parameter lists and literals.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas
+  Enabled: false
+  EnforcedStyleForMultiline: no_comma
+  SupportedStyles:
+  - comma
+  - no_comma

data/vendor/carrierwave/.travis.yml

@@ -0,0 +1,58 @@
+language: ruby
+
+cache: bundler
+
+rvm:
+ - 2.0
+ - 2.1
+ - 2.2.5
+ - 2.3.1
+ - ruby-head
+ - jruby
+ - jruby-head
+
+env:
+  global:
+    - JRUBY_OPTS="--2.0"
+
+gemfile:
+  - Gemfile
+  - gemfiles/rails-4-0-stable.gemfile
+  - gemfiles/rails-4-1-stable.gemfile
+  - gemfiles/rails-4-2-stable.gemfile
+  - gemfiles/rails-master.gemfile
+
+sudo: false
+
+before_script:
+  - psql -c 'create database carrierwave_test;' -U postgres
+
+matrix:
+  exclude:
+    - rvm: 2.0
+      gemfile: Gemfile
+    - rvm: 2.0
+      gemfile: gemfiles/rails-master.gemfile
+    - rvm: 2.1
+      gemfile: Gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/rails-master.gemfile
+    - rvm: jruby
+      gemfile: Gemfile
+    - rvm: jruby
+      gemfile: gemfiles/rails-master.gemfile
+    - rvm: jruby-head
+      gemfile: gemfiles/rails-master.gemfile
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+    - gemfile: gemfiles/rails-master.gemfile
+  fast_finish: true
+
+notifications:
+  email: false
+  slack:
+    secure: Npzanyv/LXLIRlrNs8iTUbZNRhXlP+K2ZpjZoS2UKkr09jYyP1qdf5a//R3Lu7Yat7g2b4qTJGbaZBEMUQSVaJ6UX6quiBJjVWxjxjQ4Ugk8k/yOIAcGEGYPfS6YzRXemRwo9j4uy76cmwlv8cwEuYTSTBRK4XrdYHslX6pKSXM=
+
+addons:
+  postgresql: "9.3"