reactive-record 0.7.38 → 0.7.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f77d2366d23cd6c8049d86b02edd7a82d5723a2
-  data.tar.gz: dcfd1e30f5e78ef0ff210ba0593eead0ed31d254
+  metadata.gz: 38627e5aff47130857117db10b665d62df420ddd
+  data.tar.gz: d5f8d93a888c7ac27a7032f020ca784553b1dceb
 SHA512:
-  metadata.gz: 4f27b71db22686152ef9638caa65322735ce29901a2122f233bc76f6b6253baea37d4d36e498b9159698d792b64cf5ddae783693e1e9b47c63157acf12c843f8
-  data.tar.gz: ef7a46308444d4793973002f35dbefbf4674675164dd65bc459b0304f6d363117fc7e79621d0dc3f5c3bcd8e14ef3f8b7e9ebd1274c1fa2bca17b46c5b1707cf
+  metadata.gz: 11dcbafdbb5d8bc1d9c00586c38ea6bb15726d6045ab18a75ff622f087c18c76755899dce2fe6e5a2f5cf424d3b05e23b73b8beb3a4127a07b3782a1e1f4e9b3
+  data.tar.gz: 47c7b2bf0db583da4940395dbe9c3fc476892bebd04697335a9a38a9a6b1e6c0b3eb9f93447e5020b18acf66db88707a928803bcc1b7faa1126973ae152b3923

data/lib/reactive-record.rb

@@ -16,27 +16,6 @@ if RUBY_ENGINE == 'opal'
 
 else
 
-  module ::ActiveRecord
-    module Core
-      module ClassMethods
-        def inherited(child_class)
-          begin
-            file = Rails.root.join('app','models',"#{child_class.name.underscore}.rb").to_s rescue nil
-            begin
-              require file
-            rescue LoadError
-            end
-            # from active record:
-            child_class.initialize_find_by_cache
-          rescue
-          end
-          super
-        end
-      end
-    end
-  end
-
-
   require "opal"
   require "reactive_record/version"
   require "reactive_record/permissions"

data/lib/reactive_record/active_record/class_methods.rb

@@ -49,6 +49,10 @@ module ActiveRecord
       base_class.instance_eval {ReactiveRecord::Base.find(self, opts.first.first, opts.first.last)}
     end
 
+    def enum(*args)
+      # when we implement schema validation we should also implement value checking
+    end
+
     def method_missing(name, *args, &block)
       if args.count == 1 && name =~ /^find_by_/ && !block
         find_by(name.gsub(/^find_by_/, "") => args[0])

data/lib/reactive_record/active_record/reactive_record/isomorphic_base.rb

@@ -370,6 +370,10 @@ module ReactiveRecord
         end
       end
 
+      def self.is_enum?(record, key)
+        record.class.respond_to?(:defined_enums) && record.class.defined_enums[key]
+      end
+
       def self.save_records(models, associations, acting_user, validate, save)
         reactive_records = {}
         vectors = {}
@@ -394,7 +398,9 @@ module ReactiveRecord
             # we have an already exising activerecord model
             keys = record.attributes.keys
             attributes.each do |key, value|
-              if keys.include? key
+              if is_enum?(record, key)
+                record.send("#{key}=",value)
+              elsif keys.include? key
                 record[key] = value
               elsif !value.nil? and aggregation = record.class.reflect_on_aggregation(key.to_sym) and !(aggregation.klass < ActiveRecord::Base)
                 aggregation.mapping.each_with_index do |pair, i|
@@ -411,7 +417,9 @@ module ReactiveRecord
             dont_save_list << record unless save
             keys = record.attributes.keys
             attributes.each do |key, value|
-              if keys.include? key
+              if is_enum?(record, key)
+                record.send("#{key}=",value)
+              elsif keys.include? key
                 record[key] = value
               elsif !value.nil? and aggregation = record.class.reflect_on_aggregation(key) and !(aggregation.klass < ActiveRecord::Base)
                 aggregation.mapping.each_with_index do |pair, i|

data/lib/reactive_record/version.rb

@@ -1,3 +1,3 @@
 module ReactiveRecord
-  VERSION = "0.7.38"
+  VERSION = "0.7.39"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reactive-record
 version: !ruby/object:Gem::Version
-  version: 0.7.38
+  version: 0.7.39
 platform: ruby
 authors:
 - Mitch VanDuyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails