mexico 0.0.11 → 0.0.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTU2MmVjZDQ1ZGUyZjIyZTU2YWZjNzY5YzVmZGNhYmUzOTM0ZjE3Yw==
+    MzA1YTcwYjg0ZjIyZGE2MWMwN2ViMGRkMmVkOGU0OGU4Y2EwNjE2Zg==
   data.tar.gz: !binary |-
-    Zjc3NDE2NWUzMTM0ZTIwMzJiZDQ5ODQwMDQ0YWJiMDY5MDUzMzNiMQ==
+    NzllMzRjMWNkMzIxN2M2YjE2ODAwZmRkYTQ2NWY2MzMyMjkyMzVkYw==
 SHA512:
   metadata.gz: !binary |-
-    ODNiZmI3N2JjMzY0ZjQ2YWQ3NGFiNTgwNTA1YzJiY2IxZDZkOTU4MGEzOWI1
-    MTllMjdjZTdiNGMzMGVmNTg4YWZjYmY4NGI2NTNlNDQ1NjRmNmI3YTcyNTMw
-    MWQ5ZDNjMzRkOWIwNmVjZWZkMWUzYTA4N2YyYWMzMDk0OGUzMzA=
+    ZGY3ZGJkYTM3OWM1Mjk2NzQyZGVhYTdlOGMyYjg0MmVmOTE1ZDVhNDdjOGUy
+    MjIyZDVkN2I5N2FkZDNhYWM4MzYzYjU3Yzc4M2U0M2IyMWIyYzJmYzM0MzQ3
+    ODk0YmFkMzBkNjc2OTc4YjE2NDNkYzdkYjdiYTM3NTM1MWI1Zjg=
   data.tar.gz: !binary |-
-    ZjRhODUzODVjMWY4YjlhMzNhZmRmYmZjYzU0ZTU4Nzc5NzNmZWU2ZTlkOThh
-    MzBkODNkZDU4M2RlNDNhNWI1YjUzNTdlMjMyZDc2MWJiZmZlYTZhNDQzOTg3
-    ZDk5NTUxNmQ4YmY4ZDRiMGUwYTIxYjZjYjliN2Q4NWU4M2FmZGM=
+    MDgyNDcxNjkzMjM5MzE4YzcxMjlmN2IzMWQ3MTkzNTFlYjRjMTIwYzA0MjRl
+    ZDM5NGFmMDQxNTRlMzFiY2ZmNGQ2OTE2NjRiOTgwYjNiZTk5NWIwZDE2OWM0
+    OTE4Nzk0Nzk4ZDY3MGVhMzNkNzEwNDY3ODgyODkwZjc3NTE2MDg=

data/Gemfile

@@ -10,10 +10,10 @@ gem 'roxml'
 gem 'builder'
 gem 'colorize'
 
-gem 'rdf', '~> 1.0.7'
-gem 'rdf-turtle', '~> 1.0.8'
+gem 'rdf', '~> 1.1'
+gem 'rdf-turtle', '~> 1.1'
 # gem 'rdf-ntriples'
-gem 'rdf-rdfxml'
+gem 'rdf-rdfxml', '~> 1.1'
 #gem 'poseidon', :require => true, :path => '~/code/poseidon'
 gem 'poseidon', '~> 1.1.1', :require => true, :git => 'git://github.com/sfb673/poseidon.git'
 

data/README.md

@@ -10,6 +10,13 @@ Its central organising unit is the **Corpus** class which allows researchers to
 
 ## Last Changes
 
+## 0.0.12 (Hotfix)
+
+Completed on April 10 2014.
+
++ [**#269**](http://intranet.sfb673.org/issues/269): Fixes a constructor in LayerConnector that did not allow parameter-less initialization (as needed by ROXML).
++ [**#270**](http://intranet.sfb673.org/issues/270): The chat game corpus interface now uses the current setter methods.
+
 ## 0.0.11
 
 Completed on March 24 2014.

data/Rakefile

@@ -64,3 +64,9 @@ end
 task :undoc do |t|
   YARD::CLI::Stats.run('--list-undoc')
 end
+
+desc "Open an irb session preloaded with this library"
+task :console do
+  sh "irb -rubygems -I lib -r test.rb"
+end
+

data/VERSION

@@ -1 +1 @@
-0.0.11
+0.0.12

data/info/releasenotes/0.0.12.md

@@ -0,0 +1,4 @@
+## Release notes for version 0.0.12 – Import fixes
+
++ [**#269**](http://intranet.sfb673.org/issues/269): Fixes a constructor in LayerConnector that did not allow parameter-less initialization (as needed by ROXML).
++ [**#270**](http://intranet.sfb673.org/issues/270): The chat game corpus interface now uses the current setter methods.

data/lib/mexico/fiesta/interfaces/b6_chat_game_interface.rb

@@ -40,8 +40,8 @@ class Mexico::Fiesta::Interfaces::B6ChatGameInterface
     t = fiesta_document.add_standard_timeline('s')
     x = Scale.new(identifier: 'spatial_x', name: 'Spatial coordinate X', unit: 'pixel', document: f)
     y = Scale.new(identifier: 'spatial_y', name: 'Spatial coordinate Y', unit: 'pixel', document: f)
-    fiesta_document.scales << x
-    fiesta_document.scales << y
+    fiesta_document.add_scale x
+    fiesta_document.add_scale y
 
     lChats = Layer.new(identifier: 'chats',     name: 'Chats',     document: f)
     lMoves = Layer.new(identifier: 'moves',     name: 'Moves',     document: f)
@@ -56,11 +56,11 @@ class Mexico::Fiesta::Interfaces::B6ChatGameInterface
     # - sentences, with attributes
     # - their parsetrees, with attributes
 
-    fiesta_document.layers << lChats
-    fiesta_document.layers << lMoves
-    fiesta_document.layers << lSents
-    fiesta_document.layers << lParsT
-    fiesta_document.layers << lParsP
+    fiesta_document.add_layer lChats
+    fiesta_document.add_layer lMoves
+    fiesta_document.add_layer lSents
+    fiesta_document.add_layer lParsT
+    fiesta_document.add_layer lParsP
 
     # B6 data is avaiable in XML documents, so we read
     # those into a Nokogiri object.
@@ -92,7 +92,7 @@ class Mexico::Fiesta::Interfaces::B6ChatGameInterface
           i.data = Data.new(item: i, document: f)
           # link layer
           i.layer_links << LayerLink.new(identifier: "move-#{el_counter}-layer", target_object: lMoves, document: f)
-          fiesta_document.items << i
+          fiesta_document.add_item i
         end
 
         if tag_name == 'chat'
@@ -101,7 +101,7 @@ class Mexico::Fiesta::Interfaces::B6ChatGameInterface
           i.point_links << PointLink.new(identifier: "chat-#{el_counter}-t", point: time_val , target_object: t, document: f)
           i.data = Data.new(:string_value => action['message'], item: i, document: f)
           i.layer_links << LayerLink.new(identifier: "chat-#{el_counter}-layer", target_object: lChats, document: f)
-          fiesta_document.items << i
+          fiesta_document.add_item i
           # todo: remember this chat item, the next annotations refer to it
 
           last_chat_elem = action
@@ -141,28 +141,24 @@ class Mexico::Fiesta::Interfaces::B6ChatGameInterface
                                            no:   sentence['no']}),
                                       item: sent_item, document: f
             sidm = sent_item.data.map
-            f.items << sent_item
+            f.add_item sent_item
 
             parsetree_elem = sentence.xpath('./parsetree').first
-            pt_id = parsetree_elem['id']
-            parsetree_item = Item.new identifier: pt_id , document: f
-
-            parsetree_item.item_links << ItemLink.new(identifier: "#{pt_id}-to-sentence", target_object: sent_item, role: 'parent', document: f)
-            parsetree_item.layer_links << LayerLink.new(identifier:"#{pt_id}-to-layer", target_object: lParsT, document: f  )
-
-            parsetree_item.data = Data.new map: Mexico::FileSystem::FiestaMap.new({
-                                                                         tiefe: parsetree_elem['tiefe'],
-                                                                         verzweigung:  parsetree_elem['verzweigung'],
-                                                                         hoeflichkeit:  parsetree_elem['hoeflichkeit']}),
-                                           item: parsetree_item, document: f
-
-            # parsetree_item.data = Mexico::FileSystem::Data.new string_value: "Parsetree"
-
-
-            f.items << parsetree_item
-
-            convert_phrases f, parsetree_item, lParsP, parsetree_elem
-
+            if parsetree_elem.nil?
+              $stderr.puts "There is a parsetree missing in sentence #{s_id}"
+            else
+              pt_id = parsetree_elem['id']
+              parsetree_item = Item.new identifier: pt_id , document: f
+              parsetree_item.item_links << ItemLink.new(identifier: "#{pt_id}-to-sentence", target_object: sent_item, role: 'parent', document: f)
+              parsetree_item.layer_links << LayerLink.new(identifier:"#{pt_id}-to-layer", target_object: lParsT, document: f  )
+              parsetree_item.data = Data.new map: Mexico::FileSystem::FiestaMap.new({
+                                                                           tiefe: parsetree_elem['tiefe'],
+                                                                           verzweigung:  parsetree_elem['verzweigung'],
+                                                                           hoeflichkeit:  parsetree_elem['hoeflichkeit']}),
+                                             item: parsetree_item, document: f
+              f.add_item parsetree_item
+              convert_phrases f, parsetree_item, lParsP, parsetree_elem
+            end
           end
         end
       end

data/lib/mexico/file_system/fiesta_document.rb

@@ -163,6 +163,20 @@ class Mexico::FileSystem::FiestaDocument
     return nil
   end
 
+  def add_scale(args)
+    if args.is_a?(Hash)
+      new_layer = Mexico::FileSystem::Scale.new(args.merge({document: self}))
+      @scales_container << new_layer
+      return new_layer
+    end
+    if args.is_a?(Mexico::FileSystem::Scale)
+      @scales_container << args
+      return args
+    end
+    # @TODO catch error if parameter has wrong object type
+    return nil
+  end
+
   # This method attempts to link objects from other locations of the XML/object tree
   # into position inside this object, by following the xml ids given in the
   # appropriate fields of this class.

data/lib/mexico/file_system/layer_connector.rb

@@ -38,7 +38,7 @@ class Mexico::FileSystem::LayerConnector
   attr_accessor :document
 
 
-  def initialize(new_source, new_target, args={})
+  def initialize(new_source=nil, new_target=nil, args={})
     self.source= new_source
     self.target= new_target
     args.each do |k,v|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mexico
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Peter Menke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -72,42 +72,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: poseidon
   requirement: !ruby/object:Gem::Requirement
@@ -249,6 +249,7 @@ files:
 - info/releasenotes/0.0.1.md
 - info/releasenotes/0.0.10.md
 - info/releasenotes/0.0.11.md
+- info/releasenotes/0.0.12.md
 - info/releasenotes/0.0.2.md
 - info/releasenotes/0.0.3.md
 - info/releasenotes/0.0.4.md