diaspora-vines 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33f5f3afd1563cc0deb0d6c01e2e4e106c080c1c
-  data.tar.gz: c9efd2b5249a1bae0c7b778b8c8450f4b77fa508
+  metadata.gz: 3ce3ef9b28f9b71a58588bba5547b7be71c9d93d
+  data.tar.gz: 46863f581edbf9da56a588fb2ab005f28c13827f
 SHA512:
-  metadata.gz: b28a8475282ff632df35a67467eb2650c38d7e91d8cf0fb952b151ee94e6d3372e298c20f5d459a57626d2cd105b6fd87789a0a7dcee7803b1146a016ab005a7
-  data.tar.gz: e4334b4750a2858ddc01c82be62a9a6d4af7036ca2e212d861d85fbffb280fe3c3c61844653cb693fd2cb65af72ffc077163d04931f0831b07d9bf754afaeff6
+  metadata.gz: e136a59ff668bc14016e34cbe85a45cff9a5d5eb844d1b7a8d9d984f5db33741f1cba3790a36ed9ac63e86188f0f44531f81640beb215a91fa27af5af977548c
+  data.tar.gz: 497a8b3b3928c39be34f1cd0cbfee2f8132168977cf48a4a8ffdb809cb28f97a08afebee8f0881ccf97bf6d4355808f0f4ef21fec443b41681dbbb62d66ca95b

data/lib/vines/storage/sql.rb

@@ -7,7 +7,22 @@ module Vines
 
       register :sql
 
-      class Person < ActiveRecord::Base; end
+      class Profile < ActiveRecord::Base
+        belongs_to :person
+      end
+      class Person < ActiveRecord::Base
+        has_one :profile
+
+        def local?
+          !self.owner_id.nil?
+        end
+
+        def name(opts = {})
+          self.profile.first_name.blank? && self.profile.last_name.blank? ?
+            self.diaspora_handle : "#{self.profile.first_name.to_s.strip} #{self.profile.last_name.to_s.strip}".strip
+        end
+      end
+
       class Aspect < ActiveRecord::Base
         belongs_to :users
 
@@ -43,8 +58,6 @@ module Vines
 
       class ChatContact < ActiveRecord::Base
         belongs_to :users
-
-        serialize :groups, JSON
       end
 
       class ChatFragment < ActiveRecord::Base
@@ -113,7 +126,7 @@ module Vines
               jid: contact.jid,
               name: contact.name,
               subscription: contact.subscription,
-              groups: contact.groups,
+              groups: get_external_groups,
               ask: contact.ask)
           end
         end if xuser
@@ -148,7 +161,7 @@ module Vines
             name: fresh.name,
             ask: fresh.ask,
             subscription: fresh.subscription,
-            groups: fresh.groups)
+            groups: get_external_groups)
         end
 
         # add new contacts to roster
@@ -163,7 +176,7 @@ module Vines
               name: contact.name,
               ask: contact.ask,
               subscription: contact.subscription,
-              groups: contact.groups) unless jids.include?(contact.jid.bare.to_s)
+              groups: get_external_groups) unless jids.include?(contact.jid.bare.to_s)
           end
         }
         xuser.save
@@ -171,13 +184,19 @@ module Vines
       with_connection :save_user
 
       def find_vcard(jid)
-        # not supported yet
-        nil
+        jid = JID.new(jid).bare.to_s
+        return nil if jid.empty?
+        person = Sql::Person.find_by_diaspora_handle(jid)
+        return nil unless person.nil? || person.local?
+
+        build_vcard(person)
       end
       with_connection :find_vcard
 
       def save_vcard(jid, card)
-        # not supported yet
+        # NOTE this is not supported. If you'd like to change your
+        # vcard details you can edit it via diaspora-web-interface
+        nil
       end
       with_connection :save_vcard
 
@@ -213,12 +232,40 @@ module Vines
           Sql::User.find_by_username(name)
         end
 
+        def get_external_groups
+          # TODO Make the group name configurable by the user
+          # https://github.com/diaspora/vines/issues/39
+          group_name = "External XMPP Contacts"
+          matches = Sql::Aspect.where(:name => group_name).count
+          if matches > 0
+            group_name = "#{group_name} (#{matches + 1})"
+          end
+          [ group_name ]
+        end
+
         def fragment_by_jid(jid, node)
           jid = JID.new(jid).bare.to_s
           clause = 'user_id=(select id from users where jid=?) and root=? and namespace=?'
           Sql::ChatFragment.where(clause, jid, node.name, node.namespace.href).first
         end
 
+        def build_vcard(person)
+          builder = Nokogiri::XML::Builder.new
+          builder.vCard('xmlns' => 'vcard-temp') do |xml|
+            xml.send(:"FN", person.name) if person.name
+            xml.send(:"N") do |sub|
+              sub.send(:"FAMILY", person.profile.last_name) if person.profile.last_name
+              sub.send(:"GIVEN", person.profile.first_name) if person.profile.first_name
+            end if (person.profile.last_name? || person.profile.first_name?)
+            xml.send(:"URL", person.url) if person.url
+            xml.send(:"PHOTO") do |sub|
+              sub.send(:"EXTVAL", person.profile.image_url)
+            end if person.profile.image_url
+          end
+
+          builder.to_xml :save_with => Nokogiri::XML::Node::SaveOptions::NO_DECLARATION
+        end
+
         def get_diaspora_flags(contact)
           groups = Array.new
           ask, subscription = 'none', 'none'

data/lib/vines/version.rb

@@ -2,5 +2,5 @@
 
 module Vines
   # vines forked version 0.4.10
-  VERSION = '0.1.24'
+  VERSION = '0.1.25'
 end

data/test/storage/sql_schema.rb

@@ -41,11 +41,34 @@ module SqlSchema
         t.boolean  "closed_account",        :default => false
         t.integer  "fetch_status",          :default => 0
       end
-      
+
       add_index "people", ["diaspora_handle"], :name => "index_people_on_diaspora_handle", :unique => true
       add_index "people", ["guid"], :name => "index_people_on_guid", :unique => true
       add_index "people", ["owner_id"], :name => "index_people_on_owner_id", :unique => true
 
+      create_table "profiles", force: true do |t|
+        t.string   "diaspora_handle"
+        t.string   "first_name",       limit: 127
+        t.string   "last_name",        limit: 127
+        t.string   "image_url"
+        t.string   "image_url_small"
+        t.string   "image_url_medium"
+        t.date     "birthday"
+        t.string   "gender"
+        t.text     "bio"
+        t.boolean  "searchable",                   default: true,  null: false
+        t.integer  "person_id",                                    null: false
+        t.datetime "created_at",                                   null: false
+        t.datetime "updated_at",                                   null: false
+        t.string   "location"
+        t.string   "full_name",        limit: 70
+        t.boolean  "nsfw",                         default: false
+      end
+
+      add_index "profiles", ["full_name", "searchable"], name: "index_profiles_on_full_name_and_searchable", using: :btree
+      add_index "profiles", ["full_name"], name: "index_profiles_on_full_name", using: :btree
+      add_index "profiles", ["person_id"], name: "index_profiles_on_person_id", using: :btree
+
       create_table "aspects", :force => true do |t|
         t.string   "name",                               :null => false
         t.integer  "user_id",                            :null => false

data/test/storage/sql_test.rb

@@ -22,6 +22,8 @@ describe Vines::Storage::Sql do
   before do
     @test_user = {
       :name => "test",
+      :url => "http://remote.host/",
+      :image_url => "http://path.to/image.png",
       :jid => "test@local.host",
       :email => "test@test.de",
       :password => "$2a$10$c2G6rHjGeamQIOFI0c1/b.4mvFBw4AfOtgVrAkO1QPMuAyporj5e6", # pppppp
@@ -37,10 +39,18 @@ describe Vines::Storage::Sql do
       authentication_token: @test_user[:token]
     ).save
     Vines::Storage::Sql::Person.new(
+      owner_id: 1,
       guid: "1697a4b0198901321e9b10e6ba921ce9",
-      url: "http://remote.host/",
+      url: @test_user[:url],
       serialized_public_key: "some pub key",
-      diaspora_handle: "test2@remote.host"
+      diaspora_handle: @test_user[:jid]
+    ).save
+    Vines::Storage::Sql::Profile.new(
+      person_id: 1,
+      last_name: "Hirsch",
+      first_name: "Harry",
+      diaspora_handle: @test_user[:jid],
+      image_url: @test_user[:image_url]
     ).save
     Vines::Storage::Sql::Contact.new(
       user_id: 1,
@@ -134,6 +144,27 @@ describe Vines::Storage::Sql do
     end
   end
 
+  def test_find_vcard
+    fibered do
+      db = storage
+      xml = db.find_vcard(@test_user[:jid])
+      assert (xml != nil), "no vcard found"
+
+      doc = node(xml)
+      assert_equal "Harry Hirsch", doc.search("FN").text
+      assert_equal "Harry", doc.search("GIVEN").text
+      assert_equal "Hirsch", doc.search("FAMILY").text
+      assert_equal @test_user[:url], doc.search("URL").text
+      assert_equal @test_user[:image_url], doc.search("EXTVAL").text
+    end
+  end
+
+  def test_save_vcard
+    fibered do
+      assert_nil storage.save_vcard(@test_user[:jid], "<vCard></vCard>")
+    end
+  end
+
   def test_find_fragment
     skip("not working probably")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diaspora-vines
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - David Graham
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt