immutabler 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ace3e3c55f66f5b67df37dd9d007cf732d825856
-  data.tar.gz: 7dde795173390f9effdd177460e5eadd6f1e1508
+  metadata.gz: b988c688568544db5349c6927ef6dec0d6aeb2be
+  data.tar.gz: 19e97a7fc6dbe1c67bbeabca39ed07b80e6b3515
 SHA512:
-  metadata.gz: 4ee9685bbbb3b98d05e18598549cf7d81317e1cc49647289dfea3e9889a09b140c5f4954f936886f2bd8c8c4ea9a017845a98cbbe1998db276d9e68ce2144b1e
-  data.tar.gz: 7637a1fb3fb94959ddffd6a9aedbb2ea6f97a0f77565ec64cf1ac393f4b4119ca2858f3e56ae15480f2dd528e19b438afe53afa51f15441d8b73e27a1a40b604
+  metadata.gz: c04672fd825c54996958301afb89873ac121468585b722e9ce3259b030ec4a5969e04a4f1b9ee220ee958903037719139240738897cc59f80c9a30bc3467d1be
+  data.tar.gz: b80e1c70e72d7087005ee2d6dca60466cffde2175927d69dc5b257135a3229e57a60ca1a0455d5682247a7264a392fd7a8a28eb40b17d84b3c806b97dce77a6e

data/GETTING_STARTED.md

@@ -88,24 +88,27 @@ end
 Each field is defining by
 
 ```ruby
-    prop :fieldName, :fieldType
+    prop :fieldName, :fieldType, :name_prefix => your_custom_prefix(string, optional), :is_ref => true or false(optional), :ref_type => 'assign', 'weak', 'strong'(optional), :is_id => true or false(optional)
 ```
 
 There are predefined types:
-* int
-* float
-* bool
-* string
-* array
-* dict
-* id
+* int -> NSInteger in Objective-C
+* float -> CGFloat in Objective-C
+* double -> double in Objective-C
+* bool -> BOOL in Objective-C
+* string -> NSString* in Objective-C
+* array -> NSArray* in Objective-C
+* dict -> NSDictionary* in Objective-C
+* id -> id in Objective-C
 
 When you use custom type and it will be transformed into the same.
 
 You can pass additional parameters for prop:
 
-+ prefix: prefix used in Objective-C code (e.g. `*` for referential types).
-+ ref: reference type in Objective-C code (e.g. `weak`)
++ name_prefix: name_prefix to include (please, don't use it for adding/supressing asterisk before property name - use `is_ref`, `is_id` instead)
++ is_ref: defines whether property is reference type (pointer) or value type
++ ref_type: property memory management specifier (`weak`, `strong`, `assign`, default - `strong` when `is_ref` is `true`, `assign` when `is_ref` is `false`)
++ is_id: `id` is Objective-C special built-in type. Despite it's reference type, '*' is assumed implicitly and shouldn't be specified manually. Whenever you want to define something of type like `id<MyAwesomeProtocol>` don't forget to add :is_id => true to property definition to suppress asterisk
 
 Example:
 ```ruby

data/immutabler.gemspec

@@ -6,8 +6,8 @@ require 'immutabler/version'
 Gem::Specification.new do |spec|
   spec.name          = 'immutabler'
   spec.version       = Immutabler::VERSION
-  spec.authors       = ['Serhij Korochanskyj', 'Sergey Zenchenko']
-  spec.email         = ['serge.k@techery.io', 'serge.z@techery.io']
+  spec.authors       = ['Serhij Korochanskyj', 'Sergey Zenchenko', 'Petro Korienev']
+  spec.email         = ['serge.k@techery.io', 'serge.z@techery.io', 'soxjke@gmail.com']
 
   spec.summary       = 'Generator of Objective-C immutable models'
   spec.description   = 'Generator of Objective-C immutable models'

data/lib/immutabler/dsl/props_builder.rb

@@ -10,9 +10,10 @@ module Immutabler
 
       def prop(name, type, options={})
         prop_options = {}
-        prop_options[:is_ref] = !!options[:ref] if options.key?(:ref)
-        prop_options[:ref_type] = options[:ref] if options.key?(:ref)
-        prop_options[:name_prefix] = options[:prefix] if options.key?(:prefix)
+        prop_options[:is_ref] = options[:is_ref] if options.key?(:is_ref)
+        prop_options[:ref_type] = options[:ref_type] if options.key?(:ref_type)
+        prop_options[:name_prefix] = options[:name_prefix] if options.key?(:name_prefix)
+        prop_options[:is_id] = options[:is_id] if options.key?(:is_id)
         @props << Prop.new(name.to_s, type.to_s, prop_options)
       end
     end

data/lib/immutabler/template/header_template.rb

@@ -25,9 +25,11 @@ module Immutabler
           arg.map do |prop|
             options = block[:hash]
             access_type = options[:readOnly] ? 'readonly' : 'readwrite'
-            prop_arguments = "@property(nonatomic, #{prop[:ref_type]}, #{access_type})"
-            prop_field = "#{prop[:type]} #{prop[:name_prefix]}#{prop[:name]}"
-
+            asterisk = prop[:is_ref] && !prop[:is_id] ? '*' : ''
+            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_arguments} #{prop_field};"
           end.join("\n")
         end

data/lib/immutabler/type_mapper.rb

@@ -3,50 +3,42 @@ module Immutabler
     TYPE_MAPPING = {
       'int' => {
         type: 'NSInteger',
-        is_ref: false,
-        ref_type: 'assign',
-        name_prefix: ''
+        is_ref: false
       },
       'float' => {
         type: 'CGFloat',
-        is_ref: false,
-        ref_type: 'assign',
-        name_prefix: ''
+        is_ref: false
       },
+      'double' => {
+        type: 'double',
+        is_ref: false
+      },      
       'bool' => {
         type: 'BOOL',
-        is_ref: false,
-        ref_type: 'assign',
-        name_prefix: ''
+        is_ref: false
       },
       'array' => {
         type: 'NSArray',
-        is_ref: true,
-        ref_type: 'strong',
-        name_prefix: '*'
+        is_ref: true
       },
       'string' => {
         type: 'NSString',
-        is_ref: true,
-        ref_type: 'strong',
-        name_prefix: '*'
+        is_ref: true
       },
       'dict' => {
         type: 'NSDictionary',
-        is_ref: true,
-        ref_type: 'strong',
-        name_prefix: '*',
+        is_ref: true
       },
       'id' => {
         type: 'id',
         is_ref: true,
         ref_type: 'strong',
-        name_prefix: ''
+        is_id: true
       }
     }
 
     def self.map(type, options)
-      TYPE_MAPPING.fetch(type, default_mapping(type)).merge(options)
+      default_mapping(type).merge(TYPE_MAPPING.fetch(type, default_mapping(type))).merge(options)
     end
 
     private
@@ -56,7 +48,7 @@ module Immutabler
         type: type,
         is_ref: true,
         ref_type: 'strong',
-        name_prefix: '*'
+        is_id: false
       }
     end
   end

data/lib/immutabler/version.rb

@@ -1,3 +1,3 @@
 module Immutabler
-  VERSION = '0.1.9'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: immutabler
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Serhij Korochanskyj
 - Sergey Zenchenko
+- Petro Korienev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-10 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: handlebars
@@ -71,6 +72,7 @@ description: Generator of Objective-C immutable models
 email:
 - serge.k@techery.io
 - serge.z@techery.io
+- soxjke@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []