diograph 0.0.1.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 434de2c1102fdad09a26f4eb32d9204da021d6fa
-  data.tar.gz: d061818771e8df8ba3b6ada88a0426db03bb183e
+  metadata.gz: 6504cdb7428d41f73daf4fb2ecd0f4315fc5e33d
+  data.tar.gz: 48153fae1c00bc1a174a125bba475a9d150a73dd
 SHA512:
-  metadata.gz: 57ca10b18b2a791b8e5a535817a850605a65e708354b0cb067d2965fd5a520f235d84d7a2f64588877e14ea18432fbce4029c4a711e48cb782079f7b6e3a6660
-  data.tar.gz: 63f7805687d4addddaa049428f1129e5c3942e653cca21dee4761331243115aba016eb6f45c4455fd745c6e51ad5a0119745bdf63cb3f8cfbf5688a6905f24eb
+  metadata.gz: be53af76ed24f3a058a7668a5775107bef8245b9f52beac74afa4d1581acb3ae8dc41ef1b7406608b52a9ae4a0008f0667b8c01705e6e3c66c2bc187041beb23
+  data.tar.gz: 70aa91b39c55c8914d662f18b8a6e481be21125fa88639c93fccdb29635036f077a24da5c043e35bce6326c5dbbb81c0aed50c1649f388dfd13d9f2cbd61668f

data/lib/diograph.rb

@@ -1,351 +1,44 @@
-module Diograph 
-
-
-  class Diograph
-
-
-	  ATTRIBUTES = {
-		"diories" => "@graph",
-		"diory_id" => "id", 
-		"diory_type" => "type", 
-		"name" => "name",
-		"url" => "www",
-		"date" => "date",
-		"gps" => "geo",
-		"data" => "data",
-		"strong_relations" => "view",
-		"weak_relations" => "connected",
-		"created_at" => "created",
-		"updated_at" => "modified"
-		# app-related-type?
-		# app-name?
-	  }
-
-
-
-	  attr_accessor :diories
-
-	  def initialize
-		@diories = []
-	  end
-
-	  def add(diory)
-		@diories.push(diory)
-	  end
-
-
-	  # Create from STRING
-	  def self.create_from_diograph(diograph)
-		diograph_obj = Diograph.new
-		diograph_hash = DiographHash.new_hash_from_diograph(diograph)
-		diograph_hash[Diograph::ATTRIBUTES['diories']].each do |diory_hash|
-		  diory = Diory.create_from_hash(diory_hash)
-		  diograph_obj.diories << diory
-		end
-		diograph_obj
-	  end
-
-
-	  def self.create_from_database
-
-		diograph = Diograph.new
-		diograph.diories = Diory.all
-		diograph
-
-	  end
-
-	  def self.new_hash_from_diograph(diograph)
-		JSON.parse(diograph)
-	  end
-
-	  def self.new_hash
-		self.empty_static_hash_template # at the bottom of this class
-	  end
-
-
-	  def to_diograph
-		diograph_hash = self.to_diograph_hash
-		JSON.pretty_generate(diograph_hash)  
-	  end
-
-	  def to_diograph_hash
-		diograph_hash = Diograph.new_hash
-		@diories.each do |diory|
-		  diograph_hash[Diograph::ATTRIBUTES['diories']] << diory.to_diograph_hash
-		end
-		diograph_hash
-	  end
-
-	  def to_s
-		self.to_diograph
-		# puts JSON.pretty_generate(self.to_diograph)
-	  end
-
-
-
-	private
-
-	  def self.empty_static_hash_template
-
-		diograph = {
-		  "@context" => {
-
-			  "xsd"=>"http://www.w3.org/2001/XMLSchema#",
-			  "prov"=>"http://www.w3.org/ns/prov#",
-			  "dct"=>"http://purl.org/dc/terms/",
-			  "css"=>"http://www.w3.org/wiki/CSS/Properties/",
-			  "diograph"=>"http://diograph.org/",
-			  "diory"=>"http://diograph.org/diory/",
-			  
-			  "id"=>"@id",
-			  "type"=>"@type",
-			  "name"=>"dct:title",
-
-			  "style" => "diory:style",
-			  "background-color" => "css:background-color",
-			  "background-image" => "css:background-image",
-
-			  "modified" => {
-				  "@id" => "dct:modified",
-				  "@type" => "xsd:dateTime"
-			  },
-			  "created" => {
-				  "@id" => "dct:created",
-				  "@type" => "xsd:dateTime"
-			  },
-			  "data" => "diory:data",
-
-			  "IRI" => {
-				  "@id" => "dct:abstract",
-				  "@type" => "@id"
-			  },
-			  "www" => {
-				  "@id" => "dct:source",
-				  "@type" => "xsd:anyURI"
-			  },
-			  "view" => {
-				  "@id" => "diory:view",
-				  "@container" => "@list"
-			  },
-			  "connected" => {
-				  "@id" => "diory:connected",
-				  "@container" => "@list"
-			  },
-
-			  "ratio" => "diory:ratio",
-			  "position" => "diory:position",
-			  "top" => "css:top",
-			  "left" => "css:left",
-			  "height" => "css:height",
-			  "padding-bottom" => "css:padding-bottom",
-			  "width" => "css:width",
-
-			  "app" => "dct:agent",
-			  "icon" => "http://purl.org/dc/dcmitype/Image",
-
-			  "owl-time" => "http://www.w3.org/2006/time#",
-			  "datetime" => "owl-time:inXSDDateTime",
-			  "dateStart" => {
-				  "@id" => "owl-time:hasBeginning",
-				  "@type" => "datetime"
-			  },
-			  "dateStop" => {
-				  "@id" => "owl-time:hasEnding",
-				  "@type" => "datetime"
-			  },
-			  "duration" => "owl-time:duration",
-
-			  "geo" => "http://ld.geojson.org/vocab#",
-			  "geometry" => "geo:geometry",
-			  "coordinates" => {
-				"@id" => "geo:coordinates",
-				"@container" => "@list"
-			  },
-			  "Polygon" => "geo:Polygon",
-			  "Point" => "geo:Point",
-
-			  "dct" => "http://purl.org/dc/terms/",
-			  "distance" => "dct:SizeOrDuration",
-
-			  "note" => "http://purl.org/dc/dcmitype/Text",
-			  "photo" => "http://purl.org/dc/dcmitype/image"
-
-			}, 
-
-			"@graph" => [] 
-		}
-
-	  end
-
-
-	end
-	
-	
-	
-	class Diory
-
-	  attr_accessor :app_id, :app_related_type, :app_name, :name, :url, :diory_id, :date, :geo, :data, :type, :thumbnail, :created_at, :updated_at, :strong_relations, :weak_relations
-
-
-	  def initialize
-
-		@app_id = nil
-		@app_related_type = nil
-		@app_name = nil
-
-		@name = nil
-		@url = nil
-		@diory_id = nil
-		@date = nil
-		@geo = nil
-		@data = {}
-		@type = "diory"
-		@thumbnail = nil
-
-		@created_at = nil
-		@updated_at = nil
-
-		@strong_relations = []
-		@weak_relations = []
-
-	  end
-
-
-	  def self.generate_id(app_id, app_related_type, name)
-		# Cut down too long names
-		if name.size > 25
-		  name = name[0..24]
-		end
-		# Encode name suitable for an URL
-		name = URI.escape(name, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
-		# Compose the id
-		return app_id + app_related_type + '/' + name
-
-	  end
-
-	  def relate(diory)
-		self.strong_relations.push(diory)
-		diory.weak_relations.push(self)
-	  end
-	  
-
-	  # Create Diory itself
-	  def self.create_from_hash(diory_hash)
-
-		# Create new or load existing diory 
-		diory = Diory.new
-		diory.load_attributes_from_hash(diory_hash)
-
-		# Relations or no relations?
-		relations = diory_hash["#{Diograph::ATTRIBUTES['strong_relations']}"].blank? ? false : true
-
-		# Save and update relations
-		if relations
-		  # Go through relations in JSON-LD
-		  diory_hash["#{Diograph::ATTRIBUTES['strong_relations']}"].each do |related_hash|
-			# Create diory from JSON-LD
-			related = Diory.create_from_hash(related_hash)
-			# Add all the relations for freshly created diory
-			if Diory.where(diory_id: related.diory_id).blank?
-			  diory.strong_relations << related
-			end
-		  end
-		end
-
-		# Return saved diory
-		diory
-	  end
-
-
-	  # Fills in all the attributes of Diory from JSON-LD
-	  def load_attributes_from_hash(diory_hash)    
-		# Load Diory basic attributes from JSONLD
-		@diory_id = diory_hash[Diograph::ATTRIBUTES["diory_id"]]
-		@diory_type = diory_hash[Diograph::ATTRIBUTES["diory_type"]]
-		@name = diory_hash[Diograph::ATTRIBUTES["name"]]
-		@url = diory_hash[Diograph::ATTRIBUTES["url"]]
-		@date = diory_hash[Diograph::ATTRIBUTES["date"]]
-		@gps = diory_hash[Diograph::ATTRIBUTES["gps"]]
-
-		# Define which are basic attributes
-		diograph_attr = [Diograph::ATTRIBUTES["diory_id"], Diograph::ATTRIBUTES["diory_type"], Diograph::ATTRIBUTES["name"], Diograph::ATTRIBUTES["url"], Diograph::ATTRIBUTES["date"], Diograph::ATTRIBUTES["gps"], Diograph::ATTRIBUTES["strong_relations"]]
-
-		# Extract all the other attributes to data
-		# Sorts out the basic attributes from diory_hash
-		diory_hash.select do |key, value|
-		  if !diograph_attr.include?(key)
-			@data[key] = value
-		  end
-		end
-		
-	  end
-
-
-	  # Get a Diograph hash of the Diory and its related diories 
-	  def to_diograph_hash(include_relations=true)
-
-		diory_hash = {}
-		diory_hash["#{Diograph::ATTRIBUTES['diory_id']}"] = @diory_id
-		diory_hash["#{Diograph::ATTRIBUTES['diory_type']}"] = @diory_type
-		diory_hash["#{Diograph::ATTRIBUTES['name']}"] = @name
-		if !@url.blank?
-		  diory_hash["#{Diograph::ATTRIBUTES['url']}"] = @url
-		end
-		if !@date.blank?
-		  diory_hash["#{Diograph::ATTRIBUTES['date']}"] = @date
-		end
-		if !@gps.blank?
-		  diory_hash["#{Diograph::ATTRIBUTES['gps']}"] = @gps
-		end
-
-		diory_hash["style"] = {"background-color" => "rgb(84,97,112)"}
-		diory_hash["created"] = @created_at
-		diory_hash["modified"] = @updated_at
-		diory_hash["IRI"] = nil
-
-		if !@data.blank?
-		  diory_hash.merge!(DiographHash.new_hash_from_diograph(@data))
-		end
-
-		diory_hash["#{Diograph::ATTRIBUTES['strong_relations']}"] = []
-
-		if include_relations
-
-		  if !@strong_relations.blank?
-			@strong_relations.each do |strong_relation|
-			  diory_hash["#{Diograph::ATTRIBUTES['strong_relations']}"] << to_related_hash(strong_relation.diory_id, @strong_relations.index(strong_relation) + 1)
-			end
-		  end
-
-		  if !@weak_relations.blank?
-			@weak_relations.each do |weak_relation|
-			  diory_hash["#{Diograph::ATTRIBUTES['strong_relations']}"] << to_related_hash(weak_relation.diory_id, @weak_relations.index(weak_relation) + 1)
-			end
-		  end
-
-		end
-
-		diory_hash
-
-	  end
-
-
-	  def to_related_hash(diory_id, order)
-		related_hash = {}
-		related_hash["diory"] = { Diograph::ATTRIBUTES["diory_id"] => diory_id }
-		related_hash["order"] = order
-		related_hash["position"] = {"width" => "25%", "padding-bottom" => "15%"}
-		related_hash
-	  end
-
-
-	  def to_diograph
-		Diograph.to_diograph(self.to_diograph_hash)
-	  end
-
-
-	end
-
-	
+require 'JSON'
+
+class Diograph
+
+  def self.create_from_room(room)
+    dg = {
+      name: room.name,
+      roomID: room.room_id,
+      created: room.created,
+      modified: room.modified,
+      diories: room.diories.map{|d| create_from_diory(d)}
+    }
+    return JSON.parse dg.to_json # stringify keys
+  end
+
+  def self.create_from_diory(diory, include_connections=true)
+    dg = {
+      ID: diory.diory_id,
+      name: diory.name,
+      type: diory.diory_type,
+      created: diory.created,
+      modified: diory.modified,
+      date: diory.date,
+      address: diory.address,
+      background: diory.background
+    }
+    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)
+      end
+    end
+    return JSON.parse dg.to_json # stringify keys
+  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?
+    one == two
+  end
 
 end

metadata

@@ -1,23 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: diograph
 version: !ruby/object:Gem::Version
-  version: 0.0.1.1
+  version: 0.1.0
 platform: ruby
 authors:
-- Jouni Alanen
+- jvalanen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies: []
-description: Libraries for dealing with diographs and diories in Personal Web applications
+description: Library to deal with diographs in Personal Web applications
 email: jouni.alanen@iki.fi
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/diograph.rb
-homepage: http://personalweb.me
+homepage: http://rubygems.org/gems/diograph
 licenses: []
 metadata: {}
 post_install_message: 
@@ -39,5 +39,5 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Diograph and diory libraries for Personal Web
+summary: Library to deal with diographs in Personal Web applications
 test_files: []