push_type_core 0.5.0.alpha.2 → 0.5.0.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ccc2d89b2a7564b64c4162a769cbc709729962b
-  data.tar.gz: 6d9442afef9ed0a0db080fd9cadbf30344a2a564
+  metadata.gz: b12033b0e730c01d39ed6a7d667dcb0009418897
+  data.tar.gz: 09ef26e24eff460828285fdeef96107b39a1b160
 SHA512:
-  metadata.gz: a1ffa5d3b0f954aad8295d8ce1b940e1348ce3ce2c6beb47499d0adb897327494a7fbb30d4a4a83992ed5f4327b8ddbc930d438fc145f72558d26b07cea02acf
-  data.tar.gz: d6584a69f40548a537488fbc6986ff1aeeb99c0a9548fd3aa5c281b3128ec62032a57ea0daf09660bd7fdf4e867222df67f5b33c1bf1e1c8a86882e7f27ad63c
+  metadata.gz: 73d086627daf27c656e4b655cb76f5bf7c4d7183052d749db2f014c332762c6724e43ff4b4f22ad515c3b8af3d40b888a40dce7735e406220097c2ba672cd65e
+  data.tar.gz: 53e698227a5f563102d8478bfbcb20a7514f1b355df91cfd0f93531a850de316dd4f8c6d2e1b12fb3900587df201ae4e33e61cebe4685d75b3f34a8cdb6ea6a4

data/app/fields/push_type/asset_field.rb

@@ -1,32 +1,21 @@
 module PushType
   class AssetField < PushType::FieldType
 
-    def template
-      @opts[:template] || 'asset'
-    end
+    include PushType::Fields::Relations
+
+    options template: 'asset'
 
     def id_attr
       "#{ name }-asset-modal"
     end
 
-    def from_json(val)
-      return if val.blank?
-      PushType::Asset.find(val)
-    end
-
     initialized_on_node do |object, field|
       object.class_eval do
-
-        define_method field.relation_id_method do
-          field_store[field.name]
+        define_method field.name.to_sym do
+          PushType::Asset.find send(field.json_key) if send(field.json_key).present?
         end
-
       end
     end
 
-    def relation_id_method
-      (name + '_id').to_sym
-    end
-
   end
 end

data/app/fields/push_type/date_field.rb

@@ -1,17 +1,10 @@
 module PushType
   class DateField < PushType::FieldType
 
-    def template
-      @opts[:template] || 'date'
-    end
-
-    def form_helper
-      @opts[:form_helper] || :date_field
-    end
+    options template: 'date', form_helper: :date_field
 
     def from_json(val)
-      return if val.blank?
-      val.to_date
+      val.to_date if val.present?
     end
 
   end

data/app/fields/push_type/markdown_field.rb

@@ -3,7 +3,7 @@ require 'redcarpet'
 module PushType
   class MarkdownField < PushType::FieldType
 
-    DEFAULT_EXTENSIONS = {
+    options form_helper: :text_area, renderer: Redcarpet::Render::HTML, render_options: {}, extensions: {
       autolink:             true,
       fenced_code_blocks:   true,
       no_intra_emphasis:    true,
@@ -18,26 +18,18 @@ module PushType
     end
 
     def markdown
-      @markdown ||= Redcarpet::Markdown.new(renderer, extensions)
+      @markdown ||= Redcarpet::Markdown.new(renderer, @opts[:extensions])
     end
 
     def renderer
-      ( @opts[:renderer] || Redcarpet::Render::HTML ).new render_options
-    end
-
-    def render_options
-      @opts[:render_options] || {}
-    end
-
-    def extensions
-      DEFAULT_EXTENSIONS.merge(@opts[:extensions] || {})
+      @opts[:renderer].new @opts[:render_options]
     end
 
     initialized_on_node do |object, field|
       object.presenter_class.class_eval do
 
         define_method field.name.to_sym do
-          fields[field.name.to_sym].markdown.render super()
+          fields[field.json_key].markdown.render super()
         end
 
       end

data/app/fields/push_type/matrix_field.rb

@@ -1,20 +1,24 @@
 module PushType
-  class MatrixField < ArrayField
+  class MatrixField < PushType::FieldType
+
+    include PushType::Fields::Arrays
+
+    options template: :matrix, mapping: [:key, :value]
 
     def param
-      { name.to_sym => mapping.keys }
-    end
-    
-    def template
-      @opts[:template] || :matrix
+      { json_key => mapping.keys }
     end
 
     def mapping
-      @mapping ||= (@opts[:mapping] || []).reduce({}) do |h, col|
+      @mapping ||= @opts[:mapping].reduce({}) do |h, col|
         col.is_a?(Hash) ? h.merge(col) : h.update(col => form_helper)
       end
     end
 
+    def struct
+      @struct ||= Struct.new *mapping.keys
+    end
+
     def to_json(val)
       return if val.blank?
       super.reject { |v| v.blank? or v.values.all?(&:blank?) }
@@ -25,9 +29,5 @@ module PushType
       super.reject { |v| v.blank? or v.values.all?(&:blank?) }.map { |h| struct.new(*h.values) }
     end
 
-    def struct
-      @struct ||= Struct.new *mapping.keys
-    end
-
   end
 end

data/app/fields/push_type/node_field.rb

@@ -0,0 +1,22 @@
+module PushType
+  class NodeField < SelectField
+
+    include PushType::Fields::Relations 
+
+    options template: 'relation', field_options: {}, root: '/'
+
+    def relation_root
+      root = @opts[:root] == '/' ? PushType::Node : PushType::Node.find_by_path(@opts[:root].split('/'))
+      root or raise "Cannot find root node at path '#{ @opts[:root] }'"
+    end   
+
+    initialized_on_node 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
+      end
+    end
+
+  end
+end

data/app/fields/push_type/number_field.rb

@@ -1,17 +1,11 @@
 module PushType
   class NumberField < PushType::FieldType
-    def form_helper
-      @opts[:form_helper] || :number_field
-    end
+
+    options form_helper: :number_field
 
     def to_json(val)
-      return if val.blank?
-      val.to_i
+      val.to_i if val.present?
     end
 
-    def from_json(val)
-      return if val.blank?
-      val.to_i
-    end
   end
 end

data/app/fields/push_type/repeater_field.rb

@@ -1,18 +1,16 @@
 module PushType
-  class RepeaterField < ArrayField
-    
-    def template
-      @opts[:template] || :repeater
-    end
+  class RepeaterField < FieldType
+
+    include PushType::Fields::Arrays
+
+    options template: :repeater
 
     def to_json(val)
-      return if val.blank?
-      super.reject(&:blank?)
+      super.reject(&:blank?) if val.present?
     end
 
     def from_json(val)
-      return if val.blank?
-      super.reject(&:blank?)
+      super.reject(&:blank?) if val.present?
     end
 
   end

data/app/fields/push_type/select_field.rb

@@ -1,16 +1,17 @@
 module PushType
   class SelectField < PushType::FieldType
 
-    def param
-      multiple? ? { name.to_sym => [] } : super
+    options template: 'select', choices: [], field_options: { include_blank: 'Please select...' }, multiple: false
+
+    def multiple?
+      @opts[:multiple]
     end
 
-    def template
-      @opts[:template] || 'select'
+    def param
+      multiple? ? { json_key => [] } : super
     end
 
     def choices
-      return [] unless @opts[:choices]
       if @opts[:choices].respond_to? :call
         @opts[:choices].call
       else
@@ -19,7 +20,7 @@ module PushType
     end
 
     def field_options
-      { include_blank: 'Please select...' }.merge(@opts[:field_options] || {})
+      @opts[:field_options]
     end
 
     def html_options
@@ -36,9 +37,5 @@ module PushType
       multiple? ? Array(val).reject(&:blank?) : super
     end
 
-    def multiple?
-      @opts[:multiple] || false
-    end
-
   end
 end

data/app/fields/push_type/tag_list_field.rb

@@ -1,24 +1,18 @@
 require 'push_type/tag_list_query'
 
 module PushType
-  class TagListField < ArrayField
+  class TagListField < PushType::FieldType
 
-    def template
-      @opts[:template] || 'tag_list'
-    end
+    include PushType::Fields::Arrays
 
-    def html_options
-      { multiple: true, placeholder: 'Tags...' }.merge(super)
-    end
+    options template: 'tag_list', html_options: { multiple: true, placeholder: 'Tags...' }
 
     def to_json(val)
-      return if val.blank?
-      super.reject(&:blank?)
+      super.reject(&:blank?) if val.present?
     end
 
     def from_json(val)
-      return if val.blank?
-      super.reject(&:blank?)
+      super.reject(&:blank?) if val.present?
     end
 
     initialized_on_node do |object, field|

data/app/fields/push_type/taxonomy_field.rb

@@ -1,62 +1,21 @@
 module PushType
   class TaxonomyField < SelectField
 
-    def template
-      @opts[:template] || 'taxonomy'
-    end
+    include PushType::Fields::Relations 
 
-    def choices
-      []
-    end
+    options template: 'relation', field_options: {}
 
-    def from_json(val)
-      return if val.blank?
-      ids = multiple? ? Array(val).reject(&:blank?) : super
-      taxonomy_class.find(ids)
+    def relation_option
+      @opts[:taxonomy_class]
     end
 
     initialized_on_node do |object, field|
       object.class_eval do
-
-        define_method field.relation_id_method do
-          field_store[field.name]
+        define_method field.name.to_sym do
+          field.relation_class.find send(field.json_key) if send(field.json_key).present?
         end
-
       end
     end
 
-    def singular_name
-      multiple? ? name.singularize : name
-    end
-
-    def taxonomy_class
-      (@opts[:taxonomy_class] || singular_name).to_s.classify.constantize
-    end
-
-    def taxonomy_tree_to_json
-      flatten_tree taxonomy_class.hash_tree
-    end
-
-    def relation_id_method
-      suffix = multiple? ? '_ids' : '_id'
-      (singular_name + suffix).to_sym
-    end
-
-    private
-
-    def flatten_tree(hash_tree, d = 0)
-      hash_tree.flat_map do |parent, children|
-        [
-          {
-            value:  parent.id,
-            text:   parent.title,
-            depth:  d
-          },
-          flatten_tree(children, d+1)
-        ]
-      end.flatten
-    end
-
-
   end
 end

data/app/fields/push_type/text_field.rb

@@ -1,7 +1,7 @@
 module PushType
   class TextField < PushType::FieldType
-    def form_helper
-      @opts[:form_helper] || :text_area
-    end
+
+    options form_helper: :text_area
+    
   end
 end

data/app/fields/push_type/time_field.rb

@@ -1,17 +1,10 @@
 module PushType
   class TimeField < PushType::FieldType
 
-    def template
-      @opts[:template] || 'date'
-    end
-
-    def form_helper
-      @opts[:form_helper] || :time_field
-    end
+    options template: 'date', form_helper: :time_field
 
     def from_json(val)
-      return if val.blank?
-      val.to_time
+      val.to_time if val.present?
     end
     
   end

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

@@ -26,15 +26,15 @@ module PushType
           else        [ :string, {} ]
         end
 
-        fields[name] = field_factory(kind).new(name, opts)
-        store_accessor :field_store, name
+        _field = fields[name] = field_factory(kind).new(name, opts)
+        store_accessor :field_store, _field.json_key
 
-        validates name, opts[:validates] if opts[:validates]
+        validates _field.json_key, opts[:validates] if opts[:validates]
 
-        override_accessor fields[name]
+        override_accessor _field
 
-        if block = field_factory(kind).initialized_blk
-          block.call(self, fields[name])
+        if block = _field.class.initialized_blk
+          block.call(self, _field)
         end
       end
 
@@ -49,10 +49,10 @@ module PushType
       end
 
       def override_accessor(f)
-        define_method "#{f.name}=".to_sym do |val|
+        define_method "#{ f.json_key }=".to_sym do |val|
           super f.to_json(val)
         end
-        define_method f.name do
+        define_method f.json_key do
           f.from_json super()
         end
       end

data/db/migrate/20150531183944_add_field_store_default_values.rb

@@ -0,0 +1,6 @@
+class AddFieldStoreDefaultValues < ActiveRecord::Migration
+  def change
+    change_column :push_type_nodes, :field_store, :jsonb, default: {}, null: false
+    change_column :push_type_users, :field_store, :jsonb, default: {}, null: false
+  end
+end

data/lib/generators/push_type/field/templates/field.rb

@@ -1,4 +1,4 @@
-class <%= class_name %>Field < PushType::FieldType
+class <%= class_name %>Field < PushType::FieldType::Base
 
   # Override built-in methods to extend functionality
   # See PushType::FieldType Rdoc for methods to Override

data/lib/push_type/field_type.rb

@@ -1,60 +1,16 @@
+require 'push_type/fields/class_methods'
+require 'push_type/fields/base'
+require 'push_type/fields/ui'
+require 'push_type/fields/arrays'
+require 'push_type/fields/relations'
+
 module PushType
   class FieldType
 
-    attr_reader :name
-
-    class << self
-      attr_reader :initialized_blk
-      def initialized_on_node(&block)
-        @initialized_blk = block
-      end
-    end
-
-    def initialize(name, opts = {})
-      @name = name.to_s
-      @opts = opts
-    end
-
-    def param
-      name.to_sym
-    end
-
-    def kind
-      self.class.name.demodulize.underscore.gsub(/_(field|type)$/, '')
-    end
-
-    def template
-      @opts[:template] || 'default'
-    end
-
-    def label
-      @opts[:label] || name.humanize
-    end
-
-    def html_options
-      @opts[:html_options] || {}
-    end
-
-    def form_helper
-      @opts[:form_helper] || :text_field
-    end
-
-    def column_class
-      case @opts[:colspan]
-        when 2 then 'medium-6'
-        when 3 then 'medium-4'
-        when 3 then 'medium-3'
-        else nil
-      end
-    end
-
-    def to_json(val)
-      val
-    end
+    extend PushType::Fields::ClassMethods
 
-    def from_json(val)
-      val
-    end
+    include PushType::Fields::Base
+    include PushType::Fields::Ui
 
   end
 end

data/lib/push_type/fields/arrays.rb

@@ -0,0 +1,23 @@
+module PushType
+  module Fields
+    module Arrays
+
+      def param
+        { json_key => [] }
+      end
+
+      def multiple?
+        true
+      end
+
+      def to_json(val)
+        Array(val)
+      end
+
+      def from_json(val)
+        Array(val)
+      end
+
+    end
+  end
+end

data/lib/push_type/fields/base.rb

@@ -0,0 +1,65 @@
+module PushType
+  module Fields
+    module Base
+
+      attr_reader :name      
+
+      def initialize(name, opts = {})
+        @name = name.to_s
+        @opts = [defaults, self.class.options, opts].compact.inject(&:merge)
+      end
+
+      def kind
+        self.class.kind
+      end
+
+      def json_key
+        name.to_sym
+      end
+
+      def param
+        json_key
+      end
+
+      def multiple?
+        false
+      end
+
+      def template
+        @opts[:template]
+      end
+
+      def label
+        @opts[:label]
+      end
+
+      def html_options
+        @opts[:html_options]
+      end
+
+      def form_helper
+        @opts[:form_helper]
+      end
+
+      def to_json(val)
+        val
+      end
+
+      def from_json(val)
+        val
+      end
+
+      private
+
+      def defaults
+        {
+          template:     'default',
+          label:        name.humanize,
+          form_helper:  :text_field,
+          html_options: {}
+        }
+      end
+
+    end
+  end
+end

data/lib/push_type/fields/class_methods.rb

@@ -0,0 +1,21 @@
+module PushType
+  module Fields
+    module ClassMethods
+
+      attr_reader :initialized_blk
+
+      def options(*opts)
+        @options ||= opts.first
+      end
+
+      def initialized_on_node(&block)
+        @initialized_blk = block
+      end
+
+      def kind
+        self.name.demodulize.underscore.gsub(/_(field|type)$/, '')
+      end
+
+    end
+  end
+end

data/lib/push_type/fields/relations.rb

@@ -0,0 +1,39 @@
+module PushType
+  module Fields
+    module Relations
+      
+      def json_key
+        suffix = multiple? ? '_ids' : 'id'
+        (name.singularize + suffix).to_sym
+      end
+
+      def relation_option
+        @opts[:relation_class]
+      end
+
+      def relation_root
+        (relation_option || name.singularize).to_s.classify.constantize
+      end
+
+      def relation_tree
+        flatten_tree relation_root.hash_tree
+      end
+
+      private
+
+      def flatten_tree(hash_tree, d = 0)
+        hash_tree.flat_map do |parent, children|
+          [
+            {
+              value:  parent.id,
+              text:   parent.title,
+              depth:  d
+            },
+            flatten_tree(children, d+1)
+          ]
+        end.flatten
+      end
+
+    end
+  end
+end

data/lib/push_type/fields/ui.rb

@@ -0,0 +1,16 @@
+module PushType
+  module Fields
+    module Ui
+      
+      def column_class
+        case @opts[:colspan]
+          when 2 then 'medium-6'
+          when 3 then 'medium-4'
+          when 3 then 'medium-3'
+          else nil
+        end
+      end
+
+    end
+  end
+end