immutabler 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4df8bc78510e50ac97667f16c13295f4cc303d61
-  data.tar.gz: c6f1219c73509e11ce24ac831be173a6fc33a708
+  metadata.gz: abc6f4fb7cc071157e338539a05eed7f701a634a
+  data.tar.gz: 001d0b3734fcee8d27f72f4083bb536a9b0395e0
 SHA512:
-  metadata.gz: 586d97092480d65a824a2c9a88ccceed60adfe20b3b0704cf7163dfd535eda35bea01219154f3b4a3924144f675e78139c17d5464f5015f2f9b8329e788aaa4c
-  data.tar.gz: c17236921b797cddfb2efed67a0d4ce7706a3fbf64c8d829e27b7b9bb89cba4230380e0621996545d29e6f9cd0c090d7c94c0862b53e7254b56890e7c7a90be6
+  metadata.gz: e4c3e855a7325dc52b4913be8f4c93f87e52cc3f2758b634a03cf7230231278933cabbec7d76fb149dbef51b45658c5c2e52e68261b19528beae15ef6c280cdb
+  data.tar.gz: 3f2e278f589cf15b4ffc61a1a1d78a08b290ce0d916b2549531cb3be24b9cdcd6095cfbe4160bc0b7b4d8b438fe0431d31bfff4fa4cb2da143be6ce68f52b19e

data/lib/immutabler/dsl/mapping.rb

@@ -8,7 +8,7 @@ module Immutabler
         @destination_name = destination_name
         @type = options[:type]
         @is_array = options.fetch(:array, false)
-        @is_dict  = options.fetch(:dict,  false)
+        @is_dict = options.fetch(:dict, false)
         @custom_transformer = options[:with]
         @dict_mappings = []
       end

data/lib/immutabler/template/body_template.rb

@@ -14,9 +14,7 @@ module Immutabler
           body = "@{\n"
 
           if arg
-            body << arg.map{|m|
-              "@\"#{m.destination_name}\" : @\"#{m.origin_name}\""
-            }.join(",\n")
+            body << arg.map { |m| "@\"#{m.destination_name}\" : @\"#{m.origin_name}\"" }.join(",\n")
           end
 
           body << "\n};"
@@ -26,9 +24,7 @@ module Immutabler
           body = "@{\n"
 
           if arg
-            body << arg.map{|m|
-              "@\"#{m.origin_name}\" : @(#{m.destination_name})"
-            }.join(",\n")
+            body << arg.map { |m| "@\"#{m.origin_name}\" : @(#{m.destination_name})" }.join(",\n")
           end
 
           body << "\n};"
@@ -50,6 +46,46 @@ module Immutabler
           end
         end
 
+        helper(:decodeProperty) do |context, arg, block|
+          case arg.type
+            when 'BOOL'
+              "        _#{arg.name} = [coder decodeBoolForKey:@\"_#{arg.name}\"];"
+            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\
+                        }"
+            when 'CGFloat'
+              "        _#{arg.name} = [coder decodeFloatForKey:@\"_#{arg.name}\"];"
+            when 'double'
+              "        _#{arg.name} = [coder decodeDoubleForKey:@\"_#{arg.name}\"];"
+            else
+              "        _#{arg.name} = [coder decodeObjectForKey:@\"_#{arg.name}\"];"
+          end
+        end
+
+        helper(:encodeProperty) do |context, arg, block|
+          case arg.type
+            when 'BOOL'
+              "        [coder encodeBool:self.#{arg.name} forKey:@\"_#{arg.name}\"];"
+            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\
+                        }"
+            when 'CGFloat'
+              "        [coder encodeFloat:self.#{arg.name} forKey:@\"_#{arg.name}\"];"
+            when 'double'
+              "        [coder encodeDouble:self.#{arg.name} forKey:@\"_#{arg.name}\"];"
+            else
+              "        [coder encodeObject:self.#{arg.name} forKey:@\"_#{arg.name}\"];"
+          end
+        end
+
         helper(:base_immutable_interface) do |context, arg, block|
           if arg[:base_immutable]
             [

data/lib/immutabler/template/builder.rb

@@ -26,7 +26,7 @@ module Immutabler
             props: build_props(model.props),
             any_mappings: model.mappings.any?,
             array_mappings: model.mappings.select(&:array?),
-            dict_mappings:  build_dict_mappings(model.mappings),
+            dict_mappings: build_dict_mappings(model.mappings),
             custom_mappers: build_custom_mappers(model.mappings),
             mappings: build_mappings(model.mappings)
           }
@@ -53,7 +53,7 @@ module Immutabler
         mappings.select(&:dict?).map do |mapping|
           attributes = mapping.dict_mappings.map do |dict_mapping|
             {
-              origin_name:      dict_mapping[:origin_name],
+              origin_name: dict_mapping[:origin_name],
               destination_name: dict_mapping[:destination_name]
             }
           end

data/lib/immutabler/template/header_template.rb

@@ -26,10 +26,10 @@ module Immutabler
             options = block[:hash]
             access_type = options[:readOnly] ? 'readonly' : 'readwrite'
             asterisk = prop[:is_ref] && !prop[:is_id] ? '*' : ''
-            asterisk_and_prefix =  "#{asterisk}#{prop[:name_prefix]}"
+            asterisk_and_prefix = "#{asterisk}#{prop[:name_prefix]}"
             memory_management = prop[:is_ref] ? prop[:ref_type] : 'assign';
             prop_arguments = "@property(nonatomic, #{memory_management}, #{access_type})"
-            prop_field = "#{prop[:type]} #{asterisk_and_prefix}#{prop[:name]}"            
+            prop_field = "#{prop[:type]} #{asterisk_and_prefix}#{prop[:name]}"
             "#{prop_arguments} #{prop_field};"
           end.join("\n")
         end
@@ -45,7 +45,7 @@ module Immutabler
 
       def build_enums(enums)
         enums.map do |enum|
-          attributes = enum.attributes.map { |attr| { name: attr.name } }
+          attributes = enum.attributes.map { |attr| {name: attr.name} }
 
           {
             name: enum.name,

data/lib/immutabler/type_mapper.rb

@@ -12,7 +12,7 @@ module Immutabler
       'double' => {
         type: 'double',
         is_ref: false
-      },      
+      },
       'bool' => {
         type: 'BOOL',
         is_ref: false

data/lib/immutabler/version.rb

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

data/templates/body_template.hbs

@@ -139,18 +139,8 @@
     {{#init_with_coder .}}
     {{/init_with_coder}}
     if (self) {
-        {{#props}}
-        {{#is_ref}}
-        _{{name}} = [coder decodeObjectForKey:@"_{{name}}"];
-        {{/is_ref}}
-        {{^is_ref}}
-        if (sizeof(_{{name}}) < 8) {
-        	_{{name}} = [coder decodeInt32ForKey:@"_{{name}}"];
-        }
-        else {
-        	_{{name}} = [coder decodeInt64ForKey:@"_{{name}}"];
-        }
-        {{/is_ref}}
+        {{#props}}        
+        {{#decodeProperty this}}{{/decodeProperty}}
         {{/props}}
         __modelVersion = [coder decodeIntegerForKey:@"__modelVersion"];
     }
@@ -159,18 +149,8 @@
 }
 
 - (void)encodeWithCoder:(NSCoder *)coder {
-    {{#props}}
-    {{#is_ref}}
-    [coder encodeObject:self.{{name}} forKey:@"_{{name}}"];
-    {{/is_ref}}
-    {{^is_ref}}
-	if (sizeof(_{{name}}) < 8) {
-		[coder encodeInt32:self.{{name}} forKey:@"_{{name}}"];
-	}
-	else {
-		[coder encodeInt64:self.{{name}} forKey:@"_{{name}}"];	
-	}    
-    {{/is_ref}}
+    {{#props}}       
+    {{#encodeProperty this}}{{/encodeProperty}}
     {{/props}}
     [coder encodeInteger:__modelVersion forKey:@"__modelVersion"];
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: immutabler
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Serhij Korochanskyj
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-25 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: handlebars
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Generator of Objective-C immutable models