mailcatcher-api 0.0.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8b6a40842d2e537e5844010417fdf6bdeadd5f0d
-  data.tar.gz: 5e388f3c72cd485699afdae7994501c1aae1c07b
+SHA256:
+  metadata.gz: 04d45440217381836f6a4ef5fdf4e03664644d5f07481dd556be856188dec811
+  data.tar.gz: face6fcf0cd00b1f96e6abe0f6ad3430453cd7900eec131fd62d2733dd8ad12b
 SHA512:
-  metadata.gz: 801956af0ca0d441515cc11673beb0c78c0b1e1a12937db8b249bd42fcf4b75703fdef6813c23537e87a5ad381bd83da0edb6e2467432dce7fc27e4639e90da6
-  data.tar.gz: faee53254a0a48b377c09177f47a14ba8c4d9b1b2add88ca6297cc4438853cb90e0da4e0419ac24b7f661a465e70d01e6a41a689ad7eff9db35862d7380adffd
+  metadata.gz: abd1e6ecbeb9deb1b03b22f65c58aa16daf5a6181e9fbd691e88b4fee5b2f54829f8960dfff4ab3063a2ab59cfcd806117ece54dbce5d76c3eedd4b74f3ad355
+  data.tar.gz: 6de63e51576b3c77df466db2e0568bdaaea70ce44b8d51ef8e59eb800a3c2bc07698ac61e2f100ab8b8bcd06fcb6b4494ebd565f0c5ba3f92b39ea36b2511fb5

data/lib/mailcatcher/api.rb

@@ -1,11 +1,5 @@
-require 'faraday'
-require 'multi_json'
-
 require 'mailcatcher/api/version'
-require 'mailcatcher/api/configuration'
-require 'mailcatcher/api/error'
-require 'mailcatcher/api/middleware/network_exceptions'
-require 'mailcatcher/api/message'
+require 'mailcatcher/api/config'
 require 'mailcatcher/api/mailbox'
 
 module MailCatcher
@@ -15,11 +9,7 @@ module MailCatcher
     end
 
     def self.config
-      @configuration ||= Configuration.new
-    end
-
-    def self.reset_config
-      @configuration = Configuration.new
+      @config ||= Config.new
     end
 
     def self.configure

data/lib/mailcatcher/api/client.rb

@@ -0,0 +1,43 @@
+require 'net/http'
+require 'uri'
+require 'json'
+
+module MailCatcher
+  module API
+    module Client
+      MESSAGE_ENDPOINT = '/messages/%{message_id}.json'.freeze
+      MESSAGE_INDEX_ENDPOINT = '/messages'.freeze
+
+      def self.fetch_message_index
+        request(:get, MESSAGE_INDEX_ENDPOINT)
+      end
+
+      def self.fetch_message(id)
+        request(:get, format(MESSAGE_ENDPOINT, message_id: id))
+      end
+
+      def self.delete_all
+        request(:delete, MESSAGE_INDEX_ENDPOINT)
+      end
+
+      def self.delete_message(id)
+        request(:delete, format(MESSAGE_ENDPOINT, message_id: id))
+      end
+
+      def self.request(method, path)
+        request = case method
+                  when :get; Net::HTTP::Get.new(path)
+                  when :delete; Net::HTTP::Delete.new(path)
+                  else raise NotImplementedError, "Don't know how to request #{method} method"
+                  end
+        response = http.request(request)
+        JSON.load(response.body)
+      end
+
+      def self.http
+        uri = URI(MailCatcher::API.config.server)
+        Net::HTTP.new(uri.host, uri.port)
+      end
+    end
+  end
+end

data/lib/mailcatcher/api/{configuration.rb → config.rb}

@@ -1,6 +1,6 @@
 module MailCatcher
   module API
-    class Configuration
+    class Config
       attr_accessor :server
 
       def initialize

data/lib/mailcatcher/api/mailbox.rb

@@ -1,48 +1,21 @@
+require 'mailcatcher/api/client'
+require 'mailcatcher/api/mailbox/message_collection'
+
 module MailCatcher
   module API
     class Mailbox
-      attr_reader :server
-
-      def initialize
-        @server = MailCatcher::API.config.server
-
-        @connection = Faraday.new(url: @server) do |faraday|
-          faraday.request :network_exception
-          faraday.adapter :net_http
-        end
-
-        @messages_index = nil
-        @messages = nil
+      def messages(reload: false)
+        @messages = nil if reload == true
+        @messages ||= MessageCollection.new
       end
 
-      def refresh
-        load_messages_index
-        load_messages unless @messages.nil?
+      def clear!
+        MailCatcher::API::Client.delete_all
       end
 
+      # Deprecated
       def count
-        messages_index.count
-      end
-
-      def messages
-        @messages ||= load_messages
-      end
-
-      private
-
-      def load_messages_index
-        @messages_index = MultiJson.load(@connection.get('/messages').body)
-      end
-
-      def messages_index
-        @messages_index ||= load_messages_index
-      end
-
-      def load_messages
-        @messages = messages_index.map do |msg|
-          response = @connection.get("/messages/#{ msg['id'] }.json")
-          API::Message.new(MultiJson.load(response.body)['source'])
-        end
+        messages.count
       end
     end
   end

data/lib/mailcatcher/api/mailbox/message.rb

@@ -0,0 +1,33 @@
+require 'forwardable'
+require 'uri'
+require 'mail'
+
+module MailCatcher
+  module API
+    class Mailbox
+      class Message
+        extend Forwardable
+
+        def_delegators :@mail, :message_id, :date, :from, :to, :subject, :body, :decode_body,
+                       :mime_type, :charset, :content_type
+
+        attr_reader :id, :raw
+
+        def initialize(msg)
+          @id = msg['id'].to_i
+          @raw = msg['source']
+
+          @mail = Mail.new(@raw)
+        end
+
+        def links
+          @links ||= URI.extract(decode_body).select { |s| s.start_with?('http') || s.start_with?('https') }
+        end
+
+        def delete!
+          MailCatcher::API::Client.delete_message(id)
+        end
+      end
+    end
+  end
+end

data/lib/mailcatcher/api/mailbox/message_collection.rb

@@ -0,0 +1,43 @@
+require 'mailcatcher/api/client'
+require 'mailcatcher/api/mailbox/message'
+
+module MailCatcher
+  module API
+    class Mailbox
+      class MessageCollection
+        include Enumerable
+
+        def each
+          collection.each do |msg|
+            yield(msg)
+          end
+          nil
+        end
+
+        private
+
+        def collection
+          @collection ||= load_collection
+        end
+
+        def load_collection
+          collection_index.map do |msg|
+            Mailbox::Message.new(client.fetch_message(msg['id']))
+          end
+        end
+
+        def collection_index
+          @collection_index ||= load_collection_index.sort { |a, b| b['id'] <=> a['id'] }
+        end
+
+        def load_collection_index
+          client.fetch_message_index
+        end
+
+        def client
+          MailCatcher::API::Client
+        end
+      end
+    end
+  end
+end

data/lib/mailcatcher/api/version.rb

@@ -1,5 +1,5 @@
 module MailCatcher
   module API
-    VERSION = '0.0.1'
+    VERSION = '0.2.0'.freeze
   end
 end

data/lib/tasks/console.rake

@@ -1,5 +1,9 @@
-desc 'Start the IRB console (short-cut alias: "c")'
+desc 'Start the IRB console (aliased to "c")'
 task :console do
-    sh 'irb -I lib -rubygems -r mailcatcher/api'
+  require 'irb'
+  require 'irb/completion'
+  require 'mailcatcher/api'
+  ARGV.clear
+  IRB.start
 end
 task c: :console

data/lib/tasks/spec.rake

@@ -1,4 +1,10 @@
-Rake::TestTask.new(:spec) do |t|
-  t.test_files = FileList[ ENV['SPEC_FILES'] ].exclude( ENV['INTEGRATION_FILES'] )
+begin
+  require 'rspec/core/rake_task'
+
+  RSpec::Core::RakeTask.new(:spec)
+
+  task :default => :spec
+rescue LoadError
+  # no rspec available
+  puts 'It seems like RSpec is not available, probably you need to run `bundle install`'
 end
-task default: :spec

metadata

@@ -1,127 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: mailcatcher-api
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrii Vakarev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
-  name: rspec-expectations
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '4.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '4.8'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: '0'
 description: MailCatcher REST API SDK
 email:
 - avakarev@gmail.com
@@ -131,16 +89,14 @@ extra_rdoc_files: []
 files:
 - lib/mailcatcher.rb
 - lib/mailcatcher/api.rb
-- lib/mailcatcher/api/configuration.rb
-- lib/mailcatcher/api/error.rb
+- lib/mailcatcher/api/client.rb
+- lib/mailcatcher/api/config.rb
 - lib/mailcatcher/api/mailbox.rb
-- lib/mailcatcher/api/message.rb
-- lib/mailcatcher/api/middleware/network_exceptions.rb
+- lib/mailcatcher/api/mailbox/message.rb
+- lib/mailcatcher/api/mailbox/message_collection.rb
 - lib/mailcatcher/api/version.rb
 - lib/tasks/console.rake
 - lib/tasks/spec.rake
-- lib/tasks/spec_all.rake
-- lib/tasks/spec_integration.rake
 homepage: https://github.com/avakarev/mailcatcher-api
 licenses:
 - MIT
@@ -161,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: MailCatcher REST API SDK

data/lib/mailcatcher/api/error.rb

@@ -1,8 +0,0 @@
-module MailCatcher
-  module API
-    module Error
-      class Connection < StandardError; end
-      class Timeout < Connection; end
-    end
-  end
-end

data/lib/mailcatcher/api/message.rb

@@ -1,32 +0,0 @@
-require 'uri'
-require 'mail'
-
-module MailCatcher
-  module API
-    class Message
-      attr_reader :raw
-      attr_reader :message_id, :date
-      attr_reader :from, :to, :subject, :body
-      attr_reader :mime_type, :charset, :content_type
-
-      def initialize(raw_message)
-        mail = Mail.new(raw_message)
-
-        @raw = raw_message
-        @message_id = mail.message_id
-        @date = mail.date
-        @from = mail.from
-        @to = mail.to
-        @subject = mail.subject
-        @body = mail.body.raw_source
-        @mime_type = mail.mime_type
-        @charset = mail.charset
-        @content_type = mail.content_type
-      end
-
-      def links
-        @links ||= URI.extract(@body).select { |s| s.start_with? 'http' }
-      end
-    end
-  end
-end

data/lib/mailcatcher/api/middleware/network_exceptions.rb

@@ -1,17 +0,0 @@
-module MailCatcher
-  module API
-    module Middleware
-      class NetworkExceptions < ::Faraday::Middleware
-        def call(env)
-          @app.call(env)
-        rescue ::Faraday::Error::TimeoutError
-          raise Error::Timeout, $!
-        rescue
-          raise Error::Connection, $!
-        end
-      end
-    end
-  end
-end
-
-Faraday::Request.register_middleware network_exception: MailCatcher::API::Middleware::NetworkExceptions

data/lib/tasks/spec_all.rake

@@ -1,3 +0,0 @@
-Rake::TestTask.new('spec:all') do |t|
-  t.test_files = FileList[ ENV['SPEC_FILES'] ]
-end

data/lib/tasks/spec_integration.rake

@@ -1,3 +0,0 @@
-Rake::TestTask.new('spec:integration') do |t|
-  t.test_files = FileList[ ENV['INTEGRATION_FILES'] ]
-end