wordpress_client 0.0.1 → 2.0.1

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/spec_helper.rb

@@ -4,6 +4,7 @@ if ENV['CODECLIMATE_REPO_TOKEN']
 end
 
 require "webmock/rspec"
+require "pry"
 
 require_relative "support/wordpress_server"
 require_relative "support/fixtures"

data/spec/support/docker_runner.rb

@@ -9,11 +9,15 @@ module DockerRunner
   end
 
   def image_exists?(name)
-    system("docker images | grep -q '^#{name.shellescape} '")
+    name, tag = name.split(":", 2)
+    matcher = "^#{name} "
+    matcher << "[[:space:]]*#{tag}" if tag
+
+    system("docker images | grep -q #{matcher.shellescape}")
   end
 
   def build_image(name, path: Dir.pwd)
-    system("cd #{path.shellescape} && docker build -t #{name.shellescape} .")
+    system("docker build -t #{name.shellescape} #{path.shellescape}")
   end
 
   def run_container(name, port:, environment: {})
@@ -25,25 +29,41 @@ module DockerRunner
       docker run \
         -dit -p #{port.to_i}:80 \
         #{environment_flags.join(" ")} \
-        #{name.shellescape}
+        #{name.shellescape} \
+      2>&1
     `
     if $?.success?
       output.chomp
     else
-      fail "Failed to start container. Maybe it's already running? Output: #{output}"
+      fail "Failed to start container. Maybe it's already running? Output:\n#{output}"
     end
   end
 
-  def purge_container(id)
-    output = `docker kill #{id.shellescape}; docker rm #{id.shellescape} `
+  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
 
-    unless $?.success?
-      message = "Could not clean up docker image #{id}. Output was:\n#{output}.\n"
-      if ENV["CIRCLECI"]
-        puts message
-      else
-        raise message
-      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,103 +1,141 @@
 require_relative "docker_runner"
 
-class WordpressServer
-  include Singleton
+# rubocop:disable Rails/TimeZone
 
-  attr_reader :container_id, :port, :host
+module WordpressServer
+  def self.instance
+    if (ENV["CI"] || "").strip.size > 0
+      CIStrategy.instance
+    else
+      DockerStrategy.instance
+    end
+  end
 
-  def initialize
-    @host = docker_host
-    @port = 8181
+  class DockerStrategy
+    include Singleton
+    attr_reader :container_id, :port, :host
 
-    start_docker_container
-    at_exit { purge_container }
-  end
+    def initialize
+      @host = docker_host
+      @port = 8181
 
-  def url
-    "http://#{host_with_port}/wp-json"
-  end
+      start_docker_container
+      at_exit { purge_container }
+    end
 
-  # Defined in the dbdump in spec/docker/dbdump.sql.gz
-  def username() "test" end
+    def url
+      "http://#{host_with_port}/wp-json"
+    end
 
-  # Defined in the dbdump in spec/docker/dbdump.sql.gz
-  def password() "test" end
+    # Defined in the dbdump in spec/docker/dbdump.sql.gz
+    def username() "test" end
 
-  private
-  def host_with_port
-    "#{host}:#{port}"
-  end
+    # Defined in the dbdump in spec/docker/dbdump.sql.gz
+    def password() "test" end
 
-  def docker_host
-    if ENV['DOCKER_HOST']
-      URI.parse(ENV['DOCKER_HOST']).host
-    else
-      "localhost"
+    private
+    DOCKER_IMAGE_NAME = "hemnet/wordpress_client_test:dev".freeze
+
+    def host_with_port
+      "#{host}:#{port}"
     end
-  end
 
-  def start_docker_container
-    fail_if_docker_missing
-    build_container_if_missing
+    def docker_host
+      if ENV['DOCKER_HOST']
+        URI.parse(ENV['DOCKER_HOST']).host
+      else
+        "localhost"
+      end
+    end
 
-    @container_id = start_container
-    @running = true
+    def start_docker_container
+      fail_if_docker_missing
+      build_container_if_missing
+
+      @container_id = start_container
+      @running = true
 
-    begin
-      wait_for_container_to_start
-    rescue
-      purge_container
-      raise $!
+      begin
+        wait_for_container_to_start
+      rescue => error
+        puts "Could not start container: #{error}. Cleaning up."
+        purge_container
+        raise error
+      end
     end
-  end
 
-  def fail_if_docker_missing
-    unless DockerRunner.docker_installed?
-      STDERR.puts(
-        "It does not look like you have docker installed. " \
-        "Please install docker so you can run integration tests."
-      )
-      fail "No docker installed"
+    def fail_if_docker_missing
+      unless DockerRunner.docker_installed?
+        STDERR.puts(
+          "It does not look like you have docker installed. " \
+            "Please install docker so you can run integration tests.",
+        )
+        fail "No docker installed"
+      end
     end
-  end
 
-  def build_container_if_missing
-    unless DockerRunner.image_exists?("wpclient-test")
-      DockerRunner.build_image("wpclient-test", path: "spec/docker")
+    def build_container_if_missing
+      unless DockerRunner.image_exists?(DOCKER_IMAGE_NAME)
+        DockerRunner.build_image(DOCKER_IMAGE_NAME, path: "spec/docker")
+      end
     end
-  end
 
-  def start_container
-    DockerRunner.run_container(
-      "wpclient-test",
-      port: port,
-      environment: {wordpress_host: host_with_port}
-    )
-  end
+    def start_container
+      DockerRunner.run_container(
+        DOCKER_IMAGE_NAME,
+        port: port,
+        environment: {wordpress_host: host_with_port},
+      )
+    end
 
-  def purge_container
-    if @running
-      DockerRunner.purge_container(container_id)
-      @running = true
+    def purge_container
+      if @running
+        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 = 10
+      start = Time.now
+
+      loop do
+        fail "Timed out while waiting for the container to start" if Time.now - start > timeout
+
+        begin
+          response = Faraday.get(url)
+          fail response.body if response.status == 500
+          return if response.status == 200
+        rescue Faraday::ConnectionFailed
+          # Server not yet started. Just wait it out...
+        end
+        sleep 0.5
+      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
-    start = Time.now
+  class CIStrategy
+    include Singleton
 
-    loop do
-      fail "Timed out while waiting for the container to start" if Time.now - start > timeout
+    def url
+      "http://wordpress/wp-json"
+    end
 
-      begin
-        response = Faraday.get(url)
-        return if response.status == 200
-      rescue Faraday::ConnectionFailed
-        # Server not yet started. Just wait it out...
-      end
-      sleep 0.5
+    # Defined in the dbdump in spec/docker/dbdump.sql.gz
+    def username
+      "test"
+    end
+
+    # Defined in the dbdump in spec/docker/dbdump.sql.gz
+    def password
+      "test"
     end
   end
 end

data/wordpress_client.gemspec

@@ -1,27 +1,27 @@
-# 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"
+  spec.add_dependency "faraday", [">= 0.9", "< 2"]
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.3"
-  spec.add_development_dependency "webmock", "~> 1.22"
+  spec.add_development_dependency "bundler", "~> 2.2"
+  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rspec", "~> 3.7"
+  spec.add_development_dependency "webmock", "~> 3.3"
+  spec.add_development_dependency "yard", "~> 0.9"
 end

metadata

@@ -1,60 +1,81 @@
 --- !ruby/object:Gem::Specification
 name: wordpress_client
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 2.0.1
 platform: ruby
 authors:
 - Magnus Bergmark
 - Rebecca Meritz
-autorequire: 
+- Hans Maaherra
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2021-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
+- !ruby/object:Gem::Dependency
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -68,37 +89,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.3'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '0.9'
 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: []
 files:
+- ".circleci/config.yml"
+- ".codeclimate.yml"
 - ".gitignore"
-- ".hound.yml"
 - ".rubocop.yml"
-- ".ruby-version"
+- ".yardopts"
+- Changelog.md
 - Gemfile
 - Guardfile
 - LICENSE
 - README.md
 - Rakefile
-- circle.yml
 - lib/wordpress_client.rb
 - lib/wordpress_client/category.rb
 - lib/wordpress_client/client.rb
@@ -109,8 +132,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
@@ -123,10 +144,10 @@ files:
 - spec/docker/dbdump.sql.gz
 - spec/docker/htaccess
 - spec/docker/restore-dbdump.sh
+- spec/docker/yum.repos.d/CentOS-Base.repo
 - 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
@@ -134,18 +155,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
@@ -158,7 +175,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -173,9 +190,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: A simple client to the Wordpress API.
 test_files:
@@ -187,10 +203,10 @@ test_files:
 - spec/docker/dbdump.sql.gz
 - spec/docker/htaccess
 - spec/docker/restore-dbdump.sh
+- spec/docker/yum.repos.d/CentOS-Base.repo
 - 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
@@ -198,18 +214,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

data/.hound.yml

@@ -1,2 +0,0 @@
-ruby:
-  config_file: .rubocop.yml

data/.ruby-version

@@ -1 +0,0 @@
-ruby-2.2.2

data/circle.yml

@@ -1,3 +0,0 @@
-machine:
-  services:
-    - docker