diograph 0.1.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6504cdb7428d41f73daf4fb2ecd0f4315fc5e33d
-  data.tar.gz: 48153fae1c00bc1a174a125bba475a9d150a73dd
+  metadata.gz: c9330e603168cb057aa2a524890765f8bc9f9075
+  data.tar.gz: 54cb41f4b889d8bb84bc0f6b7cec1c3aaf2dcc2a
 SHA512:
-  metadata.gz: be53af76ed24f3a058a7668a5775107bef8245b9f52beac74afa4d1581acb3ae8dc41ef1b7406608b52a9ae4a0008f0667b8c01705e6e3c66c2bc187041beb23
-  data.tar.gz: 70aa91b39c55c8914d662f18b8a6e481be21125fa88639c93fccdb29635036f077a24da5c043e35bce6326c5dbbb81c0aed50c1649f388dfd13d9f2cbd61668f
+  metadata.gz: a367a80542e8ba94031627271c0af8b7686228381e55578b13b494982a71aaaa9914e0396461e40b2a716a9c0aa1613fc95d7ab7abcb6fda1766af44bb6aa489
+  data.tar.gz: d7499cff811b7614d5555feafefabbd1522e06ac96b7ecb8a09ec356ec2f5d84edc38624088aa187060b781983cf4079a22f6aad7b407f1a0f82cc51e6ac2520

data/lib/diograph.rb

@@ -1,7 +1,97 @@
-require 'JSON'
+# require 'room'
+# require 'diory'
+# require 'connection'
 
 class Diograph
 
+  def self.create_room_from_diograph(diograph, user=nil)
+    # Parse diograph to hash
+    diograph = JSON.parse(diograph) if diograph.class == String
+    # Create room
+    room = user.nil? ? create_room_from_attributes(diograph) : create_room_from_attributes(diograph, user)
+    diograph["diories"].map do |diory_hash|
+      create_diory_and_connections_from_diograph(room, diory_hash)
+    end
+    room
+  end
+
+  # def self.create_connections_and_related_diories(diory, diory_hash)
+  #   diory_hash["connections"].keys.each do |key|
+  #     to_diory = find_or_create_diory_from_attributes(diory.room, diory_hash["connections"][key]["diory"])
+  #     diory.connect_to(to_diory)
+  #   end
+  # end
+
+  def self.create_diory_and_connections_from_diograph(room, diory_hash)
+    diory_hash = JSON.parse(diory_hash) if diory_hash.class == String
+    diory = find_or_create_diory_from_attributes(room, diory_hash)
+    diory_hash["connections"].keys.each do |key|
+      connection = create_connection_from_hash(diory, diory_hash["connections"][key])
+      diory.connections << connection
+    end
+    diory
+  end
+
+
+  ################################
+  ### FROM diograph TO diories ###
+  ################################
+
+  def self.create_room_from_attributes(args={}, user=nil)
+    room = Room.new(
+      name: args["name"],
+      room_id: args["roomID"],
+      created: args["created"],
+      modified: args["modified"]
+    )
+    room.user = user unless user.nil?
+    room.save if room.respond_to?(:save)
+    room
+  end
+
+  def self.find_or_create_diory_from_attributes(room, args={})
+    existing_diory = room.diories.find{|d| d.diory_id == args["ID"]}
+    if existing_diory.nil?
+      create_diory_from_attributes(room, args)
+    else
+      existing_diory
+    end
+  end
+
+  def self.create_diory_from_attributes(room, args={})
+    diory = Diory.new(
+      diory_id: args["ID"],
+      name: args["name"],
+      diory_type: args["type"],
+      date: args["date"],
+      address: args["address"],
+      background: args["background"],
+      modified: args["modified"] || DateTime.now,
+      created: args["created"] || DateTime.now,
+      room: room
+    )
+    room.diories << diory if diory.respond_to?(:save)
+    diory.save if diory.respond_to?(:save)
+    diory
+  end
+
+  def self.create_connection_from_hash(diory, connection_hash)
+    connected_diory_hash = connection_hash["diory"]
+    to_diory = find_or_create_diory_from_attributes(diory.room, connected_diory_hash)
+    connection = Connection.new(
+      from_diory: diory,
+      to_diory: to_diory,
+      room_id: diory.room.room_id
+    )
+    connection.save if connection.respond_to?(:save)
+    connection
+  end
+
+
+  ################################
+  ### FROM diories TO diograph ###
+  ################################
+
   def self.create_from_room(room)
     dg = {
       name: room.name,
@@ -26,15 +116,25 @@ class Diograph
     }
     if include_connections
       dg[:connections] = {}
-      diory.connected_diories.map do |d|
-        dg[:connections][d.diory_id] = {}
-        dg[:connections][d.diory_id]["roomID"] = d.room.room_id
-        dg[:connections][d.diory_id]["diory"] = create_from_diory(d, false)
+      diory.connections.each do |c|
+        dg[:connections][c.to_diory.diory_id] = self.create_from_connection(c)
       end
     end
     return JSON.parse dg.to_json # stringify keys
   end
 
+
+  ### 0.1.0 stuff ###
+
+  def self.create_from_connection(connection)
+    d = connection.to_diory
+    connection_dg = {}
+    # connection_dg["ID"] = connection.connection_id
+    connection_dg["roomID"] = d.room.room_id
+    connection_dg["diory"] = create_from_diory(d, false)
+    connection_dg
+  end
+
   def self.is_equal(diograph1, diograph2)
     one = diograph1["diories"].sort_by{|d| d["ID"]} unless diograph1.nil?
     two = diograph2["diories"].sort_by{|d| d["ID"]} unless diograph2.nil?

metadata

@@ -1,17 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: diograph
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.1
 platform: ruby
 authors:
 - jvalanen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
-dependencies: []
+date: 2016-09-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Library to deal with diographs in Personal Web applications
-email: jouni.alanen@iki.fi
+email: jouni@diory.me
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -26,17 +40,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Library to deal with diographs in Personal Web applications