gedcomx-jruby 0.1.1 → 0.1.3

data/lib/gedcomx/place.rb

@@ -0,0 +1,42 @@
+module Gedcomx
+  class Place
+
+    attr_reader :fields
+
+    def self.java_class
+      Java::OrgGedcomxConclusion::PlaceReference
+    end
+
+    def self.create(attributes = {})
+      new_place = self.new
+      new_place.original = attributes[:original] if attributes[:original]
+      attributes[:fields].each { |field| new_place.add_field(field) } if attributes[:fields].is_a? Array
+      new_place
+    end
+
+    def initialize(input = nil)
+      @place = input || self.class.java_class.new
+      @fields = []
+      @fields = @place.fields.map { |field| Gedcomx::Field.new(field) } if @place.fields.is_a? Array
+    end
+
+    def add_field(field)
+      return false unless field.is_a? Gedcomx::Field
+      @place.add_field field.to_java
+      @place.fields << field
+    end
+
+    def original
+      @place.get_original
+    end
+
+    def original=(input_string)
+      return false unless input_string.is_a? String
+      @place.original = input_string
+    end
+
+    def to_java
+      @place
+    end
+  end
+end

data/lib/gedcomx/record.rb

@@ -1,12 +1,50 @@
-
 module Gedcomx
   class Record
 
     attr_reader :people, :relationships
 
-    def initialize(input)
-      @record = input
-      @people = @record.persons.map{|person| Person.new(person) }
+    def self.java_class
+      Java::OrgGedcomx::Gedcomx
+    end
+
+    def initialize(input = nil)
+      @record = input || self.class.java_class.new
+
+      @people = []
+      @people = @record.persons.map { |person| Gedcomx::Person.new(person) } if @record.persons
+
+      @relationships = []
+      if @record.relationships
+        @relationships = @record.relationships.map { |relationship| Gedcomx::Relationship.new(relationship) }
+      end
+    end
+
+    def add_person(person)
+      return false unless person.is_a? Gedcomx::Person
+      @record.add_person(person.to_java)
+      @people << person
+    end
+
+    def add_relationship(relationship)
+      return false unless relationship.is_a? Gedcomx::Relationship
+      @record.add_relationship(relationship.to_java)
+      @relationships << relationship
+    end
+
+    def relate_people(person1, person2, type)
+      return false unless ( person1.is_a?(Gedcomx::Person) && person2.is_a?(Gedcomx::Person) )
+      reference1 = Gedcomx::ResourceReference.create(resource: person1.relative_id)
+      reference2 = Gedcomx::ResourceReference.create(resource: person2.relative_id)
+      relationship = Gedcomx::Relationship.create(person1: reference1, person2: reference2, type: type)
+      add_relationship(relationship)
+    end
+
+    def add_couple(person1, person2)
+      relate_people(person1, person2, Gedcomx::TYPES[:couple])
+    end
+
+    def add_parent_child(parent, child)
+      relate_people(parent, child, Gedcomx::TYPES[:parent_child])
     end
 
     def each_person
@@ -15,5 +53,14 @@ module Gedcomx
       end
     end
 
+    def each_relationship
+      @relationships.each do |relationship|
+        yield relationship
+      end
+    end
+
+    def to_java
+      @record
+    end
   end
 end

data/lib/gedcomx/relationship.rb

@@ -0,0 +1,56 @@
+module Gedcomx
+  class Relationship
+
+    attr_reader :person1, :person2
+
+    def self.java_class
+      Java::OrgGedcomxConclusion::Relationship
+    end
+
+    def self.create(attributes = {})
+      new_relationship = self.new
+      new_relationship.type = attributes[:type] if attributes[:type]
+      new_relationship.person1 = attributes[:person1] if attributes[:person1]
+      new_relationship.person2 = attributes[:person2] if attributes[:person2]
+      new_relationship
+    end
+
+    def initialize(input = nil)
+      @relationship = input || self.class.java_class.new
+      @person1 = Gedcomx::ResourceReference.new(@relationship.get_person1) if @relationship.get_person1
+      @person2 = Gedcomx::ResourceReference.new(@relationship.get_person2) if @relationship.get_person2
+    end
+
+    def couple?
+      type == TYPES[:couple]
+    end
+
+    def parent_child?
+      type == TYPES[:parent_child]
+    end
+
+    def person1=(person_reference)
+      return false unless person_reference.is_a? Gedcomx::ResourceReference
+      @relationship.person1 = person_reference.to_java
+      @person1 = person_reference
+    end
+
+    def person2=(person_reference)
+      return false unless person_reference.is_a? Gedcomx::ResourceReference
+      @relationship.person2 = person_reference.to_java
+      @person2 = person_reference
+    end
+
+    def type
+      @relationship.get_type.to_s
+    end
+
+    def type=(input_type)
+      @relationship.type = ( input_type.is_a? Gedcomx.java_uri_class ) ? input_type : Gedcomx.new_uri(input_type)
+    end
+
+    def to_java
+      @relationship
+    end
+  end
+end

data/lib/gedcomx/resource_reference.rb

@@ -0,0 +1,39 @@
+module Gedcomx
+  class ResourceReference
+
+    def self.java_class
+      Java::OrgGedcomxCommon::ResourceReference
+    end
+
+    def self.create(attributes = {})
+      reference = self.new
+      reference.resource = attributes[:resource] if attributes[:resource]
+      reference.resource_id = attributes[:resource_id] if attributes[:resource_id]
+      reference
+    end
+
+    def initialize(input = nil)
+      @reference = input || self.class.java_class.new
+    end
+
+    def resource
+      @reference.get_resource.to_s
+    end
+
+    def resource=(new_resource)
+      @reference.resource = ( new_resource.is_a? Gedcomx.java_uri_class ) ? new_resource : Gedcomx.new_uri(new_resource)
+    end
+
+    def resource_id
+      @reference.get_resource_id
+    end
+
+    def resource_id=(new_resource_id)
+      @reference.resource_id = new_resource_id
+    end
+
+    def to_java
+      @reference
+    end
+  end
+end

data/lib/gedcomx/writer.rb

@@ -0,0 +1,18 @@
+module Gedcomx
+  class Writer
+
+    def initialize
+      @output_stream = java.io.ByteArrayOutputStream.new
+      @writer = org.gedcomx.util.RecordSetWriter.new(@output_stream)
+    end
+
+    def add_record(record)
+      @writer.writeRecord(record.to_java)
+    end
+
+    def close
+      @writer.close
+      java.lang.String.new(@output_stream.toByteArray).to_s
+    end
+  end
+end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: gedcomx-jruby
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Daniel Alkalai
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
 description: Provides ruby calls to import, process, and export Gedcomx files
 email:
 - djalkalai@gmail.com
@@ -51,11 +51,25 @@ files:
 - README.md
 - Rakefile
 - gedcomx-jruby.gemspec
-- lib/gedcomx/gedcomx.rb
+- lib/gedcomx-jruby.rb
+- lib/gedcomx.rb
+- lib/gedcomx/date.rb
+- lib/gedcomx/fact.rb
+- lib/gedcomx/field.rb
+- lib/gedcomx/field_value.rb
+- lib/gedcomx/gender.rb
+- lib/gedcomx/identifier.rb
 - lib/gedcomx/iterator.rb
 - lib/gedcomx/jruby/version.rb
+- lib/gedcomx/name.rb
+- lib/gedcomx/name_form.rb
+- lib/gedcomx/name_part.rb
 - lib/gedcomx/person.rb
+- lib/gedcomx/place.rb
 - lib/gedcomx/record.rb
+- lib/gedcomx/relationship.rb
+- lib/gedcomx/resource_reference.rb
+- lib/gedcomx/writer.rb
 - lib/gedcomx_java_jars/enunciate-gedcomx-support-1.0.82.M1-SNAPSHOT-sources.jar
 - lib/gedcomx_java_jars/enunciate-gedcomx-support-1.0.82.M1-SNAPSHOT.jar
 - lib/gedcomx_java_jars/familysearch-api-client-1.0.82.M1-SNAPSHOT-sources.jar
@@ -83,7 +97,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -98,9 +112,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.2.2
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.0.14
+signing_key: 
 specification_version: 4
 summary: Gedcomx ruby parser
 test_files: []

data/lib/gedcomx/gedcomx.rb

@@ -1,40 +0,0 @@
-require "gedcomx/jruby/version"
-Dir.glob('lib/gedcomx_java_jars/*.jar').each { |jar| require jar }
-
-module Gedcomx
-
-  TYPES = {
-      birth: 'http://gedcomx.org/Birth',
-      birth_place_father: 'http://gedcomx.org/FatherBirthPlace',
-      birth_place_mother: 'http://gedcomx.org/MotherBirthPlace',
-      census: 'http://gedcomx.org/Census',
-      collection: 'http://gedcomx.org/Collection',
-      collection_id: 'http://familysearch.org/types/fields/FS_COLLECTION_ID',
-      couple: 'http://gedcomx.org/Couple',
-      digital_artifact: 'http://gedcomx.org/DigitalArtifact',
-      ethnicity: 'http://familysearch.org/types/fields/PR_ETHNICITY_CSS',
-      female: 'http://gedcomx.org/Female',
-      given: 'http://gedcomx.org/Given',
-      household: 'http://familysearch.org/types/fields/HOUSEHOLD_ID',
-      image_id: 'http://familysearch.org/types/fields/IMAGE_PAL',
-      immigration: 'http://gedcomx.org/Immigration',
-      male: 'http://gedcomx.org/Male',
-      marital_status: 'http://gedcomx.org/MaritalStatus',
-      month: 'http://gedcomx.org/Month',
-      parent_child: 'http://gedcomx.org/ParentChild',
-      persistent: 'http://gedcomx.org/Persistent',
-      race: 'http://gedcomx.org/Race',
-      record: 'http://gedcomx.org/Record',
-      source_line: 'http://familysearch.org/types/fields/SOURCE_LINE_NBR',
-      source_sheet: 'http://familysearch.org/types/fields/SOURCE_SHEET_NBR_LTR',
-      source_sheet_letter: 'http://familysearch.org/types/fields/SOURCE_SHEET_LTR',
-      source_sheet_number: 'http://familysearch.org/types/fields/SOURCE_SHEET_NBR',
-      surname: 'http://gedcomx.org/Surname',
-      unique_id: 'http://familysearch.org/types/fields/UNIQUE_IDENTIFIER',
-      year: 'http://gedcomx.org/Year',
-      years_married: 'http://familysearch.org/types/fields/PR_CNT_YEARS_MARR'
-  }
-
-end
-
-