contents_core 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 638db7f2736f8122e4d3df7fd00c14be26b5968b
-  data.tar.gz: 2939dfe17490c73f03a9ca541c15cfb9959a5726
+  metadata.gz: da496467b39f33f60cba8e1ce3356a83cf26f804
+  data.tar.gz: a81d0b06211ffaf5c3aa262fd82167c9e88f88ac
 SHA512:
-  metadata.gz: dc24cccc25294ddaaf58900d936ecaab4b7ffb3e91c212daa96259b329699109180f8b1c816f5df46594363be3fa91a407b2f07dd904407b6487aaac80177ae0
-  data.tar.gz: 12fdb14837f0275ed3cdf34abc74087fb615c6439975f4b2fa9713470480ae6c61a786c28701c94399af22c7e5be6238acf923182d2ca3beb7a6803b459d0be6
+  metadata.gz: 47c86fbecb6193acb88816373765193d7c60cf68ae81ca4ae781675d9b27794ed58b617fb733d32cd70ba7ab3f4d5cd25e106288d5698c23c1a5dcd897c9511e
+  data.tar.gz: 3dd11bae3f087cf3ad7d6569c6387d5c3aa57240bda029b7cb1b97945974c1979f74de165eed0e8384340b0cb8111c2f6292bd361e1619db3869335be1be4945

data/README.md

@@ -104,7 +104,7 @@ To set a field value: `block.set( 'new-field', 'Some value' )`
 
 #### ActiveAdmin
 
-If you use ActiveAdmin as admin interface you can find a sample model configuration [here](extra/activeadmin_page.rb)
+If you use ActiveAdmin as admin interface you can find a sample model configuration: [page](extra/active_admin_page.rb) plus a js [page](extra/active_admin.js)
 
 ### Notes
 

data/app/models/contents_core/block.rb

@@ -51,10 +51,25 @@ module ContentsCore
     #
     # # scope :published, -> { where( published: true ) unless ApplicationController.edit_mode }
 
+    def initialize( params = {} )
+      super
+      self.group = config[:group]
+      self.block_type = parent.config[:children_type] if params[: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 || {}))
+    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
@@ -86,11 +101,16 @@ module ContentsCore
 
     # Returns an item by name
     def get( name )
+      item = get_item( name )
+      item.data if item
+    end
+
+    def get_item( name )
       unless @_items
         @_items = {}
         items.each { |item| @_items[item.name] = item }
       end
-      @_items[name] ? @_items[name].data : nil
+      @_items[name]
     end
 
     def has_parent?
@@ -105,6 +125,10 @@ 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 )
@@ -161,7 +185,7 @@ module ContentsCore
     end
 
     def self.block_list
-      @@block_list ||= ContentsCore.config[:cc_blocks].map{|k, v| [v[:name], k.to_s]}.sort_by{|b| b[0]}
+      @@block_list ||= ContentsCore.config[:cc_blocks].map{|k, v| [v[:name], k.to_s] unless v[:child_only]}.compact.sort_by{|b| b[0]}
     end
 
     def self.block_types
@@ -191,7 +215,7 @@ module ContentsCore
     end
 
     def config
-      @config ||= ContentsCore.config[:cc_blocks][block_type.to_sym] ? ContentsCore.config[:cc_blocks][block_type.to_sym] : {}
+      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,6 +6,10 @@ module ContentsCore
 
     belongs_to :block
 
+    def as_json
+      super( {only: [:id, :name, :type], methods: [:data]} )
+    end
+
     def attr_id
       "#{self.class_name}-#{self.id}"
     end

data/app/models/contents_core/{item_enum.rb → item_array.rb}

@@ -1,11 +1,11 @@
 module ContentsCore
-  class ItemEnum < Item
+  class ItemArray < Item
     alias_attribute :data, :data_string
 
     serialize :data_hash, Array
 
     def enum
-      config[:values] ? config[:values] : self.data_hash
+      config[:values] ? config[:values] : ( config[:values_method] ? config[:values_method].call : self.data_hash )
     end
 
     def init
@@ -22,7 +22,7 @@ module ContentsCore
     end
 
     def self.type_name
-      'enum'
+      'array'
     end
   end
 end

data/config/initializers/contents_core.rb

@@ -47,9 +47,9 @@ module ContentsCore
       },
     },
     items: {
+      array: {},
       boolean: {},
       datetime: {},
-      enum: {},
       float: {},
       hash: {},
       file: {

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, :string  # , null: false, default: ''
+    add_column :contents_core_items, :data_hash, :text  # , null: false, default: ''
     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

@@ -7,6 +7,16 @@ module ContentsCore
     @@config
   end
 
+  def self.create_block_in_parent( parent, type = :text, params = {} )
+    block = Block.new( block_type: type )
+    block.name = params[:name] if params[:name]
+    block.options = params[:options] if params[:options]
+    block.validations = params[:validations] if params[:validations]
+    parent.cc_blocks << block
+    Block::init_items block, params[:schema] if params[:schema]
+    block
+  end
+
   def self.editing( editing = nil )
     @@editing = editing unless editing.nil?
     @@editing

data/lib/contents_core/blocks.rb

@@ -8,13 +8,7 @@ module ContentsCore
       accepts_nested_attributes_for :cc_blocks, allow_destroy: true
 
       def create_block( type = :text, params = {} )
-        block = Block.new( block_type: type )
-        block.name = params[:name] if params[:name]
-        block.options = params[:options] if params[:options]
-        block.validations = params[:validations] if params[:validations]
-        cc_blocks << block
-        Block::init_items block, params[:schema] if params[:schema]
-        block
+        ContentsCore::create_block_in_parent( self, type, params )
       end
 
       def current_blocks( version = 0 )

data/lib/contents_core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contents_core
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Mat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2017-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,9 +38,9 @@ files:
 - app/models/contents_core/application_record.rb
 - app/models/contents_core/block.rb
 - app/models/contents_core/item.rb
+- app/models/contents_core/item_array.rb
 - app/models/contents_core/item_boolean.rb
 - app/models/contents_core/item_datetime.rb
-- app/models/contents_core/item_enum.rb
 - app/models/contents_core/item_file.rb
 - app/models/contents_core/item_float.rb
 - app/models/contents_core/item_hash.rb