iron-cms 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83e3bff7dec1d8b8314905585a727fd217f74a98490b10df269073ead9552751
-  data.tar.gz: fb88aabc41e2655a676b3fb69bc2b59b9fc9288ad6705fd179545726a39bd287
+  metadata.gz: 3dc16db2bf8c1ee5f0cca129113aed94f3064d405ae13b7a8a80cc2f601c4a4f
+  data.tar.gz: ff04983432ca9fce51945b29625144685b082047278f6afda51a057e70040b5a
 SHA512:
-  metadata.gz: d89557492a11a6e822deec7b7243cc21da7cc118e5432d1dda791477b7d6160e941cdf853e691beda3782fda896454c2c0bb3fe9f0368913bb653c01918646fd
-  data.tar.gz: 467047c34bd40ac2a56a4c472274bd6806561031ee35e98853d4c7fa3cc8a28fac2849643cd76591842e1a291595a8cb462a3c802e5630ad259910395ee9b7c2
+  metadata.gz: 8f1b195f43f04b198e29f18c8bae4dde22424dd869435db76c1e1ea644f8756e67ca0f0cd6f81b4b83410687c664e14952448b599125630c12a13dc547f744a8
+  data.tar.gz: c3c3fa9ae10cb698dac50abdac3f36fd6d0342f2ca7800e8d42445330fdb7863faab8a562b57d2d432a71e50ba7a12138d90592b77557a455e55a0899bfb5fba

data/app/models/iron/archive.rb

@@ -58,7 +58,7 @@ module Iron
         Gem::Package::TarReader.new(tar_io) do |tar|
           tar.each do |entry|
             if entry.file?
-              @files[entry.full_name] = entry.read
+              @files[entry.full_name] = entry.read.force_encoding("UTF-8")
             end
           end
         end

data/app/models/iron/content_import/entry_builder.rb

@@ -61,7 +61,10 @@ module Iron
           end
 
           existing_entry = @registry.find_entry(snapshot.gid)
-          return existing_entry if existing_entry
+          # Only use the existing entry if it belongs to the correct content type
+          if existing_entry && existing_entry.content_type_id == @content_type.id
+            return existing_entry
+          end
 
           new_entry = create_entry
           @registry.register_entry(snapshot.gid, new_entry)

data/app/models/iron/content_import/field_reconstructor.rb

@@ -60,7 +60,7 @@ module Iron
           entry = @registry.find_entry(entry_gid)
           return unless entry
 
-          update_entry_route(entry, snapshot.route) if snapshot.route.present?
+          update_entry_route(entry, snapshot.route) unless snapshot.route.nil?
           reconstruct_entry_fields(entry, snapshot)
         end
 

data/app/models/iron/entry.rb

@@ -4,6 +4,8 @@ module Iron
 
     belongs_to :creator, class_name: "Iron::User", default: -> { Current.user }
     has_many :fields, inverse_of: :entry, dependent: :destroy
+    has_many :referencing_fields, class_name: "Iron::Field", foreign_key: :referenced_entry_id, dependent: :destroy
+    has_many :referencing_references, class_name: "Iron::Reference", dependent: :destroy
 
     accepts_nested_attributes_for :fields, allow_destroy: true
 

data/lib/iron/global_id/instance_scoped_locator.rb

@@ -19,6 +19,8 @@ module Iron
       private
 
         def instance_matches?(gid)
+          return true if gid.params.nil?
+
           instance_token = gid.params[:instance]
           return true if instance_token.blank?
 

data/lib/iron/version.rb

@@ -1,3 +1,3 @@
 module Iron
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Massimo De Marchi