micropub-server-rails 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0d1797707cb23260c584285b9b401db7e802902
-  data.tar.gz: ef87798788f594ea0e26892207ed1a429a450bc8
+  metadata.gz: 3fc8a92467ed79dba67eb9424cedaaefd85ce092
+  data.tar.gz: a96aad15017c7aafbee089e8086faebdeb7e745e
 SHA512:
-  metadata.gz: c44ee546e070a5e8025fc93c5ea116d439c96656349ac56a7f56ee1c154dfbf96dc2780829fa389b3ce3b8b5e2a7a0bf4c4b2cfb3ca322ba1769ec03fdc98465
-  data.tar.gz: ca8916c1f7381db0199d13acd9ed6a0bbeb90c61971fcbcd18da6eedfa667d2f2da3a2165c3f95c68023eda7635367baa5455c3523bd9869dcf8c872bf1f13d9
+  metadata.gz: ad32670e1f9ac91e4de8e2254617624bde56a05226c63df2d9b46dcd9093f64b12466cf0a901c9ce81ffbe1b5f92b11aae4daa819d0459607f39f2e4ac71f550
+  data.tar.gz: 1d53540d13575eba42cf6efe68bdc6874d1f06aab6d1cfd42af39401d81aa8cb9a16fec220d5552c2c488815bc63f9484a9a9a1b7c6179097377f16cdf844e12

data/lib/micropub/homesteading/router.rb

@@ -0,0 +1,15 @@
+module Micropub::Homesteading
+  class Router
+    H_MAP = {
+      "entry" => "note"
+    }
+    attr_reader :as
+    def initialize(params={})
+      @as = params["as"] || h_map(params["h"])
+    end
+
+    def h_map(h)
+      H_MAP[h]
+    end
+  end
+end

data/lib/micropub/server/rails/middleware.rb

@@ -2,45 +2,66 @@ require 'micropub'
 
 module Micropub::Server::Rails
   class Middleware
+    class HTTPError < StandardError
+      def initialize(env, status, body="")
+        @env    = env
+        @status = status
+        @body   = body
+      end
+    end
+
     def initialize(app)
       @app = app
     end
 
     def call(env)
-      if env["PATH_INFO"] == "/micropub"
-        token = Micropub::Token.new(auth_token(env))
-        token.valid? ? response : error_response
-      else
-        @app.call env
+      begin
+        @params = request(env).params
+        @headers = {"Content-Type" => "text/plain; charset=utf-8"}
+        if env["PATH_INFO"] == "/micropub"
+          check_token(env)
+          micropub_call env
+        else
+          @app.call env
+        end
+      rescue
+        error_response(401)
       end
     end
 
+    def check_token(env)
+      token = Micropub::Token.new(auth_token(env))
+      raise HTTPError.new env, 401 if !token.valid?
+    end
+
     def auth_token(env)
-      input = env["HTTP_AUTHORIZATION"] || request(env).params["access_token"] || ""
+      input = env["HTTP_AUTHORIZATION"] || @params["access_token"] || ""
       input.split("Bearer ").last
     end
 
-    def response
-      [201, headers, body]
+    def micropub_call(env)
+      router = Micropub::Homesteading::Router.new(@params)
+      client = Micropub::Client.new(router.as, token: auth_token(env))
+      response = client.post(@params.except("access_token"))
+
+      raise HTTPError.new env, response.status if !response.successful?
+
+      @headers["Location"] = response.location
+
+      success_response
     end
 
-    def error_response
-      [401, {}, body]
+    def success_response
+      [201, @headers, [""]]
     end
 
-    def body
-      [""]
+    def error_response(status)
+      [status, {}, [""]]
     end
 
     def request(env)
       Rack::Request.new(env)
     end
 
-    def headers
-      {
-        "Location"     => "http://bookisworthy.com/posts/1",
-        "Content-Type" => "text/plain; charset=utf-8"
-      }
-    end
   end
 end

data/lib/micropub/server/rails/version.rb

@@ -1,7 +1,7 @@
 module Micropub
   module Server
     module Rails
-      VERSION = "0.1.5"
+      VERSION = "0.1.6"
     end
   end
 end

data/lib/micropub/server/rails.rb

@@ -1,4 +1,5 @@
 require "micropub/server/rails/version"
+require "micropub/homesteading/router"
 
 module Micropub
   module Server

data/micropub-server-rails.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rack-test"
+  spec.add_development_dependency "webmock"
 
-  spec.add_dependency "micropub", "~> 0.0.3"
+  spec.add_dependency "micropub", "~> 0.0.6"
 end

data/spec/lib/micropub/homesteading/router_spec.rb

@@ -0,0 +1,15 @@
+require "micropub/homesteading/router"
+
+describe Micropub::Homesteading::Router do
+  describe "#as" do
+    it "uses the as attr to set as" do
+      router = Micropub::Homesteading::Router.new("as" => "note")
+      expect(router.as).to eq "note"
+    end
+
+    it "can use h to convert the type" do
+      router = Micropub::Homesteading::Router.new("h" => "entry")
+      expect(router.as).to eq "note"
+    end
+  end
+end

data/spec/lib/micropub/server/rails/middleware_spec.rb

@@ -1,6 +1,10 @@
 require "micropub/server/rails/middleware"
+require 'webmock/rspec'
 require "rack/test"
 
+# How do we determine what host to hit?
+# Where does the code go which tells the mapping how to notes to work?
+
 Micropub.configure do |c|
   c.token_endpoint = "https://tokens.indieauth.com/token"
   c.me             = "http://bookisworthy.com"
@@ -25,21 +29,50 @@ describe Micropub::Server::Rails::Middleware do
     before do
       expect(Micropub::Token).to receive(:new).with("1234").and_return(token)
     end
+
+    context "when publisher returns 401" do
+      let(:request) { post "/micropub", {content: "Blah Blah", "as" => "note"}, "HTTP_AUTHORIZATION" => "Bearer 1234" }
+      let(:token) { double("Token", valid?: true) }
+
+      before do
+        stub_request(:post, "http://bookisworthy.com/notes").with(
+          body: {content: "Blah Blah", as: "note"},
+          headers: { 'Authorization' => "Bearer 1234" })
+        .to_return(status: 401, body: "", headers: {})
+      end
+
+      it "returns a 401" do
+        request
+        expect(last_response.status).to eq 401
+      end
+    end
+
     context "when given a valid token" do
       let(:token) { double("Token", valid?: true) }
 
+      # params "as" stands for "activity stream"
+      # this is the experimental value to indicate the post type
+      let(:request) { post "/micropub", {content: "Blah Blah", "as" => "note"}, "HTTP_AUTHORIZATION" => "Bearer 1234" }
+
+      before do
+        stub_request(:post, "http://bookisworthy.com/notes").with(
+          body: {content: "Blah Blah", as: "note"},
+          headers: { 'Authorization' => "Bearer 1234" })
+        .to_return(status: 201, body: "http://bookisworthy.com/notes/1", headers: {"Location" => "http://bookisworthy.com/notes/1"})
+      end
+
       it "returns a 201" do
-        post "/micropub", {}, "HTTP_AUTHORIZATION" => "Bearer 1234"
+        request
         expect(last_response.status).to eq 201
       end
 
       it "returns a Location header" do
-        post "/micropub", {}, "HTTP_AUTHORIZATION" => "Bearer 1234"
-        expect(last_response.header["Location"]).to eq "http://bookisworthy.com/posts/1"
+        request
+        expect(last_response.header["Location"]).to eq "http://bookisworthy.com/notes/1"
       end
 
       it "with params access_token returns a 201" do
-        post "/micropub", {access_token: 1234}
+        post "/micropub", {content: "Blah Blah", access_token: 1234, as: "note"}
         expect(last_response.status).to eq 201
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: micropub-server-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Shane Becker
@@ -67,20 +67,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  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'
 - !ruby/object:Gem::Dependency
   name: micropub
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.6
 description: Micropub Railtie
 email:
 - veganstraightedge@gmail.com
@@ -99,11 +113,13 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- lib/micropub/homesteading/router.rb
 - lib/micropub/server/rails.rb
 - lib/micropub/server/rails/middleware.rb
 - lib/micropub/server/rails/railtie.rb
 - lib/micropub/server/rails/version.rb
 - micropub-server-rails.gemspec
+- spec/lib/micropub/homesteading/router_spec.rb
 - spec/lib/micropub/server/rails/middleware_spec.rb
 homepage: 
 licenses:
@@ -130,4 +146,5 @@ signing_key:
 specification_version: 4
 summary: Micropub Railtie
 test_files:
+- spec/lib/micropub/homesteading/router_spec.rb
 - spec/lib/micropub/server/rails/middleware_spec.rb