tzispa_helpers 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 258ac692a120498a6c674cc1a2c8c3a25e0efe05
-  data.tar.gz: ba449f0b62e81ab21ac2db99c1563f8da8332cc4
+  metadata.gz: ff5ee9fd3dbe5599f7ba42bace28922feb0c8ce4
+  data.tar.gz: ddfc4699dd6ee7e4b84a5cb0dbf122d4f6531862
 SHA512:
-  metadata.gz: 915c48be23cab2d230c591e559608f5b3df88705f699f23579fd8f5f6c6b500992667be8a9a9a36391991c3e4605779ed40a02902f75e58ea503337c73be9116
-  data.tar.gz: 3192166cfeb384c3030ccfc886ffb8c3682e0b09bf5b1ef01f6294d9affaffb568b335b80f5d65643a1ee712ce2130c4c53c1c5dcdf94e88a59a399646c83ebb
+  metadata.gz: 30ad6c7d0682f26e51958570daeae58ab0e3a8da45a2ecd4749b0ec0193a6761e40959aa9600dc38513aa6d2a6490ce95954b05d0ce228d363860cd02a5aa7b1
+  data.tar.gz: df205ac43b8b2be62d400379e298bf42c9539c30edb733faa037977e7fff742e9cb89bb9f238898863d5a050b18bed42c20a4e0d67142f28df5e0a26d8027b3b

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 Tzispa Helpers
 
+## v0.3.4
+- added macro_field helper
+- added user login related helper module
+
 ## v0.3.3
 - added str_to_integer text helper macro
 

data/lib/tzispa/helpers/login.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Tzispa
+  module Helpers
+    module Login
+
+      def login_redirect
+        context.redirect(context.layout_path(context.config.login_layout.to_sym), true, context.response) if login_redirect?
+      end
+
+      def login_redirect?
+        !context.logged? && (context.layout != context.config.login_layout)
+      end
+
+      def unauthorized_but_logged
+        context.not_authorized unless context.logged?
+      end
+
+    end
+  end
+end

data/lib/tzispa/helpers/macro_field.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'tzispa/utils/string'
+require 'json'
+require_relative 'text'
+
+module Tzispa
+  module Helpers
+    module MacroField
+
+      include Tzispa::Helpers::Text
+      using Tzispa::Utils::TzString
+
+      def process_macros(source, fields, data_object: nil, json: nil)
+        (data_object || {}).tap do |data|
+          fields.each do |name|
+            macro_field = name.split('@:')
+            macro = macro_field.first.to_sym if macro_field.length == 2
+            field = macro_field.length == 2 ? macro_field.last : macro_field.first
+            build_field source, field, macro, data
+          end
+          json&.each do |key, value|
+            data.send "#{key}=", build_json_field(source, value)
+          end
+        end
+      end
+
+      def build_field(source, field, macro, data)
+        field.split(':').tap do |orig, dest|
+          dest ||= orig
+          value = if String == source[orig]
+                    String.unescape_html(source[orig])
+                  else
+                    source[orig]
+                  end
+          value = macro ? send(macro, value) : value
+          if data.is_a? ::Hash
+            data[dest.to_sym] = value
+          else
+            data.send "#{dest}=".to_sym, value
+          end
+        end
+      end
+
+      def build_json_field(source, values)
+        {}.tap do |data|
+          values.each do |name|
+            macro_field = name.split('@:')
+            macro = macro_field.first.to_sym if macro_field.length == 2
+            field = macro_field.length == 2 ? macro_field.last : macro_field.first
+            build_field source, field, macro, data
+          end
+        end.to_json
+      end
+
+    end
+  end
+end

data/lib/tzispa/helpers/request.rb

@@ -2,36 +2,32 @@
 
 require 'tzispa/utils/string'
 require 'json'
+require_relative 'macro_field'
 
 module Tzispa
   module Helpers
     module Request
 
-      using Tzispa::Utils::TzString
+      include Tzispa::Helpers::MacroField
+
+      def request_json(key = nil)
+        return unless request.content_type&.include?('application/json')
+        body = request.body.gets
+        key ? JSON.parse(body)[key] : JSON.parse(body)
+      end
+
+      def request_json_object(key = nil, data_object:, fields:, json: nil)
+        process_macros request_json(key), fields, data_object: data_object,
+                                                  json: json
+      end
 
       def request_data(fields)
-        {}.tap do |data|
-          fields.each do |name|
-            macro_field = name.split('@:')
-            macro = macro_field.first.to_sym if macro_field.length == 2
-            field = macro_field.length == 2 ? macro_field.last : macro_field.first
-            build_field field, macro, data
-          end
-        end
+        process_macros request, fields
       end
 
       def request_data_object(data_object:, fields:, json: nil)
-        data_object.tap do |data|
-          fields.each do |name|
-            macro_field = name.split('@:')
-            macro = macro_field.first.to_sym if macro_field.length == 2
-            field = macro_field.length == 2 ? macro_field.last : macro_field.first
-            build_field field, macro, data
-          end
-          json&.each do |key, value|
-            data.send "#{key}=", build_json_field(value)
-          end
-        end
+        process_macros request, fields, data_object: data_object,
+                                        json: json
       end
 
       def request_file_upload(request_file:, destination_path:, save_as: nil, keep_ext: true)
@@ -53,34 +49,6 @@ module Tzispa
           size: ::File.size(dest_file), type: filetype }
       end
 
-      def build_field(field, macro, data)
-        field.split(':').tap do |src, dest|
-          dest ||= src
-          value = if String == request[src]
-                    String.unescape_html(request[src])
-                  else
-                    request[src]
-                  end
-          value = macro ? send(macro, value) : value
-          if data.is_a? ::Hash
-            data[dest.to_sym] = value
-          else
-            data.send "#{dest}=".to_sym, value
-          end
-        end
-      end
-
-      def build_json_field(values)
-        {}.tap do |data|
-          values.each do |name|
-            macro_field = name.split('@:')
-            macro = macro_field.first.to_sym if macro_field.length == 2
-            field = macro_field.length == 2 ? macro_field.last : macro_field.first
-            build_field field, macro, data
-          end
-        end.to_json
-      end
-
     end
   end
 end

data/lib/tzispa/helpers/version.rb

@@ -3,7 +3,7 @@
 module Tzispa
   module Helpers
 
-    VERSION  = '0.3.3'
+    VERSION  = '0.3.4'
     NAME     = 'Tzispa Helpers'
     GEM_NAME = 'tzispa_helpers'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tzispa_helpers
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Juan Antonio Piñero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2017-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -67,6 +67,8 @@ files:
 - lib/tzispa/helpers/hooks/after.rb
 - lib/tzispa/helpers/hooks/before.rb
 - lib/tzispa/helpers/html.rb
+- lib/tzispa/helpers/login.rb
+- lib/tzispa/helpers/macro_field.rb
 - lib/tzispa/helpers/mime.rb
 - lib/tzispa/helpers/pattern.rb
 - lib/tzispa/helpers/provider.rb