form_obj 0.4.0 → 0.5.0

data/lib/form_obj/struct.rb

@@ -2,11 +2,18 @@ require "form_obj/struct/array"
 require "form_obj/struct/attribute"
 require "form_obj/struct/attributes"
 require "active_support/core_ext/class/attribute"
+require "active_support/core_ext/hash/indifferent_access"
 
 module FormObj
+  class UnknownAttributeError < RuntimeError; end
+  class WrongDefaultValueClass < RuntimeError; end
+
   class Struct
     class_attribute :_attributes, instance_predicate: false, instance_reader: false, instance_writer: false
+    class_attribute :primary_key, instance_predicate: false, instance_reader: false, instance_writer: false
+
     self._attributes = Attributes.new
+    self.primary_key = :id
 
     class << self
       def array_class
@@ -52,16 +59,59 @@ module FormObj
       end
     end
 
+    def initialize(*args)
+      super()
+      update_attributes(*args) if args.size > 0 && args[0]
+    end
+
+    def primary_key
+      send(self.class.primary_key)
+    end
+
+    def primary_key=(val)
+      send("#{self.class.primary_key}=", val)
+    end
+
+    def update_attributes(new_attrs, raise_if_not_found: true)
+      new_attrs = HashWithIndifferentAccess.new(new_attrs) unless new_attrs.is_a? HashWithIndifferentAccess
+      new_attrs.each_pair do |new_attr, new_val|
+        attr = self.class._attributes.find(new_attr)
+        if attr.nil?
+          raise UnknownAttributeError.new(new_attr) if raise_if_not_found
+        else
+          if attr.subform?
+            self.send(new_attr).update_attributes(new_val, raise_if_not_found: raise_if_not_found)
+          else
+            update_attribute(attr, new_val)
+          end
+        end
+      end
+
+      self
+    end
+
     def to_hash
-      Hash[self.class._attributes.map { |attribute| [attribute.name, attribute.subform? ? send(attribute.name).to_hash : send(attribute.name)] }]
+      Hash[self.class._attributes.map { |attribute| [attribute.name, attribute.subform? ? read_attribute(attribute).to_hash : read_attribute(attribute)] }]
     end
 
     def inspect
-      "#<#{self.class.name} #{self.class._attributes.map { |attribute| "#{attribute.name}: #{send(attribute.name).inspect}"}.join(', ')}>"
+      "#<#{self.class.name} #{self.class._attributes.map { |attribute| "#{attribute.name}: #{read_attribute(attribute).inspect}"}.join(', ')}>"
     end
 
     private
 
+    def update_attribute(attribute, new_value)
+      write_attribute(attribute, new_value)
+    end
+
+    def read_attribute(attribute)
+      send(attribute.name)
+    end
+
+    def write_attribute(attribute, value)
+      send("#{attribute.name}=", value)
+    end
+
     def _get_attribute_value(attribute)
       value = instance_variable_get("@#{attribute.name}")
       value = instance_variable_set("@#{attribute.name}", attribute.default_value) if value.nil?

data/lib/form_obj/version.rb

@@ -1,3 +1,3 @@
 module FormObj
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/{run_spec.sh → run_tests.sh}

@@ -22,6 +22,7 @@ do
   echo "====================================================="
   echo "$i: Start Test"
   echo "====================================================="
+  rvm $i exec bundle exec appraisal rake test
   rvm $i exec bundle exec appraisal rake spec
   echo "====================================================="
   echo "$i: End Test"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: form_obj
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Alexander Koltun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-04 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typed_array
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -148,7 +162,6 @@ files:
 - bundle_install.sh
 - form_obj.gemspec
 - gemfiles/3.2.gemfile
-- gemfiles/4.0.gemfile
 - gemfiles/4.1.gemfile
 - gemfiles/4.2.gemfile
 - gemfiles/5.0.gemfile
@@ -171,7 +184,7 @@ files:
 - lib/form_obj/struct/attribute.rb
 - lib/form_obj/struct/attributes.rb
 - lib/form_obj/version.rb
-- run_spec.sh
+- run_tests.sh
 homepage: https://github.com/akoltun/form_obj
 licenses:
 - MIT

data/gemfiles/4.0.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activesupport", "~> 4.0.0"
-gem "activemodel", "~> 4.0.0"
-gem "actionpack", "~> 4.0.0"
-
-gemspec path: "../"