diaspora_federation-rails 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df9eff5d088637994c318e81e93091d9383db3c8
-  data.tar.gz: d1ac35b2e70f23201dff5ef4df42305261498dfb
+  metadata.gz: d2c073fb6f129f342655357c413e15f71d8488f0
+  data.tar.gz: acb5f067af3627610f934df034fd13b33d377492
 SHA512:
-  metadata.gz: 088d9b783a29ecbcf5deef9e372312106df7cf6fd4adce8eb2754e13e552127019c55caf470c7d0be4fb8a23edfe4f856996070a7db2f35a6043180d4207a6e7
-  data.tar.gz: 2e3d0b70969bb1bd249452912fde7834841558d36050ebba335ce1afe995ddaa60050be170acc0bfa106bc1d79c600e6b244332a8ee16c2cc52fad93225ec830
+  metadata.gz: d48b15881d82d5501fd0f240c4be60439dcb5b894858904a9d41fbb4f609b35275a549426930600e2615dbdd8cb4d8983af28c414712bc5083f16171fb919513
+  data.tar.gz: d9ee969284db6a11239a1e2901e2a87830f94bae9da483d1b3c82d906d3fcb75fc6594833fa9b3882b09147ddd4d16b95015d3ebc5d210434be312f6f488912c

data/README.md

@@ -43,16 +43,16 @@ DiasporaFederation.configure do |config|
   config.server_uri = AppConfig.pod_uri
 
   config.define_callbacks do
-    on :person_webfinger_fetch do |handle|
-      person = Person.find_local_by_diaspora_handle(handle)
+    on :fetch_person_for_webfinger do |diaspora_id|
+      person = Person.find_local_by_diaspora_id(diaspora_id)
       if person
-        DiasporaFederation::WebFinger::WebFinger.new(
+        DiasporaFederation::Discovery::WebFinger.new(
           # ...
         )
       end
     end
 
-    on :person_hcard_fetch do |guid|
+    on :fetch_person_for_hcard do |guid|
       # ...
     end
   end

data/app/controllers/diaspora_federation/h_card_controller.rb

@@ -7,12 +7,14 @@ module DiasporaFederation
     #
     # GET /hcard/users/:guid
     def hcard
-      person_hcard = DiasporaFederation.callbacks.trigger(:person_hcard_fetch, params[:guid])
+      person_hcard = DiasporaFederation.callbacks.trigger(:fetch_person_for_hcard, params[:guid])
 
-      return render nothing: true, status: 404 if person_hcard.nil?
-
-      logger.info "hcard profile request for: #{person_hcard.nickname}:#{person_hcard.guid}"
-      render html: person_hcard.to_html.html_safe
+      if person_hcard.nil?
+        render nothing: true, status: 404
+      else
+        logger.info "hcard profile request for: #{person_hcard.nickname}:#{person_hcard.guid}"
+        render html: person_hcard.to_html.html_safe
+      end
     end
   end
 end

data/app/controllers/diaspora_federation/webfinger_controller.rb

@@ -37,10 +37,12 @@ module DiasporaFederation
     def legacy_webfinger
       person_wf = find_person_webfinger(params[:q]) if params[:q]
 
-      return render nothing: true, status: 404 if person_wf.nil?
-
-      logger.info "webfinger profile request for: #{person_wf.acct_uri}"
-      render body: person_wf.to_xml, content_type: "application/xrd+xml"
+      if person_wf.nil?
+        render nothing: true, status: 404
+      else
+        logger.info "webfinger profile request for: #{person_wf.acct_uri}"
+        render body: person_wf.to_xml, content_type: "application/xrd+xml"
+      end
     end
 
     private
@@ -48,11 +50,11 @@ module DiasporaFederation
     # creates the host-meta xml with the configured server_uri and caches it
     # @return [String] XML string
     def self.host_meta_xml
-      @host_meta_xml ||= WebFinger::HostMeta.from_base_url(DiasporaFederation.server_uri.to_s).to_xml
+      @host_meta_xml ||= Discovery::HostMeta.from_base_url(DiasporaFederation.server_uri.to_s).to_xml
     end
 
     def find_person_webfinger(query)
-      DiasporaFederation.callbacks.trigger(:person_webfinger_fetch, query.strip.downcase.gsub("acct:", ""))
+      DiasporaFederation.callbacks.trigger(:fetch_person_for_webfinger, query.strip.downcase.sub("acct:", ""))
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diaspora_federation-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Benjamin Neff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
 description: A rails engine that adds the diaspora* federation protocol to a rails
   app
 email: