emmy-extends 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a0e3a4faca05d0d6a5c8538652143080296e81c
-  data.tar.gz: e1d0b56934235795d602acdc37f0fa46b8025d4b
+  metadata.gz: 097746b50e4d27dba575c4fb189564590e7cea17
+  data.tar.gz: 9aa6795db438cf2209267123f0326effe1beac3f
 SHA512:
-  metadata.gz: b9fca19b26b97bde2a10297b5c29861ce43c2bb04b4a5b37e036e44bd5bb866a4e2bb5d455337ffd540c96837c45ec571439eb12a83a6e936345a86d5138615d
-  data.tar.gz: 046dc4b7d3bfbca15de50b826125bc94553ff558c8f59f12e644bfdd2cf105befa10d0e9122de62c596374edc1896a89e1c2183194a8f77f4fabcca988ec20aa
+  metadata.gz: 996f3d706ed8ebae5b9f81750b26ec250e2ce6e1fdb86b31bbe12c1665f0fd3e3e8a24beb460b6d9ee207be4318284cba4b6b3afc5e979dc33bf34a2f1021308
+  data.tar.gz: b9db1cc0221e4f6ca6b114c45bbae926ac41f173d22969cfe14be32ff7e157f11a8a5fa5faa8d597e4789ac070ffa0a20d2d70bcc013f7c815d088005d6a3c06

data/Gemfile

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in emmy-extends.gemspec
 gemspec
 
+gem 'em-http-request', '~> 1.1.2'
+gem 'mysql2'
 gem 'httpi'
 gem 'savon', github: 'chelovekov/savon', branch: 'version2'
-gem 'mysql2'

data/emmy-extends.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "eventmachine", "~> 1.0.3"
-  spec.add_dependency "em-http-request", "~> 1.1.2"
   spec.add_dependency "emmy-machine", "~> 0.1.6"
   spec.add_dependency "emmy-http", "~> 0.1.1"
 

data/lib/emmy_extends/activerecord/adapter.rb

@@ -0,0 +1,70 @@
+module EmmyExtends
+  class ActiveRecord::Adapter < ::ActiveRecord::ConnectionAdapters::Mysql2Adapter
+    def configure_connection
+      nil
+    end
+
+    def transaction(*args, &blk)
+      @connection.execute(false) do |conn|
+        super
+      end
+    end
+
+    def real_connection
+      @connection.connection
+    end
+
+    def open_transactions
+      real_connection.open_transactions
+    end
+
+    def increment_open_transactions
+      real_connection.open_transactions += 1
+    end
+
+    def decrement_open_transactions
+      real_connection.open_transactions -= 1
+    end
+
+    def current_transaction #:nodoc:
+      @transaction[Fiber.current.object_id] || @closed_transaction
+    end
+
+    def transaction_open?
+      current_transaction.open?
+    end
+
+    def begin_transaction(options = {}) #:nodoc:
+      set_current_transaction(current_transaction.begin(options))
+    end
+
+    def commit_transaction #:nodoc:
+      set_current_transaction(current_transaction.commit)
+    end
+
+    def rollback_transaction #:nodoc:
+      set_current_transaction(current_transaction.rollback)
+    end
+
+    def reset_transaction #:nodoc:
+      @transaction = {}
+      @closed_transaction = ::ActiveRecord::ConnectionAdapters::ClosedTransaction.new(self)
+    end
+
+    # Register a record with the current transaction so that its after_commit and after_rollback callbacks
+    # can be called.
+    def add_transaction_record(record)
+      current_transaction.add_record(record)
+    end
+
+    protected
+
+    def set_current_transaction(t)
+      if t == @closed_transaction
+        @transaction.delete(Fiber.current.object_id)
+      else
+        @transaction[Fiber.current.object_id] = t
+      end
+    end
+  end
+end

data/lib/emmy_extends/activerecord/connection_handling.rb

@@ -0,0 +1,26 @@
+module EmmyExtends
+  module ConnectionHandling
+    def self.emmy_mysql2_connection(config)
+      client = ConnectionPool.new(size: config[:pool]) do
+        conn = ActiveRecord::ConnectionAdapters::EMMysql2Adapter::Client.new(config.symbolize_keys)
+        # From Mysql2Adapter#configure_connection
+        conn.query_options.merge!(:as => :array)
+
+        # By default, MySQL 'where id is null' selects the last inserted id.
+        # Turn this off. http://dev.rubyonrails.org/ticket/6778
+        variable_assignments = ['SQL_AUTO_IS_NULL=0']
+        encoding = config[:encoding]
+        variable_assignments << "NAMES '#{encoding}'" if encoding
+
+        wait_timeout = config[:wait_timeout]
+        wait_timeout = 2592000 unless wait_timeout.is_a?(Fixnum)
+        variable_assignments << "@@wait_timeout = #{wait_timeout}"
+
+        conn.query("SET #{variable_assignments.join(', ')}")
+        conn
+      end
+      options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], 0]
+      Adapter.new(client, logger, options, config)
+    end
+  end
+end

data/lib/emmy_extends/activerecord/connection_pool.rb

@@ -0,0 +1,31 @@
+module ActiveRecord
+  class ConnectionPool < EM::Synchrony::ConnectionPool
+
+    def execute(async)
+      f = Fiber.current
+      begin
+        conn = acquire(f)
+        conn.acquired_for_connection_pool += 1
+        yield conn
+      ensure
+        conn.acquired_for_connection_pool -= 1
+        release(f) if !async && conn.acquired_for_connection_pool == 0
+      end
+    end
+
+    def acquire(fiber)
+      return @reserved[fiber.object_id] if @reserved[fiber.object_id]
+      super
+    end
+
+    def connection
+      acquire(Fiber.current)
+    end
+
+    def affected_rows(*args, &blk)
+      execute(false) do |conn|
+        conn.send(:affected_rows, *args, &blk)
+      end
+    end
+  end
+end

data/lib/emmy_extends/em_http_request/adapter.rb

@@ -1,5 +1,3 @@
-require 'em-http-request'
-
 module EmmyExtends
   class EmHttpRequest::Adapter < EmmyHttp::Adapter
     using EventObject

data/lib/emmy_extends/em_http_request.rb

@@ -0,0 +1,8 @@
+require 'em-http-request'
+
+module EmmyExtends
+  module EmHttpRequest
+    autoload :Connection, "emmy_extends/em_http_request/connection"
+    autoload :Adapter,    "emmy_extends/em_http_request/adapter"
+  end
+end

data/lib/emmy_extends/httpi/adapter.rb

@@ -1,5 +1,3 @@
-require "httpi"
-
 module EmmyExtends
   class HTTPI::Adapter < ::HTTPI::Adapter::Base
     register :emmy
@@ -30,12 +28,20 @@ module EmmyExtends
         raise NotSupportedError, "EM-HTTP-Request does not support response streaming"
       end
 
+      if @request.ssl
+        ssl = {
+          cert_chain_file: @request.ssl.ca_cert_file,
+          verify_peer: @request.ssl.verify_mode
+        }
+      end
+
       @http_request = EmmyHttp::Request.new(
         url: build_request_url(@request.url),
         method: method,
         timeouts: { connect: @request.open_timeout, inactivity: @request.read_timeout },
         headers: @request.headers.to_hash,
-        body: @request.body
+        body: @request.body,
+        ssl: ssl
       )
 
       # FIXME: proxy support # proxy_options if @request.proxy

data/lib/emmy_extends/httpi.rb

@@ -0,0 +1,9 @@
+require "emmy_extends/em_http_request"
+require "httpi"
+
+module EmmyExtends
+  module HTTPI
+    require "emmy_extends/httpi/adapter"
+    autoload :Operation,  "emmy_extends/httpi/operation"
+  end
+end

data/lib/emmy_extends/mysql2.rb

@@ -0,0 +1,9 @@
+require "mysql2"
+
+module EmmyExtends
+  module Mysql2
+    autoload :Operation,  "emmy_extends/mysql2/operation"
+    autoload :Client,     "emmy_extends/mysql2/client"
+    autoload :Watcher,    "emmy_extends/mysql2/watcher"
+  end
+end

data/lib/emmy_extends/savon/class_methods.rb

@@ -1,5 +1,3 @@
-require "savon"
-
 # Example,
 #   client = Savon.client do
 #     endpoint "http://example.com"
@@ -10,7 +8,8 @@ require "savon"
 module EmmyExtends
   module Savon::ClassMethods
     def client(globals = {}, &block)
-      globals[:response_class] = Savon::Response
+      globals[:response_class] = Savon::Operation
+      globals[:raise_errors] = false
       ::Savon::Client.new(globals, &block)
     end
   end

data/lib/emmy_extends/savon/model.rb

@@ -2,7 +2,7 @@ module EmmyExtends
   module Savon::Model
     def self.included(base)
       base.extend ::Savon::Model
-      base.global :response_class, Response
+      base.global :response_class, Operation
     end
   end
 end

data/lib/emmy_extends/savon/{response.rb → operation.rb}

@@ -1,10 +1,9 @@
 module EmmyExtends
-  class Savon::Response
+  class Savon::Operation
     using EventObject
 
     attr_reader :request
     attr_reader :response
-    attr_reader :connection
     attr_reader :httpi
     attr_reader :globals
     attr_reader :locals
@@ -40,9 +39,16 @@ module EmmyExtends
 
     def setup
       @httpi.on :success do |response, httpi, conn|
-        @response = ::Savon::Response.new(response, globals, locals)
-        @connection = conn
-        success!(@response, self, conn)
+        unless response.http_error
+          unless response.soap_fault
+            @response = ::Savon::Response.new(response, globals, locals)
+            success!(@response, self, conn)
+          else
+            error!("SOAP error (#{response.soap_fault.to_s})", self, conn)
+          end
+        else
+          error!("HTTP error (#{response.http.code})", self, conn)
+        end
       end
 
       @httpi.on :error do |error, httpi, conn|

data/lib/emmy_extends/savon.rb

@@ -0,0 +1,12 @@
+require "emmy_extends/httpi"
+require "savon"
+
+module EmmyExtends
+  module Savon
+    autoload :ClassMethods, "emmy_extends/savon/class_methods"
+    autoload :Operation,    "emmy_extends/savon/operation"
+    autoload :Model,        "emmy_extends/savon/model"
+
+    extend ClassMethods
+  end
+end

data/lib/emmy_extends/thin/backend.rb

@@ -5,7 +5,7 @@ module EmmyExtends
     attr_accessor :url
 
     def initialize(host, port, options)
-      super
+      super()
     end
 
     def connect

data/lib/emmy_extends/thin/class_methods.rb

@@ -3,7 +3,7 @@ module EmmyExtends
     using CoreExt
 
     def server(url, app, opt={})
-      Controller.new(url, app, opt.to_options).start
+      Thin::Controller.new(url, app, opt.to_options).start
     end
   end
 end

data/lib/emmy_extends/thin/controller.rb

@@ -1,15 +1,25 @@
+require 'uri'
+
 module EmmyExtends
   class Thin::Controller < ::Thin::Controllers::Controller
 
-    def initialize(url, app, options)
-      @url = URL(url.to_s)
+    attr_accessor :app, :url
+
+    def initialize(url, app, options={})
+      @url = URI(url.to_s)
       @app = app
+      options[:backend] ||= EmmyExtends::Thin::Backend
       super(options)
-      options[:backend] ||= Backend
     end
 
     def start
-      server = ::Thin::Server.new(@options[:socket] || @url.host, @url.port, @options)
+      if @options[:socket]
+        server = ::Thin::Server.new(@options[:socket], @options)
+      else
+        server = ::Thin::Server.new(url.host, url.port, @options)
+      end
+      server.backend.url = url
+
       # Set options
       server.pid_file                       = @options[:pid]
       server.log_file                       = @options[:log]
@@ -41,5 +51,24 @@ module EmmyExtends
       # just return thin-backend
       server.backend
     end
+
+    private
+
+      def options_with_defaults(opt)
+        {
+          chdir:                Dir.pwd,
+          environment:          env,
+          address:              '0.0.0.0',
+          port:                 3434,
+          timeout:              30, #sec
+          pid:                  "tmp/pids/server.pid",
+          log:                  File.join(Dir.pwd, "log/server.log"),
+          max_conns:            1024,
+          max_persistent_conns: 100,
+          require:              [],
+          wait:                 30, #sec
+          daemonize:            false
+        }.update(opt)
+      end
   end
 end

data/lib/emmy_extends/thin.rb

@@ -0,0 +1,10 @@
+module EmmyExtends
+  module Thin
+    autoload :Connection,   "emmy_extends/thin/connection"
+    autoload :Backend,      "emmy_extends/thin/backend"
+    autoload :Controller,   "emmy_extends/thin/controller"
+    autoload :ClassMethods, "emmy_extends/thin/class_methods"
+
+    extend ClassMethods
+  end
+end

data/lib/emmy_extends/version.rb

@@ -1,3 +1,3 @@
 module EmmyExtends
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/npm-debug.log

@@ -0,0 +1,62 @@
+0 info it worked if it ends with ok
+1 verbose cli [ 'node', '/usr/local/bin/npm', 'install', 'bit8' ]
+2 info using npm@1.3.11
+3 info using node@v0.10.21
+4 verbose cache add [ 'bit8', null ]
+5 verbose cache add name=undefined spec="bit8" args=["bit8",null]
+6 verbose parsed url { protocol: null,
+6 verbose parsed url   slashes: null,
+6 verbose parsed url   auth: null,
+6 verbose parsed url   host: null,
+6 verbose parsed url   port: null,
+6 verbose parsed url   hostname: null,
+6 verbose parsed url   hash: null,
+6 verbose parsed url   search: null,
+6 verbose parsed url   query: null,
+6 verbose parsed url   pathname: 'bit8',
+6 verbose parsed url   path: 'bit8',
+6 verbose parsed url   href: 'bit8' }
+7 silly lockFile dda9e3ba-bit8 bit8
+8 verbose lock bit8 /Users/che/.npm/dda9e3ba-bit8.lock
+9 silly lockFile dda9e3ba-bit8 bit8
+10 silly lockFile dda9e3ba-bit8 bit8
+11 verbose addNamed [ 'bit8', '' ]
+12 verbose addNamed [ null, '*' ]
+13 silly lockFile b74efb73-bit8 bit8@
+14 verbose lock bit8@ /Users/che/.npm/b74efb73-bit8.lock
+15 silly addNameRange { name: 'bit8', range: '*', hasData: false }
+16 verbose url raw bit8
+17 verbose url resolving [ 'https://registry.npmjs.org/', './bit8' ]
+18 verbose url resolved https://registry.npmjs.org/bit8
+19 info trying registry request attempt 1 at 18:31:24
+20 http GET https://registry.npmjs.org/bit8
+21 http 404 https://registry.npmjs.org/bit8
+22 silly registry.get cb [ 404,
+22 silly registry.get   { date: 'Sat, 20 Sep 2014 14:31:25 GMT',
+22 silly registry.get     server: 'CouchDB/1.5.0 (Erlang OTP/R16B03)',
+22 silly registry.get     'content-type': 'application/json',
+22 silly registry.get     'cache-control': 'max-age=0',
+22 silly registry.get     'content-length': '52',
+22 silly registry.get     'accept-ranges': 'bytes',
+22 silly registry.get     via: '1.1 varnish',
+22 silly registry.get     age: '0',
+22 silly registry.get     'x-served-by': 'cache-ams4133-AMS',
+22 silly registry.get     'x-cache': 'MISS',
+22 silly registry.get     'x-cache-hits': '0',
+22 silly registry.get     'x-timer': 'S1411223485.110665,VS0,VE714',
+22 silly registry.get     'keep-alive': 'timeout=10, max=50',
+22 silly registry.get     connection: 'Keep-Alive' } ]
+23 silly lockFile b74efb73-bit8 bit8@
+24 silly lockFile b74efb73-bit8 bit8@
+25 error 404 'bit8' is not in the npm registry.
+25 error 404 You should bug the author to publish it
+25 error 404
+25 error 404 Note that you can also install from a
+25 error 404 tarball, folder, or http url, or git url.
+26 error System Darwin 13.3.0
+27 error command "node" "/usr/local/bin/npm" "install" "bit8"
+28 error cwd /Users/che/Dropbox/Projects/emmy-extends
+29 error node -v v0.10.21
+30 error npm -v 1.3.11
+31 error code E404
+32 verbose exit [ 1, true ]

data/spec/em_http_request_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require "emmy_extends/em_http_request"
 
 describe EmmyExtends::EmHttpRequest do
 

data/spec/httpi_spec.rb

@@ -1,6 +1,5 @@
 require "spec_helper"
-require "emmy_extends/httpi/adapter"
-require "httpi"
+require "emmy_extends/httpi"
 
 describe EmmyExtends::HTTPI do
   around do |example|
@@ -10,7 +9,7 @@ describe EmmyExtends::HTTPI do
   it "should send request to github.com home page" do
     request = HTTPI.get("http://httpbin.org", :emmy)
     response = request.sync
-    
+
     expect(response).to be_a(HTTPI::Response)
     expect(response.code).to be 200
     expect(response.headers).to include("Content-Type")

data/spec/mysql2_spec.rb

@@ -1,5 +1,5 @@
 require "spec_helper"
-require "mysql2"
+require "emmy_extends/mysql2"
 
 describe EmmyExtends::Mysql2 do
   using EventObject

data/spec/savon_spec.rb

@@ -1,7 +1,5 @@
 require "spec_helper"
-require "httpi"
-require "emmy_extends/httpi/adapter"
-require "savon"
+require "emmy_extends/savon"
 
 describe EmmyExtends::Savon do
   around do |example|
@@ -18,8 +16,8 @@ describe EmmyExtends::Savon do
       read_timeout: 10,
       log: false
     )
-    request = client.call(:convert_temp, :message => { :temperature => 30, :from_unit => "degreeCelsius", :to_unit => "degreeFahrenheit" })
-    response = request.sync
+    operation = client.call(:convert_temp, :message => { :temperature => 30, :from_unit => "degreeCelsius", :to_unit => "degreeFahrenheit" })
+    response = operation.sync
 
     fahrenheit = response.body[:convert_temp_response][:convert_temp_result]
     expect(fahrenheit).to eq("86")

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'bundler/setup'
 Bundler.setup
 
-require File.expand_path("./lib/emmy_extends")
+#require File.expand_path("./lib/emmy_extends")
 require "emmy_machine"
 require "emmy_http"
 require "fibre"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emmy-extends
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - che
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-20 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.3
-- !ruby/object:Gem::Dependency
-  name: em-http-request
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: emmy-machine
   requirement: !ruby/object:Gem::Requirement
@@ -121,23 +107,31 @@ files:
 - README.md
 - Rakefile
 - emmy-extends.gemspec
-- lib/emmy_extends.rb
+- lib/emmy_extends/activerecord/adapter.rb
+- lib/emmy_extends/activerecord/connection_handling.rb
+- lib/emmy_extends/activerecord/connection_pool.rb
 - lib/emmy_extends/core_ext.rb
+- lib/emmy_extends/em_http_request.rb
 - lib/emmy_extends/em_http_request/adapter.rb
 - lib/emmy_extends/em_http_request/connection.rb
+- lib/emmy_extends/httpi.rb
 - lib/emmy_extends/httpi/adapter.rb
 - lib/emmy_extends/httpi/operation.rb
+- lib/emmy_extends/mysql2.rb
 - lib/emmy_extends/mysql2/client.rb
 - lib/emmy_extends/mysql2/operation.rb
 - lib/emmy_extends/mysql2/watcher.rb
+- lib/emmy_extends/savon.rb
 - lib/emmy_extends/savon/class_methods.rb
 - lib/emmy_extends/savon/model.rb
-- lib/emmy_extends/savon/response.rb
+- lib/emmy_extends/savon/operation.rb
+- lib/emmy_extends/thin.rb
 - lib/emmy_extends/thin/backend.rb
 - lib/emmy_extends/thin/class_methods.rb
 - lib/emmy_extends/thin/connection.rb
 - lib/emmy_extends/thin/controller.rb
 - lib/emmy_extends/version.rb
+- npm-debug.log
 - spec/ConvertTemperature.asmx.xml
 - spec/em_http_request_spec.rb
 - spec/httpi_spec.rb

data/lib/emmy_extends.rb

@@ -1,38 +0,0 @@
-require "emmy_extends/version"
-
-module EmmyExtends
-  autoload :CoreExt,      "emmy_extends/core_ext"
-
-  module EmHttpRequest
-    autoload :Connection, "emmy_extends/em_http_request/connection"
-    autoload :Adapter,    "emmy_extends/em_http_request/adapter"
-  end
-
-  module HTTPI
-    autoload :Adapter,    "emmy_extends/httpi/adapter"
-    autoload :Operation,  "emmy_extends/httpi/operation"
-  end
-
-  module Mysql2
-    autoload :Operation,  "emmy_extends/mysql2/operation"
-    autoload :Client,     "emmy_extends/mysql2/client"
-    autoload :Watcher,    "emmy_extends/mysql2/watcher"
-  end
-
-  module Savon
-    autoload :ClassMethods, "emmy_extends/savon/class_methods"
-    autoload :Response,     "emmy_extends/savon/response"
-    autoload :Model,        "emmy_extends/savon/model"
-
-    extend ClassMethods
-  end
-
-  module Thin
-    autoload :Connection,   "emmy_extends/thin/connection"
-    autoload :Backend,      "emmy_extends/thin/backend"
-    autoload :Controller,   "emmy_extends/thin/controller"
-    autoload :ClassMethods, "emmy_extends/thin/class_methods"
-
-    extend ClassMethods
-  end
-end