form_obj 0.3.0 → 0.4.0

data/gemfiles/4.0.gemfile

@@ -0,0 +1,9 @@
+# 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: "../"

data/gemfiles/4.1.gemfile

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

data/gemfiles/4.2.gemfile

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

data/gemfiles/5.0.gemfile

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

data/gemfiles/5.1.gemfile

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

data/gemfiles/5.2.gemfile

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

data/install_rubies_and_bundler.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+set -e
+
+rubies=()
+versions=false
+while read -r line; do
+  if [[ $line == "rvm:" ]]
+  then
+    versions=true
+  elif $versions && [[ $line == -* ]]
+  then
+    rubies+=(${line:2})
+  elif [[ ${line:0:1} != "#" ]]
+  then
+    versions=false
+  fi
+done < ".travis.yml"
+
+for i in "${rubies[@]}"
+do
+  echo "====================================================="
+  echo "Install Ruby $i"
+  echo "====================================================="
+  rvm install $i
+done
+
+rvm all do gem install bundler

data/lib/form_obj/form/array.rb

@@ -0,0 +1,36 @@
+module FormObj
+  class Form < FormObj::Struct
+    class Array < FormObj::Struct::Array
+      def update_attributes(vals)
+        ids_exists = []
+        items_to_add = []
+
+        vals.each do |val|
+          id = primary_key(val)
+          item = self.find { |i| i.primary_key == id }
+          if item
+            item.update_attributes(val)
+            ids_exists << id
+          else
+            items_to_add << val
+          end
+        end
+
+        ids_to_remove = self.map(&:primary_key) - ids_exists
+        self.delete_if { |item| ids_to_remove.include? item.primary_key }
+
+        items_to_add.each do |item|
+          self.create.update_attributes(item)
+        end
+
+        sort! { |a, b| vals.index { |val| primary_key(val) == a.primary_key } <=> vals.index { |val| primary_key(val) == b.primary_key } }
+      end
+
+      private
+
+      def primary_key(hash)
+        hash.key?(item_class.primary_key.to_sym) ? hash[item_class.primary_key.to_sym] : hash[item_class.primary_key.to_s]
+      end
+    end
+  end
+end

data/lib/form_obj/form/attribute.rb

@@ -0,0 +1,19 @@
+module FormObj
+  class Form < FormObj::Struct
+    class Attribute < FormObj::Struct::Attribute
+      def initialize(name, array: false, class: nil, default: nil, parent:, primary_key: nil, &block)
+        super(name, array: array, class: binding.local_variable_get(:class), default: default, parent: parent, &block)
+
+        @nested_class.instance_variable_set(:@model_name, ActiveModel::Name.new(@nested_class, nil, name.to_s)) if !@nested_class && block_given?
+
+        if primary_key
+          if @nested_class
+            @nested_class.primary_key = primary_key
+          else
+            parent.primary_key = name.to_sym
+          end
+        end
+      end
+    end
+  end
+end

data/lib/form_obj/form/attributes.rb

@@ -0,0 +1,13 @@
+module FormObj
+  class Form < FormObj::Struct
+    class Attributes < FormObj::Struct::Attributes
+      def find(name)
+        @items.find { |item| item.name == name.to_sym }
+      end
+
+      def each(&block)
+        @items.each(&block)
+      end
+    end
+  end
+end

data/lib/form_obj/form.rb

@@ -1,50 +1,44 @@
-require 'tree_struct'
-require 'form_obj/attributes'
-require 'form_obj/attribute'
-require 'form_obj/array'
+require 'form_obj/struct'
+require 'form_obj/form/attributes'
+require 'form_obj/form/attribute'
+require 'form_obj/form/array'
 require 'active_model'
 
 module FormObj
   class UnknownAttributeError < RuntimeError; end
 
-  class Form < ::TreeStruct
+  class Form < FormObj::Struct
     extend ::ActiveModel::Naming
     extend ::ActiveModel::Translation
 
     include ::ActiveModel::Conversion
     include ::ActiveModel::Validations
 
-    private
+    class_attribute :primary_key, instance_predicate: false, instance_reader: false, instance_writer: false
+    self.primary_key = :id
     self._attributes = Attributes.new
 
-    public
+    class << self
+      def array_class
+        Array
+      end
 
-    def self.array_class
-      Array
-    end
+      def nested_class
+        ::FormObj::Form
+      end
 
-    def self.nested_class
-      ::TreeStruct
-    end
+      def attribute_class
+        Attribute
+      end
 
-    def self.attribute_class
-      Attribute
+      def model_name
+        @model_name || super
+      end
     end
 
     attr_accessor :persisted
     attr_reader :errors
 
-    class_attribute :primary_key, instance_predicate: false, instance_reader: false, instance_writer: false
-    self.primary_key = :id
-
-    def self.nested_class
-      ::FormObj::Form
-    end
-
-    def self.model_name
-      @model_name || super
-    end
-
     def initialize()
       @errors = ActiveModel::Errors.new(self)
       @persisted = false

data/lib/form_obj/{mappable → model_mapper}/array.rb

@@ -1,6 +1,6 @@
 module FormObj
-  module Mappable
-    class Array < FormObj::Array
+  module ModelMapper
+    class Array < FormObj::Form::Array
       def initialize(item_class, model_attribute:)
         @model_attribute = model_attribute
         super(item_class)
@@ -14,14 +14,14 @@ module FormObj
         self
       end
 
-      def save_to_models(models)
+      def sync_to_models(models)
         model_array = models[:default]
         ids_exists = []
         items_to_add = []
 
         self.each do |item|
           if model = find_model(model_array, id = item.primary_key)
-            item.save_to_models(models.merge(default: model))
+            item.sync_to_models(models.merge(default: model))
             ids_exists << id
           else
             items_to_add << item
@@ -33,7 +33,7 @@ module FormObj
 
         items_to_add.each do |item|
           model_array << model = @model_attribute.create_model # || model_array.create_model
-          item.save_to_models(models.merge(default: model))
+          item.sync_to_models(models.merge(default: model))
         end
       end
 

data/lib/form_obj/{mappable → model_mapper}/attribute.rb

@@ -1,24 +1,23 @@
-require 'form_obj/mappable/model_attribute'
+require 'form_obj/model_mapper/model_attribute'
 
 module FormObj
-  module Mappable
-    class Attribute < FormObj::Attribute
+  module ModelMapper
+    class Attribute < FormObj::Form::Attribute
       attr_reader :model_attribute
 
-      def initialize(name, array: false, class: nil, default: nil, hash: false, model: :default, model_attribute: nil, model_class: nil, parent:, primary_key: nil, &block)
-        @hash = hash
-        @model_attribute = ModelAttribute.new(model: model, names: model_attribute, classes: model_class, default_name: name, array: array, hash: hash, subform: binding.local_variable_get(:class) || block_given?)
+      def initialize(name, array: false, class: nil, default: nil, model_hash: false, model: :default, model_attribute: nil, model_class: nil, parent:, primary_key: nil, &block)
+        @model_attribute = ModelAttribute.new(model: model, names: model_attribute, classes: model_class, default_name: name, array: array, hash: model_hash, subform: binding.local_variable_get(:class) || block_given?)
 
         if block_given?
           new_block = Proc.new do
-            include FormObj::Mappable
+            include FormObj::ModelMapper
             class_eval &block
           end
         end
         super(name, array: array, class: binding.local_variable_get(:class), default: default, parent: parent, primary_key: primary_key, &new_block)
 
-        @nested_class = Class.new(@nested_class) if binding.local_variable_get(:class)
-        @nested_class.hash = hash if @nested_class
+        @nested_class            = Class.new(@nested_class) if binding.local_variable_get(:class)
+        @nested_class.model_hash = model_hash if @nested_class
       end
 
       def array?

data/lib/form_obj/{mappable → model_mapper}/model_attribute/item.rb

@@ -1,7 +1,7 @@
 require 'active_support/inflector'
 
 module FormObj
-  module Mappable
+  module ModelMapper
     class ModelAttribute
       private
 

data/lib/form_obj/{mappable → model_mapper}/model_attribute.rb

@@ -1,8 +1,8 @@
 require 'active_support/inflector'
-require 'form_obj/mappable/model_attribute/item'
+require 'form_obj/model_mapper/model_attribute/item'
 
 module FormObj
-  module Mappable
+  module ModelMapper
     class ModelAttribute
       attr_reader :model
 

data/lib/form_obj/{mappable → model_mapper}/model_primary_key.rb

@@ -1,5 +1,5 @@
 module FormObj
-  module Mappable
+  module ModelMapper
     class ModelPrimaryKey
       def initialize(model_attribute)
         @model_attribute = model_attribute

data/lib/form_obj/{mappable.rb → model_mapper.rb}

@@ -1,9 +1,10 @@
-require 'form_obj/mappable/attribute'
-require 'form_obj/mappable/array'
-require 'form_obj/mappable/model_primary_key'
+require 'form_obj/form'
+require 'form_obj/model_mapper/attribute'
+require 'form_obj/model_mapper/array'
+require 'form_obj/model_mapper/model_primary_key'
 
 module FormObj
-  module Mappable
+  module ModelMapper
     class PrimaryKeyMappingError < RuntimeError; end
 
     def self.included(base)
@@ -12,19 +13,19 @@ module FormObj
 
     module ClassMethods
       def attribute_class
-        Mappable::Attribute
+        ModelMapper::Attribute
       end
 
       def array_class
-        Mappable::Array
+        ModelMapper::Array
       end
 
-      def hash=(value)
+      def model_hash=(value)
         _attributes.each { |attribute| attribute.model_attribute.hash_item = value }
       end
 
       def model_primary_key
-        Mappable::ModelPrimaryKey.new(self._attributes.find(self.primary_key).model_attribute)
+        ModelMapper::ModelPrimaryKey.new(self._attributes.find(self.primary_key).model_attribute)
       end
     end
 
@@ -38,12 +39,12 @@ module FormObj
       self
     end
 
-    def save_to_model(model)
-      save_to_models(default: model)
+    def sync_to_model(model)
+      sync_to_models(default: model)
     end
 
-    def save_to_models(models)
-      self.class._attributes.each { |attribute | save_attribute_to_model(attribute, models) }
+    def sync_to_models(models)
+      self.class._attributes.each { |attribute | sync_attribute_to_model(attribute, models) }
       self.persisted = true
       self
     end
@@ -109,12 +110,12 @@ module FormObj
       end
     end
 
-    def save_attribute_to_model(attribute, models)
+    def sync_attribute_to_model(attribute, models)
       if attribute.subform?
         if attribute.model_attribute.write_to_model?
-          self.send(attribute.name).save_to_models(models.merge(default: attribute.model_attribute.read_from_models(models, create_nested_model_if_nil: true)))
+          self.send(attribute.name).sync_to_models(models.merge(default: attribute.model_attribute.read_from_models(models, create_nested_model_if_nil: true)))
         else
-          self.send(attribute.name).save_to_models(models.merge(default: models[attribute.model_attribute.model]))
+          self.send(attribute.name).sync_to_models(models.merge(default: models[attribute.model_attribute.model]))
         end
       elsif attribute.model_attribute.write_to_model?
         attribute.model_attribute.write_to_models(models, self.send(attribute.name))

data/lib/form_obj/struct/array.rb

@@ -0,0 +1,22 @@
+require 'typed_array'
+
+module FormObj
+  class Struct
+    class Array < TypedArray
+      def create
+        self << (item = create_item)
+        item
+      end
+
+      def to_hash
+        self.map(&:to_hash)
+      end
+
+      private
+
+      def create_item
+        item_class.new
+      end
+    end
+  end
+end

data/lib/form_obj/struct/attribute.rb

@@ -0,0 +1,69 @@
+module FormObj
+  class Struct
+    class Attribute
+      attr_reader :name
+
+      def initialize(name, array: false, class: nil, default: nil, parent:, &block)
+        @name = name.to_sym
+        @array = array
+        @default_value = default
+        @parent = parent
+
+        @nested_class = binding.local_variable_get(:class)
+        @nested_class = Class.new(@parent.nested_class, &block) if !@nested_class && block_given?
+
+        raise ArgumentError.new('Nested structure has to be defined (either with :class parameter or with block) for arrays if :default parameter is not specified') if @array && @nested_class.nil? && @default_value.nil?
+      end
+
+      def subform?
+        !@nested_class.nil?
+      end
+
+      def validate_value!(value)
+        if @nested_class
+          if @array
+            unless value.class == @parent.array_class
+              raise ArgumentError.new(":#{@name} attribute value should be of class #{@parent.nested_class.name}::Array while attempt to assign value of class #{value.class.name}")
+            end
+            unless value.item_class == @nested_class
+              raise ArgumentError.new(":#{@name} attribute value should be an array with items of class #{@nested_class.name} while attempt to assign an array with items of class #{value.item_class.name}")
+            end
+
+          else
+            unless value.class == @nested_class
+              raise ArgumentError.new(":#{@name} attribute value should be of class #{@nested_class.name} while attempt to assign value of class #{value.class.name}")
+            end
+          end
+        end
+      end
+
+      def default_value
+        if @default_value.nil?
+          if @nested_class
+            if @array
+              create_array
+            else
+              create_nested
+            end
+          end
+
+        elsif @default_value.is_a? Proc
+          @default_value.call(@parent, self)
+
+        else
+          @default_value
+        end
+      end
+
+      private
+
+      def create_nested
+        @nested_class.new
+      end
+
+      def create_array
+        @parent.array_class.new(@nested_class)
+      end
+    end
+  end
+end

data/lib/form_obj/struct/attributes.rb

@@ -0,0 +1,21 @@
+module FormObj
+  class Struct
+    class Attributes
+      def initialize(items = [])
+        @items = items
+      end
+
+      def add(attribute)
+        if @items.map(&:name).include? attribute.name
+          self.class.new(@items.map { |item| item.name == attribute.name ? attribute : item })
+        else
+          self.class.new(@items + [attribute])
+        end
+      end
+
+      def map(*args, &block)
+        @items.map(*args, &block)
+      end
+    end
+  end
+end

data/lib/form_obj/struct.rb

@@ -0,0 +1,76 @@
+require "form_obj/struct/array"
+require "form_obj/struct/attribute"
+require "form_obj/struct/attributes"
+require "active_support/core_ext/class/attribute"
+
+module FormObj
+  class Struct
+    class_attribute :_attributes, instance_predicate: false, instance_reader: false, instance_writer: false
+    self._attributes = Attributes.new
+
+    class << self
+      def array_class
+        Array
+      end
+
+      def nested_class
+        ::FormObj::Struct
+      end
+
+      def attribute_class
+        Attribute
+      end
+
+      def attribute(name, opts = {}, &block)
+        attr = attribute_class.new(name, opts.merge(parent: self), &block)
+        self._attributes = _attributes.add(attr)
+        _define_attribute_getter(attr)
+        _define_attribute_setter(attr)
+        self
+      end
+
+      def attributes
+        self._attributes.map(&:name)
+      end
+
+      def inspect
+        "#{name}#{attributes.size > 0 ? "(#{attributes.join(', ')})" : ''}"
+      end
+
+      private
+
+      def _define_attribute_getter(attribute)
+        define_method attribute.name do
+          _get_attribute_value(attribute)
+        end
+      end
+
+      def _define_attribute_setter(attribute)
+        define_method "#{attribute.name}=" do |value|
+          _set_attribute_value(attribute, value)
+        end
+      end
+    end
+
+    def to_hash
+      Hash[self.class._attributes.map { |attribute| [attribute.name, attribute.subform? ? send(attribute.name).to_hash : send(attribute.name)] }]
+    end
+
+    def inspect
+      "#<#{self.class.name} #{self.class._attributes.map { |attribute| "#{attribute.name}: #{send(attribute.name).inspect}"}.join(', ')}>"
+    end
+
+    private
+
+    def _get_attribute_value(attribute)
+      value = instance_variable_get("@#{attribute.name}")
+      value = instance_variable_set("@#{attribute.name}", attribute.default_value) if value.nil?
+      value
+    end
+
+    def _set_attribute_value(attribute, value)
+      attribute.validate_value!(value)
+      instance_variable_set("@#{attribute.name}", value)
+    end
+  end
+end

data/lib/form_obj/version.rb

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

data/lib/form_obj.rb

@@ -2,5 +2,6 @@ module FormObj
 end
 
 require "form_obj/version"
-require 'form_obj/form'
-require 'form_obj/mappable'
+require "form_obj/struct"
+require "form_obj/form"
+require "form_obj/model_mapper"

data/run_spec.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+set -e
+
+rubies=()
+versions=false
+while read -r line; do
+  if [[ $line == "rvm:" ]]
+  then
+    versions=true
+  elif $versions && [[ $line == -* ]]
+  then
+    rubies+=(${line:2})
+  elif [[ ${line:0:1} != "#" ]]
+  then
+    versions=false
+  fi
+done < ".travis.yml"
+
+for i in "${rubies[@]}"
+do
+  echo "====================================================="
+  echo "$i: Start Test"
+  echo "====================================================="
+  rvm $i exec bundle exec appraisal rake spec
+  echo "====================================================="
+  echo "$i: End Test"
+  echo "====================================================="
+done