datastax_rails 1.0.15 → 1.0.16.3

data/lib/datastax_rails/tasks/column_family.rb

@@ -108,26 +108,53 @@ module DatastaxRails
           
           solr_url = "#{DatastaxRails::Base.solr_base_url}/resource/#{DatastaxRails::Base.config[:keyspace]}.#{model.column_family}"
           uri = URI.parse(solr_url)
-          Net::HTTP.start(uri.host, uri.port) do |http|
-            http.read_timeout(300)
-            if force || solrconfig_digest != sm_digests['solrconfig'] 
+          http = Net::HTTP.new(uri.host, uri.port)
+          if uri.scheme == 'https'
+            http.use_ssl = true
+            http.cert = OpenSSL::X509::Certificate.new(Rails.root.join("config","pow.crt").read)
+            http.key = OpenSSL::PKey::RSA.new(Rails.root.join("config","pow.key").read)
+            http.ca_path = Rails.root.join("config","sade_ca.crt").to_s
+            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          end
+          http.read_timeout = 300
+          if force || solrconfig_digest != sm_digests['solrconfig']
+            loop do 
               puts "Posting Solr Config file to '#{solr_url}/solrconfig.xml'"
               http.post(uri.path+"/solrconfig.xml", solrconfig)
-              sleep(5) if Rails.env.production?
-              DatastaxRails::Cql::Update.new(SchemaMigration, model.column_family).columns(:solrconfig => solrconfig_digest).execute
+              if Rails.env.production?
+                sleep(5)
+                resp = http.get(uri.path+"/solrconfig.xml")
+                continue unless resp.message == 'OK'                  
+              end
+              break
             end
-            if force || stopwords_digest != sm_digests['stopwords']
+            DatastaxRails::Cql::Update.new(SchemaMigration, model.column_family).columns(:solrconfig => solrconfig_digest).execute
+          end
+          if force || stopwords_digest != sm_digests['stopwords']
+            loop do
               puts "Posting Solr Stopwords file to '#{solr_url}/stopwords.txt'"
               http.post(uri.path+"/stopwords.txt", stopwords)
-              sleep(5) if Rails.env.production?
-              DatastaxRails::Cql::Update.new(SchemaMigration, model.column_family).columns(:stopwords => stopwords_digest).execute
+              if Rails.env.production?
+                sleep(5)
+                resp = http.get(uri.path+"/stopwords.txt")
+                continue unless resp.message == 'OK'
+              end
+              break
             end
-            if force || schema_digest != sm_digests['digest']
+            DatastaxRails::Cql::Update.new(SchemaMigration, model.column_family).columns(:stopwords => stopwords_digest).execute
+          end
+          if force || schema_digest != sm_digests['digest']
+            loop do
               puts "Posting Solr Schema file to '#{solr_url}/schema.xml'"
               http.post(uri.path+"/schema.xml", schema)
-              sleep(5) if Rails.env.production?
-              DatastaxRails::Cql::Update.new(SchemaMigration, model.column_family).columns(:digest => schema_digest).execute
+              if Rails.env.production?
+                sleep(5)
+                resp = http.get(uri.path+"/schema.xml")
+                continue unless resp.message == 'OK'
+              end
+              break
             end
+            DatastaxRails::Cql::Update.new(SchemaMigration, model.column_family).columns(:digest => schema_digest).execute
           end
         end
       end

data/lib/datastax_rails/tasks/keyspace.rb

@@ -8,7 +8,7 @@ module DatastaxRails
   
         def create(name, options = {})
           opts = { :name => name.to_s,
-                   :strategy_class => 'org.apache.cassandra.locator.NetworkTopologyStrategy'}.merge(options)
+                   :strategy_class => 'org.apache.cassandra.locator.NetworkTopologyStrategy'}.with_indifferent_access.merge(options)
   
           if(exists?(name.to_s))
             puts "Keyspace #{name.to_s} already exists"

data/lib/datastax_rails/types/binary_type.rb

@@ -5,6 +5,7 @@ module DatastaxRails
       def encode(str)
         raise ArgumentError.new("#{self} requires a String") unless str.kind_of?(String)
         io = StringIO.new(Base64.encode64(str))
+        #io = StringIO.new(str)
         chunks = []
         while chunk = io.read(1.megabyte)
           chunks << chunk
@@ -20,6 +21,7 @@ module DatastaxRails
           end
           io.rewind
           Base64.decode64(io.read)
+          #io.read
         else
           arr
         end

data/lib/datastax_rails/types/date_type.rb

@@ -5,6 +5,7 @@ module DatastaxRails
       FORMAT = '%Y-%m-%dT%H:%M:%SZ'
 
       def encode(value)
+        return unless value
         raise ArgumentError.new("#{self} requires a Date") unless value.kind_of?(Date) || value.kind_of?(Time)
         value.to_date.strftime(FORMAT)
       end

data/lib/datastax_rails/types/string_type.rb

@@ -4,8 +4,7 @@ module DatastaxRails
       DEFAULTS = {:solr_type => 'string', :indexed => true, :stored => true, :multi_valued => false, :sortable => true, :tokenized => false, :fulltext => true}
       def encode(str)
         str = "" unless str
-        raise ArgumentError.new("#{self} requires a String") unless str.kind_of?(String)
-        str.dup
+        str.to_s
       end
 
       def wrap(record, name, value)

data/lib/datastax_rails/types/time_type.rb

@@ -5,6 +5,7 @@ module DatastaxRails
       FORMAT = "%Y-%m-%dT%H:%M:%SZ"
 
       def encode(time)
+        return unless time
         raise ArgumentError.new("#{self} requires a Time") unless time.kind_of?(Time)
         time.strftime(FORMAT)
       end

data/lib/datastax_rails/version.rb

@@ -1,4 +1,4 @@
 module DatastaxRails
   # The current version of the gem
-  VERSION = "1.0.15"
+  VERSION = "1.0.16.3"
 end

data/lib/datastax_rails.rb

@@ -1,5 +1,5 @@
 require 'active_support/all'
-require 'cassandra-cql/1.0'
+require 'cassandra-cql/1.1'
 require 'blankslate'
 require 'schema_migration'
 

data/spec/datastax_rails/relation/search_methods_spec.rb

@@ -79,12 +79,24 @@ describe DatastaxRails::Relation do
       @relation.where(:complexity).greater_than(1.0).should_not be_empty
     end
     
+    it "should allow :greater_than to be specified in a single call" do
+      Hobby.create(:name => 'Swimming', :complexity => 1.1)
+      @relation.commit_solr
+      @relation.where(:complexity => {:greater_than => 1.0}).should_not be_empty
+    end
+    
     it "should return documents where a value is less than the given value" do
       Hobby.create(:name => 'Swimming', :complexity => 1.1)
       @relation.commit_solr
       @relation.where(:complexity).less_than(2.0).should_not be_empty
     end
     
+    it "should allow :less_than to be specified in a single call" do
+      Hobby.create(:name => 'Swimming', :complexity => 1.1)
+      @relation.commit_solr
+      @relation.where(:complexity => {:less_than => 2.0}).should_not be_empty
+    end
+    
     it "should allow arrays to be passed as OR queries" do
       %w[fishing hiking boating jogging swimming chess].each do |word|
         Hobby.create(:name => word)
@@ -114,7 +126,7 @@ describe DatastaxRails::Relation do
     end
     
     it "should search for values within a range" do
-      Hobby.create(:name => 'jobbing', :complexity => 1.2)
+      Hobby.create(:name => 'jogging', :complexity => 1.2)
       @relation.commit_solr
       @relation.where(:complexity => 1..2).should_not be_empty
       @relation.where(:complexity => 2..3).should be_empty
@@ -134,6 +146,37 @@ describe DatastaxRails::Relation do
       @relation.commit_solr
       @relation.where_not(:name => ['Swimming','Biking']).should be_empty
     end
+    
+    it "should return documents where a value is not greater than the given value" do
+      Hobby.create(:name => 'Swimming', :complexity => 1.1)
+      @relation.commit_solr
+      @relation.where_not(:complexity).greater_than(2.0).should_not be_empty
+    end
+    
+    it "should allow :greater_than to be specified in a single call" do
+      Hobby.create(:name => 'Swimming', :complexity => 1.1)
+      @relation.commit_solr
+      @relation.where_not(:complexity => {:greater_than => 2.0}).should_not be_empty
+    end
+    
+    it "should return documents where a value is not less than the given value" do
+      Hobby.create(:name => 'Swimming', :complexity => 1.1)
+      @relation.commit_solr
+      @relation.where_not(:complexity).less_than(1.0).should_not be_empty
+    end
+    
+    it "should allow :less_than to be specified in a single call" do
+      Hobby.create(:name => 'Swimming', :complexity => 1.1)
+      @relation.commit_solr
+      @relation.where_not(:complexity => {:less_than => 1.0}).should_not be_empty
+    end
+    
+    it "should search for values outside a range" do
+      Hobby.create(:name => 'jogging', :complexity => 1.2)
+      @relation.commit_solr
+      @relation.where_not(:complexity => 1..2).should be_empty
+      @relation.where_not(:complexity => 2..3).should_not be_empty
+    end
   end
   
   describe "#fulltext" do

data/spec/datastax_rails/validations/uniqueness_spec.rb

@@ -13,9 +13,9 @@ describe DatastaxRails::Base do
     end
     
     it "should allow an update to a model without triggering a uniqueness error" do
-      p=Person.create!(:name => "Jason", :birthdate => Date.parse("10/19/1985"))
+      p=Person.create!(:name => "Jason", :birthdate => Date.strptime("10/19/1985", '%m/%d/%Y'))
       Person.commit_solr
-      p.birthdate = Date.parse("10/19/1980")
+      p.birthdate = Date.strptime("10/19/1980", '%m/%d/%Y')
       p.save!
     end
     

data/spec/dummy/config/datastax.yml

@@ -1,22 +1,29 @@
-development:
-  servers: ["localhost:9160"]
-  keyspace: "datastax_rails_development"
-  strategy_class: "org.apache.cassandra.locator.SimpleStrategy"
-  strategy_options: {"DC1": "1"} 
-  connection_options:
-    timeout: 10
-  solr:
-    port: 8983
-    path: /solr
-    
-test:
-  servers: ["localhost:9160"]
-  keyspace: "datastax_rails_test"
-  strategy_class: "org.apache.cassandra.locator.SimpleStrategy"
-  strategy_options: {"DC1": "1"} 
-  connection_options:
-    timeout: 10
-  solr:
-    port: 8983
-    path: /solr
-        
+development:
+  servers: ["127.0.0.1:9160"]
+  keyspace: "datastax_rails_development"
+  strategy_class: "org.apache.cassandra.locator.SimpleStrategy"
+  strategy_options: {"replication_factor": "1"}
+  connection_options:
+    timeout: 10
+  solr:
+    port: 8984
+    path: /solr
+    ssl:
+      use_ssl: true
+      cert: config/datastax_rails.crt
+      key: config/datastax_rails.key
+    
+test:
+  servers: ["127.0.0.1:9160"]
+  keyspace: "datastax_rails_test"
+  strategy_class: "org.apache.cassandra.locator.SimpleStrategy"
+  strategy_options: {"replication_factor": "1"}
+  connection_options:
+    timeout: 10
+  solr:
+    port: 8984
+    path: /solr
+    ssl:
+      use_ssl: true
+      cert: config/datastax_rails.crt
+      key: config/datastax_rails.key

data/spec/dummy/config/datastax_rails.crt

@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC6DCCAlGgAwIBAgIBKTANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJVUzER
+MA8GA1UECBMIVmlyZ2luaWExDzANBgNVBAcTBlJlc3RvbjEbMBkGA1UEChMST3Bl
+biBTb3VyY2UgQ2VudGVyMQ0wCwYDVQQLEwRTQURFMQ0wCwYDVQQDEwRTQURFMB4X
+DTEyMTAxMjA5MjQ1OVoXDTIyMTAxMjA5MjQ1OVowdjELMAkGA1UEBhMCVVMxETAP
+BgNVBAgMCFZpcmdpbmlhMQ8wDQYDVQQHDAZSZXN0b24xGzAZBgNVBAoMEk9wZW4g
+U291cmNlIENlbnRlcjENMAsGA1UECwwEU0FERTEXMBUGA1UEAwwOREFUQVNUQVhf
+UkFJTFMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKjMV5VJP2smXnkmD3pr
+u/Cv2VIQu947C0vIlZ0adE2mTTO4QhsMYXl/WdWy7oXkKBmDlEHquM/I9EbaxSCD
+4jx0lCOi/qc4M+PLTABQLtfsMyxDWs17uCqSU8DgkeTi6GuRLlQKHJDm5vw359GC
+gr8mMZw1n6lSaiTZ4/R2GPdBAgMBAAGjgY8wgYwwDAYDVR0TAQH/BAIwADAxBglg
+hkgBhvhCAQ0EJBYiUnVieS9PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAd
+BgNVHQ4EFgQUHrQU6mRIT/g4W3z4gLnA145MwN4wCwYDVR0PBAQDAgXgMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDBDANBgkqhkiG9w0BAQUFAAOBgQAuNmNo
+OjpJx8idSVDQsQi7USpqvES5G9pLoa6OIkH8Ktx6TezI5zpYUrRSwzHE8qIGUKD3
+ylPku7qbFJw2+n1K4TKbfrn+ad5+zdRez/uGidEfRtOR7rfkyFVfYaU5htO6PXO5
+Rj9pMTgEXIjMsKLAHBm6Cit3HQTZTJXdSYTmdw==
+-----END CERTIFICATE-----

data/spec/dummy/config/datastax_rails.key

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXgIBAAKBgQCozFeVST9rJl55Jg96a7vwr9lSELveOwtLyJWdGnRNpk0zuEIb
+DGF5f1nVsu6F5CgZg5RB6rjPyPRG2sUgg+I8dJQjov6nODPjy0wAUC7X7DMsQ1rN
+e7gqklPA4JHk4uhrkS5UChyQ5ub8N+fRgoK/JjGcNZ+pUmok2eP0dhj3QQIDAQAB
+AoGAM7KiAG72pXKS7LfjdbMZVJYHEUNexql+xC8i44L+q+mLK5P7ax1XnUaL1Q+A
+TjGatnW+KpIhGEKLzkeiqFq8JxiBgp1l25lri4V1aTF8YuloekzroebUmz5sOVXO
+GZxBkLl73t7m3xMWrMlR6o5tXgzeap5a2gMFLVBgJR/nIAECQQDXuINWtZKStza6
+ZoPy0ofF3BVzXwP9ybt8rCA9NTTmH/06cOhIHibj8cDnEq29y8m9nJY122HKkdPP
+77J/yxBhAkEAyFDsh8O2EkPH40ajWvFTpaI9aforaXEcgGNEyGg5f1ghrGOGjpkf
+GDWdrOHyRzcoFxpi/fZfbvWYfjOm3zDS4QJBAJd45jBCetMudu1YAprEnbWfHijO
+tPzFZDLcoh6Yd7aHC8a3dUL+eQxhurQGd5zntZbAlvDmRLp6vyIpC0uUiMECQQC8
+d0bTRVOcQ6FhOCihe8RTZh2aBAGsJvvF35/rXgQax/SGmO0UZQRYZrl+2uZ0EnTp
+p63Te2W2o+NheX9bJjiBAkEAhlnGxWHEPZfW6R+rFfbVKLW2NZe9wPVJb35XLRxf
+G1W41KMP267frVpEXC8Kd/HOFLD9cM3tvFaN6B8GqRMj4g==
+-----END RSA PRIVATE KEY-----

data/spec/dummy/log/development.log

@@ -64,3 +64,6 @@ update hobbies using consistency QUORUM SET name = 'j', schema_version = '0' WHE
   hobbies insert (8.7ms)  7332d7f8-0758-11e2-93a6-c8fd85e4fc7d {"name"=>"j", "schema_version"=>"0"}
 update hobbies using consistency QUORUM SET created_at = '2012-09-25T21:35:31Z', updated_at = '2012-09-25T21:35:31Z', schema_version = '0' WHERE KEY IN ('ee85bbfa-0758-11e2-9b96-52afb52cd9cd')
   hobbies insert (8.2ms)  ee85bbfa-0758-11e2-9b96-52afb52cd9cd {"created_at"=>"2012-09-25T21:35:31Z", "updated_at"=>"2012-09-25T21:35:31Z", "schema_version"=>"0"}
+update people using consistency QUORUM SET name = 'Jason', created_at = '2012-10-05T18:57:18Z', updated_at = '2012-10-05T18:57:18Z', nickname = 'Jason', schema_version = '0' WHERE KEY IN ('7c3fa8f8-0f1e-11e2-88cb-3b5bb170a231')
+  people insert (37.1ms)  7c3fa8f8-0f1e-11e2-88cb-3b5bb170a231 {"name"=>"Jason", "created_at"=>"2012-10-05T18:57:18Z", "updated_at"=>"2012-10-05T18:57:18Z", "nickname"=>"Jason", "schema_version"=>"0"}
+SELECT updated_at,birthdate,nickname,created_at,name FROM people USING CONSISTENCY QUORUM WHERE key = '12345'