contents_core 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da496467b39f33f60cba8e1ce3356a83cf26f804
-  data.tar.gz: a81d0b06211ffaf5c3aa262fd82167c9e88f88ac
+  metadata.gz: 3635d8643c427f43b9fb5f929fc98c111bc84994
+  data.tar.gz: b5eb85c95998603fac03517e1221dfee6a409b59
 SHA512:
-  metadata.gz: 47c86fbecb6193acb88816373765193d7c60cf68ae81ca4ae781675d9b27794ed58b617fb733d32cd70ba7ab3f4d5cd25e106288d5698c23c1a5dcd897c9511e
-  data.tar.gz: 3dd11bae3f087cf3ad7d6569c6387d5c3aa57240bda029b7cb1b97945974c1979f74de165eed0e8384340b0cb8111c2f6292bd361e1619db3869335be1be4945
+  metadata.gz: 0d064f8cdf42dbb1eaed6060c019f2a3c213750bf7fb09a3a835af64b7f52dc1a98dbf9e2e15680a1fd2eeb247f8e53ade283f3e674033d685ca5470ca96e8cb
+  data.tar.gz: 1ce8483d568007a1e90b17a725408a1acac654b29b1d2ef0b1605d10ec161d1ef7a2c1cde9623b6e478b1e365f40e5db613949936b90f7dadb20e0a3b295cdf4

data/README.md

@@ -1,9 +1,10 @@
-# ContentsCore [![Gem Version](https://badge.fury.io/rb/contents_core.svg)](https://badge.fury.io/rb/contents_core)
+# ContentsCore [![Gem Version](https://badge.fury.io/rb/contents_core.svg)](https://badge.fury.io/rb/contents_core) [![Build Status](https://travis-ci.org/blocknotes/contents_core.svg)](https://travis-ci.org/blocknotes/contents_core)
 
 A Rails gem which offer a simple structure to manage contents in a flexible way.
 
-Goals:
+Disclaimer: this component is in ALPHA, major changes could happen
 
+Goals:
 - attach the contents structure to a model transparently
 - improve block views management
 - add fields to blocks without migrations
@@ -108,7 +109,7 @@ If you use ActiveAdmin as admin interface you can find a sample model configurat
 
 ### Notes
 
-- Blocks list (enum): `ContentsCore::Block.block_list`
+- Blocks enum: `ContentsCore::Block.block_enum`
 - Blocks types: `ContentsCore::Block.block_types`
 - Default blocks [here](config/initializers/contents_core.rb)
 

data/app/models/contents_core/block.rb

@@ -2,6 +2,8 @@ module ContentsCore
   class Block < ApplicationRecord
     EMPTY_DATA = OpenStruct.new( { data: '' } )
 
+    attr_accessor :create_children
+
     # --- fields options ----------------------------------------------------- #
     serialize :options, JSON
     serialize :validations, JSON
@@ -51,29 +53,29 @@ module ContentsCore
     #
     # # scope :published, -> { where( published: true ) unless ApplicationController.edit_mode }
 
-    def initialize( params = {} )
-      super
+    def initialize( attributes = {}, &block )
+      super( attributes, &block )
+      @create_children = 1
       self.group = config[:group]
-      self.block_type = parent.config[:children_type] if params[:block_type].nil? && self.parent_type == 'ContentsCore::Block'
+      self.block_type = parent.config[:children_type] if attributes[:block_type].nil? && self.parent_type == 'ContentsCore::Block'
     end
 
-    def as_json
-      # binding.pry
-      super({ only: [:id, :block_type, :name, :group, :position, :published], methods: [:blocks_collection, :items_collection]}.merge(options || {}))
+    def as_json( options = nil )
+      super({ only: [:id, :block_type, :name, :group, :position, :published], include: [:cc_blocks, :items]}.merge(options || {}))
     end
 
     def attr_id
       "#{self.class.to_s.split('::').last}-#{self.id}"
     end
 
-    def blocks_collection
-      self.cc_blocks.map &:as_json
-    end
-
     def children_type
       config[:children_type]
     end
 
+    def config
+      ContentsCore.config[:cc_blocks][block_type.to_sym] ? ContentsCore.config[:cc_blocks][block_type.to_sym] : {}
+    end
+
     def create_item( item_type, item_name = nil )
       new_item = ContentsCore::Item.new( type: item_type )
       new_item.name = item_name if item_name
@@ -125,18 +127,14 @@ module ContentsCore
       parent.present? && parent_type == 'ContentsCore::Block'
     end
 
-    def items_collection
-      self.items.map &:as_json
-    end
-
     def on_after_create
       # TODO: validates type before creation!
-      Block::init_items( self, config[:items] ) if Block::block_types.include?( self.block_type.to_sym )
+      Block::init_items( self, config[:items] ) if Block::block_types( false ).include?( self.block_type.to_sym )
     end
 
     def on_before_create
       if self.name.blank?
-        names = parent.cc_blocks.map &:name
+        names = parent.cc_blocks.map( &:name )
         i = 0
         while( ( i += 1 ) < 1000 )  # Search an empty group
           unless names.include? "#{block_type}-#{i}"
@@ -184,15 +182,15 @@ module ContentsCore
       end
     end
 
-    def self.block_list
-      @@block_list ||= ContentsCore.config[:cc_blocks].map{|k, v| [v[:name], k.to_s] unless v[:child_only]}.compact.sort_by{|b| b[0]}
+    def self.block_enum( include_children = true )
+      ContentsCore.config[:cc_blocks].map{|k, v| [v[:name], k.to_s] if !include_children || !v[:child_only]}.compact.sort_by{|b| b[0]}
     end
 
-    def self.block_types
-      @@block_types ||= ContentsCore.config[:cc_blocks].keys
+    def self.block_types( include_children = true )
+      ContentsCore.config[:cc_blocks].select{|k, v| !include_children || !v[:child_only]}.keys
     end
 
-    def self.init_items( block, items )
+    def self.init_items( block, items, options = {} )
       items.each do |name, type|
         t = type.to_sym
         if type.to_s.start_with? 'item_'
@@ -204,8 +202,10 @@ module ContentsCore
             model = false
           end
           block.items << model.new( name: name ).init if model
-        elsif Block::block_types.include? t.to_sym
-          block.cc_blocks << ( cmp = Block.new( block_type: t, name: name ) )
+        elsif Block::block_types( false ).include? t.to_sym
+          block.create_children.times do
+            block.cc_blocks << Block.new( block_type: t, name: name )
+          end
         end
       end if items
     end
@@ -213,9 +213,5 @@ module ContentsCore
     def self.permitted_attributes
       [ :id, :name, :block_type, :position, :_destroy, items_attributes: [ :id ] + Item::permitted_attributes, cc_blocks_attributes: [ :id, :name, :block_type, items_attributes: [ :id ] + Item::permitted_attributes ] ]
     end
-
-    def config
-      ContentsCore.config[:cc_blocks][block_type.to_sym] ? ContentsCore.config[:cc_blocks][block_type.to_sym] : {}
-    end
   end
 end

data/app/models/contents_core/item.rb

@@ -6,8 +6,8 @@ module ContentsCore
 
     belongs_to :block
 
-    def as_json
-      super( {only: [:id, :name, :type], methods: [:data]} )
+    def as_json( options = nil )
+      super( {only: [:id, :name, :type], methods: [:data]}.merge(options || {}) )
     end
 
     def attr_id
@@ -32,6 +32,10 @@ module ContentsCore
       end
     end
 
+    def process_data( args = nil )
+      config[:process_data].call( self.data, args ) if config[:process_data]
+    end
+
     def set( value )
       self.data = value
       self
@@ -47,7 +51,7 @@ module ContentsCore
     end
 
     def self.item_types
-      @@item_types ||= ContentsCore.config[:items].keys.map &:to_s
+      @@item_types ||= ContentsCore.config[:items].keys.map( &:to_s )
     end
 
     def self.permitted_attributes
@@ -57,7 +61,47 @@ module ContentsCore
   protected
 
     def config
-      @config ||= self.block.config[:options] && self.block.config[:options][self.name.to_sym] ? self.block.config[:options][self.name.to_sym] : ( ContentsCore.config[:items][self.class::type_name.to_sym] ? ContentsCore.config[:items][self.class::type_name.to_sym] : {} )
+      @config ||= self.block && self.block.config[:options] && self.block.config[:options][self.name.to_sym] ? self.block.config[:options][self.name.to_sym] : ( ContentsCore.config[:items][self.class::type_name.to_sym] ? ContentsCore.config[:items][self.class::type_name.to_sym] : {} )
+    end
+
+    def convert_data( value )
+      # return ( data = config[:convert_method].call( data ) ) if config[:convert_method]
+      if config[:data_type]
+        case config[:data_type].to_sym
+        when :boolean
+          self.data_boolean = ( value == 1 ) || ( value == '1' ) || ( value == 'true' ) || ( value == 'yes' )
+        when :float
+          self.data_float = value.to_f
+        when :integer
+          self.data_integer = value.to_i
+        when :string
+          self.data_string = value.to_s
+        when :text
+          self.data_text = value.to_s
+        else
+          return false
+        end
+        true
+      else
+        false
+      end
+    end
+
+    def converted_data
+      if config[:data_type]
+        case config[:data_type].to_sym
+        when :boolean
+          self.data_boolean
+        when :float
+          self.data_float
+        when :integer
+          self.data_integer
+        when :string
+          self.data_string
+        when :text
+          self.data_text
+        end
+      end
     end
   end
 end

data/app/models/contents_core/item_array.rb

@@ -1,24 +1,54 @@
 module ContentsCore
   class ItemArray < Item
-    alias_attribute :data, :data_string
-
     serialize :data_hash, Array
+    serialize :data_text, Array
+
+    # after_initialize do
+    #   config[:data_type] ||= :integer  # TODO: this overrides the config !
+    # end
+
+    def data
+      is_multiple? ? self.data_text : converted_data
+    end
+
+    def data=( value )
+      if is_multiple?
+        if config[:data_type]
+          self.data_text = case config[:data_type].to_sym
+            # when :boolean
+            #   self.data_boolean = ( value == 1 ) || ( value == '1' ) || ( value == 'true' ) || ( value == 'yes' )
+            when :float
+              value.map( &:to_f )
+            when :integer
+              value.map( &:to_i )
+            when :string, :text
+              value.map( &:to_s )
+            else
+              value
+            end
+        else
+          self.data_text = value
+        end
+      else
+        convert_data( value )
+      end
+    end
 
-    def enum
-      config[:values] ? config[:values] : ( config[:values_method] ? config[:values_method].call : self.data_hash )
+    def enum( params = nil )
+      config[:values] ? config[:values] : ( config[:values_method] ? config[:values_method].call( params ) : self.data_hash )
     end
 
     def init
-      self.data = ''
+      self.data_string = []
       self
     end
 
-    def to_s
-      self.data
+    def is_multiple?
+      config[:multiple] ? true : false
     end
 
-    def self.permitted_attributes
-      [:data_string, :data_hash]
+    def to_s
+      self.data
     end
 
     def self.type_name

data/config/locales/active_record.en.yml

@@ -8,6 +8,13 @@ en:
         one: Item
         other: Items
     attributes:
+      contents_core/block:
+        image: Image
+        multi_text: Text Only
+        slide: Slide
+        slider: Slider
+        text: Text Only
+        text_with_image: Text with Image
       contents_core/item:
         column: Column
         content: Content

data/db/migrate/20170414173611_add_extra_items.rb

@@ -4,7 +4,7 @@ class AddExtraItems < ActiveRecord::Migration[5.0]
     add_column :contents_core_items, :data_datetime, :datetime
     add_column :contents_core_items, :data_file, :string  # , null: false, default: ''
     add_column :contents_core_items, :data_float, :float
-    add_column :contents_core_items, :data_hash, :text  # , null: false, default: ''
+    add_column :contents_core_items, :data_hash, :text
     add_column :contents_core_items, :data_integer, :integer
     add_column :contents_core_items, :data_string, :string  # , null: false, default: ''
     add_column :contents_core_items, :data_text, :text

data/lib/contents_core.rb

@@ -12,8 +12,9 @@ module ContentsCore
     block.name = params[:name] if params[:name]
     block.options = params[:options] if params[:options]
     block.validations = params[:validations] if params[:validations]
+    block.create_children = params[:create_children].to_i if params[:create_children]
     parent.cc_blocks << block
-    Block::init_items block, params[:schema] if params[:schema]
+    Block::init_items block, params[:schema], {create_children: params[:create_children]} if params[:schema]
     block
   end
 

data/lib/contents_core/version.rb

@@ -1,3 +1,3 @@
 module ContentsCore
-  VERSION = '0.2.2'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contents_core
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Mat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-28 00:00:00.000000000 Z
+date: 2017-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Rails gem which offer a simple structure to manage contents in a flexible
   way
 email: