contents_core 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be0478a45deafccaf2eb6aebee455e6af25a8c82
-  data.tar.gz: 8de680af051e77b3396be8f79ba3c059d66b3b71
+  metadata.gz: 638db7f2736f8122e4d3df7fd00c14be26b5968b
+  data.tar.gz: 2939dfe17490c73f03a9ca541c15cfb9959a5726
 SHA512:
-  metadata.gz: 560a8da1c70ddca4ce964d67554f6889a09a87dee1e1b46fabd04fa6ddd9d825f2862af28a3a0c40ca2bf712da22d7ef91d7c23720b441f1ba7161a36008ec71
-  data.tar.gz: 8d9d89e770ff43184d85dcf5a7ac7aa41243d70643a3a910bcd2563cb213f60423f0f5fe5d1427d683182009c21eff292c85f7667e4cd7fb545cb560f1eeb43b
+  metadata.gz: dc24cccc25294ddaaf58900d936ecaab4b7ffb3e91c212daa96259b329699109180f8b1c816f5df46594363be3fa91a407b2f07dd904407b6487aaac80177ae0
+  data.tar.gz: 12fdb14837f0275ed3cdf34abc74087fb615c6439975f4b2fa9713470480ae6c61a786c28701c94399af22c7e5be6238acf923182d2ca3beb7a6803b459d0be6

data/README.md

@@ -2,28 +2,20 @@
 
 A Rails gem which offer a simple structure to manage contents in a flexible way.
 
-_NOTE_: this is an **ALPHA** version, major changes could happens - this is a refactoring of another gem of mine (editable_components)
-
 Goals:
 
 - attach the contents structure to a model transparently
-
 - improve block views management
-
 - add fields to blocks without migrations
 
 ### Install
 
 - Add to the Gemfile:
 `gem 'contents_core'`
-
 - Copy migrations (Rails 5.x syntax, in Rails 4.x use `rake`):
 `rails contents_core:install:migrations`
-
 - Execute migrations
-
 - Add the concern *Blocks* to your model (ex. *Page*): `include ContentsCore::Blocks`
-
 - Add the blocks to a view (ex. *page show*): `= render partial: 'contents_core/blocks', locals: { container: @page }`
 
 ### Config
@@ -116,16 +108,14 @@ If you use ActiveAdmin as admin interface you can find a sample model configurat
 
 ### Notes
 
+- Blocks list (enum): `ContentsCore::Block.block_list`
 - Blocks types: `ContentsCore::Block.block_types`
-
 - Default blocks [here](config/initializers/contents_core.rb)
 
 #### Structure
 
 - Including the Blocks concern to a model will add `has_many :cc_blocks` relationship (the list of blocks attached to a container) and some utility methods
-
 - Block: UI component, a group of items (ex. a text with a title, a slider, a 3 column text widget, etc.); built with a list of sub blocks (for nested components) and a list of items
-
 - Item: a single piece of information (ex. a string, a text, a boolean, an integer, a file, etc.) with a virtual method named *data*
 
 ## Contributors

data/app/models/contents_core/block.rb

@@ -56,7 +56,7 @@ module ContentsCore
     end
 
     def children_type
-      ContentsCore.config[:cc_blocks][block_type.to_sym][:children_type]
+      config[:children_type]
     end
 
     def create_item( item_type, item_name = nil )
@@ -107,8 +107,7 @@ module ContentsCore
 
     def on_after_create
       # TODO: validates type before creation!
-      t = self.block_type.to_sym
-      Block::init_items( self, ContentsCore.config[:cc_blocks][t][:items] ) if Block::block_types.include?( t )
+      Block::init_items( self, config[:items] ) if Block::block_types.include?( self.block_type.to_sym )
     end
 
     def on_before_create
@@ -161,6 +160,10 @@ module ContentsCore
       end
     end
 
+    def self.block_list
+      @@block_list ||= ContentsCore.config[:cc_blocks].map{|k, v| [v[:name], k.to_s]}.sort_by{|b| b[0]}
+    end
+
     def self.block_types
       @@block_types ||= ContentsCore.config[:cc_blocks].keys
     end
@@ -186,5 +189,9 @@ 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
+      @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

@@ -53,7 +53,7 @@ module ContentsCore
   protected
 
     def config
-      @config ||= ContentsCore.config[:items][self.class::type_name.to_sym] ? ContentsCore.config[:items][self.class::type_name.to_sym] : {}
+      @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] : {} )
     end
   end
 end

data/app/models/contents_core/item_enum.rb

@@ -0,0 +1,28 @@
+module ContentsCore
+  class ItemEnum < Item
+    alias_attribute :data, :data_string
+
+    serialize :data_hash, Array
+
+    def enum
+      config[:values] ? config[:values] : self.data_hash
+    end
+
+    def init
+      self.data = ''
+      self
+    end
+
+    def to_s
+      self.data
+    end
+
+    def self.permitted_attributes
+      [:data_string, :data_hash]
+    end
+
+    def self.type_name
+      'enum'
+    end
+  end
+end

data/app/models/contents_core/item_hash.rb

@@ -2,13 +2,17 @@ module ContentsCore
   class ItemHash < Item
     alias_attribute :data, :data_hash
 
-    serialize :data_hash, JSON
+    serialize :data_hash, Hash
 
     def init
       self.data = {}
       self
     end
 
+    def keys
+      config[:keys] ? config[:keys] : self.data_hash.keys
+    end
+
     def from_string( value )
       if value.is_a? String
         val = {}
@@ -20,8 +24,17 @@ module ContentsCore
       end
     end
 
+    def method_missing( method, *args, &block )
+      matches = /data_(.+)=/.match method.to_s
+      self.data[matches[1]] = args[0] if matches[1]
+    end
+
+    def respond_to?( method, include_private = false )
+      method.to_s.starts_with?( 'data_' ) || super
+    end
+
     def to_s
-      self.data_hash.inject( '' ) { |k, v| k + v[0] + ': ' + v[1] + "\n" }
+      self.data_hash ? self.data_hash.inject( '' ) { |k, v| k + v[0] + ': ' + v[1] + "\n" } : {}
     end
 
     def self.permitted_attributes

data/app/models/contents_core/item_object.rb

@@ -0,0 +1,36 @@
+# TODO: needs improvements
+module ContentsCore
+  class ItemObject < Item
+    alias_attribute :data, :data_hash
+
+    serialize :data_hash, JSON
+
+    def init
+      self.data = {}
+      self
+    end
+
+    def from_string( value )
+      if value.is_a? String
+        val = {}
+        value.each_line do |line|
+          m = line.match( /([^:]*):(.*)/ )
+          val[m[1]] = m[2].strip if m && !m[1].blank?
+        end
+        self.data_hash = val
+      end
+    end
+
+    def to_s
+      self.data_hash ? self.data_hash.inject( '' ) { |k, v| k + v[0] + ': ' + v[1] + "\n" } : {}
+    end
+
+    def self.permitted_attributes
+      [ :data_hash ]
+    end
+
+    def self.type_name
+      'object'
+    end
+  end
+end

data/config/initializers/contents_core.rb

@@ -49,12 +49,14 @@ module ContentsCore
     items: {
       boolean: {},
       datetime: {},
+      enum: {},
       float: {},
       hash: {},
       file: {
         input: :file_image
       },
       integer: {},
+      object: {},
       string: {},
       text: {
         input: :html

data/db/migrate/20170414173603_create_contents_core_blocks.rb

@@ -1,15 +1,16 @@
 class CreateContentsCoreBlocks < ActiveRecord::Migration[5.0]
   def change
     create_table :contents_core_blocks do |t|
-      t.string :block_type, null: false, default: 'text'
+      t.string  :block_type, null: false, default: 'text'
       t.integer :version, null: false, default: 0
-      t.string :name, null: false, default: ''
+      t.string  :name, null: false, default: ''
+      t.string  :group
       t.integer :position, null: false, default: 0
       t.boolean :published, null: false, default: true
-      t.string :options, null: false, default: '{}'
-      t.string :validations, null: false, default: '{}'
+      t.string  :options, null: false, default: '{}'
+      t.string  :validations, null: false, default: '{}'
       t.integer :parent_id
-      t.string :parent_type
+      t.string  :parent_type
     end
 
     add_index :contents_core_blocks, [:parent_id, :parent_type]

data/db/migrate/20170414173610_create_contents_core_items.rb

@@ -1,8 +1,8 @@
 class CreateContentsCoreItems < ActiveRecord::Migration[5.0]
   def change
     create_table :contents_core_items do |t|
-      t.string :type
-      t.string :name, null: false, default: 'data'
+      t.string  :type
+      t.string  :name, null: false, default: 'data'
       t.integer :block_id
     end
 

data/lib/contents_core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contents_core
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Mat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-16 00:00:00.000000000 Z
+date: 2017-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -40,10 +40,12 @@ files:
 - app/models/contents_core/item.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
 - app/models/contents_core/item_integer.rb
+- app/models/contents_core/item_object.rb
 - app/models/contents_core/item_string.rb
 - app/models/contents_core/item_text.rb
 - app/views/contents_core/_block.html.erb
@@ -85,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Flexible contents structure for Rails