muffin 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f444194037bfb0ce4da565e15de9365aba611a72
-  data.tar.gz: 58ab1e839e36c8070e4f4cb24bc4af5ddbc87b25
+  metadata.gz: 2fd061494a4e7fef968dd4351c7404bd089c209a
+  data.tar.gz: f86718d799b5f72adf9156b1fcbd2ee85477eff8
 SHA512:
-  metadata.gz: f4899b5cf39c11bf4c64561bec040877e71aa43d6a443d8fbe0eae6a1de87aa51d3c3a47df6f549793ea9be76e4ad2bf2fb7ade4d61c235daaa470ef27abd047
-  data.tar.gz: 820ec3cb4faf5e037fa565feceb28c83d3fc102de599cd2de0bf831363ef78fd6ca2b2bbeb20d5789932df5c7eee5e09cb28d59e26616766e0a717c9e6f72b26
+  metadata.gz: 87007332acf8b0753272f6bef8d6c6dab614ca2d010f405ce2b57bad2c8dda6c8ec7dfcac8bf21969bbfac193167569d8ae52e4c8185f1119138f362d7cbe184
+  data.tar.gz: 7487d1aa3ea54e1b98e0823657fae557e29e4ea7ddbc74f8f197ab8aa35f8bd50af7e43044af186807f035421ea5bc200bd79a383837d34bd12279986977e9f3

data/lib/muffin/attribute.rb

@@ -27,7 +27,14 @@ module Muffin
     def convert(value, access_array: false)
       return convert(default) if value == nil && default
       return (value || []).map { |e| convert(e, access_array: true) } if array? && !access_array
-      if type <= Integer
+      return value.deep_dup if value.is_a? type
+      return value if value.nil?
+
+      if type <= DateTime
+        value.to_s.in_time_zone(Time.zone).to_datetime if value.present?
+      elsif type <= Date # needs to come *after* DateTime because DateTime <= Date
+        Date.parse(value) if value.present?
+      elsif type <= Integer
         value&.to_i
       elsif type <= Float
         value&.to_f
@@ -35,6 +42,8 @@ module Muffin
         value&.to_s
       elsif type <= Symbol
         value.class <= Integer ? value.to_s.to_sym : value&.to_sym
+      elsif type <= Time
+        Time.parse(value).in_time_zone if value.present?
       elsif type <= BigDecimal
         type.new(value) if value.present?
       elsif type <= Hash

data/lib/muffin/frostings/attributes.rb

@@ -27,6 +27,10 @@ module Muffin
         attributes[name]
       end
 
+      def reflect_on_association(name)
+        OpenStruct.new klass: attributes[name].type
+      end
+
       private
 
       def define_class(name, block)
@@ -74,7 +78,7 @@ module Muffin
 
     validates_with Muffin::Validation::NestedAttributesValidator
 
-    def initialize(attributes)
+    def initialize(attributes = {})
       self.attributes = attributes
     end
   end

data/lib/muffin/frostings/execution.rb

@@ -4,6 +4,7 @@ module Muffin
       return false unless valid?
       permit!
       perform if respond_to? :perform
+      true
     end
 
     def call!

data/lib/muffin/frostings/policy.rb

@@ -40,9 +40,8 @@ module Muffin
     end
 
     def attribute_value_permitted?(name, value)
-      block = self.class.attributes[name]&.permitted_values
-      return true unless block
-      instance_exec(&block).include? value
+      return true if permitted_values(name).nil?
+      Array.wrap(value).all? { |e| permitted_values(name).include? e }
     end
 
     def self.included(base)

data/lib/muffin/frostings/sync.rb

@@ -2,7 +2,7 @@ module Muffin
   module Sync
     private
 
-    def update_nested!(relation, entities = [self])
+    def update_nested!(relation, entities = [self], synced_attributes: nil)
       entities = Array.wrap(entities)
 
       # load all (available) records upfront to avoid fetching them one by one in the loop
@@ -26,14 +26,16 @@ module Muffin
         if entity.try(:id).presence
           record = records[entity.id]
 
-          if entity.try(:_destroy).presence
+          if entity.try(:_destroy)
             record.destroy
           else
-            record.assign_attributes(model_attributes)
-            record.save! if record.changed?
+            record.assign_attributes(model_attributes.slice(*(synced_attributes || record.attributes.keys.map(&:to_sym))))
+            record.save!
           end
         else
-          record = relation.create!(model_attributes)
+          record = relation.build
+          record.assign_attributes(model_attributes.slice(*(synced_attributes || record.attributes.keys.map(&:to_sym))))
+          record.save!
         end
 
         association_attributes.each do |k, v|

data/lib/muffin/rails/controller_additions.rb

@@ -5,8 +5,8 @@ module Muffin
     module ControllerAdditions
       def prepare(operation, params: nil, request: nil, scope: nil)
         if params.blank? && respond_to?(:params) && operation.respond_to?(:model_name)
-          if self.params.key?(operation.model_name.underscore)
-            params = self.params[operation.model_name.underscore].deep_dup.permit!.to_h
+          if self.params.key?(operation.model_name.param_key)
+            params = parse_arrays self.params[operation.model_name.param_key].deep_dup.permit!.to_h
             params.deep_transform_keys! do |key|
               if key.to_s[/.+_attributes\Z/]
                 new_key = key.to_s.sub(/_attributes\Z/, "")
@@ -24,6 +24,21 @@ module Muffin
 
         operation.new(params: params, request: request, scope: scope)
       end
+
+      private
+
+      def parse_arrays(obj)
+        obj.each do |key, value|
+          if value.is_a? Hash
+            if value.keys.find { |k, _| k =~ /\D/ }
+              parse_arrays(value)
+            else
+              obj[key] = value.values
+              value.each_value { |h| parse_arrays(h) }
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/muffin/version.rb

@@ -1,3 +1,3 @@
 module Muffin
-  VERSION = "0.2.0".freeze
+  VERSION = "0.3.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: muffin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jens Ravens
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2018-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel