ead 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3b8b4dac74bd298fe1030da9c00bd04c1badb639de8ae1777f2ca8b98895381
-  data.tar.gz: bad574c55817b25d32b11307a7d867e3c503a7b768bf02e8f75ec5d4ec2a15b7
+  metadata.gz: fdf447d3d21569e59ca07b26f7354cc8eb59f76a342b1c2354c9fdfa23833248
+  data.tar.gz: 34efcb34a6d879813ecfcbfe6264d4185a904eb7894298375784a4eafc3aed0d
 SHA512:
-  metadata.gz: a9cbd8d53a5fef880146af795e76efae5505b26649d7138cd846f169f6f4cdfbac6542f053335f87cbeb5bc67e443b859b783f4b7accf9f2d876b7267955bd07
-  data.tar.gz: 3156c9c4990b013217e9d365d8f65bc80c6da3923bbab06c345bebcbd6dde5f2afd2841e050be3d6f82caa996ff002aec425e7f3670101a69ba24e6f8787770b
+  metadata.gz: 7aa15ee71a2453776e7c8bc3cd11b8f87ef15e5e942ae97c7d503022eb1f84167d05c40b13e5be43cfea0706855a397eab4ab3ab310305447f2fb3f12c7b265a
+  data.tar.gz: 3648f0fb4fcf540a2bf4dc536e3cf21d059cbef63ba358c37800924c711023e3434354146713f65b28330664dbca9b12327d857b08e46a18380a574128f3e6a2

data/lib/association.rb

@@ -12,13 +12,7 @@ class Association
 
   def add_second_items(block)
     block.sub_blocks.each do |sub_block|
-      if sub_block.entity
-        second_items << Item.new(sub_block, first_item, self)
-      elsif sub_block.entity_clone
-        second_items << ItemClone.new(sub_block, first_item, self)
-      elsif sub_block.entity_container
-        add_second_items(sub_block)
-      end
+      second_items << ItemClone.new(sub_block, first_item, self)
     end
   end
 

data/lib/block.rb

@@ -1,14 +1,14 @@
 class Block
-  attr_accessor :id, :content, :category, :attribute_container, :attribute, :type, :association, :sub_blocks,
-                :clone_blocks, :cloneable, :entity, :entity_clone, :clone_parent, :entity_container
+  attr_accessor :id, :content, :category, :attribute, :type, :association, :sub_blocks,
+                :clone_blocks, :cloneable, :entity, :entity_clone, :clone_parent, :entity_container, :entity_association
 
   def initialize(id, items)
     item = items[id]
     @id = id
     @content = item['content']
     @category = item['category']
-    @attribute_container = item['attributeContainer']
     @entity = item['entity']
+    @entity_association = item['entityAssociation']
     @entity_container = item['entityContainer']
     @attribute = item['attribute']
     @type = item['type']

data/lib/ead.rb

@@ -6,7 +6,23 @@ require 'block'
 class EAD
   def import_JSON(user_arguments)
     file = File.read(user_arguments[0] || './EAD.json')
-    items = JSON.parse(file)
+
+    if JSON.parse(file)['version'] != '0.3.0'
+      puts "\n\n----------------"
+      puts "\e[31m#{
+        'Versions of your EAD file and the gem are not compatible.'\
+        ' So, you may have some unexpected results.'\
+        'To run your EAD file correctly, please run'
+      }\e[0m"
+
+      puts "\e[31m#{
+        "\ngem install ead -v #{JSON.parse(file)['version']}"
+      }\e[0m"
+      puts "----------------\n\n"
+
+    end
+
+    items = JSON.parse(file)['items']
     ead_id = '9'
     Block.new(ead_id, items)
     Block.all.each do |block|
@@ -24,7 +40,7 @@ class EAD
         Item.new(sub_block)
       elsif sub_block.entity_clone
         ItemClone.new(sub_block)
-      elsif sub_block.entity_container
+      elsif sub_block.entity_container || sub_block.entity_association
         create_items(sub_block)
       end
     end
@@ -41,15 +57,11 @@ class EAD
       parent.clones << item_clone
     end
 
-    Item.all.reverse.each do |item|
+    Item.all.each do |item|
       item.create_migration
     end
 
-    Item.all.reverse.each do |item|
-      item.add_associations
-    end
-
-    ItemClone.all.reverse.each do |item_clone|
+    ItemClone.all.each do |item_clone|
       item_clone.add_associations
     end
   end

data/lib/item.rb

@@ -4,13 +4,21 @@ require 'association'
 require 'active_support/core_ext/string'
 
 class Item < ItemBase
-  attr_accessor :clones, :polymorphic, :polymorphic_names
+  attr_accessor :attributes, :clones, :polymorphic, :polymorphic_names
 
-  def initialize(block, parent = nil, parent_association = nil)
-    super(block, parent, parent_association)
+  def initialize(block)
+    super(block)
     @clones = []
     @polymorphic = false
     @polymorphic_names = []
+    @attributes = []
+    block.sub_blocks.each do |sub_block|
+      add_to_attributes(sub_block)
+    end
+  end
+
+  def add_to_attributes(block)
+    @attributes << Attribute.new(block.content, block.type)
   end
 
   def model_name
@@ -28,11 +36,28 @@ class Item < ItemBase
   end
 
   def update_polymorphic_names
-    all_parents_name = [self, *clones].map do |item|
-      [item.parent&.name, item.through_association && item.through_child.name]
+    return if clones.size.zero?
+
+    belong_parents = []
+    clones.each do |item|
+      if item.through_association && item.parent_has_many?
+        belong_parents << item.parent
+        belong_parents << item.through_child
+      elsif !item.parent_through_has_many? && item.parent
+        belong_parents << item.parent
+      end
+    end
+    belong_parent_names = belong_parents.map(&:name)
+
+    filtered_parent_names = belong_parent_names.find_all do |parent_name|
+      belong_parent_names.count(parent_name) > 1
+    end.uniq
+
+    @polymorphic_names = filtered_parent_names.find_all do |parent_name|
+      belong_parents.find_all do |item|
+        item.name == parent_name
+      end.map(&:clone_parent).map(&:name).uniq.size > 1
     end
-    all_parents_name.flatten!.compact!
-    @polymorphic_names = all_parents_name.find_all { |name| all_parents_name.count(name) > 1 }.uniq
   end
 
   def check_polymorphic(command)
@@ -53,11 +78,8 @@ class Item < ItemBase
 
     check_polymorphic(command)
 
-    [self, *clones].each do |item|
-      if item.parent_has_many? && item.through_association
-        item.through_child.create_migration if item.through_child.not_clone?
-        add_references(command, item.through_child)
-      end
+    clones.each do |item|
+      add_references(command, item.through_child) if item.parent_has_many? && item.through_association
 
       next unless item.parent && !item.one_polymorphic_names?(item.parent) && (
         item.parent_has_any? || item.parent_through_has_one?

data/lib/item_base.rb

@@ -1,232 +1,10 @@
-require 'project_file'
-
 class ItemBase
-  attr_accessor :name, :parent, :parent_association, :associations, :attributes, :id, :twin_name
+  attr_accessor :name, :id, :twin_name
 
-  def initialize(block, parent = nil, parent_association = nil)
+  def initialize(block, _parent = nil, _parent_association = nil)
     @id = block.id
     @name = block.content.split(' || ')[0].underscore.singularize
     @twin_name = block.content.split(' || ')[1]&.underscore&.singularize
-    @parent = parent
-    @parent_association = parent_association
-    @attributes = []
-    @associations = []
-    block.sub_blocks.each do |sub_block|
-      if sub_block.attribute
-        add_to_attributes(sub_block)
-      elsif sub_block.attribute_container
-        add_attribute_container(sub_block)
-      elsif sub_block.association
-        add_to_associations(sub_block)
-      end
-    end
-  end
-
-  def add_attribute_container(block)
-    block.sub_blocks.each do |attribute|
-      add_to_attributes(attribute)
-    end
-  end
-
-  def add_to_attributes(block)
-    @attributes << Attribute.new(block.content, block.type)
-  end
-
-  def add_to_associations(block)
-    @associations << Association.new(self, block)
-  end
-
-  def grand
-    parent.parent
-  end
-
-  def grand_association
-    parent.parent_association
-  end
-
-  def grand_has_many?
-    grand_association&.has_many?
-  end
-
-  def grand_has_one?
-    grand_association&.has_one?
-  end
-
-  def grand_real_self_real?
-    reals_same? grand
-  end
-
-  def reals_same?(item)
-    real_item == item.real_item
-  end
-
-  def parent_through?
-    parent_association&.through?
-  end
-
-  def parent_has_many?
-    parent_association&.has_many?
-  end
-
-  def parent_has_one?
-    parent_association&.has_one?
-  end
-
-  def parent_has_any?
-    parent_has_one? || parent_has_many?
-  end
-
-  def parent_through_has_one?
-    parent_through? && grand_has_one?
-  end
-
-  def parent_through_has_many?
-    parent_through? && grand_has_many?
-  end
-
-  def through_association
-    associations.find(&:through?)
-  end
-
-  def through_child
-    through_association&.second_items&.first
-  end
-
-  def through?(item)
-    item.present?
-  end
-
-  def clone_name_different?
-    clone? && (clone_parent.name != name)
-  end
-
-  def one_polymorphic_names?(item)
-    real_item.polymorphic && real_item.polymorphic_names.include?(item.name)
-  end
-
-  def clone?
-    instance_of?(ItemClone)
-  end
-
-  def not_clone?
-    !clone?
-  end
-
-  def real_item
-    clone? ? clone_parent : self
-  end
-
-  def grand_many_through_reals_same?(item)
-    parent_through_has_many? && (grand == item) && reals_same?(item)
-  end
-
-  def parent_has_many_reals_same_through_child?(item)
-    item.parent_through_has_many? && (through_child == item) && item.reals_same?(parent)
-  end
-
-  def update_end_model_migration_files(start_item, association)
-    polymorphic_end = one_polymorphic_names?(start_item)
-
-    end_model_line = {}
-    end_migration_line = {}
-    if association.has_one? && start_item.parent&.reals_same?(self)
-      end_model_line['optional'] = 'true'
-      end_migration_line['null'] = 'true'
-    end
-
-    if association.has_any?
-      if reals_same?(start_item)
-        end_model_line['optional'] = 'true'
-        end_migration_line['null'] = 'true'
-      end
-
-      if start_item.clone? && !polymorphic_end && start_item.clone_name_different?
-        end_model_line['class_name'] = "\"#{start_item.clone_parent.name.camelize}\""
-        end_migration_line['foreign_key'] = "{ to_table: :#{start_item.clone_parent.name.pluralize} }"
-      end
-    end
-
-    ProjectFile.update_line(real_item.name, 'model', /belongs_to :#{start_item.name}/, end_model_line)
-
-    migration_name = real_item.name
-    ProjectFile.update_line(migration_name, 'migration', /t.references :#{start_item.name}/, end_migration_line)
-  end
-
-  def update_start_model_file(end_item, association, intermediate_item = nil)
-    start_model = real_item.name
-
-    end_model = if end_item.parent_has_many_reals_same_through_child?(self)
-                  end_item.twin_name
-                else
-                  end_item.name
-                end
-
-    intermediate_model = if grand_many_through_reals_same?(end_item)
-                           intermediate_item.twin_name
-                         elsif intermediate_item
-                           intermediate_item.name
-                         end
-
-    if association.has_many?
-      end_model = end_model.pluralize
-      intermediate_model = intermediate_model.pluralize if intermediate_model
-    end
-
-    line_content = {}
-    line_content[association.name] = if intermediate_item&.one_polymorphic_names?(end_item) && association.has_many?
-                                       ":#{end_item.real_item.name.pluralize}"
-                                     else
-                                       ":#{end_model}"
-                                     end
-
-    if intermediate_item
-      line_content['through'] = ":#{intermediate_model}"
-      if intermediate_item.one_polymorphic_names?(end_item)
-        line_content['source'] = ":#{end_item.name}"
-        line_content['source_type'] = "\"#{end_item.real_item.name.camelize}\" "
-      end
-    elsif !intermediate_item
-      line_content['class_name'] = "\"#{end_item.real_item.name.camelize}\"" if end_item.clone_name_different?
-
-      if end_item.one_polymorphic_names?(self)
-        line_content['as'] = ":#{name}"
-      elsif clone_name_different?
-        line_content['foreign_key'] = "\"#{name.singularize}_id\""
-      end
-    end
-
-    ProjectFile.add_line(start_model, end_model, line_content)
-  end
-
-  def update_model(end_item, association, intermediate_item = nil)
-    return unless association.has_one? || association.has_many?
-
-    end_item.update_end_model_migration_files(self, association) unless intermediate_item
-    update_start_model_file(end_item, association, intermediate_item)
-  end
-
-  def parent_through_add_associations
-    if parent_through_has_many?
-      update_model(parent, grand_association)
-      update_model(grand, grand_association, parent)
-
-    elsif parent_through_has_one?
-      parent.update_model(self, grand_association)
-    end
-
-    grand.update_model(self, grand_association, parent)
-  end
-
-  def add_associations
-    parent_through_add_associations if parent_through?
-
-    associations.each do |association|
-      next unless association.has_any?
-
-      association.second_items.each do |second_item|
-        update_model(second_item, association)
-      end
-    end
   end
 
   def self.all

data/lib/item_clone.rb

@@ -1,14 +1,212 @@
 require 'item_base'
+require 'association'
+require 'project_file'
 
 class ItemClone < ItemBase
-  attr_accessor :clone_parent
+  attr_accessor :clone_parent, :parent, :parent_association, :associations
 
   def initialize(block, parent = nil, parent_association = nil)
-    super(block, parent, parent_association)
+    super(block)
     @clone_parent = block.clone_parent
+    @parent = parent
+    @parent_association = parent_association
+
+    @associations = []
+    block.sub_blocks.each do |sub_block|
+      add_to_associations(sub_block)
+    end
   end
 
   def model_name
     clone_parent.name.camelize
   end
+
+  def add_to_associations(block)
+    @associations << Association.new(self, block)
+  end
+
+  def grand
+    parent.parent
+  end
+
+  def grand_association
+    parent.parent_association
+  end
+
+  def grand_has_many?
+    grand_association&.has_many?
+  end
+
+  def grand_has_one?
+    grand_association&.has_one?
+  end
+
+  def grand_real_self_real?
+    reals_same? grand
+  end
+
+  def reals_same?(item)
+    real_item == item.real_item
+  end
+
+  def parent_through?
+    parent_association&.through?
+  end
+
+  def parent_has_many?
+    parent_association&.has_many?
+  end
+
+  def parent_has_one?
+    parent_association&.has_one?
+  end
+
+  def parent_has_any?
+    parent_has_one? || parent_has_many?
+  end
+
+  def parent_through_has_one?
+    parent_through? && grand_has_one?
+  end
+
+  def parent_through_has_many?
+    parent_through? && grand_has_many?
+  end
+
+  def through_association
+    associations.find(&:through?)
+  end
+
+  def through_child
+    through_association&.second_items&.first
+  end
+
+  def through?(item)
+    item.present?
+  end
+
+  def clone_name_different?
+    clone_parent.name != name
+  end
+
+  def one_polymorphic_names?(item)
+    real_item.polymorphic && real_item.polymorphic_names.include?(item.name)
+  end
+
+  def real_item
+    clone_parent
+  end
+
+  def grand_many_through_reals_same?(item)
+    parent_through_has_many? && (grand == item) && reals_same?(item)
+  end
+
+  def parent_has_many_reals_same_through_child?(item)
+    item.parent_through_has_many? && (through_child == item) && item.reals_same?(parent)
+  end
+
+  def update_end_model_migration_files(start_item, association)
+    polymorphic_end = one_polymorphic_names?(start_item)
+
+    end_model_line = {}
+    end_migration_line = {}
+    if association.has_one? && start_item.parent&.reals_same?(self)
+      end_model_line['optional'] = 'true'
+      end_migration_line['null'] = 'true'
+    end
+
+    if association.has_any?
+      if reals_same?(start_item)
+        end_model_line['optional'] = 'true'
+        end_migration_line['null'] = 'true'
+      end
+
+      if !polymorphic_end && start_item.clone_name_different?
+        end_model_line['class_name'] = "\"#{start_item.clone_parent.name.camelize}\""
+        end_migration_line['foreign_key'] = "{ to_table: :#{start_item.clone_parent.name.pluralize} }"
+      end
+    end
+
+    ProjectFile.update_line(real_item.name, 'model', /belongs_to :#{start_item.name}/, end_model_line)
+
+    migration_name = real_item.name
+    ProjectFile.update_line(migration_name, 'migration', /t.references :#{start_item.name}/, end_migration_line)
+  end
+
+  def update_start_model_file(end_item, association, intermediate_item = nil)
+    start_model = real_item.name
+
+    end_model = if end_item.parent_has_many_reals_same_through_child?(self)
+                  end_item.twin_name
+                else
+                  end_item.name
+                end
+
+    intermediate_model = if grand_many_through_reals_same?(end_item)
+                           intermediate_item.twin_name
+                         elsif intermediate_item
+                           intermediate_item.name
+                         end
+
+    if association.has_many?
+      end_model = end_model.pluralize
+      intermediate_model = intermediate_model.pluralize if intermediate_model
+    end
+
+    line_content = {}
+    line_content[association.name] = if intermediate_item&.one_polymorphic_names?(end_item) && association.has_many?
+                                       ":#{end_item.real_item.name.pluralize}"
+                                     else
+                                       ":#{end_model}"
+                                     end
+
+    if intermediate_item
+      line_content['through'] = ":#{intermediate_model}"
+      if intermediate_item.one_polymorphic_names?(end_item)
+        line_content['source'] = ":#{end_item.name}"
+        line_content['source_type'] = "\"#{end_item.real_item.name.camelize}\" "
+      end
+    elsif !intermediate_item
+      line_content['class_name'] = "\"#{end_item.real_item.name.camelize}\"" if end_item.clone_name_different?
+
+      if end_item.one_polymorphic_names?(self)
+        line_content['as'] = ":#{name}"
+      elsif clone_name_different?
+        line_content['foreign_key'] = "\"#{name.singularize}_id\""
+      end
+    end
+
+    ProjectFile.add_line(start_model, end_model, line_content)
+  end
+
+  def update_model(end_item, association, intermediate_item = nil)
+    return unless association.has_one? || association.has_many?
+
+    end_item.update_end_model_migration_files(self, association) unless intermediate_item
+    update_start_model_file(end_item, association, intermediate_item)
+  end
+
+  def parent_through_add_associations
+    if parent_through_has_many?
+      update_model(parent, grand_association)
+      update_model(grand, grand_association, parent)
+
+    elsif parent_through_has_one?
+      parent.update_model(self, grand_association)
+    end
+
+    grand.update_model(self, grand_association, parent)
+  end
+
+  def add_associations
+    parent_through_add_associations if parent_through?
+
+    associations.each do |association|
+      next unless association.has_any?
+
+      association.second_items.each do |second_item|
+        update_model(second_item, association)
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ead
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Hasan Ozovali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-25 00:00:00.000000000 Z
+date: 2021-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport