thunderer 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67917833bd7bdb8962664293c6659eabda202252
-  data.tar.gz: 6aba43d84bda05ded6eec74460b310fbcac968d4
+  metadata.gz: ac9ccfa84ee7f79f531bfc0fd9fb47c75a6cb8af
+  data.tar.gz: a69cb3989a05b5f12cf5c5f8b0845b679702359a
 SHA512:
-  metadata.gz: 95cd9c98d64d08426cf6ec9b7bbc3d37948a4f4417ef4d936afcca591fffdff5b63d4eaeeafb78010b2097efebcabaaec4fe131dd6c2f81fcd00a118950c2bcf
-  data.tar.gz: 3ab00dba836fbb7dc3eead43756f15ef0fa935c7d6e613987598b07316bb52ab7bc33e3f2578c7baa0a96aadd38f17cde4a355383f3b1891c947fb77275f41d2
+  metadata.gz: 9ca8bb850cd751739ab961c15c2e5a60c9533a47fa9f6f33a1b6dedace7f54c8920d94c60280ab3a9a0d467745bfbb66010fd6682db1071ed550f690d9ba5e41
+  data.tar.gz: 241193c64ec37ffb4aeeae18ac38fa15a180b730b03e102b875c2ea9e51f9a3f3cce2cf0bd719028b61133a0619de02df169ad7b6eb80f99e4bbf06a51d85d14

data/Gemfile

@@ -3,10 +3,15 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in thunderer.gemspec
 gemspec
 
+gem 'rails', '4.2.0'
+gem 'sqlite3'
+gem 'jasmine'
+
 group :development do
   gem 'guard-rspec', require: false
   gem 'guard-jasmine'
   gem 'rsense'
+  gem 'sucker_punch'
 end
 
 

data/README.md

@@ -20,10 +20,79 @@ Or install it yourself as:
 
     $ gem install thunderer
 
-## Usage
+## Rails 4.2 integration
 
-TODO: Write usage instructions here
+Now thunderer supports ActiveJob scheduling of notifications and can be configured by global setup of ActiveJob or
+in thunderer.rb
 
+    Thunderer.configure do |config|
+      config.queue_adapter = :sucker_punch
+      config.environment = Rails.env
+      config.config_file_path = 'config/thunderer.yml'
+     end
+
+
+## Setup
+Run generator:
+
+      rails g thunderer:install
+
+It will generate thunderer.ru and thunderer.yml files. Check it and setup domain for production
+
+Next add the JavaScript file to your application.js file manifest.
+
+    //= require thunderer
+
+## Usage with typical rails app
+
+Use the `subscribe_to` helper method on any page to subscribe to a channel.
+
+```rhtml
+<%= subscribe_to "/comments" %>
+```
+
+Then setup active record models:
+
+```
+class Comment < ActiveRecord::Base
+  include Thunderer::PublishChanges
+  notify_client_to_channels '/comments/new'
+end
+```
+
+## Usage with Angular single page application
+
+Before start using with Angular add response interceptor (ThundererInterceptor) and service ($thunderer):
+
+    //= require thunderer_angular
+
+Inject `'Thunderer'` module to your app, and setup `$http` service
+
+```
+...
+provider.interceptors.push('ThundererInterceptor');
+...
+```
+
+The main deference of usage is adding special headers to json responses:
+
+```
+    class CommentsController < ApplicationController
+      include Thunderer::ControllerAdditions
+
+      thunderer_channels '/comments'
+
+    end
+```
+
+After that you can subscribe in your angular controllers and directives to Faye callbacks
+
+```
+  commentAddOrChangedCallback = function(data) {
+    alert(data);
+  }
+  $thunderer.addListener("/comments", commentAddOrChangedCallback);
+```
 ## Contributing
 
 1. Fork it ( http://github.com/<my-github-username>/thunderer/fork )

data/lib/generators/thunderer/install_generator.rb

@@ -13,6 +13,7 @@ module Thunderer
           copy_file '../../../../app/assets/javascripts/thunderer_subscription_service.js', 'public/javascripts/thunderer_subscription_service.js'
         end
         copy_file 'thunderer.ru', 'thunderer.ru'
+        copy_file 'thunderer.rb', 'app/config/initializers/thunderer.rb'
       end
     end
   end

data/lib/generators/thunderer/templates/thunderer.rb

@@ -0,0 +1,5 @@
+Thunderer.configure do |config|
+  #config.queue_adapter = :sucker_punch
+  #config.async = true
+  config.config_file_path = 'config/thunderer.yml'
+end

data/lib/thunderer.rb

@@ -1,30 +1,30 @@
 require 'thunderer/version'
-require 'thunderer/parser'
-require 'thunderer/messanger'
+require 'thunderer/channel_parser'
 require 'thunderer/faye_extension'
+require 'thunderer/messages/async_message'
+require 'thunderer/messages/base'
+require 'thunderer/configuration'
 require 'digest/sha1'
-require 'yaml'
+require 'ostruct'
 require 'thunderer/engine' if defined? Rails
 
 module Thunderer
-  class Error < StandardError; end
+  class Error < StandardError;
+  end
 
   class << self
     attr_reader :config
-    attr_reader :messanger
 
     def reset_config
-     @config = {}
+      @config = Thunderer::Configuration.new
     end
 
-    def load_config filename, environment
-      reset_config
-      config_yaml = YAML.load_file(filename)[environment]
-      raise ArgumentError, "The #{environment} environment dose not exist" unless config_yaml
-      config_yaml.each { |k,v| config[k.to_sym] = v }
-      Thunderer::Messanger.configure( config[:local_server_url] || config[:server])
-      @messanger = Thunderer::Messanger
+    def config
+      @config ||= Thunderer::Configuration.new
+    end
 
+    def configure
+      yield config if block_given?
     end
 
     def publish_to channel, data
@@ -32,31 +32,34 @@ module Thunderer
     end
 
     def publish_message(message)
-      raise Error, 'No server specified, ensure thunderer.yml was loaded properly.' unless config[:server]
-      url = URI.parse(config[:server])
-      messanger.post(message)
+      raise Error, 'No server specified, ensure thunderer.yml was loaded properly.' unless config.server
+      if config.async
+        Thunderer::Messages::Base.new(message)
+      else
+        Thunderer::Messages::AsyncMessage.new(message)
+      end.deliver
     end
 
     def message(channel, data)
-      {:channel => channel,
-       :data => {
-         :channel => channel,
-         :data => data},
-       :ext => {:thunderer_secret_token => config[:secret_token]}}
+      {channel: channel,
+       data: {
+           channel: channel,
+           data: data},
+       ext: {thunderer_secret_token: config.secret_token}}
     end
 
     def subscription(options = {})
-      sub = {:server => config[:server], :timestamp => (Time.now.to_f * 1000).round}.merge(options)
-      sub[:signature] = Digest::SHA1.hexdigest([config[:secret_token], sub[:channel], sub[:timestamp]].join)
+      sub = {server: config.server, timestamp: (Time.now.to_f * 1000).round}.merge(options)
+      sub[:signature] = Digest::SHA1.hexdigest([config.secret_token, sub[:channel], sub[:timestamp]].join)
       sub
     end
 
     def signature_expired?(timestamp)
-      timestamp < ((Time.now.to_f - config[:signature_expiration])*1000).round if config[:signature_expiration]
+      timestamp < ((Time.now.to_f - config.signature_expiration)*1000).round if config.signature_expiration
     end
 
     def faye_app(options = {})
-      options = {mount: '/faye', timeout: 45, extensions: [FayeExtension.new] }.merge(options)
+      options = {mount: '/faye', timeout: 45, extensions: [FayeExtension.new]}.merge(options)
       Faye::RackAdapter.new(options)
     end
   end

data/lib/thunderer/{parser.rb → channel_parser.rb}

@@ -1,5 +1,5 @@
 module Thunderer
-  module Parser
+  module ChannelParser
 
     class << self
       def interpolate_channel channel, object

data/lib/thunderer/configuration.rb

@@ -0,0 +1,38 @@
+require 'yaml'
+module Thunderer
+  class Configuration
+    attr_writer :environment
+    attr_accessor :queue_adapter
+    attr_accessor :server
+    attr_accessor :local_server_url
+    attr_accessor :async
+    attr_accessor :secret_token
+    attr_accessor :signature_expiration
+
+    def initialize
+      @config_file_path = ''
+      @queue_adapter = nil
+      @server = nil
+      @secret_token = nil
+      @signature_expiration = 3600
+      @local_server_url = nil
+      @async = false
+      @environment = nil
+    end
+
+    def config_file_path=(value)
+      load_configuration(value, @environment)
+    end
+
+    private
+
+    def load_configuration(path, environment)
+      config_yaml = YAML.load_file(path)[environment]
+      raise ArgumentError, "The #{environment} environment dose not exist" unless config_yaml
+      config_yaml.each do |k, v|
+        self.public_send("#{k}=",v)
+      end
+    end
+
+  end
+end

data/lib/thunderer/controller_additions.rb

@@ -14,7 +14,7 @@ module Thunderer
           headers['channels'] = (self.class.channels || []).map do |channel|
           new_str = if self.class.interpolation_object && channel
                       object = send(self.class.interpolation_object)
-                      Thunderer::Parser.interpolate_channel channel, object
+                      Thunderer::ChannelParser.interpolate_channel channel, object
                     else
                       channel
                     end

data/lib/thunderer/engine.rb

@@ -4,11 +4,6 @@ require 'thunderer/controller_additions'
 module Thunderer
   class Engine < ::Rails::Engine
 
-    initializer 'thunderer.config' do
-      path = Rails.root.join('config/thunderer.yml')
-      Thunderer.load_config(path, Rails.env) if path.exist?
-    end
-
     initializer :assets do |config|
       Rails.application.config.assets.paths << File.join(
           Gem.loaded_specs['faye'].full_gem_path, 'lib')
@@ -18,17 +13,5 @@ module Thunderer
       ActionView::Base.send :include, ViewHelpers
     end
 
-    # initializer 'thunderer.controller' do
-    #   ActiveSupport.on_load(:action_controller) do
-    #     include Thunderer::ControllerAdditions
-    #   end
-    # end
-    #
-    # initializer 'thunderer.active_record' do
-    #   ActiveSupport.on_load(:active_record) do
-    #     include Thunderer::PublishChanges
-    #   end
-    # end
-
   end
 end

data/lib/thunderer/faye_extension.rb

@@ -27,9 +27,9 @@ module Thunderer
 
     # Ensures the secret token is correct before publishing.
     def authenticate_publish(message)
-      if Thunderer.config[:secret_token].nil?
+      if Thunderer.config.secret_token.nil?
         raise Error, 'No secret_token config set, ensure thunderer.yml is loaded properly.'
-      elsif message['ext']['thunderer_secret_token'] != Thunderer.config[:secret_token]
+      elsif message['ext']['thunderer_secret_token'] != Thunderer.config.secret_token
 
         message['error'] = 'Incorrect token.'
       else

data/lib/thunderer/messages/async_message.rb

@@ -0,0 +1,32 @@
+require 'active_job'
+module Thunderer
+  module Messages
+    class AsyncMessage
+      class Job < ::ActiveJob::Base
+
+        class << self
+          def queue_adapter
+            if Thunderer.config.queue_adapter
+              "ActiveJob::QueueAdapters::#{Thunderer.config.queue_adapter.to_s.camelize}Adapter".constantize
+            else
+              super
+            end
+          end
+        end
+
+        def perform(message)
+          Thunderer::Messages::Base.new(message).deliver
+        end
+      end
+
+      def initialize(message)
+        @message = message
+      end
+
+      def deliver
+        Job.perform_later(@message)
+      end
+
+    end
+  end
+end

data/lib/thunderer/messages/base.rb

@@ -0,0 +1,40 @@
+module Thunderer
+  module Messages
+    class Base
+
+      def initialize(message)
+        @message = message
+      end
+
+      def deliver
+        form = build_form
+        form.set_form_data(message: @message.to_json)
+        protocol.start { |h| h.request(form) }
+      end
+
+      private
+
+      def build_form
+        Net::HTTP::Post.new(uri.path.empty? ? '/' : uri.path)
+      end
+
+      def protocol
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = use_ssl?
+        if use_ssl?
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
+        http
+      end
+
+      def uri
+        @uri ||= URI.parse(Thunderer.config.local_server_url || Thunderer.config.server)
+      end
+
+      def use_ssl?
+        uri.scheme == 'https'
+      end
+    end
+
+  end
+end

data/lib/thunderer/publish_changes.rb

@@ -19,7 +19,7 @@ module Thunderer
                            else
                              notification_message
                            end
-          Thunderer.publish_to Thunderer::Parser.interpolate_channel(channel, self), rooted_message
+          Thunderer.publish_to Thunderer::ChannelParser.interpolate_channel(channel, self), rooted_message
         end
       end
 

data/lib/thunderer/version.rb

@@ -1,3 +1,3 @@
 module Thunderer
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/spec_helper.rb

@@ -32,12 +32,10 @@ RSpec.configure do |config|
   dep = defined?(ActiveSupport::Dependencies) ? ActiveSupport::Dependencies : ::Dependencies
   dep.autoload_paths.unshift FIXTURES_PATH
 
-  ActiveRecord::Base.quietly do
-    ActiveRecord::Migration.verbose = false
-    load File.join(FIXTURES_PATH, 'schema.rb')
-  end
+  ActiveRecord::Migration.verbose = false
+  load File.join(FIXTURES_PATH, 'schema.rb')
 
-  ActiveRecord::Fixtures.create_fixtures(FIXTURES_PATH, ActiveRecord::Base.connection.tables)
+  ActiveRecord::FixtureSet.create_fixtures(FIXTURES_PATH, ActiveRecord::Base.connection.tables)
 
   config.order = 'random'
 end

data/spec/thunderer/controller_aditions_spec.rb

@@ -19,7 +19,12 @@ describe Thunderer::ControllerAdditions do
   describe '#thunderer_channels' do
     let(:config_file_path) { 'spec/fixtures/thunderer.yml' }
     let(:environment) { 'production' }
-    before { Thunderer.load_config(config_file_path, environment) }
+    before do
+      Thunderer.configure do |config|
+        config.environment = environment
+        config.config_file_path = config_file_path
+      end
+    end
 
     it 'should affect channels class variable' do
       controller_class.thunderer_channels('hello')
@@ -31,6 +36,7 @@ describe Thunderer::ControllerAdditions do
       expect(controller_class.interpolation_object).to include('hello')
     end
 
+
     it 'should setup before filter for setting headers' do
       expect(controller_class).to have_filters(:before, :add_channels_header)
     end

data/spec/thunderer/messages/async_message_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+require 'thunderer/messages/async_message'
+require 'rails/all'
+describe Thunderer::Messages::AsyncMessage do
+  let(:message) { Thunderer::Messages::AsyncMessage.new }
+  before { Thunderer.reset_config }
+
+  describe Thunderer::Messages::AsyncMessage::Job do
+    let(:job) { Thunderer::Messages::AsyncMessage::Job }
+    describe '#queue_adapter' do
+      subject { job.queue_adapter }
+
+      context 'when no config' do
+        it { is_expected.to eq(ActiveJob::QueueAdapters::InlineAdapter) }
+      end
+
+      context 'when active job config set to sucker_punch' do
+        around do |ex|
+          ActiveJob::Base.queue_adapter = :sucker_punch
+          ex.run
+          ActiveJob::Base.queue_adapter = :inline
+        end
+
+        it { is_expected.to eq(ActiveJob::QueueAdapters::SuckerPunchAdapter) }
+      end
+
+      context 'but thunderer config is sucker_punch' do
+        before do
+          Thunderer.configure do |config|
+            config.queue_adapter = :sucker_punch
+          end
+        end
+
+        context 'and active job config is inline' do
+          before { ActiveJob::Base.queue_adapter = :inline }
+
+          it { is_expected.to eq(ActiveJob::QueueAdapters::SuckerPunchAdapter) }
+
+        end
+      end
+    end
+  end
+
+
+end

data/spec/thunderer/messages/base_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Thunderer::Messages::Base do
+
+end

data/spec/thunderer/parser_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 require 'ostruct'
 
-describe Thunderer::Parser do
+describe Thunderer::ChannelParser do
 
   let(:object) { OpenStruct.new(first: 1, second: 2) }
 
   describe '#interpolate_channel' do
-    subject { Thunderer::Parser.interpolate_channel(channel, object) }
+    subject { Thunderer::ChannelParser.interpolate_channel(channel, object) }
 
     context 'when channel have no interpolation' do
       let(:channel) { 'without interpolation string' }

data/spec/thunderer_spec.rb

@@ -4,13 +4,18 @@ describe Thunderer do
   before { Thunderer.reset_config }
   let(:config_file_path) { 'spec/fixtures/thunderer.yml' }
   let(:environment) { 'production' }
-  let(:load_config) { Thunderer.load_config(config_file_path, environment) }
+  let(:load_config) do
+    Thunderer.configure do |config|
+      config.environment = environment
+      config.config_file_path = config_file_path
+    end
+  end
 
   describe 'default state' do
     describe '#config' do
       subject { Thunderer.config }
 
-      it { is_expected.to eq({}) }
+      it { is_expected.to be_a(Thunderer::Configuration)}
 
     end
   end
@@ -22,11 +27,19 @@ describe Thunderer do
     context 'when config environment was exists' do
       before { load_config }
 
-      it { is_expected.to include(:server => 'http://example.com/faye') }
+      {
+          server: 'http://example.com/faye',
+          secret_token: 'PRODUCTION_SECRET_TOKEN',
+          signature_expiration: 600
+      }.each do |method, value|
+        context "#config.#{method}" do
+          subject { Thunderer.config.send(method)}
 
-      it { is_expected.to include(:secret_token => 'PRODUCTION_SECRET_TOKEN') }
+          it { is_expected.to eq(value) }
+
+        end
+      end
 
-      it { is_expected.to include(:signature_expiration => 600) }
     end
 
     context 'when config environment was not exists' do
@@ -40,30 +53,13 @@ describe Thunderer do
 
     end
 
-    describe 'Thunderer::Messanger configuration' do
-      subject { Thunderer::Messanger.config }
-
-      it { is_expected.not_to eq({}) }
-
-      context 'when config have local_server_url' do
-        let(:config_file_path) { 'spec/fixtures/thunderer_local_server.yml' }
-        let(:environment) { 'production' }
-
-        before { load_config }
-
-        it { is_expected.to include('uri'=>URI.parse('http://localhost:3000')) }
-
-      end
-
-    end
-
   end
 
   describe '#subscription' do
     before { load_config }
     let!(:time_mock) { Time.now }
     before { allow(Time).to receive(:now) { time_mock } }
-    before { Thunderer.config[:server] = 'server' }
+    before { Thunderer.config.server = 'server' }
     subject { Thunderer.subscription }
 
     it { is_expected.to include(:timestamp => (time_mock.to_f * 1000).round) }
@@ -77,7 +73,7 @@ describe Thunderer do
     end
 
     describe 'signature' do
-      before { Thunderer.config[:secret_token] = 'token' }
+      before { Thunderer.config.secret_token = 'token' }
       subject { Thunderer.subscription(:timestamp => 123, :channel => 'channel') }
 
       it { is_expected.to include(:signature => Digest::SHA1.hexdigest('tokenchannel123')) }
@@ -91,7 +87,7 @@ describe Thunderer do
 
     describe 'formatting' do
       let(:secret_token) { 'token' }
-      before { Thunderer.config[:secret_token] = secret_token }
+      before { Thunderer.config.secret_token = secret_token }
 
       subject { Thunderer.message('chan', :foo => 'bar') }
 
@@ -116,7 +112,7 @@ describe Thunderer do
       before { load_config }
 
       specify do
-        expect(Thunderer::Messanger).to receive(:post)
+        expect_any_instance_of(Thunderer::Messages::Base).to receive(:deliver)
         subject
       end
     end
@@ -154,7 +150,7 @@ describe Thunderer do
 
   describe 'signature_expired?' do
     let(:expiration) { 30*60 }
-    before { Thunderer.config[:signature_expiration] = expiration }
+    before { Thunderer.config.signature_expiration = expiration }
     subject { Thunderer.signature_expired?(time) }
 
     context 'when time greater than expiration ' do

data/thunderer.gemspec

@@ -15,11 +15,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'faye'
 
-  spec.add_runtime_dependency 'activesupport'
-  spec.add_development_dependency 'rails'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'jasmine'
-  spec.add_development_dependency 'sqlite3'
+  spec.add_runtime_dependency 'activesupport', '4.2.0'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thunderer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Nick Chubarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye
@@ -28,72 +28,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  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: rspec
-  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: jasmine
-  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: sqlite3
-  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'
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -140,14 +84,17 @@ files:
 - app/assets/javascripts/thunderer.js
 - app/assets/javascripts/thunderer_angular.js
 - lib/generators/thunderer/install_generator.rb
+- lib/generators/thunderer/templates/thunderer.rb
 - lib/generators/thunderer/templates/thunderer.ru
 - lib/generators/thunderer/templates/thunderer.yml
 - lib/thunderer.rb
+- lib/thunderer/channel_parser.rb
+- lib/thunderer/configuration.rb
 - lib/thunderer/controller_additions.rb
 - lib/thunderer/engine.rb
 - lib/thunderer/faye_extension.rb
-- lib/thunderer/messanger.rb
-- lib/thunderer/parser.rb
+- lib/thunderer/messages/async_message.rb
+- lib/thunderer/messages/base.rb
 - lib/thunderer/publish_changes.rb
 - lib/thunderer/version.rb
 - lib/thunderer/view_helpers.rb
@@ -166,7 +113,8 @@ files:
 - spec/support/controller_macros.rb
 - spec/support/matchers/have_filter.rb
 - spec/thunderer/controller_aditions_spec.rb
-- spec/thunderer/messanger_spec.rb
+- spec/thunderer/messages/async_message_spec.rb
+- spec/thunderer/messages/base_spec.rb
 - spec/thunderer/parser_spec.rb
 - spec/thunderer/publish_changes_spec.rb
 - spec/thunderer_spec.rb
@@ -211,7 +159,8 @@ test_files:
 - spec/support/controller_macros.rb
 - spec/support/matchers/have_filter.rb
 - spec/thunderer/controller_aditions_spec.rb
-- spec/thunderer/messanger_spec.rb
+- spec/thunderer/messages/async_message_spec.rb
+- spec/thunderer/messages/base_spec.rb
 - spec/thunderer/parser_spec.rb
 - spec/thunderer/publish_changes_spec.rb
 - spec/thunderer_spec.rb

data/lib/thunderer/messanger.rb

@@ -1,50 +0,0 @@
-module Thunderer
-  module Messanger
-    class ConfigurationError < StandardError; end
-
-    class << self
-      attr_reader :config
-
-      def reset_config
-        @config = {}
-      end
-
-      def configure url
-        reset_config
-        uri = URI.parse(url)
-        @config['uri'] = uri
-        @config['use_ssl'] = uri.scheme == 'https'
-      end
-
-      def post( message )
-        raise ConfigurationError if not_configured?
-
-        form = build_form
-        form.set_form_data(:message => message.to_json)
-        protocol.start { |h| h.request(form) }
-      end
-
-      private
-
-      def build_form
-        uri = @config['uri']
-        Net::HTTP::Post.new(uri.path.empty? ? '/' : uri.path)
-      end
-
-      def protocol
-        uri = @config['uri']
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = @config['use_ssl']
-        if @config['use_ssl']
-          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        end
-        http
-      end
-
-      def not_configured?
-        @config == {}
-      end
-
-    end
-  end
-end

data/spec/thunderer/messanger_spec.rb

@@ -1,70 +0,0 @@
-require 'spec_helper'
-require 'thunderer/messanger'
-
-describe Thunderer::Messanger do
-  let(:messanger) { Thunderer::Messanger }
-  before { Thunderer::Messanger.reset_config }
-
-  it 'default have nil uri' do
-    expect(messanger.config['uri']).to eq(nil)
-  end
-
-  it 'default have nil use_ssl' do
-    expect(messanger.config['use_ssl']).to eq(nil)
-  end
-
-  describe '#post' do
-    subject { messanger.post(message) }
-
-    context 'with default config' do
-      let(:message) { double(:message) }
-
-      specify do
-        expect { subject }.to raise_error Thunderer::Messanger::ConfigurationError
-      end
-
-    end
-
-    context 'with correct config' do
-      before { Thunderer::Messanger.configure('http://localhost:3000') }
-      let(:http_form) { double(:form) }
-      let(:http) { double(:http) }
-      let(:message) { 'Hello world' }
-      before { allow(Net::HTTP::Post).to receive(:new).with('/').and_return(http_form) }
-      before { allow(Net::HTTP).to receive(:new).with('localhost', 3000).and_return(http) }
-      before { allow(http).to receive(:use_ssl=) }
-
-
-      specify do
-        expect(http_form).to receive(:set_form_data).with(message: message.to_json)
-        expect(http).to receive(:start).and_yield(http)
-        expect(http).to receive(:request).with(http_form).and_return(:result)
-        expect(subject).to eq(:result)
-      end
-
-    end
-
-
-  end
-
-
-  describe '#configure' do
-
-    it 'parse url and set configuration' do
-      messanger.configure('http://google.ru')
-      expect(messanger.config).not_to eq({})
-    end
-
-    it 'set use_ssl to false for http' do
-      messanger.configure('http://google.ru')
-      expect(messanger.config['use_ssl']).to eq(false)
-    end
-
-    it 'set use_ssl to false for https' do
-      messanger.configure('https://google.ru')
-      expect(messanger.config['use_ssl']).to eq(true)
-    end
-
-  end
-
-end