contents_core 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33b635a47b2e5a090eea2d2c99dba30eef64c508
-  data.tar.gz: 93e8aa348c86bc228f0b0572a7fbdbec58fe5ad4
+  metadata.gz: 01e850b0c0c4fbacf54ecb2f9c847b8f80d4ad9b
+  data.tar.gz: a9652d2e234c5c5dee333820f78138bfd422af8b
 SHA512:
-  metadata.gz: cb9f8914cbd38b7d91ae103c317c8cbc6310153f2a35d9b294d98c5abfcc84ee919cbbd406e89590ab935bf23cc82dab254e4ed315734c63350957cd0887594e
-  data.tar.gz: 3b341cdfe78f537cf7118fedc018d49bf834d4677fd1358cecdc2522bef8747411e951e92adee917df5556cadc04c8fb294ef0d31e35d5104513484e2fe74db5
+  metadata.gz: c6d7bc017c8b50fba54fa390a3e44c9b02065f900cd276f9f84e683c44cc2f8036de77dc9710242ecb06f63d57d861d97283b4275f49331820a6b3f8cec59751
+  data.tar.gz: 6e827ac0122c0b3edb0d23ca73549c86f6cad69d318f650f1d1db10e42f15412cc4f30553d60c1c6b1db7d66089c0ede4e4410bd20c496ab4740d1779ce66f50

data/README.md

@@ -1,4 +1,4 @@
-# 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)
+# 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) [![Dependency Status](https://gemnasium.com/badges/github.com/blocknotes/contents_core.svg)](https://gemnasium.com/github.com/blocknotes/contents_core) [![Test Coverage](https://api.codeclimate.com/v1/badges/59196100a1ebb599b088/test_coverage)](https://codeclimate.com/github/blocknotes/contents_core/test_coverage)
 
 A Rails gem which offer a structure to manage contents in a flexible way: blocks with recursive nested blocks + items as "leaves"
 

data/app/models/contents_core/item.rb

@@ -14,6 +14,7 @@ module ContentsCore
     # --- validations ---------------------------------------------------------
     validate :validate_item
     validates :block, presence: true, allow_blank: false
+    validates :type, presence: true, allow_blank: false
 
     # --- methods -------------------------------------------------------------
     def on_after_initialize
@@ -85,7 +86,7 @@ module ContentsCore
     end
 
     def to_s
-      self.data
+      self.data.to_s
     end
 
     def update_data( value )
@@ -98,7 +99,7 @@ module ContentsCore
     end
 
     def self.permitted_attributes
-      [ :data_boolean, :data_datetime, :data_file, :data_float, :data_hash, :data_integer, :data_string, :data_text ]
+      [:data_boolean, :data_datetime, :data_file, :data_float, :data_hash, :data_integer, :data_string, :data_text]
     end
 
     def self.type_name

data/app/models/contents_core/item_array.rb

@@ -16,12 +16,12 @@ module ContentsCore
         if data_type
           self.data_text = case data_type
             # when :boolean
-            #   self.data_boolean = ( value == 1 ) || ( value == '1' ) || ( value == 'true' ) || ( value == 'yes' )
+            #   self.data_boolean = value  # ( value == 1 ) || ( value == '1' ) || ( value == 'true' ) || ( value == 'yes' )
             when :float
               value.map( &:to_f )
             when :integer
               value.map( &:to_i )
-            when :string, :text
+            when :string  # , :text
               value.map( &:to_s )
             else
               value
@@ -55,10 +55,6 @@ module ContentsCore
       config[:multiple] ? true : false
     end
 
-    def to_s
-      self.data
-    end
-
     def self.type_name
       'array'
     end

data/app/models/contents_core/item_boolean.rb

@@ -7,13 +7,17 @@ module ContentsCore
       self
     end
 
+    def from_string( value )
+      self.data = ( value == 1 ) || ( value == '1' ) || ( value == 'true' ) || ( value == 'yes' )
+    end
+
     def update_data( value )
-      self.data = ( value == 'true' ) ? 1 : 0
+      self.data = value
       self.save
     end
 
     def to_s
-      self.data > 0 ? 'true' : 'false'
+      self.data_boolean ? 'true' : 'false'
     end
 
     def self.permitted_attributes

data/app/models/contents_core/item_float.rb

@@ -12,10 +12,6 @@ module ContentsCore
       self.save
     end
 
-    def to_s
-      self.data.to_s
-    end
-
     def self.permitted_attributes
       [ :data_float ]
     end

data/app/models/contents_core/item_hash.rb

@@ -20,13 +20,19 @@ module ContentsCore
           m = line.match( /([^:]*):(.*)/ )
           val[m[1]] = m[2].strip if m && !m[1].blank?
         end
-        self.data_hash = val
+        self.data_hash = val.symbolize_keys
       end
     end
 
     def method_missing( method, *args, &block )
-      matches = /data_(.+)=/.match method.to_s
-      self.data[matches[1]] = args[0] if matches[1]
+      matches = /data_([^=]+)([=]{0,1})/.match method.to_s
+      if matches
+        if matches[2].blank?
+          return self.data[matches[1].to_sym]
+        elsif matches[1]
+          self.data[matches[1].to_sym] = args[0]
+        end
+      end
     end
 
     def respond_to?( method, include_private = false )
@@ -34,7 +40,7 @@ module ContentsCore
     end
 
     def to_s
-      self.data_hash ? 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_integer.rb

@@ -12,10 +12,6 @@ module ContentsCore
       self.save
     end
 
-    def to_s
-      self.data.to_s
-    end
-
     def self.permitted_attributes
       [ :data_integer ]
     end

data/app/models/contents_core/item_object.rb

@@ -28,7 +28,7 @@ module ContentsCore
     end
 
     def to_s
-      self.data_hash ? 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/lib/contents_core/version.rb

@@ -1,3 +1,3 @@
 module ContentsCore
-  VERSION = '0.3.0'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contents_core
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Mat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-05 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails