immutabler 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6aa7996e400b82ef598a2d8db5661b55001accde
-  data.tar.gz: 7d7bb998f7e13c5328aa08c5ff74f7c4d60915de
+  metadata.gz: 6efd29613b37bd063481ee957519b7a55fca3102
+  data.tar.gz: fafe01bc2de0c9e32d2fcd540a10675d144c7fc3
 SHA512:
-  metadata.gz: db79646d8ad25518ac6391aad63aac1c79740c57c291bc9df6586405f0686b8c5e56241124f2317cc3641eb431494bf84b58ea359e598e271d9cb015f92f7866
-  data.tar.gz: fcdeec34297e87cd0fbd124974e5b66216ec05187a556b2f5f1b8db8662cb83902ca8b9eb1c620a209e917f139a1ec00b04bf66fa36ff8dea8b54fa3808475d7
+  metadata.gz: 69c1109152fae2905d062d3669eda0cc2879ee5d91f3a3495bdfc6ed34bc2801e4d2031e83c79ea9624da5cb9693d3948de6c6bff9aec04fb4c4c4a4a5c0fdc4
+  data.tar.gz: 42950c0b7077fbf0fd589c1c70cd66da87d5df92d06d02f7c48d6e1f224cc0affaefaca236257c8be50d452fc09c464202cef9a9427044f852a27df9e4b73f60

data/GETTING_STARTED.md

@@ -122,48 +122,6 @@ Example:
 end
 ```
 
-## Mappings
-
-All mappings are describing in `mapping` block
-```ruby
-mapping do
-
-end
-```
-
-### Simple mapping
-
-Simple mappings are describing wih `map`:
-
-```ruby
-map :json_field_name, :classFieldName
-```
-
-You can specify custom transformer class using `with` option:
-
-```ruby
-map :phone, :phoneNumber, with: :CustomPhoneTransformer
-```
-
-### Array mapping
-
-You can describe mapping array of records using `array`:
-
-```ruby
-array :json_field_name, :classFieldName, :ClassName
-```
-
-### Dict mapping
-
-You can describe mapping json field to custom value (e.g. into enum) with `dict`:
-
-```ruby
-dict  :json_state, :modelState do
-  map :active,   :TEServiceStateActive
-  map :archived, :TEServiceStateArchived
-end
-```
-
 # Full example
 ```ruby
 require 'immutabler'
@@ -174,7 +132,9 @@ Immutabler.group :TESalonModels do
 
   output_dir(gen_path)
   prefix('TE')
-  base_model('MTLModel<MTLJSONSerializing>') # Default base model for group
+  link_to :TEState # #import "TEState.h"
+  module_link_to :Mantle, :MTLModel # #import <Mantle/MTLModel.h>
+  base_model('MTLModel') # Default base model for group
 
   enum :ServiceState do
     attr :Archived
@@ -192,16 +152,6 @@ Immutabler.group :TESalonModels do
       prop :workingDays, :dict
       prop :state,       :TEState, ref: :weak, prefix: '*'
     end
-
-    mapping do
-      map   :id,       :modelId
-      map   :phone,    :phone, with: :CustomPhoneTransformer
-      array :walk_ins, :walkIns, :TEWalkIn
-      dict  :state,    :state do
-        map :active,   :TEServiceStateActive
-        map :archived, :TEServiceStateArchived
-      end
-    end
   end
 ```
 

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', 'Petro Korienev']
-  spec.email         = ['serge.k@techery.io', 'serge.z@techery.io', 'soxjke@gmail.com']
+  spec.authors       = ['Serhij Korochanskyj', 'Sergey Zenchenko', 'Petro Korienev', 'Alexey Faizullov']
+  spec.email         = ['serge.k@techery.io', 'serge.z@techery.io', 'soxjke@gmail.com', 'alex.fuzza@gmail.com']
 
   spec.summary       = 'Generator of Objective-C immutable models'
   spec.description   = 'Generator of Objective-C immutable models'

data/lib/immutabler/dsl/group.rb

@@ -2,11 +2,12 @@ require_relative 'enum'
 require_relative 'model'
 require_relative 'model_attributes_builder'
 require_relative 'enum_attributes_builder'
+require_relative 'module_import'
 
 module Immutabler
   module DSL
     class Group
-      attr_accessor :name, :models, :enums, :prefix, :links, :output_directory
+      attr_accessor :name, :models, :enums, :prefix, :links, :module_links, :output_directory
 
       def initialize(name)
         @prefix = ''
@@ -15,6 +16,7 @@ module Immutabler
         @models = []
         @enums = []
         @links = []
+        @module_links = []
       end
 
       def prefix(prefix)
@@ -25,6 +27,10 @@ module Immutabler
         links << model_group_name
       end
 
+      def module_link_to(module_name, file_name)
+        module_links << ModuleImport.new(module_name, file_name)
+      end
+
       def output_dir(dir)
         self.output_directory = dir
       end
@@ -46,10 +52,9 @@ module Immutabler
         base_immutable = options.fetch(:base_immutable, false)
         builder_base = options.fetch(:builder_base, base).to_s
         props = []
-        mappings = []
-        ModelAttributesBuilder.new(props, mappings, &block)
+        ModelAttributesBuilder.new(props, &block)
 
-        model = Model.new(prefix, base, base_immutable, builder_base, props, mappings)
+        model = Model.new(prefix, base, base_immutable, builder_base, props)
 
         models << model
       end
@@ -59,7 +64,8 @@ module Immutabler
           name: name,
           models: models,
           links: links,
-          enums: enums
+          module_links: module_links,
+          enums: enums,
         }
       end
     end

data/lib/immutabler/dsl/model.rb

@@ -1,15 +1,14 @@
 module Immutabler
   module DSL
     class Model
-      attr_accessor :name, :base, :base_immutable, :builder_base, :props, :mappings
+      attr_accessor :name, :base, :base_immutable, :builder_base, :props
 
-      def initialize(name, base, base_immutable, builder_base, props, mappings)
+      def initialize(name, base, base_immutable, builder_base, props)
         @name = name
         @base = base
         @base_immutable = base_immutable
         @builder_base = builder_base
         @props = props
-        @mappings = mappings
       end
     end
   end

data/lib/immutabler/dsl/model_attributes_builder.rb

@@ -1,22 +1,16 @@
 require_relative 'props_builder'
-require_relative 'mappings_builder'
 
 module Immutabler
   module DSL
     class ModelAttributesBuilder
-      def initialize(props, mappings, &block)
+      def initialize(props, &block)
         @props = props
-        @mappings = mappings
         instance_eval(&block)
       end
 
       def fields(&block)
         PropsBuilder.new(@props, &block)
       end
-
-      def mapping(&block)
-        MappingsBuilder.new(@mappings, &block)
-      end
     end
   end
 end

data/lib/immutabler/dsl/module_import.rb

@@ -0,0 +1,12 @@
+module Immutabler
+  module DSL
+    class ModuleImport
+      attr_accessor :module_name, :class_name
+
+      def initialize(module_name, class_name)
+        @module_name = module_name
+        @class_name = class_name
+      end
+    end
+  end
+end

data/lib/immutabler/template/body_template.rb

@@ -10,26 +10,6 @@ module Immutabler
         self.name = name
         self.models = models
 
-        helper(:dict) do |context, arg, block|
-          body = "@{\n"
-
-          if arg
-            body << arg.map { |m| "@\"#{m.destination_name}\" : @\"#{m.origin_name}\"" }.join(",\n")
-          end
-
-          body << "\n};"
-        end
-
-        helper(:enum_mapping_dict) do |context, arg, block|
-          body = "@{\n"
-
-          if arg
-            body << arg.map { |m| "@\"#{m.origin_name}\" : @(#{m.destination_name})" }.join(",\n")
-          end
-
-          body << "\n};"
-        end
-
         helper(:init_with_builder) do |context, arg, block|
           if arg[:base_immutable]
             "    self = [super initWithBuilder:builder modelVersion:modelVersion];\n"
@@ -57,7 +37,7 @@ module Immutabler
             when 'double'
               decode_template(arg.name, 'Double')
             else
-              if !arg.is_ref 
+              if !arg.is_ref
                 decode_int(arg.name)
               else
                 decode_template(arg.name, 'Object')
@@ -76,7 +56,7 @@ module Immutabler
             when 'double'
               encode_template(arg.name, 'Double')
             else
-              if !arg.is_ref 
+              if !arg.is_ref
                 encode_int(arg.name)
               else
                 encode_template(arg.name, 'Object')
@@ -129,4 +109,4 @@ module Immutabler
       end
     end
   end
-end
+end

data/lib/immutabler/template/builder.rb

@@ -24,20 +24,16 @@ module Immutabler
             base_immutable: model.base_immutable,
             builder_base_class: model.builder_base,
             props: build_props(model.props),
-            any_mappings: model.mappings.any?,
-            array_mappings: model.mappings.select(&:array?),
-            dict_mappings: build_dict_mappings(model.mappings),
-            custom_mappers: build_custom_mappers(model.mappings),
-            mappings: build_mappings(model.mappings)
           }
         end
 
         links = defs[:links]
+        module_links = defs[:module_links]
         enums = defs[:enums]
 
         FileUtils.mkdir_p(group.output_directory)
 
-        build_head(group_name, models, links, enums)
+        build_head(group_name, models, links, module_links, enums)
         build_body(group_name, models)
       end
 
@@ -49,40 +45,6 @@ module Immutabler
         end
       end
 
-      def build_dict_mappings(mappings)
-        mappings.select(&:dict?).map do |mapping|
-          attributes = mapping.dict_mappings.map do |dict_mapping|
-            {
-              origin_name: dict_mapping[:origin_name],
-              destination_name: dict_mapping[:destination_name]
-            }
-          end
-
-          {
-            name: mapping.destination_name,
-            attributes: attributes
-          }
-        end
-      end
-
-      def build_mappings(mappings)
-        mappings.map do |mapping|
-          {
-            origin_name: mapping.origin_name,
-            destination_name: mapping.destination_name
-          }
-        end
-      end
-
-      def build_custom_mappers(mappings)
-        mappings.select(&:custom?).map do |mapping|
-          {
-            origin_name: mapping.origin_name,
-            transformer_name: mapping.custom_transformer
-          }
-        end
-      end
-
       def build_body(group_name, models)
         body_template = Immutabler::Template::BodyTemplate.new(group_name, models)
         body_content = body_template.render
@@ -90,8 +52,8 @@ module Immutabler
         File.write(body_path, body_content)
       end
 
-      def build_head(group_name, models, links, enums)
-        header_template = Immutabler::Template::HeaderTemplate.new(models, links, enums)
+      def build_head(group_name, models, links, module_links, enums)
+        header_template = Immutabler::Template::HeaderTemplate.new(models, links, module_links, enums)
         header_content = header_template.render
         header_path = "#{group.output_directory}/#{group_name}.h"
         File.write(header_path, header_content)

data/lib/immutabler/template/header_template.rb

@@ -3,11 +3,12 @@ require_relative 'template'
 module Immutabler
   module Template
     class HeaderTemplate < BaseTemplate
-      attr_accessor :models, :links, :enums
+      attr_accessor :models, :links, :module_links, :enums
 
-      def initialize(models, links, enums)
+      def initialize(models, links, module_links, enums)
         self.template_file = File.expand_path("#{__dir__}/../../../templates/header_template.hbs")
         self.links = links
+        self.module_links = build_module_imports(module_links)
         self.models = models
         self.enums = build_enums(enums)
 
@@ -41,6 +42,21 @@ module Immutabler
             "} #{arg[:name]};",
           ].join("\n")
         end
+
+        helper(:module_import) do |context, arg, block|
+          [
+            "#import <#{arg[:module_name]}/#{arg[:class_name]}.h>\n"
+          ].join("\n")
+        end
+      end
+
+      def build_module_imports(module_links)
+        module_links.map do |module_link|
+          dict_mapping = {
+            module_name: module_link.module_name,
+            class_name: module_link.class_name,
+          }
+        end
       end
 
       def build_enums(enums)
@@ -55,7 +71,7 @@ module Immutabler
       end
 
       def render
-        template.call(models: models, links: links, enums: enums)
+        template.call(models: models, links: links, module_links:module_links, enums: enums)
       end
     end
   end

data/lib/immutabler/version.rb

@@ -1,3 +1,3 @@
 module Immutabler
-  VERSION = '0.2.6'
+  VERSION = '0.3.0'
 end

data/templates/body_template.hbs

@@ -13,35 +13,6 @@
     NSInteger __modelVersion;
 }
 
-{{#any_mappings}}
-+ (NSDictionary *)JSONKeyPathsByPropertyKey {
-    return {{#dict mappings}}{{/dict}}
-}
-{{/any_mappings}}
-
-{{#custom_mappers}}
-+ (NSValueTransformer *){{origin_name}}JSONTransformer {
-    return [ [{{transformer_name}} alloc] init];
-}
-{{/custom_mappers}}
-
-{{#array_mappings}}
-+ (NSValueTransformer *){{destination_name}}JSONTransformer {
-    return [MTLJSONAdapter arrayTransformerWithModelClass:[{{type}} class]];
-}
-{{/array_mappings}}
-
-{{#dict_mappings}}
-+ (NSValueTransformer *){{name}}JSONTransformer {
-    NSDictionary *dict = {{#enum_mapping_dict attributes}}{{/enum_mapping_dict}}
-    return [MTLValueTransformer transformerUsingForwardBlock:^NSNumber *(NSString *string, BOOL *success, NSError *__autoreleasing *error) {
-       return dict[string];
-   } reverseBlock:^NSString *(NSNumber *number, BOOL *success, NSError *__autoreleasing *error) {
-       return [dict allKeysForObject:number].firstObject;
-   }];
-}
-{{/dict_mappings}}
-
 + ({{name}}*)create:(void(^)({{name}}Builder *builder))builderBlock
 {
     {{name}}Builder *builder = [{{name}}Builder new];
@@ -139,7 +110,7 @@
     {{#init_with_coder .}}
     {{/init_with_coder}}
     if (self) {
-        {{#props}}        
+        {{#props}}
         {{#decodeProperty this}}{{/decodeProperty}}
         {{/props}}
         __modelVersion = [coder decodeIntegerForKey:@"__modelVersion"];
@@ -149,7 +120,7 @@
 }
 
 - (void)encodeWithCoder:(NSCoder *)coder {
-    {{#props}}       
+    {{#props}}
     {{#encodeProperty this}}{{/encodeProperty}}
     {{/props}}
     [coder encodeInteger:__modelVersion forKey:@"__modelVersion"];
@@ -172,11 +143,6 @@
 @end
 
 @implementation {{name}}Builder
-
-+ (NSDictionary *)JSONKeyPathsByPropertyKey {
-    return @{};
-}
-
 @end
 
 {{/models}}

data/templates/header_template.hbs

@@ -1,6 +1,8 @@
 #import <Foundation/Foundation.h>
-#import <Mantle/Mantle.h>
-
+{{#module_links}}
+{{#module_import .}}
+{{/module_import}}
+{{/module_links}}
 {{#links}}
 #import "{{.}}.h"
 {{/links}}

metadata

@@ -1,71 +1,72 @@
 --- !ruby/object:Gem::Specification
 name: immutabler
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Serhij Korochanskyj
 - Sergey Zenchenko
 - Petro Korienev
+- Alexey Faizullov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: handlebars
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Generator of Objective-C immutable models
@@ -73,13 +74,14 @@ email:
 - serge.k@techery.io
 - serge.z@techery.io
 - soxjke@gmail.com
+- alex.fuzza@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - GETTING_STARTED.md
 - Gemfile
 - LICENSE.txt
@@ -90,15 +92,13 @@ files:
 - immutabler.gemspec
 - lib/immutabler.rb
 - lib/immutabler/core.rb
-- lib/immutabler/dsl/dict_mappings_builder.rb
 - lib/immutabler/dsl/enum.rb
 - lib/immutabler/dsl/enum_attribute.rb
 - lib/immutabler/dsl/enum_attributes_builder.rb
 - lib/immutabler/dsl/group.rb
-- lib/immutabler/dsl/mapping.rb
-- lib/immutabler/dsl/mappings_builder.rb
 - lib/immutabler/dsl/model.rb
 - lib/immutabler/dsl/model_attributes_builder.rb
+- lib/immutabler/dsl/module_import.rb
 - lib/immutabler/dsl/prop.rb
 - lib/immutabler/dsl/props_builder.rb
 - lib/immutabler/template/body_template.rb
@@ -119,17 +119,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Generator of Objective-C immutable models

data/lib/immutabler/dsl/dict_mappings_builder.rb

@@ -1,19 +0,0 @@
-module Immutabler
-  module DSL
-    class DictMappingsBuilder
-      def initialize(dict_mappings, &block)
-        @dict_mappings = dict_mappings
-        instance_eval(&block)
-      end
-
-      def map(origin_name, destination_name)
-        dict_mapping =
-          {
-            origin_name: origin_name.to_s,
-            destination_name: destination_name.to_s
-          }
-        @dict_mappings << dict_mapping
-      end
-    end
-  end
-end

data/lib/immutabler/dsl/mapping.rb

@@ -1,29 +0,0 @@
-module Immutabler
-  module DSL
-    class Mapping
-      attr_accessor :origin_name, :destination_name, :type, :dict_mappings, :custom_transformer
-
-      def initialize(origin_name, destination_name, options = {})
-        @origin_name = origin_name
-        @destination_name = destination_name
-        @type = options[:type]
-        @is_array = options.fetch(:array, false)
-        @is_dict = options.fetch(:dict, false)
-        @custom_transformer = options[:with]
-        @dict_mappings = []
-      end
-
-      def array?
-        @is_array
-      end
-
-      def dict?
-        @is_dict
-      end
-
-      def custom?
-        !custom_transformer.nil?
-      end
-    end
-  end
-end

data/lib/immutabler/dsl/mappings_builder.rb

@@ -1,31 +0,0 @@
-require_relative 'mapping'
-require_relative 'dict_mappings_builder'
-
-module Immutabler
-  module DSL
-    class MappingsBuilder
-      def initialize(mappings, &block)
-        @mappings = mappings
-        instance_eval(&block)
-      end
-
-      def map(origin_name, destination_name, options = {})
-        @mappings << Mapping.new(origin_name.to_s, destination_name.to_s, options)
-      end
-
-      def array(origin_name, destination_name, type)
-        options = {
-          type: type.to_s,
-          array: true
-        }
-        @mappings << Mapping.new(origin_name.to_s, destination_name.to_s, options)
-      end
-
-      def dict(origin_name, destination_name, &block)
-        mapping = Mapping.new(origin_name.to_s, destination_name.to_s, dict: true)
-        DictMappingsBuilder.new(mapping.dict_mappings, &block)
-        @mappings << mapping
-      end
-    end
-  end
-end