contents_core 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3635d8643c427f43b9fb5f929fc98c111bc84994
-  data.tar.gz: b5eb85c95998603fac03517e1221dfee6a409b59
+  metadata.gz: 75a1c3e706d549e2a1760b2986ab6ed1c947e62c
+  data.tar.gz: 50c1f08869d686fb75509b3d26a92c8b59873196
 SHA512:
-  metadata.gz: 0d064f8cdf42dbb1eaed6060c019f2a3c213750bf7fb09a3a835af64b7f52dc1a98dbf9e2e15680a1fd2eeb247f8e53ade283f3e674033d685ca5470ca96e8cb
-  data.tar.gz: 1ce8483d568007a1e90b17a725408a1acac654b29b1d2ef0b1605d10ec161d1ef7a2c1cde9623b6e478b1e365f40e5db613949936b90f7dadb20e0a3b295cdf4
+  metadata.gz: 9ac52395df24233ceda982dceab0871716058adf72bfd99cb5fbb98b67ce519b7830186c37b68441a7542b7a11658a0127c9ea5f7084a4bf0875228a4fafe9e2
+  data.tar.gz: 92ccd52237adcb6bf89352b9d6d583984daac7c54aadb3659268efdca2dfe298eff598c24a0e6ca0545afa9f0286e75dbae82e6817fdf1a25fe63caa63bdd9fb

data/app/models/contents_core/item.rb

@@ -58,49 +58,52 @@ module ContentsCore
       [ :data_boolean, :data_datetime, :data_file, :data_float, :data_hash, :data_integer, :data_string, :data_text ]
     end
 
-  protected
-
     def config
       @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 data_type
+      @data_type ||= ( config[:data_type] || :string ).to_sym
+    end
+
+  protected
+
     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
+      if data_type
+        case data_type
         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
+        else  # :string or other
+          self.data_string = value.to_s
         end
-        true
-      else
-        false
+      else  # :string or other
+        self.data_string = value.to_s
       end
     end
 
-    def converted_data
-      if config[:data_type]
-        case config[:data_type].to_sym
+    def converted_data()
+      if data_type
+        case data_type
         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
+        else  # :string or other
+          self.data_string
         end
+      else  # :string or other
+        self.data_string
       end
     end
   end

data/app/models/contents_core/item_array.rb

@@ -13,8 +13,8 @@ module ContentsCore
 
     def data=( value )
       if is_multiple?
-        if config[:data_type]
-          self.data_text = case config[:data_type].to_sym
+        if data_type
+          self.data_text = case data_type
             # when :boolean
             #   self.data_boolean = ( value == 1 ) || ( value == '1' ) || ( value == 'true' ) || ( value == 'yes' )
             when :float
@@ -34,6 +34,10 @@ module ContentsCore
       end
     end
 
+    def data_type
+      @data_type ||= ( config[:data_type] || :integer ).to_sym
+    end
+
     def enum( params = nil )
       config[:values] ? config[:values] : ( config[:values_method] ? config[:values_method].call( params ) : self.data_hash )
     end

data/lib/contents_core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contents_core
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Mat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-01 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Flexible contents structure for Rails