moblues 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63ffc43b95cab00391237903c9cdb9c03ce3002f
-  data.tar.gz: 932ed263a5e7900c913932c027c0f3203d14797b
+  metadata.gz: d32bb05d4237f02286567db790547390d8431821
+  data.tar.gz: 721d8b7a87e709a8cf588a3f6b089970ac435e5b
 SHA512:
-  metadata.gz: 6f2cb4dea535e1899b663b50e2e031ecda8a940fc92856c4e8b73da638dc82862c444fc40dce30f8eef15b51d5d1faf1bee06d7c1107835b93aade56b9bc2857
-  data.tar.gz: cce4791eb9ab6b26281f04687b0b5fb940219d259b08228694a9c9cb5f7a1b523e61ce9e8ad86139fd972e29b8c54150286a0cf046e8a25e69c703bf1afaa95f
+  metadata.gz: 58174f584358d44b99fdd8f137af13533a0e81ca439550902f6d9ed2efa76d441a12417b36de4058b883caf5c931673306439e9cd9ac08498379dc2e8435ec41
+  data.tar.gz: e2dd468fe9495fadaee61306ff7357004eb75676a4cb71602c6389a2fedc89f9b08d67a97b8cfdc778f43252d0f4144bc9287953b9a486a3f8d2e13474c01726

data/lib/moblues/data_model/attribute.rb

@@ -2,12 +2,15 @@ require 'extensions/hash'
 
 module Moblues
   module DataModel
-    class Attribute < Struct.new(:name, :type)
+    class Attribute < Struct.new(:name, :type, :optional)
       def initialize(params)
         p = params.compact
+        optional = false
+        optional = p.fetch(:optional) if p.key?(:optional)
         super(
           p.fetch(:name),
-          p.fetch(:type)
+          p.fetch(:type),
+          optional
         )
       end
     end

data/lib/moblues/generator/objc/type.rb

@@ -9,14 +9,19 @@ module Moblues
         end
 
         def property_attributes(attribute)
+          attributes = []
           case attribute.type
           when :string
-            %w{nonatomic copy}
+            attributes = %w{nonatomic copy}
           when :number, :decimal, :date, :data, :id
-            %w{nonatomic strong}
+            attributes = %w{nonatomic strong}
           else
             raise ArgumentError.new("unknown type #{type}")
           end
+          if attribute.optional
+            attributes << "nullable"
+          end
+          attributes
         end
       end
     end

data/lib/moblues/reader/attribute.rb

@@ -12,7 +12,8 @@ module Moblues
       def attribute(xml)
        DataModel::Attribute.new(
          name: xml.attributes['name'],
-         type: type_reader.map_type_str(xml.attributes['attributeType'])
+         type: type_reader.map_type_str(xml.attributes['attributeType']),
+         optional: xml.attributes['optional'] == 'YES'
        )
       end
 

data/lib/moblues/version.rb

@@ -1,3 +1,3 @@
 module Moblues
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/spec/resources/expected/objc/machine/_Playable.h

@@ -3,7 +3,7 @@
 
 
 @interface _Playable : NSManagedObject
-@property (nonatomic, copy) NSString *permalink;
-@property (nonatomic, copy) NSString *title;
+@property (nonatomic, copy, nullable) NSString *permalink;
+@property (nonatomic, copy, nullable) NSString *title;
 
 @end

data/spec/resources/expected/objc/machine/_Track.h

@@ -7,7 +7,7 @@
 @class User;
 
 @interface _Track : Playable
-@property (nonatomic, strong) NSNumber *duration;
+@property (nonatomic, strong, nullable) NSNumber *duration;
 
 @property (nonatomic, strong) Playlist *playlist;
 @property (nonatomic, strong) User *user;

data/spec/resources/expected/objc/machine/_User.h

@@ -5,8 +5,8 @@
 @class Track;
 
 @interface _User : NSManagedObject
-@property (nonatomic, strong) NSDate *dob;
-@property (nonatomic, copy) NSString *name;
+@property (nonatomic, strong, nullable) NSDate *dob;
+@property (nonatomic, copy, nullable) NSString *name;
 
 @property (nonatomic, strong) NSSet *playlists;
 @property (nonatomic, strong) NSSet *tracks;

data/spec/resources/factories/data_model/attribute_factory.rb

@@ -6,6 +6,7 @@ FactoryGirl.define do
   factory :attribute, class: Moblues::DataModel::Attribute do
     name 'attribute'
     type :string
+    optional false
 
     trait :string do
       type :string
@@ -35,6 +36,10 @@ FactoryGirl.define do
       type :unknown
     end
 
-    initialize_with { new(name: name, type: type) }
+    trait :optional do
+      type :boolean
+    end
+
+    initialize_with { new(name: name, type: type, optional: optional) }
   end
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: moblues
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Vincent Garrigues
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2017-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
 - !ruby/object:Gem::Dependency
   name: plist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.5'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.1
 description: |2
@@ -120,8 +120,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -238,17 +238,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
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Generates Objective-C files for entities defined in a Core Data model