moblues 0.1.0 → 0.2.0

data/spec/resources/fixtures.rb

@@ -5,29 +5,29 @@ module Fixtures
     'spec/resources/Model.xcdatamodeld'
   end
 
-  def expected_dir
-    'spec/resources/expected'
+  def expected_dir(language)
+    "spec/resources/expected/#{language}"
   end
 
-  def generated_dir
-    'spec/resources/tmp'
+  def generated_dir(language)
+    "spec/resources/tmp/#{language}"
   end
 
-  def generated_file_content(name)
-    read_file(generated_dir, name)
+  def generated_file_content(name, language)
+    read_file(generated_dir(language), name)
   end
 
-  def expected_content(name)
-    read_file(expected_dir, name)
+  def expected_content(name, language)
+    read_file(expected_dir(language), name)
   end
 
   def read_file(directory, file)
     File.read(File.join(directory, file))
   end
 
-  def delete_tmp_files(files)
+  def delete_tmp_files(files, language)
     files.each { |file|
-      path = File.join(generated_dir, file)
+      path = File.join(generated_dir(language), file)
       File.delete(path) if File.exists?(path)
     }
   end

data/spec/resources/tmp/swift/human/Playlist.swift

@@ -0,0 +1,5 @@
+import Foundation
+
+class Playlist: _Playlist {
+/* some modifications that should not be erased */
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moblues
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Vincent Garrigues
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2014-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -135,14 +135,21 @@ files:
 - lib/moblues/data_model/entity.rb
 - lib/moblues/data_model/relationship.rb
 - lib/moblues/generator.rb
-- lib/moblues/generator/base.rb
-- lib/moblues/generator/human.rb
-- lib/moblues/generator/human_header.h.erb
-- lib/moblues/generator/human_implementation.m.erb
-- lib/moblues/generator/machine.rb
-- lib/moblues/generator/machine_header.h.erb
-- lib/moblues/generator/machine_implementation.m.erb
-- lib/moblues/generator/model.rb
+- lib/moblues/generator/base/model.rb
+- lib/moblues/generator/base/type.rb
+- lib/moblues/generator/objc/base.rb
+- lib/moblues/generator/objc/human.rb
+- lib/moblues/generator/objc/human_header.h.erb
+- lib/moblues/generator/objc/human_implementation.m.erb
+- lib/moblues/generator/objc/machine.rb
+- lib/moblues/generator/objc/machine_header.h.erb
+- lib/moblues/generator/objc/machine_implementation.m.erb
+- lib/moblues/generator/objc/type.rb
+- lib/moblues/generator/swift/base.rb
+- lib/moblues/generator/swift/human.rb
+- lib/moblues/generator/swift/human.swift.erb
+- lib/moblues/generator/swift/machine.rb
+- lib/moblues/generator/swift/machine.swift.erb
 - lib/moblues/reader.rb
 - lib/moblues/reader/attribute.rb
 - lib/moblues/reader/entity.rb
@@ -157,9 +164,13 @@ files:
 - spec/lib/moblues/data_model/attribute_spec.rb
 - spec/lib/moblues/data_model/entity_spec.rb
 - spec/lib/moblues/data_model/relationship_spec.rb
-- spec/lib/moblues/generator/human_spec.rb
-- spec/lib/moblues/generator/machine_spec.rb
-- spec/lib/moblues/generator/model_spec.rb
+- spec/lib/moblues/generator/base/model_spec.rb
+- spec/lib/moblues/generator/base/type_spec.rb
+- spec/lib/moblues/generator/objc/human_spec.rb
+- spec/lib/moblues/generator/objc/machine_spec.rb
+- spec/lib/moblues/generator/objc/type_spec.rb
+- spec/lib/moblues/generator/swift/human_spec.rb
+- spec/lib/moblues/generator/swift/machine_spec.rb
 - spec/lib/moblues/reader/attribute_spec.rb
 - spec/lib/moblues/reader/entity_spec.rb
 - spec/lib/moblues/reader/model_spec.rb
@@ -170,41 +181,52 @@ files:
 - spec/resources/Model.xcdatamodeld/.xccurrentversion
 - spec/resources/Model.xcdatamodeld/Model 2.xcdatamodel/contents
 - spec/resources/Model.xcdatamodeld/Model.xcdatamodel/contents
-- spec/resources/expected/Author.h
-- spec/resources/expected/Author.m
-- spec/resources/expected/_Author.h
-- spec/resources/expected/_Author.m
-- spec/resources/expected/_Book.h
-- spec/resources/expected/_Book.m
-- spec/resources/expected/_Person.h
-- spec/resources/expected/_Person.m
-- spec/resources/expected/_Team.h
-- spec/resources/expected/_Team.m
-- spec/resources/expected/human/Playable.h
-- spec/resources/expected/human/Playable.m
-- spec/resources/expected/human/Playlist.h
-- spec/resources/expected/human/Playlist.m
-- spec/resources/expected/human/Track.h
-- spec/resources/expected/human/Track.m
-- spec/resources/expected/human/User.h
-- spec/resources/expected/human/User.m
-- spec/resources/expected/machine/_Playable.h
-- spec/resources/expected/machine/_Playable.m
-- spec/resources/expected/machine/_Playlist.h
-- spec/resources/expected/machine/_Playlist.m
-- spec/resources/expected/machine/_Track.h
-- spec/resources/expected/machine/_Track.m
-- spec/resources/expected/machine/_User.h
-- spec/resources/expected/machine/_User.m
+- spec/resources/expected/objc/Author.h
+- spec/resources/expected/objc/Author.m
+- spec/resources/expected/objc/_Author.h
+- spec/resources/expected/objc/_Author.m
+- spec/resources/expected/objc/_Book.h
+- spec/resources/expected/objc/_Book.m
+- spec/resources/expected/objc/_Person.h
+- spec/resources/expected/objc/_Person.m
+- spec/resources/expected/objc/_Team.h
+- spec/resources/expected/objc/_Team.m
+- spec/resources/expected/objc/human/Playable.h
+- spec/resources/expected/objc/human/Playable.m
+- spec/resources/expected/objc/human/Playlist.h
+- spec/resources/expected/objc/human/Playlist.m
+- spec/resources/expected/objc/human/Track.h
+- spec/resources/expected/objc/human/Track.m
+- spec/resources/expected/objc/human/User.h
+- spec/resources/expected/objc/human/User.m
+- spec/resources/expected/objc/machine/_Playable.h
+- spec/resources/expected/objc/machine/_Playable.m
+- spec/resources/expected/objc/machine/_Playlist.h
+- spec/resources/expected/objc/machine/_Playlist.m
+- spec/resources/expected/objc/machine/_Track.h
+- spec/resources/expected/objc/machine/_Track.m
+- spec/resources/expected/objc/machine/_User.h
+- spec/resources/expected/objc/machine/_User.m
+- spec/resources/expected/swift/Author.swift
+- spec/resources/expected/swift/_Author.swift
+- spec/resources/expected/swift/_Book.swift
+- spec/resources/expected/swift/human/Playable.swift
+- spec/resources/expected/swift/human/Playlist.swift
+- spec/resources/expected/swift/human/Track.swift
+- spec/resources/expected/swift/human/User.swift
+- spec/resources/expected/swift/machine/_Playable.swift
+- spec/resources/expected/swift/machine/_Playlist.swift
+- spec/resources/expected/swift/machine/_Track.swift
+- spec/resources/expected/swift/machine/_User.swift
 - spec/resources/factories/data_model/attribute_factory.rb
 - spec/resources/factories/data_model/entity_factory.rb
 - spec/resources/factories/data_model/relationship_factory.rb
 - spec/resources/fixtures.rb
 - spec/resources/tmp/.gitkeep
-- spec/resources/tmp/_Team.h
-- spec/resources/tmp/_Team.m
-- spec/resources/tmp/human/Playlist.h
-- spec/resources/tmp/human/Playlist.m
+- spec/resources/tmp/objc/human/Playlist.h
+- spec/resources/tmp/objc/human/Playlist.m
+- spec/resources/tmp/swift/.gitkeep
+- spec/resources/tmp/swift/human/Playlist.swift
 - spec/spec_helper.rb
 homepage: http://garriguv.io
 licenses:
@@ -236,9 +258,13 @@ test_files:
 - spec/lib/moblues/data_model/attribute_spec.rb
 - spec/lib/moblues/data_model/entity_spec.rb
 - spec/lib/moblues/data_model/relationship_spec.rb
-- spec/lib/moblues/generator/human_spec.rb
-- spec/lib/moblues/generator/machine_spec.rb
-- spec/lib/moblues/generator/model_spec.rb
+- spec/lib/moblues/generator/base/model_spec.rb
+- spec/lib/moblues/generator/base/type_spec.rb
+- spec/lib/moblues/generator/objc/human_spec.rb
+- spec/lib/moblues/generator/objc/machine_spec.rb
+- spec/lib/moblues/generator/objc/type_spec.rb
+- spec/lib/moblues/generator/swift/human_spec.rb
+- spec/lib/moblues/generator/swift/machine_spec.rb
 - spec/lib/moblues/reader/attribute_spec.rb
 - spec/lib/moblues/reader/entity_spec.rb
 - spec/lib/moblues/reader/model_spec.rb
@@ -249,39 +275,50 @@ test_files:
 - spec/resources/Model.xcdatamodeld/.xccurrentversion
 - spec/resources/Model.xcdatamodeld/Model 2.xcdatamodel/contents
 - spec/resources/Model.xcdatamodeld/Model.xcdatamodel/contents
-- spec/resources/expected/Author.h
-- spec/resources/expected/Author.m
-- spec/resources/expected/_Author.h
-- spec/resources/expected/_Author.m
-- spec/resources/expected/_Book.h
-- spec/resources/expected/_Book.m
-- spec/resources/expected/_Person.h
-- spec/resources/expected/_Person.m
-- spec/resources/expected/_Team.h
-- spec/resources/expected/_Team.m
-- spec/resources/expected/human/Playable.h
-- spec/resources/expected/human/Playable.m
-- spec/resources/expected/human/Playlist.h
-- spec/resources/expected/human/Playlist.m
-- spec/resources/expected/human/Track.h
-- spec/resources/expected/human/Track.m
-- spec/resources/expected/human/User.h
-- spec/resources/expected/human/User.m
-- spec/resources/expected/machine/_Playable.h
-- spec/resources/expected/machine/_Playable.m
-- spec/resources/expected/machine/_Playlist.h
-- spec/resources/expected/machine/_Playlist.m
-- spec/resources/expected/machine/_Track.h
-- spec/resources/expected/machine/_Track.m
-- spec/resources/expected/machine/_User.h
-- spec/resources/expected/machine/_User.m
+- spec/resources/expected/objc/Author.h
+- spec/resources/expected/objc/Author.m
+- spec/resources/expected/objc/_Author.h
+- spec/resources/expected/objc/_Author.m
+- spec/resources/expected/objc/_Book.h
+- spec/resources/expected/objc/_Book.m
+- spec/resources/expected/objc/_Person.h
+- spec/resources/expected/objc/_Person.m
+- spec/resources/expected/objc/_Team.h
+- spec/resources/expected/objc/_Team.m
+- spec/resources/expected/objc/human/Playable.h
+- spec/resources/expected/objc/human/Playable.m
+- spec/resources/expected/objc/human/Playlist.h
+- spec/resources/expected/objc/human/Playlist.m
+- spec/resources/expected/objc/human/Track.h
+- spec/resources/expected/objc/human/Track.m
+- spec/resources/expected/objc/human/User.h
+- spec/resources/expected/objc/human/User.m
+- spec/resources/expected/objc/machine/_Playable.h
+- spec/resources/expected/objc/machine/_Playable.m
+- spec/resources/expected/objc/machine/_Playlist.h
+- spec/resources/expected/objc/machine/_Playlist.m
+- spec/resources/expected/objc/machine/_Track.h
+- spec/resources/expected/objc/machine/_Track.m
+- spec/resources/expected/objc/machine/_User.h
+- spec/resources/expected/objc/machine/_User.m
+- spec/resources/expected/swift/Author.swift
+- spec/resources/expected/swift/_Author.swift
+- spec/resources/expected/swift/_Book.swift
+- spec/resources/expected/swift/human/Playable.swift
+- spec/resources/expected/swift/human/Playlist.swift
+- spec/resources/expected/swift/human/Track.swift
+- spec/resources/expected/swift/human/User.swift
+- spec/resources/expected/swift/machine/_Playable.swift
+- spec/resources/expected/swift/machine/_Playlist.swift
+- spec/resources/expected/swift/machine/_Track.swift
+- spec/resources/expected/swift/machine/_User.swift
 - spec/resources/factories/data_model/attribute_factory.rb
 - spec/resources/factories/data_model/entity_factory.rb
 - spec/resources/factories/data_model/relationship_factory.rb
 - spec/resources/fixtures.rb
 - spec/resources/tmp/.gitkeep
-- spec/resources/tmp/_Team.h
-- spec/resources/tmp/_Team.m
-- spec/resources/tmp/human/Playlist.h
-- spec/resources/tmp/human/Playlist.m
+- spec/resources/tmp/objc/human/Playlist.h
+- spec/resources/tmp/objc/human/Playlist.m
+- spec/resources/tmp/swift/.gitkeep
+- spec/resources/tmp/swift/human/Playlist.swift
 - spec/spec_helper.rb

data/lib/moblues/generator/base.rb

@@ -1,65 +0,0 @@
-require 'erb'
-require 'moblues/reader/type'
-
-module Moblues
-  module Generator
-    class Base
-      def initialize(params)
-        @output_dir = params.fetch(:output_dir)
-      end
-
-      protected
-      attr_reader :output_dir
-
-      def write_header(entity)
-        write_file(header_file(entity), header(entity))
-      end
-
-      def write_implementation(entity)
-        write_file(implementation_file(entity), implementation(entity))
-      end
-
-      def write_file(file, text)
-        File.open(file, 'w+') do |f|
-          f.write(text)
-        end
-      end
-
-      def header_file(entity)
-        File.join(output_dir, format_name(entity, 'h'))
-      end
-
-      def implementation_file(entity)
-        File.join(output_dir, format_name(entity, 'm'))
-      end
-
-      def format_name(entity, extension)
-        raise NotImplemented
-      end
-
-      def header(entity)
-        render(header_template, entity)
-      end
-
-      def implementation(entity)
-        render(implementation_template, entity)
-      end
-
-      def render(template, entity)
-        ERB.new(template, 0, '-').result(entity.send(:binding))
-      end
-
-      def header_template
-        raise NotImplemented
-      end
-
-      def implementation_template
-        raise NotImplemented
-      end
-
-      def file_template(name)
-        File.read(File.expand_path("../#{name}.erb", __FILE__))
-      end
-    end
-  end
-end

data/lib/moblues/generator/human.rb

@@ -1,25 +0,0 @@
-require 'moblues/generator/base'
-
-module Moblues
-  module Generator
-    class Human < Base
-      def generate(entity)
-        write_header(entity) unless File.exists?(header_file(entity))
-        write_implementation(entity) unless File.exists?(implementation_file(entity))
-      end
-
-      private
-      def format_name(entity, extension)
-        "#{entity.name}.#{extension}"
-      end
-
-      def header_template
-        file_template('human_header.h')
-      end
-
-      def implementation_template
-        file_template('human_implementation.m')
-      end
-    end
-  end
-end

data/lib/moblues/generator/machine.rb

@@ -1,36 +0,0 @@
-require 'moblues/generator/base'
-
-module Moblues
-  module Generator
-    class Machine < Base
-      def initialize(params)
-        @type_reader = Reader::Type.new
-        super(params)
-      end
-
-      def generate(entity)
-        write_header(entity)
-        write_implementation(entity)
-      end
-
-      private
-      attr_reader :type_reader
-
-      def format_name(entity, extension)
-        "_#{entity.name}.#{extension}"
-      end
-
-      def capitalized_name(relationship)
-        relationship.name.sub(/^./) { |first_character| first_character.upcase }
-      end
-
-      def header_template
-        file_template('machine_header.h')
-      end
-
-      def implementation_template
-        file_template('machine_implementation.m')
-      end
-    end
-  end
-end

data/lib/moblues/generator/model.rb

@@ -1,23 +0,0 @@
-require 'moblues/generator/machine'
-require 'moblues/generator/human'
-
-module Moblues
-  module Generator
-    class Model
-      def initialize(params)
-        @human = Human.new(output_dir: params.fetch(:human_dir))
-        @machine = Machine.new(output_dir: params.fetch(:machine_dir))
-      end
-
-      def generate(entities)
-        entities.each do |entity|
-          human.generate(entity)
-          machine.generate(entity)
-        end
-      end
-
-      private
-      attr_reader :human, :machine
-    end
-  end
-end

data/spec/lib/moblues/generator/human_spec.rb

@@ -1,74 +0,0 @@
-require 'spec_helper'
-require 'moblues/generator/human'
-require 'moblues/data_model'
-
-describe Moblues::Generator::Human do
-  subject { described_class.new(output_dir: Fixtures.generated_dir) }
-
-  after do
-    Fixtures.delete_tmp_files(%w{Author.h Author.m})
-  end
-
-  describe '#generate' do
-    it 'generates a human header' do
-      subject.generate(entity)
-
-      expect(Fixtures.generated_file_content('Author.h')).to eq(Fixtures.expected_content('Author.h'))
-    end
-
-    it 'generates a human implementation' do
-      subject.generate(entity)
-
-      expect(Fixtures.generated_file_content('Author.m')).to eq(Fixtures.expected_content('Author.m'))
-    end
-
-    context 'if the header already exists' do
-      before do
-        File.open(File.join(Fixtures.generated_dir, 'Author.h'), 'w+') do |f|
-          f.write('do nothing')
-        end
-      end
-
-      it 'does not overwrite the header file' do
-        subject.generate(entity)
-
-        expect(Fixtures.generated_file_content('Author.h')).to eq('do nothing')
-      end
-    end
-
-    context 'if the implementation already exists' do
-      before do
-        File.open(File.join(Fixtures.generated_dir, 'Author.m'), 'w+') do |f|
-          f.write('do nothing')
-        end
-      end
-
-      it 'does not overwrite the implementation file' do
-        subject.generate(entity)
-
-        expect(Fixtures.generated_file_content('Author.m')).to eq('do nothing')
-      end
-    end
-  end
-
-  def entity
-    Moblues::DataModel::Entity.new(name:          'Author',
-                                   attributes:    attributes,
-                                   relationships: relationships)
-  end
-
-  def attributes
-    [
-      Moblues::DataModel::Attribute.new(name: 'dob', type: :date),
-      Moblues::DataModel::Attribute.new(name: 'name', type: :string)
-    ]
-  end
-
-  def relationships
-    [
-      Moblues::DataModel::Relationship.new(name: 'books', destination_entity: 'Book', to_many: true, ordered: true),
-      Moblues::DataModel::Relationship.new(name: 'essays', destination_entity: 'Book', to_many: true),
-      Moblues::DataModel::Relationship.new(name: 'publisher', destination_entity: 'Publisher')
-    ]
-  end
-end

data/spec/lib/moblues/generator/model_spec.rb

@@ -1,27 +0,0 @@
-require 'spec_helper'
-
-describe Moblues::Generator::Model do
-  describe '#generate' do
-    subject { described_class.new(human: human, machine: machine, human_dir: human_dir, machine_dir: machine_dir) }
-
-    let(:entities) { [build(:entity)] }
-    let(:entity) { entities.first }
-    let(:human_dir) { 'human/dir'}
-    let(:machine_dir) { 'machine/dir'}
-
-    let(:human) { double(Moblues::Generator::Human) }
-    let(:machine) { double(Moblues::Generator::Machine) }
-
-    before do
-      allow(Moblues::Generator::Human).to receive(:new).with(output_dir: human_dir) { human }
-      allow(Moblues::Generator::Machine).to receive(:new).with(output_dir: machine_dir) { machine }
-    end
-
-    it 'generates the human and machine files' do
-      expect(human).to receive(:generate).with(entity).once
-      expect(machine).to receive(:generate).with(entity).once
-
-      subject.generate(entities)
-    end
-  end
-end

data/spec/resources/tmp/_Team.h

@@ -1,18 +0,0 @@
-#import <Foundation/Foundation.h>
-#import <CoreData/CoreData.h>
-
-@class Person;
-
-@interface _Team : NSManagedObject
-
-@property (nonatomic, strong) NSSet *teamMembers;
-@end
-
-@interface _Team (CoreDataGeneratedAccessors)
-
-- (void)addTeamMembersObject:(Person *)value;
-- (void)removeTeamMembersObject:(Person *)value;
-- (void)addTeamMembers:(NSSet *)values;
-- (void)removeTeamMembers:(NSSet *)values;
-
-@end

data/spec/resources/tmp/_Team.m

@@ -1,5 +0,0 @@
-#import "_Team.h"
-
-@implementation _Team
-@dynamic teamMembers;
-@end