diograph 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9330e603168cb057aa2a524890765f8bc9f9075
-  data.tar.gz: 54cb41f4b889d8bb84bc0f6b7cec1c3aaf2dcc2a
+  metadata.gz: 0ea38f845d2143ac9939193e7cb846e3e44705e9
+  data.tar.gz: 86ff681d76badebdc3c947a94db6563fb5aab293
 SHA512:
-  metadata.gz: a367a80542e8ba94031627271c0af8b7686228381e55578b13b494982a71aaaa9914e0396461e40b2a716a9c0aa1613fc95d7ab7abcb6fda1766af44bb6aa489
-  data.tar.gz: d7499cff811b7614d5555feafefabbd1522e06ac96b7ecb8a09ec356ec2f5d84edc38624088aa187060b781983cf4079a22f6aad7b407f1a0f82cc51e6ac2520
+  metadata.gz: 880af575ad718dfadfc8c9a74343629665d581eadb7a632eba0c8e968e1d23fab1a2dc98fe648306099101c4649040bb567015409c9cb45e09f3f1d2d3b3b619
+  data.tar.gz: 3cce514d4db4266ba10cda2bb16408332678faeafd5790ef29c8ccc7cb332ec25b25e486cffc64fb3e5d0ca6ea767f0aead61ff44d308905e17246eb94cd2010

data/lib/diograph.rb

@@ -1,144 +1,149 @@
-# 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)
+require 'diograph/room'
+require 'diograph/diory'
+require 'diograph/connection'
+require 'diograph/diograph'
+
+require 'date'
+
+module Diograph
+
+  class << self
+
+    def create_room_from_diograph(diograph)
+      # Parse diograph to hash
+      diograph = JSON.parse(diograph) if diograph.class == String
+      # Create room
+      room = create_room_from_attributes(diograph)
+      diograph["diories"].map do |diory_hash|
+        create_diory_and_connections_from_diograph(room, diory_hash)
+      end
+      room
+    end
+
+    def 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
-    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
+    def 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
-    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
+    ################################
+    ### FROM diograph TO diories ###
+    ################################
 
-  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
+    def create_room_from_attributes(args={})
+      room = Room.new(
+        name: args["name"],
+        room_id: args["roomID"],
+        created: args["created"],
+        modified: args["modified"]
+      )
+      room.save if room.respond_to?(:save)
+      room
     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 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_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
+    def create_diory_from_attributes(room, args={})
+      diory = Diory.new(
+        diory_id: args["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 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,
-      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
+    ################################
+    ### FROM diories TO diograph ###
+    ################################
 
-  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.connections.each do |c|
-        dg[:connections][c.to_diory.diory_id] = self.create_from_connection(c)
+    def 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 create_from_diory(diory, include_connections=true)
+      dg = {
+        diory_id: diory.diory_id,
+        type: diory.diory_type,
+        text: diory.name,
+        image: diory.background,
+        style: { text: { color: "white"} },
+        data: { geo: { latitude: diory.latitude, longitude: diory.longitude, zoom: 10 } },
+        address: diory.address,
+        date: diory.date,
+        created: diory.created,
+        modified: diory.modified,
+      }
+      if include_connections
+        dg[:diorys] = {}
+        diory.connections.each_with_index do |c, i|
+          dg[:diorys][i] = create_from_connection(c)
+        end
       end
+      return JSON.parse dg.to_json # stringify keys
     end
-    return JSON.parse dg.to_json # stringify keys
-  end
 
 
-  ### 0.1.0 stuff ###
+    ### 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 create_from_connection(connection)
+      d = connection.to_diory
+      connection_dg = create_from_diory(d, false)
+      connection_dg
+    end
+
+    def 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
 
-  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

data/lib/diograph/connection.rb

@@ -0,0 +1,24 @@
+module Diograph
+
+  class Connection
+
+    attr_reader :from_diory, :to_diory
+
+    def initialize(args={})
+      @from_diory = args[:from_diory]
+      @to_diory = args[:to_diory]
+    end
+
+    def from_diory_id
+      nil if @from_diory.nil?
+      @from_diory.diory_id
+    end
+
+    def to_diory_id
+      nil if @to_diory.nil?
+      @to_diory.diory_id
+    end
+
+  end
+
+end

data/lib/diograph/diory.rb

@@ -0,0 +1,41 @@
+module Diograph
+
+  class Diory
+
+    attr_reader :diory_id, :name, :diory_type, :date, :address, :background, :latitude, :longitude, :created, :modified
+    attr_reader :room, :connections, :connected_diories
+
+    def initialize(args={})
+      @diory_id = args[:diory_id] || args[:ID]
+      @name = args[:name]
+      @diory_type = args[:diory_type]
+      @date = args[:date]
+      @address = args[:address]
+      @background = args[:background]
+      @latitude = args[:latitude]
+      @longitude = args[:longitude]
+      @created = args[:created]
+      @modified = args[:modified]
+
+      @room = args[:room]
+      @room.diories << self if @room
+
+      @connections = args[:connections] || []
+      @connected_diories = args[:connected_diories] || []
+    end
+
+    def connect_to(to_diory)
+      connection = Connection.new(from_diory: self, to_diory: to_diory)
+      @connections << connection
+      @connected_diories << to_diory
+      to_diory.connections << connection
+      to_diory.connected_diories << self
+    end
+
+    def connected_diories=(connected_diories)
+      @connected_diories = connected_diories
+    end
+
+  end
+
+end

data/lib/diograph/room.rb

@@ -0,0 +1,21 @@
+module Diograph
+
+  class Room
+
+    attr_reader :room_id, :name, :modified, :created, :diories
+
+    def initialize(args={})
+
+      # Attributes
+      @room_id = args[:room_id]
+      @name = args[:name]
+      @modified = args[:modified]
+      @created = args[:created]
+
+      # Relations
+      @diories = args[:diories] || []
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diograph
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - jvalanen
@@ -14,14 +14,14 @@ dependencies:
   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
@@ -31,6 +31,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/diograph.rb
+- lib/diograph/connection.rb
+- lib/diograph/diory.rb
+- lib/diograph/room.rb
 homepage: http://rubygems.org/gems/diograph
 licenses: []
 metadata: {}
@@ -40,17 +43,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.0.14.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Library to deal with diographs in Personal Web applications