push_type_core 0.5.3 → 0.6.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3d23adeb39ef3366d5d105a4cae0cc3de0aae06
-  data.tar.gz: 66495f92b78bd14e7a2d545a7ba3307b83befd84
+  metadata.gz: 6d2e4ab5d33d0814637934a8bdcf85e998a5a59d
+  data.tar.gz: 69ef1e5c8346a126fb9de81c9287444666904a09
 SHA512:
-  metadata.gz: 1e711c4a5c83dadb8f1b0261c7c475a96965d6091d873f56c3dd0209c75c5f39891f217d74a45ad48e808e70d50ee10152b558755928965c2ba88b391ee2a5d0
-  data.tar.gz: 15dc8d49a344112bf92c09190f74967ce16590bce305e3ab7e5c3132c34ecfdd8d74d2ae9c8740a1f6c2afdc96aa9f1dfeaecafe0ef4268b5515017993e767ed
+  metadata.gz: aca95e9efd081d8c74567fc9f1a2350dd1b8ffb66efda6fcdfbd23e9d0ad559d00683f5335051862f60017080571f0963653fb056c21c4a5b64f03284d5e3caf
+  data.tar.gz: 8c8aa84c7ea8912e2fbb86904ddc922177a17fabcd6961a50b5cda08ea0376b72813705173af742f97be218aacbf11d920304ba72c0000aeba660ef8b73e2bee

data/app/fields/push_type/asset_field.rb

@@ -1,7 +1,5 @@
 module PushType
-  class AssetField < PushType::FieldType
-
-    include PushType::Fields::Relations
+  class AssetField < RelationField
 
     options template: 'asset'
 
@@ -13,11 +11,11 @@ module PushType
       PushType::Asset
     end
 
-    initialized_on_node do |object, field|
+    on_instance do |object, field|
       object.class_eval do
-        define_method field.name.to_sym do
-          field.relation_class.not_trash.find send(field.json_key) if send(field.json_key).present?
-        end
+        define_method(field.relation_name.to_sym) do
+          field.relation_class.not_trash.find field.json_value unless field.json_value.blank?
+        end unless method_defined?(field.relation_name.to_sym)
       end
     end
 

data/app/fields/push_type/date_field.rb

@@ -1,10 +1,11 @@
 module PushType
   class DateField < PushType::FieldType
 
-    options template: 'date', form_helper: :date_field
+    options template:     'date',
+            form_helper:  :date_field
 
-    def from_json(val)
-      val.to_date if val.present?
+    def value
+      json_value.to_date unless json_value.blank?
     end
 
   end

data/app/fields/push_type/markdown_field.rb

@@ -3,15 +3,24 @@ require 'redcarpet'
 module PushType
   class MarkdownField < PushType::FieldType
 
-    options form_helper: :text_area, renderer: Redcarpet::Render::HTML, render_options: {}, extensions: {
-      autolink:             true,
-      fenced_code_blocks:   true,
-      no_intra_emphasis:    true,
-      space_after_headers:  true,
-      strikethrough:        true,
-      tables:               true,
-      underline:            true
-    }
+    options form_helper:    :text_area,
+            renderer:       Redcarpet::Render::HTML,
+            render_options: {},
+            extensions: {
+              autolink:             true,
+              fenced_code_blocks:   true,
+              no_intra_emphasis:    true,
+              space_after_headers:  true,
+              strikethrough:        true,
+              tables:               true,
+              underline:            true
+            }
+
+    def compiled_value
+      markdown.render value unless value.nil?
+    end
+
+    private
 
     def markdown
       @markdown ||= Redcarpet::Markdown.new(renderer, @opts[:extensions])
@@ -21,14 +30,9 @@ module PushType
       @opts[:renderer].new @opts[:render_options]
     end
 
-    initialized_on_node do |object, field|
+    on_instance do |object, field|
       object.presenter_class.class_eval do
-
-        define_method field.name.to_sym do
-          raw = super()
-          fields[field.json_key].markdown.render raw unless raw.nil?
-        end
-
+        define_method(field.name) { field.compiled_value } unless method_defined?(field.name)
       end
     end
 

data/app/fields/push_type/matrix_field.rb

@@ -1,32 +1,42 @@
 module PushType
   class MatrixField < PushType::FieldType
 
-    include PushType::Fields::Arrays
+    options json_primitive: :array,
+            template:       'matrix'
 
-    options template: 'matrix', mapping: [:key, :value]
-
-    def param
-      { json_key => mapping.keys }
+    def initialize(*args, &block)
+      super
+      structure_class.class_eval(&block) if block
+      validate_field_types!
     end
 
-    def mapping
-      @mapping ||= @opts[:mapping].reduce({}) do |h, col|
-        col.is_a?(Hash) ? h.merge(col) : h.update(col => form_helper)
+    def value
+      return if json_value.blank?
+      json_value.map do |h|
+        structure_class.new(field_store: h)
       end
     end
 
-    def struct
-      @struct ||= Struct.new *mapping.keys
+    def fields
+      @fields ||= structure_class.new.fields
     end
 
-    def to_json(val)
-      return if val.blank?
-      super.reject { |v| v.blank? or v.values.all?(&:blank?) }
+    private
+
+    def structure_class
+      @structure_class ||= PushType::Structure.clone
+    end
+
+    def validate_field_types!
+      fields.values.each do |f|
+        unless field_type_whitelist.include?(f.kind)
+          raise ArgumentError, "Invalid field type. `#{ kind }` cannot be used in #{ self.class.name }."
+        end
+      end
     end
 
-    def from_json(val)
-      return if val.blank?
-      super.reject { |v| v.blank? or v.values.all?(&:blank?) }.map { |h| struct.new(*h.values) }
+    def field_type_whitelist
+      [:number, :string, :text]
     end
 
   end

data/app/fields/push_type/node_field.rb

@@ -1,9 +1,7 @@
 module PushType
-  class NodeField < SelectField
+  class NodeField < RelationField
 
-    include PushType::Fields::Relations 
-
-    options template: 'relation', field_options: {}, root: '/'
+    options template: 'relation', root: '/'
 
     def relation_class
       super
@@ -15,13 +13,13 @@ module PushType
       root = relation_class.not_trash
       root = root.find_by_path(@opts[:root].split('/')) unless @opts[:root] == '/'
       root or raise "Cannot find root node at path '#{ @opts[:root] }'"
-    end   
+    end
 
-    initialized_on_node do |object, field|
+    on_instance do |object, field|
       object.class_eval do
-        define_method field.name.to_sym do
-          field.relation_class.not_trash.find send(field.json_key) if send(field.json_key).present?
-        end
+        define_method(field.relation_name.to_sym) do
+          field.relation_class.not_trash.find field.json_value unless field.json_value.blank?
+        end unless method_defined?(field.relation_name.to_sym)
       end
     end
 

data/app/fields/push_type/number_field.rb

@@ -1,11 +1,8 @@
 module PushType
   class NumberField < PushType::FieldType
 
-    options form_helper: :number_field
-
-    def to_json(val)
-      val.to_i if val.present?
-    end
+    options json_primitive: :number,
+            form_helper:    :number_field
 
   end
 end

data/app/fields/push_type/relation_field.rb

@@ -0,0 +1,78 @@
+module PushType
+  class RelationField < PushType::FieldType
+
+    options template: 'relation'
+
+    def initialize(*args)
+      super
+      raise ArgumentError, "Relation field names must end with suffix `_id` or `ids`." unless relation_name
+    end
+
+    def json_primitive
+       multiple? ? :array : super 
+    end
+
+    def label
+      super || relation_name.humanize
+    end
+
+    def html_options
+      super.merge(multiple: multiple?)
+    end
+
+    def choices
+      if relation_root.respond_to?(:hash_tree)
+        flatten_tree(relation_root.hash_tree)
+      else
+        relation_root.all.map { |item| item_hash(item) }
+      end
+    end
+
+    def relation_name
+      @relation_name ||= (rel = name.to_s.gsub!(/_ids?$/, '')) && (rel && multiple? ? rel.pluralize : rel)
+    end
+
+    def relation_class
+      (@opts[:to] || relation_name.singularize).classify.constantize
+    end
+
+    def relation_root
+      relation_class
+    end
+
+    private
+
+    def defaults
+      super.merge({
+        label:    nil,
+        mapping:  { value: :id, text: :title }
+      })
+    end
+
+    def item_hash(item, d = 0)
+      {
+        value:  item.send(@opts[:mapping][:value]),
+        text:   item.send(@opts[:mapping][:text]),
+        depth:  d
+      }
+    end
+
+    def flatten_tree(hash_tree, d = 0)
+      hash_tree.flat_map do |parent, children|
+        [
+          item_hash(parent, d),
+          flatten_tree(children, d+1)
+        ]
+      end.flatten
+    end
+
+    on_instance do |object, field|
+      object.class_eval do
+        define_method(field.relation_name.to_sym) do
+          field.relation_class.find field.json_value unless field.json_value.blank?
+        end unless method_defined?(field.relation_name.to_sym)
+      end
+    end
+
+  end
+end

data/app/fields/push_type/repeater_field.rb

@@ -1,16 +1,55 @@
 module PushType
   class RepeaterField < FieldType
 
-    include PushType::Fields::Arrays
+    options json_primitive: :array,
+            repeats:        :string
 
-    options template: 'repeater'
+    def initialize(*args)
+      super
+      validate_field_type!
+    end
+
+    def value
+      return if json_value.blank?
+      json_value.map do |j|
+        generate_field('_f' => j).value
+      end
+    end
+
+    def template
+      'repeater'
+    end
+
+    def field
+      @field ||= generate_field
+    end
+
+    private
+
+    def defaults
+      super.except(:template, :form_helper)
+    end
+
+    def generate_field(json = {})
+      field_type.new :_f, PushType::Structure.new(field_store: json), @opts.except(:css_class).merge(multiple: false)
+    end
+
+    def field_type
+      begin
+        "push_type/#{ @opts[:repeats] }_field".camelize.constantize
+      rescue NameError
+        "#{ @opts[:repeats] }_field".camelize.constantize
+      end
+    end
 
-    def to_json(val)
-      super.reject(&:blank?) if val.present?
+    def validate_field_type!
+      unless field_type_whitelist.include?(@opts[:repeats])
+        raise ArgumentError, "Invalid field type. `#{ @opts[:repeats] }` cannot be used in #{ self.class.name }."
+      end
     end
 
-    def from_json(val)
-      super.reject(&:blank?) if val.present?
+    def field_type_whitelist
+      [:number, :string, :text]
     end
 
   end

data/app/fields/push_type/select_field.rb

@@ -1,15 +1,9 @@
 module PushType
   class SelectField < PushType::FieldType
 
-    options template: 'select', choices: [], field_options: { include_blank: 'Please select...' }, multiple: false
-
-    def multiple?
-      @opts[:multiple]
-    end
-
-    def param
-      multiple? ? { json_key => [] } : super
-    end
+    options template:       'select',
+            choices:        [], 
+            field_options:  { include_blank: 'Please select...' }
 
     def choices
       if @opts[:choices].respond_to? :call
@@ -19,22 +13,16 @@ module PushType
       end
     end
 
-    def field_options
-      @opts[:field_options]
-    end
-
-    def html_options
-      super.merge(multiple: multiple?)
+    def multiple?
+      @opts[:multiple]
     end
 
-    def to_json(val)
-      return if val.blank?
-      multiple? ? Array(val).reject(&:blank?) : super
+    def json_primitive
+       multiple? ? :array : super 
     end
 
-    def from_json(val)
-      return if val.blank?
-      multiple? ? Array(val).reject(&:blank?) : super
+    def html_options
+      @opts[:html_options].merge(multiple: multiple?)
     end
 
   end

data/app/fields/push_type/structure_field.rb

@@ -0,0 +1,40 @@
+module PushType
+  class StructureField < PushType::FieldType
+
+    options json_primitive: :object,
+            template:       'structure'
+
+    def initialize(*args, &block)
+      super
+      structure_class.class_eval(&block) if block
+    end
+
+    def value
+      structure.field_store = json_value unless json_value.blank?
+      structure
+    end
+
+    def fields
+      structure.fields
+    end
+
+    private
+
+    def structure_class
+      @structure_class ||= PushType::Structure.clone
+    end
+
+    def structure
+      @structure ||= structure_class.new
+    end
+
+    on_class do |klass, field_name, field_class|
+      klass.validate do |n|
+        unless n.send(field_name).valid?
+          n.errors.add field_name, :invalid
+        end
+      end
+    end
+
+  end
+end

data/app/fields/push_type/tag_list_field.rb

@@ -1,22 +1,33 @@
 module PushType
   class TagListField < PushType::FieldType
 
-    include PushType::Fields::Arrays
+    options json_primitive: :array,
+            template:       'select',
+            html_options:   { placeholder: 'Tags...' }
 
-    options template: 'tag_list', html_options: { multiple: true, placeholder: 'Tags...' }
+    def choices
+      json_value || []
+    end
+
+    def multiple?
+      true
+    end
 
-    def to_json(val)
-      super.reject(&:blank?) if val.present?
+    def field_options
+      {}
     end
 
-    initialized_on_node do |object, field|
+    def html_options
+      super.merge(multiple: multiple?)
+    end
 
-      object.class_eval do
+    on_class do |klass, field_name, field_class|
+      klass.class_eval do
 
         # Dynamically define standard scope .with_all_`field_name`
         # Returns ActiveRecord::Relation
         #
-        scope "with_all_#{ field.name }".to_sym, ->(*args) {
+        scope "with_all_#{ field_name }".to_sym, ->(*args) {
           raise ArgumentError, 'wrong number of arguments' unless args.present?
           tags = args[0].is_a?(Array) ? args[0] : args
 
@@ -27,13 +38,13 @@ module PushType
         # Dynamically define class method .with_any_`field_name`
         # Returns Array
         #
-        define_singleton_method "with_any_#{ field.name }".to_sym do |*args, &block|
+        define_singleton_method "with_any_#{ field_name }".to_sym do |*args, &block|
           raise ArgumentError, 'wrong number of arguments' unless args.present?
           tags = args[0].is_a?(Array) ? args[0] : args
 
           composed_scope = (
             block.respond_to?(:call) ? block.call : all
-          ).where(["field_store->'#{ field.name }' ?| ARRAY[:tags]", { tags: tags }])
+          ).where(["field_store->'#{ field_name }' ?| ARRAY[:tags]", { tags: tags }])
 
           t   = Arel::Table.new('t',  ActiveRecord::Base)
           ct  = Arel::Table.new('ct', ActiveRecord::Base)
@@ -43,7 +54,7 @@ module PushType
 
           lateral = ct
             .project(Arel.sql('e').count(true).as('ct'))
-            .from(Arel.sql "jsonb_array_elements_text(t.field_store->'#{ field.name }') e")
+            .from(Arel.sql "jsonb_array_elements_text(t.field_store->'#{ field_name }') e")
             .where(Arel::Nodes::Equality.new Arel.sql('e'), any_tags_func)
 
           query = t
@@ -59,12 +70,12 @@ module PushType
         # Dynamically define class method .all_`field_name`
         # Returns Array
         #
-        define_singleton_method "all_#{ field.name }".to_sym do |*args, &block|
+        define_singleton_method "all_#{ field_name }".to_sym do |*args, &block|
           composed_scope = block.respond_to?(:call) ? block.call : all
           composed_scope.projections = []
 
           query = composed_scope
-            .project(Arel.sql "jsonb_array_elements_text(field_store->'#{ field.name }') t")
+            .project(Arel.sql "jsonb_array_elements_text(field_store->'#{ field_name }') t")
             .distinct
             .order(Arel.sql 't')
           connection.select_all(query.to_sql).rows.flatten

data/app/fields/push_type/taxonomy_field.rb

@@ -1,9 +1,7 @@
 module PushType
-  class TaxonomyField < SelectField
+  class TaxonomyField < RelationField
 
-    include PushType::Fields::Relations 
-
-    options template: 'relation', field_options: {}
+    options template: 'relation'
 
     def relation_class
       super
@@ -11,11 +9,11 @@ module PushType
       PushType::Taxonomy
     end
 
-    initialized_on_node do |object, field|
+    on_instance do |object, field|
       object.class_eval do
-        define_method field.name.to_sym do
-          field.relation_class.find send(field.json_key) if send(field.json_key).present?
-        end
+        define_method(field.relation_name.to_sym) do
+          field.relation_class.find field.json_value unless field.json_value.blank?
+        end unless method_defined?(field.relation_name.to_sym)
       end
     end
 

data/app/fields/push_type/time_field.rb

@@ -1,10 +1,11 @@
 module PushType
   class TimeField < PushType::FieldType
 
-    options template: 'date', form_helper: :time_field
+    options template:     'date',
+            form_helper:  :time_field
 
-    def from_json(val)
-      val.to_time if val.present?
+    def value
+      json_value.to_time unless json_value.blank?
     end
     
   end

data/app/models/concerns/push_type/customizable.rb

@@ -2,12 +2,30 @@ module PushType
   module Customizable
     extend ActiveSupport::Concern
 
+    included do
+      after_initialize :initialize_fields
+    end
+
     def fields
-      self.class.fields
+      @fields ||= {}
+    end
+
+    private
+
+    def initialize_fields
+      self.class.fields.keys.each do |key|
+        f = initialized_field(key)
+        if block = f.class.init_block
+          block.call(self, f)
+        end
+      end
     end
 
-    def field_params
-      fields.map { |k, field| field.param }
+    def initialized_field(key)
+      fields[key] ||= begin
+        klass, opts, blk = self.class.fields[key]
+        klass.new(key, self, opts, &blk)
+      end
     end
 
     module ClassMethods
@@ -15,10 +33,10 @@ module PushType
       attr_reader :fields
 
       def fields
-        @fields ||= ActiveSupport::OrderedHash.new
+        @fields ||= {}
       end
 
-      def field(name, *args)
+      def field(name, *args, &blk)
         raise ArgumentError if args.size > 2
         kind, opts = case args.size
           when 2 then args
@@ -26,21 +44,32 @@ module PushType
           else        [ :string, {} ]
         end
 
-        _field = fields[name] = field_factory(kind).new(name, opts)
-        store_accessor :field_store, _field.json_key
+        # Store field type and set accessor
+        fields[name] = [ field_type(kind), opts, blk ].compact
+        store_accessor :field_store, name
 
-        validates _field.json_key, opts[:validates] if opts[:validates]
+        # Set inline validates
+        validates name, opts[:validates] if opts[:validates]
 
-        override_accessor _field
+        # Override setter accessor
+        define_method "#{ name }=".to_sym do |val|
+          f = initialized_field(name)
+          super f.primitive.to_json(val)
+        end
+
+        # Override getter accessor
+        define_method name do
+          self.fields[name].value
+        end
 
-        if block = _field.class.initialized_blk
-          block.call(self, _field)
+        if block = fields[name][0].def_block
+          block.call(self, name, fields[name][0])
         end
       end
 
       protected
 
-      def field_factory(kind)
+      def field_type(kind)
         begin
           "push_type/#{ kind }_field".camelize.constantize
         rescue NameError
@@ -48,15 +77,6 @@ module PushType
         end
       end
 
-      def override_accessor(f)
-        define_method "#{ f.json_key }=".to_sym do |val|
-          super f.to_json(val)
-        end
-        define_method f.json_key do
-          f.from_json super()
-        end
-      end
-
     end
   end
 end