has-meta 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 504fd58be892719cfe7de2beee5ac0488e7618ad4b6529c748542a6e30753897
-  data.tar.gz: 9b4dabb7d2f7771b1876182fc14b9d98f4c2f8ad9b01e43ad5fa2f5eb2a70a12
+  metadata.gz: 6449bf1d52f37f801937de1aa1dc88860cf438a0d8af2327ca515bd4e7b74beb
+  data.tar.gz: 786bd5e56684b80b714800ae2fcf38f32477c12dc8e8ad0492f3c70a7fd1da4e
 SHA512:
-  metadata.gz: 82479b22cf38d4eabf06f6599524180463a137c0d0129eb2cab5c2e827ac50a37a5b80e65f51eb76f65344c66a8f6173edd3d948650627fcdd213d18275d63d3
-  data.tar.gz: 75049b8e3886b8f7fbdda6c9eca828e5792d10590024f9251097c1f86945c67ca010532d95923a14b75178200ef42ecf07b7c210469329dee846cc6872ace93e
+  metadata.gz: c68307d445a2da8111c8a9318e4b0e0433233d7b94074b21c8c274c300e234706a49e31ff1cb698129c43109ce69d9a03de5e001c59d9ee4d865423456ea77bb
+  data.tar.gz: 616fb1958da452a0fadb480b09898a8f4d886f162e40e293dd84436f24554b07a142d01237e96798f13908ca3026016655e4df421ee7e148a674f7461d48a3b7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    has-meta (0.8.2)
+    has-meta (0.9.0)
       activerecord (>= 4.2.8)
 
 GEM

data/changelog.md

@@ -0,0 +1,5 @@
+###0.9.0
+* Add support for storing datetimes
+* Return duck-typed values (strings to dates and times)
+* Allow manually setting data type via `:as` option: `#meta_set :key, value, as: :type`
+

data/db/migrate/2_add_datetime_value_to_meta_data.rb

@@ -0,0 +1,5 @@
+class AddDatetimeValueToMetaData < ActiveRecord::Migration[4.2]
+  def change
+    add_column :met_data, :datetime_value, :datetime
+  end
+end

data/lib/has_meta/instance_methods.rb

@@ -5,11 +5,12 @@ module HasMeta
       self.meta_data.where(key: key.to_s).try(:first).try(:value)
     end
   
-    def meta_set key, value
+    def meta_set key, value, options={}
       return meta_destroy key if value.nil? or value == ''
     
       meta = self.meta_data.where(key: key.to_s).first_or_create
-      meta.value = value
+      # meta.value = value
+      meta.send :value=, value, options
       meta
     end
   

data/lib/has_meta/meta_data.rb

@@ -7,11 +7,16 @@ module HasMeta
     attr_reader :data_type
 
     def value
-      @value ||= value_attributes.compact.values.pop
+      @value ||= convert_type value_attributes.compact.values.pop
     end
     
-    def value= value
-      @data_type, @value = resolve_data_type! value
+    def value= value, options={}
+      if options[:as]
+        @data_type = options[:as]
+        @value = value
+      else
+        @data_type, @value = resolve_data_type! value
+      end
       set_attribute
     end
         
@@ -40,6 +45,22 @@ module HasMeta
     
     private
     
+    def convert_type value
+      begin
+        if value =~ /^-?\d+/ and value.to_i > 2000000000
+          value.to_i
+        elsif value =~ /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} (\+|-)\d{4}$/
+          value.to_time
+        elsif value =~ /^\d{4}-\d{2}-\d{2}$/
+          value.to_date
+        else
+          value
+        end
+      rescue
+        value
+      end
+    end
+
     def self.value_hash_for value
       data_type, value = resolve_data_type! value
       {"#{data_type}_value": value}
@@ -58,15 +79,39 @@ module HasMeta
         return :decimal, value
       when ->(x) {x.kind_of? Date}
         return :date, value
+      when ->(x) {x.acts_like? :time}
+        if has_datetime_column?
+          return :datetime, value
+        else
+          return :text, value
+        end
       when ->(x) {x.respond_to? :id}
         return :integer, value.id
       else
         return :integer, value.to_i if value =~ /^-?\d+$/
         return :decimal, value.to_f if value =~ /^-?\d*\.\d+$/
+        return :date, value.to_date if date_try_convert value
+        return :datetime, value.to_datetime if has_datetime_column? and datetime_try_convert(value)
         return :text, value
       end            
     end
     
+    def self.date_try_convert value
+      begin
+        value.to_date if value =~ /^\d{4}-\d{2}-\d{2}$/
+      rescue
+        nil
+      end
+    end
+
+    def self.datetime_try_convert value
+      begin
+        value.to_datetime if value =~ /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} (\+|-)\d{4}$/
+      rescue
+        nil
+      end
+    end
+    
     def resolve_data_type! value
       self.class.resolve_data_type! value
     end
@@ -88,5 +133,8 @@ module HasMeta
       self[:"#{@data_type}_value"] = @value
     end
     
+    def self.has_datetime_column?
+      self.column_names.include? 'datetime_value'
+    end
   end
 end

data/lib/has_meta/version.rb

@@ -1,3 +1,3 @@
 module HasMeta
-  VERSION = "0.8.2"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has-meta
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Dan Drust
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-06 00:00:00.000000000 Z
+date: 2018-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -84,7 +84,9 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- changelog.md
 - db/migrate/1_has_meta_migration.rb
+- db/migrate/2_add_datetime_value_to_meta_data.rb
 - has-meta.gemspec
 - lib/has-meta.rb
 - lib/has_meta/data_mover.rb