wordpress_client 1.0.1 → 2.0.0

data/spec/integration/attachments_crud_spec.rb

@@ -40,7 +40,7 @@ describe "Attachments" do
   it "uses HTML for the title" do
     media = find_or_create_attachment
     updated = client.update_media(media.id, title: "Images & paint")
-    expect(updated.title_html).to eq "Images & paint"
+    expect(updated.title_html).to eq "Images & paint"
   end
 
   def find_or_create_attachment

data/spec/integration/posts_crud_spec.rb

@@ -71,7 +71,7 @@ describe "Posts (CRUD)" do
     )
 
     expect(post.content_html.strip).to eq '<p class="hello-world">Hello world</p>'
-    expect(post.title_html.strip).to eq 'HTML test &amp; verify'
+    expect(post.title_html.strip).to eq 'HTML test &#038; verify'
   end
 
   it "can move a post to the trash can" do

data/spec/integration/posts_finding_spec.rb

@@ -14,73 +14,4 @@ describe "Posts (finding)" do
     expect(posts.map(&:id)).to eq posts.sort_by(&:date).reverse.map(&:id)
   end
 
-  it "can list articles in a specific category" do
-    category = client.create_category(name: "Filtering time", slug: "filtering")
-    post = client.create_post(
-      category_ids: [category.id],
-      status: "publish",
-      title: "Some title",
-    )
-
-    expect(client.posts(category_slug: "filtering").map(&:id)).to eq [post.id]
-  end
-
-  it "can list articles in a specific tag" do
-    tag = client.create_tag(name: "Taggged", slug: "tagged")
-    post = client.create_post(
-      tag_ids: [tag.id],
-      status: "publish",
-      title: "Some title",
-    )
-
-    expect(client.posts(tag_slug: "tagged").map(&:id)).to eq [post.id]
-  end
-
-  it "can list articles in a specific tag and category" do
-    category = client.create_category(name: "Fishing", slug: "fish")
-    tag = client.create_tag(name: "Soup", slug: "soup")
-    post = client.create_post(
-      category_ids: [category.id],
-      tag_ids: [tag.id],
-      status: "publish",
-      title: "Some title",
-    )
-
-    _post_without_tag = client.create_post(
-      category_ids: [category.id],
-      status: "publish",
-      title: "Some title",
-    )
-
-    _post_without_category = client.create_post(
-      tag_ids: [tag.id],
-      status: "publish",
-      title: "Some title",
-    )
-
-    expect(client.posts(category_slug: "fish", tag_slug: "soup").map(&:id)).to eq [post.id]
-  end
-
-  describe "finding by slug" do
-    it "finds the matching post" do
-      post = client.create_post(title: "Oh hai", slug: "oh-hai")
-      found = client.find_post_by_slug("oh-hai")
-      expect(found.id).to eq post.id
-    end
-
-    it "raises NotFoundError when no post can be found" do
-      expect {
-        client.find_post_by_slug("clearly-does-not-exist-anywhere")
-      }.to raise_error(WordpressClient::NotFoundError, /clearly/)
-    end
-
-    it "finds on the slug even if the title is wildly different" do
-      post = client.create_post(
-        title: "Updated title that doesn't match slug",
-        slug: "original-concise-title",
-      )
-      found = client.find_post_by_slug("original-concise-title")
-      expect(found.id).to eq post.id
-    end
-  end
 end

data/spec/integration/posts_metadata_spec.rb

@@ -4,24 +4,24 @@ describe "Post meta" do
   setup_integration_client
 
   it "can be set on a post" do
-    post = client.create_post(title: "Metadata creation", meta: {foo: "bar"})
-    expect(post.meta).to eq("foo" => "bar")
+    post = client.create_post(title: "Metadata creation", meta: {"foo" => 7})
+    expect(post.meta).to include("foo" => 7)
   end
 
   it "can be updated on a post" do
-    post = client.create_post(title: "Metadata creation", meta: {before: "now"})
-    post = client.update_post(post.id, meta: {"before" => "then", "after" => "now"})
-    expect(post.meta).to eq("before" => "then", "after" => "now")
+    post = client.create_post(title: "Metadata creation", meta: {"foo" => 1})
+    post = client.update_post(post.id, meta: {"foo" => 2, "bar" => true})
+    expect(post.meta).to include("foo" => 2, "bar" => true)
   end
 
   it "can remove metadata for a post" do
-    post = client.create_post(title: "Metadata creation", meta: {one: "1", two: "2", three: "3"})
-    post = client.update_post(post.id, meta: {three: "3", two: nil})
-    expect(post.meta).to eq("three" => "3")
+    post = client.create_post(title: "Metadata creation", meta: {foo: 1, bar: true, baz: "foobar"})
+    post = client.update_post(post.id, meta: {foo: 5, baz: nil})
+    expect(post.meta).to eq("foo" => 5, "bar" => true, "baz" => "")
   end
 
-  it "does not contain HTML data" do
-    post = client.create_post(title: "Metadata HTML", meta: {foo: "bar&baz"})
-    expect(post.meta).to eq("foo" => "bar&baz")
+  it "returns unescaped HTML" do
+    post = client.create_post(title: "Metadata HTML", meta: {baz: "larry&curly<moe>"})
+    expect(post.meta).to eq("baz" => "larry&curly<moe>", "foo" => 0, "bar" => false)
   end
 end

data/spec/integration/posts_with_attachments_spec.rb

@@ -3,19 +3,33 @@ require "spec_helper"
 describe "Posts with attachments" do
   setup_integration_client
 
-  it "exposes featured image as a Media instance" do
-    media = find_or_upload_media
-    post = client.create_post(title: "With media", featured_image: media.id)
+  it "exposes featured media as a Media instance" do
+    media = find_or_upload_image
+    post = client.create_post(title: "With image", featured_media: media.id)
+    expect(post.featured_media).to be_instance_of(WordpressClient::Media)
+    expect(post.featured_media.id).to eq media.id
+    expect(post.featured_media.slug).to eq media.slug
+    expect(post.featured_media.guid).to eq media.guid
+    expect(post.featured_media.source_url).to eq media.source_url
+    expect(post.featured_media_id).to eq media.id
+  end
 
+  it "exposes featured media as featured image if Media is an image" do
+    media = find_or_upload_image
+    post = client.create_post(title: "With image", featured_media: media.id)
     expect(post.featured_image).to be_instance_of(WordpressClient::Media)
+    expect(post.featured_image.id).to eq media.id
     expect(post.featured_image.slug).to eq media.slug
     expect(post.featured_image.guid).to eq media.guid
     expect(post.featured_image.source_url).to eq media.source_url
-    expect(post.featured_image_id).to eq media.id
   end
 
-  def find_or_upload_media
-    client.media(per_page: 1).first ||
+  def find_or_upload_image
+    find_media_of_type("image") ||
       client.upload_file(fixture_path("thoughtful.jpg"), mime_type: "image/jpeg")
   end
+
+  def find_media_of_type(type)
+    client.media(per_page: 10).detect { |media| media.media_type == type }
+  end
 end

data/spec/media_spec.rb

@@ -8,6 +8,7 @@ module WordpressClient
       media = Media.parse(fixture)
 
       expect(media.id).to eq 5
+      expect(media.media_type).to eq "image"
       expect(media.title_html).to eq "thoughtful"
       expect(media.slug).to eq "thoughtful"
       expect(media.description).to eq ""
@@ -59,5 +60,17 @@ module WordpressClient
         expect(media.updated_at).to eq Time.local(2001, 1, 1, 12, 0, 0)
       end
     end
+
+    describe "#as_image" do
+      it "returns self if media_type is image" do
+        media = Media.parse(fixture)
+        expect(media.as_image).to eq(media)
+      end
+
+      it "returns nil when media_type is not image" do
+        media = Media.parse(fixture.merge("media_type" => "video"))
+        expect(media.as_image).to be_nil
+      end
+    end
   end
 end

data/spec/post_spec.rb

@@ -33,8 +33,8 @@ module WordpressClient
 
       expect(post.categories).to eq [
         Category.new(
-          id: 1, name_html: "Uncategorized", slug: "uncategorized"
-        )
+          id: 1, name_html: "Uncategorized", slug: "uncategorized",
+        ),
       ]
 
       expect(post.category_ids).to eq [1]
@@ -45,7 +45,7 @@ module WordpressClient
 
       expect(post.tags).to eq [
         Tag.new(
-          id: 2, name_html: "Foo", slug: "foo"
+          id: 2, name_html: "winamp", slug: "winamp",
         )
       ]
 
@@ -54,10 +54,8 @@ module WordpressClient
 
     it "can have a Media as featured image" do
       media = instance_double(Media, id: 12)
-      post = Post.new(featured_image: media)
-
-      expect(post.featured_image).to eq media
-      expect(post.featured_image_id).to eq 12
+      post = Post.new(featured_media: media)
+      expect(post.featured_media).to eq media
     end
 
     describe "dates" do
@@ -86,29 +84,5 @@ module WordpressClient
       end
     end
 
-    describe "metadata" do
-      it "is parsed into a hash" do
-        post = Post.parse(json_fixture("post-with-metadata.json"))
-        expect(post.meta).to eq "foo" => "bar"
-      end
-
-      it "raises UnauthorizedError when post it is forbidden" do
-        expect {
-          Post.parse(json_fixture("post-with-forbidden-metadata.json"))
-        }.to raise_error(UnauthorizedError)
-      end
-
-      it "keeps track of the ID of each metadata key" do
-        post = Post.parse(json_fixture("post-with-metadata.json"))
-        expect(post.meta_id_for("foo")).to eq 2
-      end
-
-      it "raises ArgumentError when asked for the meta ID of a meta key not present" do
-        post = Post.parse(json_fixture("post-with-metadata.json"))
-        expect {
-          post.meta_id_for("clearly unreal")
-        }.to raise_error(ArgumentError, /clearly unreal/)
-      end
-    end
   end
 end

data/spec/support/docker_runner.rb

@@ -38,16 +38,31 @@ module DockerRunner
     end
   end
 
-  def purge_container(id)
-    output = `docker kill #{id.shellescape}; docker rm #{id.shellescape} `
-
-    unless $?.success?
-      message = "Could not clean up docker image #{id}. Output was:\n#{output}.\n"
-      if ENV["CIRCLECI"]
-        puts message
-      else
-        raise message
-      end
+  def kill_container(id)
+    output = `docker kill #{id.shellescape} 2>&1`
+    raise_on_failure(
+      action: "kill",
+      id: id,
+      exit_status: $?,
+      output: output,
+    )
+  end
+
+  def remove_container(id)
+    output = `docker rm #{id.shellescape} 2>&1`
+    raise_on_failure(
+      action: "remove",
+      id: id,
+      exit_status: $?,
+      output: output,
+    )
+  end
+
+  private
+  def raise_on_failure(action:, exit_status:, output:, id:)
+    unless exit_status.success?
+      message = "Could not #{action} docker image #{id}. Output was:\n#{output}.\n"
+      raise message
     end
   end
 end

data/spec/support/wordpress_server.rb

@@ -1,5 +1,7 @@
 require_relative "docker_runner"
 
+# rubocop:disable Rails/TimeZone
+
 class WordpressServer
   include Singleton
 
@@ -47,9 +49,10 @@ class WordpressServer
 
     begin
       wait_for_container_to_start
-    rescue
+    rescue => error
+      puts "Could not start container: #{error}. Cleaning up."
       purge_container
-      raise $!
+      raise error
     end
   end
 
@@ -57,7 +60,7 @@ class WordpressServer
     unless DockerRunner.docker_installed?
       STDERR.puts(
         "It does not look like you have docker installed. " \
-        "Please install docker so you can run integration tests."
+          "Please install docker so you can run integration tests.",
       )
       fail "No docker installed"
     end
@@ -73,21 +76,26 @@ class WordpressServer
     DockerRunner.run_container(
       DOCKER_IMAGE_NAME,
       port: port,
-      environment: {wordpress_host: host_with_port}
+      environment: {wordpress_host: host_with_port},
     )
   end
 
   def purge_container
     if @running
-      DockerRunner.purge_container(container_id)
-      @running = true
+      DockerRunner.kill_container(container_id)
+      @running = false
+
+      # CircleCI does not allow `docker rm`.
+      unless ENV["CIRCLECI"]
+        DockerRunner.remove_container(container_id)
+      end
     end
   end
 
   def wait_for_container_to_start
     # Try to connect to the webserver in a loop until we successfully connect,
     # the container process dies, or the timeout is reached.
-    timeout = 60
+    timeout = 10
     start = Time.now
 
     loop do

data/wordpress_client.gemspec

@@ -1,21 +1,20 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'wordpress_client/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "wordpress_client"
-  spec.version       = WordpressClient::VERSION
-  spec.authors       = ["Magnus Bergmark", "Rebecca Meritz"]
-  spec.email         = ["magnus.bergmark@gmail.com", "rebecca@meritz.com"]
-  spec.summary       = "A simple client to the Wordpress API."
-  spec.description   = "A simple client to the Wordpress API."
-  spec.homepage      = ""
-  spec.license       = "MIT"
+  spec.name = "wordpress_client"
+  spec.version = WordpressClient::VERSION
+  spec.authors = ["Magnus Bergmark", "Rebecca Meritz", "Hans Maaherra"]
+  spec.email = ["magnus.bergmark@gmail.com", "rebecca@meritz.com", "hans.maaherra@gmail.com"]
+  spec.summary = "A simple client to the Wordpress API."
+  spec.description = "A simple client to the Wordpress API."
+  spec.homepage = ""
+  spec.license = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files = `git ls-files -z`.split("\x0")
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.add_dependency "faraday", "~> 0.9"

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: wordpress_client
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Magnus Bergmark
 - Rebecca Meritz
+- Hans Maaherra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -99,6 +100,7 @@ description: A simple client to the Wordpress API.
 email:
 - magnus.bergmark@gmail.com
 - rebecca@meritz.com
+- hans.maaherra@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -126,8 +128,6 @@ files:
 - lib/wordpress_client/paginated_collection.rb
 - lib/wordpress_client/post.rb
 - lib/wordpress_client/post_parser.rb
-- lib/wordpress_client/replace_metadata.rb
-- lib/wordpress_client/replace_terms.rb
 - lib/wordpress_client/rest_parser.rb
 - lib/wordpress_client/tag.rb
 - lib/wordpress_client/term.rb
@@ -143,7 +143,6 @@ files:
 - spec/fixtures/category.json
 - spec/fixtures/image-media.json
 - spec/fixtures/invalid-post-id.json
-- spec/fixtures/post-with-forbidden-metadata.json
 - spec/fixtures/post-with-metadata.json
 - spec/fixtures/simple-post.json
 - spec/fixtures/tag.json
@@ -151,18 +150,14 @@ files:
 - spec/fixtures/validation-error.json
 - spec/integration/attachments_crud_spec.rb
 - spec/integration/categories_spec.rb
-- spec/integration/category_assignment_spec.rb
 - spec/integration/posts_crud_spec.rb
 - spec/integration/posts_finding_spec.rb
 - spec/integration/posts_metadata_spec.rb
 - spec/integration/posts_with_attachments_spec.rb
-- spec/integration/tag_assignment_spec.rb
 - spec/integration/tags_spec.rb
 - spec/media_spec.rb
 - spec/paginated_collection_spec.rb
 - spec/post_spec.rb
-- spec/replace_metadata_spec.rb
-- spec/replace_terms_spec.rb
 - spec/shared_examples/term_examples.rb
 - spec/spec_helper.rb
 - spec/support/docker_runner.rb
@@ -191,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A simple client to the Wordpress API.
@@ -207,7 +202,6 @@ test_files:
 - spec/fixtures/category.json
 - spec/fixtures/image-media.json
 - spec/fixtures/invalid-post-id.json
-- spec/fixtures/post-with-forbidden-metadata.json
 - spec/fixtures/post-with-metadata.json
 - spec/fixtures/simple-post.json
 - spec/fixtures/tag.json
@@ -215,18 +209,14 @@ test_files:
 - spec/fixtures/validation-error.json
 - spec/integration/attachments_crud_spec.rb
 - spec/integration/categories_spec.rb
-- spec/integration/category_assignment_spec.rb
 - spec/integration/posts_crud_spec.rb
 - spec/integration/posts_finding_spec.rb
 - spec/integration/posts_metadata_spec.rb
 - spec/integration/posts_with_attachments_spec.rb
-- spec/integration/tag_assignment_spec.rb
 - spec/integration/tags_spec.rb
 - spec/media_spec.rb
 - spec/paginated_collection_spec.rb
 - spec/post_spec.rb
-- spec/replace_metadata_spec.rb
-- spec/replace_terms_spec.rb
 - spec/shared_examples/term_examples.rb
 - spec/spec_helper.rb
 - spec/support/docker_runner.rb