motion-prime 0.1.5 → 0.1.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Nzg0M2M3MWY1OWZhOTU1NDkwOWY3MzllNTY1NTJlZDc3YWY1ZDg5Yw==
+    Yzc2NmYzMWIzZTRkOTA3ODFjZjc0NTdkYWM0ZmVjMTQ0OTU1OGM4Yw==
   data.tar.gz: !binary |-
-    ZjAxODM0OTk4NDg1NGMwMTE1OGZlYTI2NTc5NTVjMmNiZmJiZDQxZA==
+    YWUzZWRiOTRjMmQyOTcyYzQzMjFhZWY4YzM0MDY0MzYwZDkzZThlOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTQzYjI2NDYxMmNjY2Y1ZmQxMGZjOWI2ZTUyMGQ3YmE3ZWM5MjBhMzU3YjUy
-    Y2RlZWU2ZmVlYmZhNzhjNmMyYTU3ZDhlYTkyYWQzNjhhYzhjNjU3YTJlNzBm
-    NzI2OTc1MWM0ZGU1ZWNiYjE3MjMzYTU2YTFkZjNmMzE0ODJmMzI=
+    ZDNhMTg1MmYxYjhkMTE3MTAzMjAyY2M0NjAzODE4Mjc0ZjZmOTIxMzNkNmQ3
+    Y2Q2MTlmNmYzMGI5YWE5YjExZmUwNWE3N2FkNWY2YzNmMmI5ZDU4OTliZDI2
+    MzUxMzg5NGVmMWVkMjk0MDQxYjlmZWY2OGYzYzUzNGJjMjcyNTk=
   data.tar.gz: !binary |-
-    OTM5NTA1YjlhNmQ1NTZlN2M4MWQ5ODhkNTEwYmM1ZDBlOTQ3MmFhMjRkZTRk
-    OWFiY2M4OWZlZTU4Y2UyNjk2MWNiNmQ3MGJlMWMxOTBjNzI3OWNkOGQ1YWVl
-    Mzg0MTFlZTI5YTU1YzYyMjRkZGY0MmNmMDJjMzJiMjBiMDg4OTM=
+    YmI1OTU0YTVjYjE1NDY3MzJkMGMwZmJkOGVlZGVlOGJlZTllNjA1ODVjMzg1
+    YWUxMDlhOGE1N2Q2YTY1ODVlNjhiYjVmOGUwN2JmYjYxYjJmZjg2MWU1ZTBi
+    NTMwM2YwYTFkOGRmNmU1NjJhNDc5NjNiYzZmODk3ZTYzYzE2OTA=

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+=== 0.1.6
+* Section container options now support proc values
+
 === 0.1.5
 * MP::FormSection#on_edit renamed to on_input_edit
 * MP::FormSection#on_input_change callback added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.1.5)
+    motion-prime (0.1.6)
       bubble-wrap
       cocoapods
       motion-cocoapods

data/motion-prime/elements/base.rb

@@ -1,9 +1,12 @@
+motion_require '../helpers/has_normalizer'
 module MotionPrime
   class BaseElement
     # MotionPrime::BaseElement is container for UIView class elements with options.
     # Elements are located inside Sections
 
     include ::MotionSupport::Callbacks
+    include HasNormalizer
+
     attr_accessor :options, :section, :name,
                   :view_class, :view, :styles, :screen
 
@@ -39,7 +42,7 @@ module MotionPrime
       @computed_options = options
       compute_block_options
       compute_style_options
-      @computed_options = normalize_options(@computed_options)
+      @computed_options = normalize_options(@computed_options, section)
     end
 
     # Compute options sent inside block, e.g.
@@ -63,16 +66,6 @@ module MotionPrime
       Styles.for(styles)
     end
 
-    def normalize_options(options)
-      options.each do |key, option|
-        options[key] = if option.is_a?(Proc) && key != :block
-          section.send :instance_eval, &option
-        else
-          option
-        end
-      end
-    end
-
     class << self
       def factory(type, options = {})
         class_name = "#{type.classify}Element"

data/motion-prime/helpers/has_normalizer.rb

@@ -0,0 +1,14 @@
+module MotionPrime
+  module HasNormalizer
+    def normalize_options(options, receiver = nil)
+      receiver ||= self
+      options.each do |key, option|
+        options[key] = if option.is_a?(Proc)
+          receiver.send :instance_eval, &option
+        else
+          option
+        end
+      end
+    end
+  end
+end

data/motion-prime/models/base.rb

@@ -157,6 +157,7 @@ module MotionPrime
       return attributes if self.class.updatable_attributes.blank?
       self.class.updatable_attributes.to_a.inject({}) do |hash, attribute|
         key, options = *attribute
+        return hash if options[:if] && !send(options[:if])
         if block = options[:block]
           value = instance_eval(&block)
         else

data/motion-prime/sections/base.rb

@@ -14,6 +14,7 @@ module MotionPrime
     DEFAULT_CONTENT_HEIGHT = 65
     include ::MotionSupport::Callbacks
     include MotionPrime::HasAuthorization
+    include MotionPrime::HasNormalizer
 
     attr_accessor :screen, :model, :name, :options, :elements
     class_attribute :elements_options, :container_options
@@ -77,7 +78,9 @@ module MotionPrime
     end
 
     def container_options
-      @container_options ||= self.class.container_options.try(:clone) || {}
+      @container_options ||= normalize_options(
+        self.class.container_options.try(:clone) || {}
+      )
     end
 
     def container_height

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/motion-prime/views/styles.rb

@@ -1,3 +1,4 @@
+motion_require '../helpers/has_normalizer'
 module MotionPrime
   class Styles
     @@repo = {}
@@ -17,6 +18,8 @@ module MotionPrime
     end
 
     class << self
+      include HasNormalizer
+
       def define(namespace = nil, &block)
         self.new(namespace).instance_eval(&block)
       end
@@ -33,12 +36,6 @@ module MotionPrime
         style_options = self.for(options.delete(:styles))
         normalize_options(style_options.merge(options))
       end
-
-      def normalize_options(options)
-        options.each do |key, option|
-          options[key] = option.is_a?(Proc) && key != :block ? instance_eval(&option) : option
-        end
-      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Iskander Haziev
@@ -201,6 +201,7 @@ files:
 - motion-prime/elements/text_field.rb
 - motion-prime/elements/text_view.rb
 - motion-prime/helpers/has_authorization.rb
+- motion-prime/helpers/has_normalizer.rb
 - motion-prime/helpers/has_search_bar.rb
 - motion-prime/models/association.rb
 - motion-prime/models/bag.rb