immutabler 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abc6f4fb7cc071157e338539a05eed7f701a634a
-  data.tar.gz: 001d0b3734fcee8d27f72f4083bb536a9b0395e0
+  metadata.gz: d5cb0ee3a96e1134941bd202ce2da8ad90b76acb
+  data.tar.gz: c3e8ee60cbe0909df14afa14f3e05e15ffed7b69
 SHA512:
-  metadata.gz: e4c3e855a7325dc52b4913be8f4c93f87e52cc3f2758b634a03cf7230231278933cabbec7d76fb149dbef51b45658c5c2e52e68261b19528beae15ef6c280cdb
-  data.tar.gz: 3f2e278f589cf15b4ffc61a1a1d78a08b290ce0d916b2549531cb3be24b9cdcd6095cfbe4160bc0b7b4d8b438fe0431d31bfff4fa4cb2da143be6ce68f52b19e
+  metadata.gz: 5a8a5d02027c9b93c9efc91e26af22672c17d201f926a4b0ad2b4bc2af75f7a259bd31791123b60deced0176502396203754e09d65c6d36ce87415642472508b
+  data.tar.gz: e7ababe5deb5ff453dba7e67ed3bd299467c29191c96ba34d83127c4037815f14a55e5908248ddf7b58253fc612f42a0594b9814e53e419ac2f0a1a5babdb9e6

data/lib/immutabler/template/body_template.rb

@@ -49,40 +49,38 @@ module Immutabler
         helper(:decodeProperty) do |context, arg, block|
           case arg.type
             when 'BOOL'
-              "        _#{arg.name} = [coder decodeBoolForKey:@\"_#{arg.name}\"];"
+              decode_template(arg.name, 'Bool')
             when 'NSInteger'
-              "        if (sizeof(_#{arg.name}) < 8) {\n            \
-                        _#{arg.name} = [coder decodeInt32ForKey:@\"_#{arg.name}\"];\n\
-                        }\n\
-                        else {\n\
-                        _#{arg.name} = [coder decodeInt64ForKey:@\"_#{arg.name}\"]; \n\
-                        }"
+              decode_int(arg.name)
             when 'CGFloat'
-              "        _#{arg.name} = [coder decodeFloatForKey:@\"_#{arg.name}\"];"
+              decode_template(arg.name, 'Float')
             when 'double'
-              "        _#{arg.name} = [coder decodeDoubleForKey:@\"_#{arg.name}\"];"
+              decode_template(arg.name, 'Double')
             else
-              "        _#{arg.name} = [coder decodeObjectForKey:@\"_#{arg.name}\"];"
+              if !arg.is_ref 
+                decode_int(arg.name)
+              else
+                decode_template(arg.name, 'Object')
+              end
           end
         end
 
         helper(:encodeProperty) do |context, arg, block|
           case arg.type
             when 'BOOL'
-              "        [coder encodeBool:self.#{arg.name} forKey:@\"_#{arg.name}\"];"
+              encode_template(arg.name, 'Bool')
             when 'NSInteger'
-              "        if (sizeof(_#{arg.name}) < 8) {\n            \
-                        [coder encodeInt32:self.#{arg.name} forKey:@\"_#{arg.name}\"];\n\
-                        }\n\
-                        else {\n\
-                        [coder encodeInt64:self.#{arg.name} forKey:@\"_#{arg.name}\"]; \n\
-                        }"
+              encode_int(arg.name)
             when 'CGFloat'
-              "        [coder encodeFloat:self.#{arg.name} forKey:@\"_#{arg.name}\"];"
+              encode_template(arg.name, 'Float')
             when 'double'
-              "        [coder encodeDouble:self.#{arg.name} forKey:@\"_#{arg.name}\"];"
+              encode_template(arg.name, 'Double')
             else
-              "        [coder encodeObject:self.#{arg.name} forKey:@\"_#{arg.name}\"];"
+              if !arg.is_ref 
+                encode_int(arg.name)
+              else
+                encode_template(arg.name, 'Object')
+              end
           end
         end
 
@@ -105,6 +103,29 @@ module Immutabler
       def render
         template.call(models: models, name: name)
       end
+
+      def encode_template(arg_name, type, leading_spaces_count = 8)
+        "#{' ' * leading_spaces_count}[coder encode#{type}:self.#{arg_name} forKey:@\"_#{arg_name}\"];"
+      end
+      def encode_int(arg_name)
+         "        if (sizeof(_#{arg_name}) < 8) {\n\
+                    #{encode_template(arg_name, 'Int32', 0)} \n\
+                }\n\
+                else {\n\
+                    #{encode_template(arg_name, 'Int64', 0)} \n\
+                }"
+      end
+      def decode_template(arg_name, type, leading_spaces_count = 8)
+        "#{' ' * leading_spaces_count}_#{arg_name} = [coder decode#{type}ForKey:@\"_#{arg_name}\"];"
+      end
+      def decode_int(arg_name)
+        "        if (sizeof(_#{arg_name}) < 8) {\n\
+                    #{decode_template(arg_name, 'Int32', 0)} \n\
+                }\n\
+                else {\n\
+                    #{decode_template(arg_name, 'Int64', 0)} \n\
+                }"
+      end
     end
   end
-end
+end

data/lib/immutabler/version.rb

@@ -1,3 +1,3 @@
 module Immutabler
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: immutabler
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Serhij Korochanskyj
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-19 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: handlebars