card 1.18.6 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76992e421f733d78acc55e2db3e0984d2858c798
-  data.tar.gz: fd5a55488a2aedbc2184d455b8df1615515c743b
+  metadata.gz: ef8c42b37b89e1b58f0a37508607e75c7b72169b
+  data.tar.gz: d5256fc5701c23eba4713d12ff8d8bdb556e582b
 SHA512:
-  metadata.gz: 37ad1cffad30a586beb101bc39e059a67f954bd77a91fa36964a2241571f91d3e86985c8e800499e0409ed30b7f9d7a9a9c5b9cf595c0584941a6061d4fe2f4a
-  data.tar.gz: 2a949e02c41349678d4f4a42bef539a8cb40d1777f0c2b139c448eac868e8783749ae5480b9f22729348fb8a301bac99fd130fe295256781f3f4f3d70173d5e4
+  metadata.gz: 674ffd539ab180d21f7f284823aa461bce848b2beed0941c3568738a4ad22f1cecec3cf3ff621df4a0280077746f41968cead0cfc2c2ba6cf4334e3a125f385c
+  data.tar.gz: fd6cb28c76b2ff7580c8038ce4d9f0b57d1ee63024243eb806155ddc0b755dedbaad9b7f24a27e88ace3bb95c494149ab5767ac26d12d175a25a630e8e80ce1e

data/.yardopts

@@ -1,6 +1,9 @@
 **/lib/**/*.rb                    \
+**/mod/*/format/*.rb              \
+**/mod/*/chunk/*.rb               \
 tmpsets/set*/**/*.rb -            \
 **/*.rdoc                         \
 GPL                               \
 LICENSE                           \
 VERSION
+--markup markdown

data/README_Developers.rdoc

@@ -1,30 +1,30 @@
 
 =A Developer's introduction to the Wagn/Card code base
 
-Start here before you dig into the code.
+New folks should start here after playing with Wagn but before digging into code.
 
 ==Intro
 
 ===Am I in the right place?
 
-This page assumes:
+Yes, if:
 
-* You're a ruby developer or, at least, someone who does not fear ruby code. <b>Not a techie? {Try Wagn.org}[http://wagn.org]</b>
-* You've experimented with Wagn enough to know the basics (cards, types, rules, etc.) <b>No idea what a card is? {Try Wagn.org}[http://wagn.org]</b>.
-* You're looking at this page from a docs site (ie, NOT GitHub) so you can use our links to navigate code. <b>Links look funny? {Try rubydocs.info}[http://rubydoc.info/gems/card/README_Developers.rdoc].</b>
+* <b>you're a Ruby developer</b>, or at least someone who does not fear ruby code. <b>Not a techie? {Try Wagn.org}[http://wagn.org]</b>
+* <b>you've experimented with Wagn</b> enough to know the basics (cards, types, rules, etc.) <b>No idea what a card is? {Try Wagn.org}[http://wagn.org]</b>.
+* <b>you're looking at this page from a docs site</b> (ie, NOT GitHub) so you can use our links to navigate code. <b>Links look funny? {Try rubydocs.info}[http://rubydoc.info/gems/card].</b>
 
 
-===Is Wagn an application or a development framework?
+===Is Wagn an _application_ or a <i>development framework</i>?
 
 It's both.
 
-When you install a new Wagn, you have a working "Deck" right away.  There are lots of things built in: account handling, edit histories, default layouts, CSS, etc.  In other words: you have a basic application.
+When you install and "seed" a new Wagn project, you have a working "deck" right away.  There are lots of things built in: account handling, edit histories, default layouts, CSS, etc.  In other words: you have a basic application.
 
 But a newly seeded Deck is just a starting point. <b>Wagn is a development framework in which you start <i>in the middle of things</i> rather than from scratch</b>.  Seeding is a bit of a headstart, and it means that designers, developers, and content creators can start working in parallel on day 1. But the seeded cards don't determine what you can build with Wagn; you can add things, you can remove things... In fact, you can build pretty much whatever you want.
 
 ===Sets
 
-_Sets_ are a central organizing concept for both Wagneers and Wagn developers.
+_Cards_ are the fundamental building blocks of Wagn, and _Sets_ are the fundamental pattern for organizing cards. Both Wagneers and Wagn developers create web systems by applying _rules_ to _sets_ of _cards_.
 
 If you've edited Rules through a card toolbar in any Wagn deck, you will have encountered Sets. For example, imagine you're on a User card named "Henry Tai", and you decide to edit its structure.  When you edit its rule, you will be prompted to choose the Set of cards to which the rule applies, eg:
 
@@ -43,7 +43,7 @@ Sets are central to Wagn's architecture.  Wagn is not, like Ruby on Rails, an im
 
 MoFoS stands for "Model-Formats-Sets": One Model, viewable in many Formats, divisible into Sets.
 
-"Everything is a Card" is an idea familiar to any Wagneer. As you may have guessed Cards are Wagn's "one Model" in MoFoS terms.
+In Wagn, the MoFoS "one model" is, as you may have guessed, the _card_.
 
 You may have also noticed that you can add .html (the default), .text, .json, etc to any card's web path to receive the card's contents in a different format. This is the Format in MoFos.
 

data/VERSION

@@ -1 +1 @@
-1.18.6
+1.19.0

data/card.gemspec

@@ -1,19 +1,19 @@
 # -*- encoding : utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = 'card'
-  s.version = File.open(File.expand_path('../VERSION', __FILE__)).read.chomp
+  s.name = "card"
+  s.version = File.open(File.expand_path("../VERSION", __FILE__)).read.chomp
   s.authors =
-    ['Ethan McCutchen', 'Lewis Hoffman', 'Gerry Gleason', "Philipp Kühl"]
-  s.email = ['info@wagn.org']
+    ["Ethan McCutchen", "Lewis Hoffman", "Gerry Gleason", "Philipp Kühl"]
+  s.email = ["info@wagn.org"]
 
   #  s.date          = '2013-12-20'
-  s.summary       = 'an atomic, set-driven content engine'
+  s.summary       = "an atomic, set-driven content engine"
   s.description   =
-    'Cards are data atoms grouped into Sets to which Rules can apply. '\
-    'Cards can formatted with Views and transformed with Events.'
-  s.homepage      = 'http://wagn.org'
-  s.licenses      = ['GPL-2.0', 'GPL-3.0']
+    "Cards are data atoms grouped into Sets to which Rules can apply. "\
+    "Cards can formatted with Views and transformed with Events."
+  s.homepage      = "http://wagn.org"
+  s.licenses      = ["GPL-2.0", "GPL-3.0"]
 
   s.files         = `git ls-files`.split $INPUT_RECORD_SEPARATOR
 
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   morepaths = `git submodule --quiet foreach pwd`.split $OUTPUT_RECORD_SEPARATOR
   morepaths.each do |submod_path|
     gem_root = File.expand_path File.dirname(__FILE__)
-    relative_submod_path = submod_path.gsub "#{gem_root}/", ''
+    relative_submod_path = submod_path.gsub "#{gem_root}/", ""
     Dir.chdir(submod_path) do
       morefiles = `git ls-files`.split $OUTPUT_RECORD_SEPARATOR
       s.files += morefiles.map do |filename|
@@ -31,34 +31,31 @@ Gem::Specification.new do |s|
   end
 
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths = ['lib']
+  s.require_paths = ["lib"]
 
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = ">= 1.9.3"
 
   [
-    ['smartname',                  '0.2.3'],
-    ['uuid',                       '~> 2.3'],
+    ["smartname",                  "0.3.1"],
+    ["uuid",                       "~> 2.3"],
     # with carrierwave 0.11.1 and 0.11.2 wagn hangs in a loop on creating
     # style and script machine output
-    ['carrierwave',                '<= 0.11.0'],
-    ['htmlentities',               '~> 4.3'],
-    ['mini_magick',                '~> 4.2'],
-    ['recaptcha',                  '~> 0.4.0'],
-    # 0.4.0 is last version that doesn't require ruby 2.0
-    ['coderay',                    '~> 1.0'],
-    ['sass',                       '~> 3.2'],
-    ['coffee-script',              '~> 2.2'],
-    ['uglifier',                   '~> 3.0'],
-
-    ['haml',                       '~> 4.0'],
-    ['kaminari',                   '~> 0.16'],
-
-    ['bootstrap-kaminari-views',   '~> 0'],
-    ['diff-lcs',                   '~> 1.2'],
+    ["carrierwave",                "<= 0.11.0"],
+    ["htmlentities",               "~> 4.3"],
+    ["mini_magick",                "~> 4.2"],
+    # recaptcha 0.4.0 is last version that doesn't require ruby 2.0
+    ["recaptcha",                  "~> 0.4.0"],
+    ["coderay",                    "~> 1.0"],
+    ["sass",                       "~> 3.2"],
+    ["coffee-script",              "~> 2.2"],
+    ["uglifier",                   "~> 3.0"],
+    ["haml",                       "~> 4.0"],
+    ["kaminari",                   "~> 0.16"],
+    ["bootstrap-kaminari-views",   "~> 0"],
+    ["diff-lcs",                   "~> 1.2"],
     # mime-types can be removed if we drop support for ruby 1.9.3
     # mime-types 3.0 uses mime-types-data which isn't compatible with 1.9.3
-    ['mime-types',                  '2.99.1'],
-
+    ["mime-types",                 "2.99.1"]
   ].each do |dep|
     s.add_runtime_dependency(*dep)
   end

data/config/i18n-tasks.yml

@@ -0,0 +1,126 @@
+# i18n-tasks finds and manages missing and unused translations: https://github.com/glebm/i18n-tasks
+
+# The "main" locale.
+base_locale: en
+## All available locales are inferred from the data by default. Alternatively, specify them explicitly:
+# locales: [es, fr]
+## Reporting locale, default: en. Available: en, ru.
+# internal_locale: en
+
+# Read and write translations.
+data:
+  ## Translations are read from the file system. Supported format: YAML, JSON.
+  ## Provide a custom adapter:
+  # adapter: I18n::Tasks::Data::FileSystem
+
+  # Locale files or `File.find` patterns where translations are read from:
+  read:
+    ## Default:
+     - config/locales/%{locale}.yml
+    ## More files:
+    # - config/locales/**/*.%{locale}.yml
+    ## Another gem (replace %#= with %=):
+    # - "<%#= %x[bundle show vagrant].chomp %>/templates/locales/%{locale}.yml"
+
+  # Locale files to write new keys to, based on a list of key pattern => file rules. Matched from top to bottom:
+  # `i18n-tasks normalize -p` will force move the keys according to these rules
+  write:
+    ## For example, write devise and simple form keys to their respective files:
+    # - ['{devise, simple_form}.*', 'config/locales/\1.%{locale}.yml']
+    ## Catch-all default:
+    # - config/locales/%{locale}.yml
+
+  ## Specify the router (see Readme for details). Valid values: conservative_router, pattern_router, or a custom class.
+  # router: convervative_router
+
+  yaml:
+    write:
+      # do not wrap lines at 80 characters
+      line_width: -1
+
+  ## Pretty-print JSON:
+  # json:
+  #   write:
+  #     indent: '  '
+  #     space: ' '
+  #     object_nl: "\n"
+  #     array_nl: "\n"
+
+# Find translate calls
+search:
+  ## Paths or `File.find` patterns to search in:
+  # paths:
+  #  - app/
+  paths:
+    - lib/
+    - mod/
+
+  ## Root directories for relative keys resolution.
+  # relative_roots:
+  #   - app/controllers
+  #   - app/helpers
+  #   - app/mailers
+  #   - app/presenters
+  #   - app/views
+
+  ## Files or `File.fnmatch` patterns to exclude from search. Some files are always excluded regardless of this setting:
+  ##   %w(*.jpg *.png *.gif *.svg *.ico *.eot *.otf *.ttf *.woff *.woff2 *.pdf *.css *.sass *.scss *.less *.yml *.json)
+  exclude:
+    - app/assets/images
+    - app/assets/fonts
+
+  ## Alternatively, the only files or `File.fnmatch patterns` to search in `paths`:
+  ## If specified, this settings takes priority over `exclude`, but `exclude` still applies.
+  # only: ["*.rb", "*.html.slim"]
+  only: ["*.rb"]
+
+  ## If `strict` is `false`, guess usages such as t("categories.#{category}.title"). The default is `true`.
+  # strict: true
+
+  ## Multiple scanners can be used. Their results are merged.
+  ## The options specified above are passed down to each scanner. Per-scanner options can be specified as well.
+  ## See this example of a custom scanner: https://github.com/glebm/i18n-tasks/wiki/A-custom-scanner-example
+
+## Google Translate
+# translation:
+#   # Get an API key and set billing info at https://code.google.com/apis/console to use Google Translate
+#   api_key: "AbC-dEf5"
+
+## Do not consider these keys missing:
+# ignore_missing:
+# - 'errors.messages.{accepted,blank,invalid,too_short,too_long}'
+# - '{devise,simple_form}.*'
+
+## Consider these keys used:
+# ignore_unused:
+# - 'activerecord.attributes.*'
+# - '{devise,kaminari,will_paginate}.*'
+# - 'simple_form.{yes,no}'
+# - 'simple_form.{placeholders,hints,labels}.*'
+# - 'simple_form.{error_notification,required}.:'
+ignore_unused:
+  - 'time.formats.*'  # i18n-tasks doesn't understand I18n.localize usage
+
+## Exclude these keys from the `i18n-tasks eq-base' report:
+# ignore_eq_base:
+#   all:
+#     - common.ok
+#   fr,es:
+#     - common.brand
+
+## Ignore these keys completely:
+# ignore:
+#  - kaminari.*
+
+## Sometimes, it isn't possible for i18n-tasks to match the key correctly,
+## e.g. in case of a relative key defined in a helper method.
+## In these cases you can use the built-in PatternMapper to map patterns to keys, e.g.:
+#
+# <%#= I18n::Tasks.add_scanner 'I18n::Tasks::Scanners::PatternMapper',
+#        only: %w(*.html.haml *.html.slim),
+#        patterns: [['= title\b', '.page_title']] %>
+#
+# The PatternMapper can also match key literals via a special %{key} interpolation, e.g.:
+#
+# <%#= I18n::Tasks.add_scanner 'I18n::Tasks::Scanners::PatternMapper',
+#        patterns: [['\bSpree\.t[( ]\s*%{key}', 'spree.%{key}']] %>

data/config/initializers/01_core_extensions/hash.rb

@@ -28,26 +28,26 @@ module CoreExtensions
       #  h = {:class => "btn"} # => {:class=>"btn"}
       #  h.css_merge({:class => "btn-primary"}) # => {:class=>"btn
       # btn-primary"}
-      def css_merge other_hash, separator=' '
+      def css_merge other_hash, separator=" "
         merge(other_hash) do |key, old, new|
           key == :class ? old.to_s + separator + new.to_s : new
         end
       end
 
-      def css_merge! other_hash, separator=' '
+      def css_merge! other_hash, separator=" "
         merge!(other_hash) do |key, old, new|
           key == :class ? old.to_s + separator + new.to_s : new
         end
       end
 
       # merge string values with `separator`
-      def string_merge other_hash, separator=' '
+      def string_merge other_hash, separator=" "
         merge(other_hash) do |_key, old, new|
           old.is_a?(String) ? old + separator + new.to_s : new
         end
       end
 
-      def string_merge! other_hash, separator=' '
+      def string_merge! other_hash, separator=" "
         merge!(other_hash) do |_key, old, new|
           old.is_a?(String) ? old + separator + new.to_s : new
         end

data/config/initializers/01_core_extensions/module.rb

@@ -10,5 +10,14 @@ module CoreExtensions
     def const_get_or_set const
       const_get_if_defined(const) || const_set(const, yield)
     end
+
+    def add_set_modules list
+      Array(list).each do |mod|
+        include mod if mod.instance_methods.any?
+        if (class_methods = mod.const_get_if_defined(:ClassMethods))
+          extend class_methods
+        end
+      end
+    end
   end
 end

data/config/initializers/01_core_extensions/object.rb

@@ -31,7 +31,7 @@ module CoreExtensions
     end
 
     def to_viewname
-      Card::ViewName.new self
+      Card::Name::ViewName.new self
     end
 
     def deep_clone_instance_variables
@@ -39,5 +39,9 @@ module CoreExtensions
         instance_variable_set v, instance_variable_get(v).deep_clone
       end
     end
+
+    def in? other
+      other.include? self
+    end
   end
 end

data/config/initializers/02_extensions/kaminari.rb

@@ -6,7 +6,7 @@ module Extensions
           p = params_for(page)
           p.delete :controller
           p.delete :action
-          card = Card[p.delete('id')]
+          card = Card[p.delete("id")]
           card.format.path p
         end
 

data/config/initializers/inflections.rb

@@ -3,11 +3,11 @@
 
 # Add new inflection rules using the following format
 ActiveSupport::Inflector.inflections do |inflect|
-  inflect.irregular 'grave', 'graveyard'
-  inflect.uncountable 'this'
+  inflect.irregular "grave", "graveyard"
+  inflect.uncountable "this"
   #  inflect.uncountable 'plus'
-  inflect.uncountable 'anonymous'
-  inflect.uncountable 's'
+  inflect.uncountable "anonymous"
+  inflect.uncountable "s"
   inflect.singular(/(ss)$/i, '\1')
   inflect.plural(/(ss)$/i, '\1')
 end

data/config/initializers/internationalization.rb

@@ -0,0 +1,44 @@
+# -*- encoding : utf-8 -*-
+
+# Arrange for locale files to be found
+#
+# Necessary since 'card' is packaged as a gem which is not an Engine
+
+I18n.load_path += Dir.glob(Pathname(__FILE__).parent.parent.to_s +
+                           "/locales/*.{rb,yml}")
+
+# see http://svenfuchs.com/2009/7/19/experimental-ruby-i18n-extensions-pluralization-fallbacks-gettext-cache-and-chained-backend
+module I18n::Backend::Transformers
+
+  # this variable is a hook to allow dynamic activation/deactivation
+  @@demark_enable = true
+
+  def translate(*args)
+    transform_text(super) { |entry| "⟪#{entry}⟫" }
+  end
+
+  def localize(*args)
+    transform_text(super) { |entry| "⟦#{entry}⟧" }
+  end
+
+  def transform_text entry
+    if @@demark_enable && entry && (entry.is_a? String)
+      yield(entry)
+    else
+      entry
+    end
+  end
+end
+
+# For testing/debugging purposes, one can set the WAGN_I18N_DEMARK environment
+# variable, and this will cause all translated text to include visual
+# demarcation that distinguishes it from text not obtained from I18n.
+#
+# Enable by setting WAGN_I18N_DEMARK=1 in the host environment, or
+# with ENV['WAGN_I18N_DEMARK']=1 on the command line in server startup,
+# or ./config/environments/*.rb file.
+
+if ENV["WAGN_I18N_DEMARK"]
+  I18n::Backend::Simple.send(:include, I18n::Backend::Transformers)
+  puts "WAGN_I18N_DEMARK is active"
+end

data/config/initializers/mime_types.rb

@@ -6,8 +6,8 @@
 # Mime::Type.register 'application/rss+xml', :rss
 # Mime::Type.register_alias 'text/plain', :csv   # useful for testing csv in browser
 
-Mime::Type.register_alias 'text/plain', :txt
-Mime::Type.register 'application/vnd.google-earth.kml+xml', :kml
+Mime::Type.register_alias "text/plain", :txt
+Mime::Type.register "application/vnd.google-earth.kml+xml", :kml
 
 # Mime::Type.register "text/richtext", :rtf
 # Mime::Type.register_alias "text/html", :iphone

data/config/initializers/recaptcha.rb

@@ -3,15 +3,20 @@
 # card config overrides application.rb config overrides default
 def load_recaptcha_config setting
   setting = "recaptcha_#{setting}".to_sym
-  Cardio.config.send("#{setting}=",
-                     load_recaptcha_card_config(setting) || # card content
-                     Cardio.config.send(setting) || # application.rb
-                     Card::Auth::DEFAULT_RECAPTCHA_SETTINGS[setting])
+  Cardio.config.send(
+    "#{setting}=", load_recaptcha_card_config(setting) || # card content
+                   Cardio.config.send(setting) || # application.rb
+                   default_setting(setting)
+  )
+end
+
+def default_setting setting
+  Card::Auth::Permissions::RECAPTCHA_DEFAULTS[setting]
 end
 
 def card_table_ready?
   # FIXME: this test should be more generally usable
-  ActiveRecord::Base.connection.table_exists?('cards') &&
+  ActiveRecord::Base.connection.table_exists?("cards") &&
     Card.ancestors.include?(ActiveRecord::Base)
 end