card 1.101.2 → 1.101.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af639cc0367bf40d94b5f4f4b170898aecf1fabd9554613cd6ead266c3460758
-  data.tar.gz: 156bdc8fb46acd5d05ee77e371dc3baebc51ab038064099ac7489106fdf150db
+  metadata.gz: faefffa729032513970c6385b5d327791a5126ff3b3b8973a003c46bef3e7248
+  data.tar.gz: f4529445aae06fa4b7fac2aef3de056d3beaaa75c2a0f609b1bce93fa3cf3cba
 SHA512:
-  metadata.gz: 686e3a3cf69d047756b65f65868c55403493bf94f8e77ce9cc71cf7a1eccb931096cdc0f0fbe593827133bb525ef7132dc1be8ad6fb00c7d8492b273e31b8d9d
-  data.tar.gz: 6f0db4e8c51a8b7e4f03fc184ac134747443c0f31f58fc2e8609a065b38e653c62d22fbf99d3d6cf31f3979cdbd0fc699a0e120371d8e6d5827ca204857cc369
+  metadata.gz: e654fd3876906be1fb56802fa438a536ab6b3c22d29b6485f01fdadbe254cf3154abea3489d05bef6945e76a162002f61c69d05ce693ebbba3ecf4dcfa1a3dbc
+  data.tar.gz: 25d8c4b240631bb7b21cf7d6c070196ad06ad5a8829385deb9cdb9bf4aeeebb68981efcf39872a09349e734f367b10053b2d9e975fb33be1e0dfc1c4aabad241

data/VERSION

@@ -1 +1 @@
-0.11.2
+0.11.3

data/config/locales/en.yml

@@ -80,6 +80,8 @@ en:
     # deny_verb_name: You don't have permission to %{verb} %{name}
     # deny_verb_this: You don't have permission to %{verb} this
     # error_cant_delete_child: "can't delete %{child_name}: %{message}"
+
+
     error_code_in_use: codename %{codename} already in use
     error_hard_templated: can't be changed because %{name} is hard templated to %{type_name}
     error_indestructible: "%{name} is an indestructible rule"
@@ -231,7 +233,7 @@ en:
     discuss: discuss
     edit: edit
     error_message: Error message (visible to admin only)
-    error_rendering: error rendering
+    error_rendering: "Error rendering: %{cardname} (%{view} view)"
     exception_not_set_path: "not a set path: %{path}"
     invalid_json: invalid json
     label_select: Select

data/db/migrate_core_cards/20120611203506_rails_inflection_updates.rb

@@ -69,7 +69,7 @@ class RailsInflectionUpdates < Cardio::Migration::Core
       end
     end
 
-    cards_with_css = Card.search type: %w(in html css scss)
+    cards_with_css = Card.search type: %w[in html css scss]
     cards_with_css.each do |card|
       new_content = card.db_content
       content_changed = false

data/lib/card/env/success.rb

@@ -2,7 +2,8 @@ class Card
   module Env
     # Success objects
     class Success
-      include Card::Env::Location
+      include Location
+      include Target
 
       attr_accessor :redirect, :name, :name_context, :reload
       attr_writer :params, :card
@@ -15,23 +16,20 @@ class Card
         self << normalize_success_args(success_args)
       end
 
+      def to_url name_context=@name_context
+        case (target = target(name_context))
+        when Card
+          target.format.path params
+        else
+          target
+        end
+      end
+
       def in_context name_context
         self.name_context = name_context
         self
       end
 
-      def normalize_success_args success_args
-        case success_args
-        when nil
-          self.mark = "_self"
-          {}
-        when ActionController::Parameters
-          success_args.to_unsafe_h
-        else
-          success_args
-        end
-      end
-
       def << value
         if value.is_a? Hash
           apply value
@@ -44,75 +42,6 @@ class Card
         @reload.to_s == "true"
       end
 
-      # TODO: refactor to use cardish
-      def mark= value
-        case value
-        when Integer then @id = value
-        when String then @name = value
-        when Card then @card = value
-        else
-          self.target = value
-        end
-      end
-
-      # @deprecated
-      def id= id
-        # for backwards compatibility use mark here.
-        # id was often used for the card name
-        self.mark = id
-      end
-
-      def type= type
-        @new_args[:type] = type
-      end
-
-      def type_id= type_id
-        @new_args[:type_id] = type_id.to_i
-      end
-
-      def content= content
-        @new_args[:content] = content
-      end
-
-      def target= value
-        @id = @name = @card = nil
-        @target = process_target value
-      end
-
-      def process_target value
-        case value
-        when ""                     then ""
-        when "*previous", :previous then :previous
-        when %r{^(http|/)}          then value
-        when /^REDIRECT:\s*(.+)/
-          @redirect = true
-          process_target Regexp.last_match(1)
-        else self.mark = value
-        end
-      end
-
-      def apply hash
-        hash.each_pair do |key, value|
-          self[key] = value
-        end
-      end
-
-      def card name_context=@name_context
-        if @card
-          @card
-        elsif @id
-          Card.fetch @id
-        elsif @name
-          Card.fetch @name.to_name.absolute(name_context), new: @new_args
-        end
-      end
-
-      def target name_context=@name_context
-        card(name_context) ||
-          (@target == :previous ? Card::Env.previous_location : @target) ||
-          Card.fetch(name_context)
-      end
-
       def []= key, value
         if respond_to? "#{key}="
           send "#{key}=", value
@@ -139,32 +68,46 @@ class Card
         @params.marshal_dump
       end
 
-      def raw_params
-        @params
+      def session
+        Card::Env.session
       end
 
-      def to_url name_context=@name_context
-        case (target = target(name_context))
-        when Card
-          target.format.path params
-        else
-          target
-        end
+      private
+
+      def respond_to_missing? method, _include_private=false
+        method.match?(/^(\w+)=?$/) || super
       end
 
       def method_missing method, *args
-        case method
-        when /^(\w+)=$/
-          self[Regexp.last_match(1).to_sym] = args[0]
-        when /^(\w+)$/
-          self[Regexp.last_match(1).to_sym]
+        if (m = method.match(/^(\w+(=)?)/))
+          infer_bracket m[1].to_sym, m[2], args[0]
         else
           super
         end
       end
 
-      def session
-        Card::Env.session
+      def infer_bracket method, assign, val
+        args = [method]
+        args << val if assign
+        @params.send(*args)
+      end
+
+      def apply hash
+        hash.each_pair do |key, value|
+          self[key] = value
+        end
+      end
+
+      def normalize_success_args success_args
+        case success_args
+        when nil
+          self.mark = "_self"
+          {}
+        when ActionController::Parameters
+          success_args.to_unsafe_h
+        else
+          success_args
+        end
       end
     end
   end

data/lib/card/env/success/target.rb

@@ -0,0 +1,75 @@
+class Card
+  module Env
+    class Success
+      # The success "target" is the destination upon success.
+      #
+      # @card, @name, @id, etc all refer to the target card
+      module Target
+        def target= value
+          @id = @name = @card = nil
+          @target = process_target value
+        end
+
+        def target name_context=@name_context
+          card(name_context) ||
+            (@target == :previous ? Card::Env.previous_location : @target) ||
+            Card.fetch(name_context)
+        end
+
+        # TODO: refactor to use cardish
+        def mark= value
+          case value
+          when Integer then @id = value
+          when String then @name = value
+          when Card then @card = value
+          else
+            self.target = value
+          end
+        end
+
+        # @deprecated
+        def id= id
+          # for backwards compatibility use mark here.
+          # id was often used for the card name
+          self.mark = id
+        end
+
+        def type= type
+          @new_args[:type] = type
+        end
+
+        def type_id= type_id
+          @new_args[:type_id] = type_id.to_i
+        end
+
+        def content= content
+          @new_args[:content] = content
+        end
+
+        def card name_context=@name_context
+          if @card
+            @card
+          elsif @id
+            Card.fetch @id
+          elsif @name
+            Card.fetch @name.to_name.absolute(name_context), new: @new_args
+          end
+        end
+
+        private
+
+        def process_target value
+          case value
+          when ""                     then ""
+          when "*previous", :previous then :previous
+          when %r{^(http|/)}          then value
+          when /^REDIRECT:\s*(.+)/
+            @redirect = true
+            process_target Regexp.last_match(1)
+          else self.mark = value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/card/set/i18n_scope.rb

@@ -80,7 +80,7 @@ class Card
 
       def find_set_path backtrace
         re = %r{(?<!card)/set/}
-        backtrace.find { |line| line =~ re }.tap do |path|
+        backtrace.find { |line| line.match?(re) }.tap do |path|
           return nil unless path
         end
       end

data/lib/card/set/inheritance.rb

@@ -1,7 +1,6 @@
 class Card
   module Set
     # API to inherit other sets and their formats
-
     module Inheritance
 
       # include a set module and all its format modules
@@ -66,15 +65,19 @@ class Card
 
       # iterate through each format associated with a set
       def each_format set
-        set_type = set.abstract_set? ? :abstract : :nonbase
-        format_type = "#{set_type}_format".to_sym
-        modules[format_type].each_pair do |format, set_format_mod_hash|
-          next unless (format_mods = set_format_mod_hash[set.shortname])
+        each_format_with_mods set do |format, mods_for_set|
+          next unless (format_mods = mods_for_set[set.shortname])
 
           yield format, format_mods
         end
       end
 
+      def each_format_with_mods set
+        set_type = set.abstract_set? ? :abstract : :nonbase
+        format_type = "#{set_type}_format".to_sym
+        modules[format_type].each_pair { |*args| yield(*args) }
+      end
+
       def applicable_format? format, except, only
         format_sym = Card::Format.format_sym format
         return false if except && Array(except).include?(format_sym)

data/lib/card/set/loader.rb

@@ -24,9 +24,7 @@ class Card
           modules[:base] << set_module
         else
           set_type = set_module.abstract_set? ? :abstract : :nonbase
-          # made ready for dynamic loading via #include_set_modules
-          modules[set_type][set_module.shortname] ||= []
-          modules[set_type][set_module.shortname] << set_module
+          register_set_of_type set_module, set_type
         end
       end
 
@@ -44,19 +42,17 @@ class Card
       # Format class
       # 'nonbase modules' are included dynamically on singleton_classes
       def process_base_modules
-        return unless modules[:base].present?
+        base_modules = modules[:base]
+        return unless base_modules.present?
 
-        Card.add_set_modules modules[:base]
-        modules[:base_format].each do |format_class, modules_list|
-          format_class.add_set_modules modules_list
-        end
-        modules[:base].clear
-        modules[:base_format].clear
+        Card.add_set_modules base_modules
+        process_base_format_modules modules[:base_format]
+        base_modules.clear
       end
 
       def clean_empty_modules
         clean_empty_module_from_hash modules[:nonbase]
-        modules[:nonbase_format].values.each do |hash|
+        modules[:nonbase_format].each_value do |hash|
           clean_empty_module_from_hash hash
         end
       end
@@ -67,6 +63,23 @@ class Card
           hash.delete mod_name if modlist.empty?
         end
       end
+
+      private
+
+      # makes sets ready for dynamic loading via #include_set_modules
+      def register_set_of_type set_module, set_type
+        mods = modules[set_type]
+        key = set_module.shortname
+        mods[key] ||= []
+        mods[key] << set_module
+      end
+
+      def process_base_format_modules base_format_modules
+        base_format_modules.each do |format_class, modules_list|
+          format_class.add_set_modules modules_list
+        end
+        base_format_modules.clear
+      end
     end
   end
 end

data/lib/card/set/pattern/base.rb

@@ -3,60 +3,7 @@ class Card
     class Pattern
       # class from which set patterns inherit
       class Base
-        class << self
-          attr_accessor :pattern_code, :pattern_id, :junction_only,
-                        :assigns_type, :anchorless
-          attr_writer :anchor_parts_count
-
-          def new card
-            super if pattern_applies? card
-          end
-
-          def register pattern_code, opts={}
-            if (self.pattern_id = Card::Codename.id(pattern_code))
-              self.pattern_code = pattern_code
-              Card.set_patterns.insert opts.delete(:index).to_i, self
-              self.anchorless = !respond_to?(:anchor_name)
-              opts.each { |key, val| send "#{key}=", val }
-            else
-              warn "no codename for pattern_code #{pattern_code}"
-            end
-          end
-
-          def junction_only?
-            junction_only == true
-          end
-
-          def anchorless?
-            anchorless
-          end
-
-          def pattern
-            Card.fetch(pattern_id, skip_modules: true).name
-          end
-
-          def pattern_applies? card
-            junction_only? ? card.name.junction? : true
-          end
-
-          def anchor_parts_count
-            @anchor_parts_count ||= (anchorless? ? 0 : 1)
-          end
-
-          def module_key anchor_codes
-            return pattern_code.to_s.camelize if anchorless?
-            return unless anchor_codes # is this not an error?
-
-            ([pattern_code] + anchor_codes).map { |code| code.to_s.camelize }.join "::"
-          end
-
-          # label for set pattern if no anchor is given
-          def generic_label
-            label nil
-          end
-        end
-
-        # Instance methods
+        extend ClassMethods
 
         def initialize card
           return if self.class.anchorless?
@@ -134,24 +81,6 @@ class Card
           end
         end
       end
-
-      module Helper
-        private
-
-        def left_type card
-          card.superleft&.type_name || quick_type(card.name.left_name)
-        end
-
-        def quick_type name
-          if name.present?
-            card = Card.fetch name, skip_modules: true, new: {}
-            card.include_set_modules if card.new? && name.to_name.junction?
-            card&.type_name
-          else
-            "RichText"
-          end
-        end
-      end
     end
   end
 end

data/lib/card/set/pattern/class_methods.rb

@@ -0,0 +1,75 @@
+class Card
+  module Set
+    class Pattern
+      # methods for Set::Pattern classes
+      module ClassMethods
+        attr_accessor :pattern_code, :pattern_id, :junction_only,
+                      :assigns_type, :anchorless
+        attr_writer :anchor_parts_count
+
+        def new card
+          super if pattern_applies? card
+        end
+
+        def register pattern_code, opts={}
+          if (self.pattern_id = Card::Codename.id(pattern_code))
+            self.pattern_code = pattern_code
+            Card.set_patterns.insert opts.delete(:index).to_i, self
+            self.anchorless = !respond_to?(:anchor_name)
+            opts.each { |key, val| send "#{key}=", val }
+          else
+            warn "no codename for pattern_code #{pattern_code}"
+          end
+        end
+
+        def junction_only?
+          junction_only == true
+        end
+
+        def anchorless?
+          anchorless
+        end
+
+        def pattern
+          Card.fetch(pattern_id, skip_modules: true).name
+        end
+
+        def pattern_applies? card
+          junction_only? ? card.name.junction? : true
+        end
+
+        def anchor_parts_count
+          @anchor_parts_count ||= (anchorless? ? 0 : 1)
+        end
+
+        def module_key anchor_codes
+          return pattern_code.to_s.camelize if anchorless?
+          return unless anchor_codes # is this not an error?
+
+          ([pattern_code] + anchor_codes).map { |code| code.to_s.camelize }.join "::"
+        end
+
+        # label for set pattern if no anchor is given
+        def generic_label
+          label nil
+        end
+
+        private
+
+        def left_type card
+          card.superleft&.type_name || quick_type(card.name.left_name)
+        end
+
+        def quick_type name
+          if name.present?
+            card = Card.fetch name, skip_modules: true, new: {}
+            card.include_set_modules if card.new? && name.to_name.junction?
+            card&.type_name
+          else
+            "RichText"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cardio/mod/dirs.rb

@@ -65,7 +65,7 @@ module Cardio
       # Add a mod to mod load paths
       def add_path mod_name, path=nil
         if @mods.include? mod_name
-          raise Error,
+          raise Card::Error,
                 "name conflict: mod with name \"#{mod_name}\" already loaded"
         end
         @mods << mod_name
@@ -80,7 +80,7 @@ module Cardio
       end
 
       def unknown_gem_mod! name
-        raise Error, %(Unknown gem "#{name}". Make sure it is in your Gemfile.)
+        raise Card::Error, %(Unknown gem "#{name}". Make sure it is in your Gemfile.)
       end
 
       def add_gem_mod mod_name, mod_path

data/lib/cardio/mod/loader/set_pattern_loader.rb

@@ -40,7 +40,6 @@ module Cardio
           def preamble_bits
             [module_comment,
              module_chain,
-             "extend Card::Set::Pattern::Helper",
              "cattr_accessor :options",
              "class << self"]
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.101.2
+  version: 1.101.3
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cardname
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.11.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.11.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -543,6 +543,7 @@ files:
 - lib/card/env/serialization.rb
 - lib/card/env/slot_options.rb
 - lib/card/env/success.rb
+- lib/card/env/success/target.rb
 - lib/card/error.rb
 - lib/card/fetch.rb
 - lib/card/fetch/results.rb
@@ -631,6 +632,7 @@ files:
 - lib/card/set/loader.rb
 - lib/card/set/pattern.rb
 - lib/card/set/pattern/base.rb
+- lib/card/set/pattern/class_methods.rb
 - lib/card/set/required_field.rb
 - lib/card/set/trait.rb
 - lib/card/set/type.rb
@@ -1237,7 +1239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: a simple engine for emergent data structures