funkr 0.0.19 → 0.0.20

data/lib/funkr/types/simple_record.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module Funkr
   module Types
     
@@ -14,37 +15,67 @@ module Funkr
       class << self; attr_accessor :fields_list; end
       @fields_list = nil
 
-      def self.fields(*flds); self.fields_list = flds; end
+      def self.fields(*flds)
+        self.fields_list = flds
+        flds.each do |f|
+          getter = f.to_sym
+          setter = format("%s=", f.to_s).to_sym
+          define_method(getter){ @key_vals[f] }
+          define_method(setter){|nv| @key_vals[f] = nv; rebuild_array}
+        end
+      end
 
       def initialize(key_vals)
         fields = self.class.fields_list
-        if not fields.nil? and fields != key_vals.keys then
-          raise "#{self.class.to_s} wrong initialization, expected #{fields}"
-        end
-        @key_vals = key_vals
-        key_vals.each do |k,v|
-          getter = k.to_sym
-          setter = format("%s=", k.to_s).to_sym
-          define_singleton_method(getter){ @key_vals[k] }
-          define_singleton_method(setter){|nv| @key_vals[k] = nv}
-          self.push(v)
+        if not fields.nil? then # record paramétré
+          if fields == key_vals.keys then # tout va bien
+            @allowed_keys = fields
+            @key_vals = key_vals
+            rebuild_array
+          else raise "#{self.class.to_s} wrong initialization, expected #{fields}" end
+        else  # record anonyme
+          @allowed_keys = key_vals.keys
+          @key_vals = key_vals
+          key_vals.each do |k,v|
+            getter = k.to_sym
+            setter = format("%s=", k.to_s).to_sym
+            define_singleton_method(getter){ @key_vals[k] }
+            define_singleton_method(setter){|nv| @key_vals[k] = nv; rebuild_array}
+            self.push(v)
+          end
         end
       end
-      
+
       def with(new_key_vals)
+        check_keys(new_key_vals.keys)
         self.class.new(@key_vals.merge(new_key_vals))
       end
 
       def update!(new_key_vals)
+        check_keys(new_key_vals.keys)
         @key_vals.merge!(new_key_vals)
+        rebuild_array
         self
       end
-      
+
       def to_hash; @key_vals; end
-      
+
       def to_s; @key_vals.to_s; end
-      
+
     end
 
+    private
+
+    def rebuild_array
+      self.replace(@key_vals.values)
+    end
+
+    def check_keys(keys)
+      unless keys.all?{|k| @allowed_keys.include?(k)} then
+          raise "#{self.class.to_s} forbidden key in update"
+      end
+    end
+
+
   end
 end

data/lib/funkr/version.rb

@@ -1,3 +1,3 @@
 module Funkr
-  VERSION = "0.0.19"
+  VERSION = "0.0.20"
 end

data/test/tests.rb

@@ -119,10 +119,12 @@ puts format("%s is back to %s and really lives in %s", r.name, r.age, r.city)
 r.name = "Paul R"
 puts r.to_s
 r.update!(name: "Paul")
-puts r.to_s
+n, _x, _y = r
+puts n
 
 class Person < SimpleRecord;  fields :name, :age, :city; end
 r = Person.new(name: "Paul", age: 27, city: "Rennes")
+puts r.to_s
 x = Person.new(name: "Paul", age: 27, city: "Rennes", genre: "Male") rescue "Forbidden"
 y = Person.new(name: "Paul", age: 27) rescue "Forbidden"
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 19
-  version: 0.0.19
+  - 20
+  version: 0.0.20
 platform: ruby
 authors: 
 - Paul Rivier