sessionm-cassandra_object 2.2.14 → 2.2.16

data/lib/cassandra_object.rb

@@ -4,6 +4,7 @@ module CassandraObject
   extend ActiveSupport::Autoload
 
   autoload :Base
+  autoload :AsyncConnection
   autoload :Connection
   autoload :Attributes
   autoload :Dirty

data/lib/cassandra_object/async_connection.rb

@@ -0,0 +1,48 @@
+module CassandraObject
+  module AsyncConnection
+    extend ActiveSupport::Concern
+    
+    included do
+      class_attribute :connection_spec
+
+      class_eval do
+        @@fiber_connections = {}
+        def self.connection()
+          @@fiber_connections[Fiber.current.object_id] ||=
+            begin
+              spec = connection_spec.dup
+              
+              if EM.reactor_running?
+                require 'thrift_client/event_machine'
+                spec[:thrift].merge!(:transport => Thrift::EventMachineTransport,
+                                     :transport_wrapper => nil)
+              end
+              
+              Cassandra.new(spec[:keyspace], spec[:servers], spec[:thrift])
+            end
+        end
+        def self.connection?() !!connection end
+
+        def connection
+          defined?(@connection) ? @connection : singleton_class.connection
+        end
+
+        def connection?
+          !!connection
+        end
+      end
+    end
+
+    module ClassMethods
+      DEFAULT_OPTIONS = {
+        servers: "127.0.0.1:9160",
+        thrift: {}
+      }
+      def establish_connection(spec)
+        spec.reverse_merge!(DEFAULT_OPTIONS)
+        spec[:thrift].symbolize_keys!
+        self.connection_spec = spec
+      end
+    end
+  end
+end

data/lib/cassandra_object/base.rb

@@ -30,7 +30,9 @@ module CassandraObject
     include ActiveModel::Conversion
     extend ActiveSupport::DescendantsTracker
     
-    include Connection
+    #TODO: make the connection type configurable
+    include AsyncConnection
+    #include Connection
     include Consistency
     include Identity
     include Attributes

data/sessionm-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'sessionm-cassandra_object'
-  s.version = '2.2.14'
+  s.version = '2.2.16'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
 

metadata

@@ -1,58 +1,74 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: sessionm-cassandra_object
-version: !ruby/object:Gem::Version
-  version: 2.2.14
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 2
+  - 2
+  - 16
+  version: 2.2.16
 platform: ruby
-authors:
+authors: 
 - Michael Koziarski
 - gotime
 - sessionm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-04 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-08-12 00:00:00 -04:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rails
-  requirement: &70124182833500 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70124182833500
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: cassandra
-  requirement: &70124182832940 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 11
+        - 3
         version: 0.11.3
   type: :runtime
-  prerelease: false
-  version_requirements: *70124182832940
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &70124182832160 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :development
-  prerelease: false
-  version_requirements: *70124182832160
+  version_requirements: *id003
 description: Cassandra ActiveModel
 email: klange@sessionm.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.markdown
-files:
+files: 
 - .gitignore
 - CHANGELOG
 - Gemfile
@@ -64,6 +80,7 @@ files:
 - lib/cassandra_object/associations.rb
 - lib/cassandra_object/associations/one_to_many.rb
 - lib/cassandra_object/associations/one_to_one.rb
+- lib/cassandra_object/async_connection.rb
 - lib/cassandra_object/attributes.rb
 - lib/cassandra_object/base.rb
 - lib/cassandra_object/batches.rb
@@ -137,31 +154,41 @@ files:
 - test/types/time_type_test.rb
 - test/types/utf8_string_type_test.rb
 - test/validations_test.rb
+has_rdoc: true
 homepage: http://github.com/sessionm/cassandra_object
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 9
+      - 2
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 5
       version: 1.3.5
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Cassandra ActiveModel
-test_files:
+test_files: 
 - test/active_model_test.rb
 - test/base_test.rb
 - test/batches_test.rb