cassilds-model 0.1.0 → 0.1.1

data/cassilds-model.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'shoulda', [">= 0"]
-  s.add_dependency 'cassilds'#, [">= 0.9.1"]
+  s.add_dependency 'cassilds', [">= 0.12.1"]
+  s.add_dependency 'cassilds-connection-pool', [">= 0.0.2"]
   s.add_dependency 'simple_uuid', [">= 0"]
 end

data/lib/cassandra-model/base.rb

@@ -14,12 +14,7 @@ module CassandraModel
 
       @@logger = nil
 
-      def establish_connection
-        Connection.establish_connection
-      end
-
       def connection
-        #        Connection.establish_connection
         Connection.connection
       end
 

data/lib/cassandra-model/config.rb

@@ -51,13 +51,13 @@ module CassandraModel
       @@keyspace = keyspace
     end
 
-    def self.initialize
+    def self.init
       cfg = YAML.load_file(self.cfg_file)[Rails.env]
       initialize_props cfg
     end
 
     def self.initialize_props props
-      self.hosts = props['hosts']
+      self.hosts    = props['hosts']
       self.username = props['username']
       self.password = props['password']
       self.keyspace = props['keyspace']

data/lib/cassandra-model/connection.rb

@@ -1,21 +1,16 @@
 require 'cassandra-model/config'
+require 'cassandra/pooled'
 module CassandraModel
   class Connection
 
-    def self.establish_connection
-      connection = Thread.current[:cassandra_conn]
-      if ! connection
-        connection = Cassandra.new(Config.keyspace, Config.hosts)
-        if Config.username
-          connection.login!(Config.username, Config.password)
-        end
-        Thread.current[:cassandra_conn] = connection
-      end
-      return connection
+	def self.init
+      Config.init
+      @@Pool = Cassandra::Pooled.new Config.keyspace, Config.hosts
     end
 
     def self.connection
-      return Thread.current[:cassandra_conn]
+      return @@Pool.connection_pool.connection
     end
+
   end
-end
+end

data/lib/cassandra-model/persistence.rb

@@ -348,7 +348,7 @@ module CassandraModel
       
       def validate_key_type(key)
         raise RecordNotFound, "Couldn't find #{name} without an ID" if key.blank?
-        if !self.key_type.blank? and self.key_type.downcase == 'time_uuid'
+        if !self.key_type.blank? and (self.key_type.downcase == 'time_uuid' or self.key_type.downcase == 'timeuuid')
           key = SimpleUUID::UUID.new(key)
         end
         return key.to_s
@@ -364,4 +364,4 @@ module CassandraModel
 
     end
   end
-end
+end

data/lib/cassandra-model/version.rb

@@ -1,3 +1,3 @@
 class CassandraModel
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/cassandra-model.rb

@@ -27,4 +27,3 @@ require 'cassandra-model/callbacks'
 require 'cassandra-model/persistence'
 require 'cassandra-model/batches'
 require 'cassandra-model/base'
-#require 'cassandra-model/railtie'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassilds-model
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-20 00:00:00.000000000Z
+date: 2011-09-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &20771940 !ruby/object:Gem::Requirement
+  requirement: &13449980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,21 +22,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20771940
+  version_requirements: *13449980
 - !ruby/object:Gem::Dependency
   name: cassilds
-  requirement: &20770340 !ruby/object:Gem::Requirement
+  requirement: &13446480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *13446480
+- !ruby/object:Gem::Dependency
+  name: cassilds-connection-pool
+  requirement: &13443040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *20770340
+  version_requirements: *13443040
 - !ruby/object:Gem::Dependency
   name: simple_uuid
-  requirement: &20766840 !ruby/object:Gem::Requirement
+  requirement: &13442200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +55,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20766840
+  version_requirements: *13442200
 description: Cassandra-model allows you to map ColumnFamily/SuperColumnFamily in Cassandra
   to Ruby objects. It was designed to be fast and simple.
 email:
@@ -70,7 +81,6 @@ files:
 - lib/cassandra-model/config.rb
 - lib/cassandra-model/connection.rb
 - lib/cassandra-model/persistence.rb
-- lib/cassandra-model/railtie.rb
 - lib/cassandra-model/types.rb
 - lib/cassandra-model/version.rb
 - test/base_test.rb

data/lib/cassandra-model/railtie.rb

@@ -1,14 +0,0 @@
-require 'cassandra-model/config'
-module CassandraModel
-  if defined? Rails::Railtie
-    require 'rails'
-    class Railtie < Rails::Railtie
-      initializer 'cassandra-model.config_init' do
-        CassandraModel::Config.initialize
-      end
-      rake_tasks do
-        load "tasks/paperclip.rake"
-      end
-    end
-  end
-end