datastax_rails 1.1.0.3 → 1.2.3

data/spec/spec_helper.rb

@@ -12,6 +12,17 @@ Dir[File.expand_path(File.join(ENGINE_RAILS_ROOT, "spec/support/**/*.rb"))].each
 
 RSpec.configure do |config|
   config.alias_it_should_behave_like_to :it_has_behavior, 'has behavior:'
+  
+  # Use a focus tag to filter specific specs. This helps if you need to
+  # focus on one spec instead of the whole suite.
+  config.filter_run focus: true
+  config.run_all_when_everything_filtered = true
+  
+  # Filter slow specs. Add a :slow tag to the spec to keep it from
+  # running unless the SLOW_SPECS environment variable is set.
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.filter_run_excluding :slow unless ENV['SLOW_SPECS']
+  
   config.before(:each) do
     DatastaxRails::Base.recorded_classes = {}
   end

data/spec/support/models.rb

@@ -47,6 +47,18 @@ class CarPayload < DatastaxRails::PayloadModel
   self.column_family = "car_payloads"
 end
 
+class AuditLog < DatastaxRails::WideStorageModel
+  self.column_family = "audit_logs"
+  
+  key :natural, :attributes => [:uuid]
+  cluster_by :created_at
+  
+  string     :uuid
+  string     :message
+  string     :user, :indexed => :cassandra
+  timestamps
+end
+
 class Job < DatastaxRails::Base
   self.column_family = "jobs"
   
@@ -66,9 +78,11 @@ class Boat < DatastaxRails::Base
   
   key :uuid
   string :name
+  integer :registration
   timestamps
   
   validates :name, :uniqueness => true
+  default_scope order(:name)
 end
 
 class Hobby < DatastaxRails::Base

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: datastax_rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0.3
+  version: 1.2.3
 platform: ruby
 authors:
 - Jason M. Kusar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2014-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: cassandra-cql
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.9
 - !ruby/object:Gem::Dependency
   name: rsolr-client-cert
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta2
+- !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'
 description: A Ruby-on-Rails interface to Datastax Enterprise. Intended for use with
   the DSE search nodes.
 email:
@@ -90,10 +118,10 @@ extra_rdoc_files: []
 files:
 - config/stopwords.txt
 - config/schema.xml.erb
-- config/solrconfig.xml
-- lib/datastax_rails/schema/migration_proxy.rb
-- lib/datastax_rails/schema/migration.rb
+- config/solrconfig.xml.erb
 - lib/datastax_rails/schema/migrator.rb
+- lib/datastax_rails/schema/solr.rb
+- lib/datastax_rails/schema/cassandra.rb
 - lib/datastax_rails/serializers/xml_serializer.rb
 - lib/datastax_rails/scoping.rb
 - lib/datastax_rails/callbacks.rb
@@ -101,8 +129,6 @@ files:
 - lib/datastax_rails/schema.rb
 - lib/datastax_rails/rsolr_client_wrapper.rb
 - lib/datastax_rails/associations.rb
-- lib/datastax_rails/log_subscriber.rb
-- lib/datastax_rails/mocking.rb
 - lib/datastax_rails/identity.rb
 - lib/datastax_rails/cql/use_keyspace.rb
 - lib/datastax_rails/cql/alter_column_family.rb
@@ -122,12 +148,15 @@ files:
 - lib/datastax_rails/cql/drop_index.rb
 - lib/datastax_rails/attribute_methods.rb
 - lib/datastax_rails/connection.rb
+- lib/datastax_rails/scoping/default.rb
+- lib/datastax_rails/scoping/named.rb
 - lib/datastax_rails/reflection.rb
 - lib/datastax_rails/identity/custom_key_factory.rb
 - lib/datastax_rails/identity/uuid_key_factory.rb
 - lib/datastax_rails/identity/hashed_natural_key_factory.rb
 - lib/datastax_rails/identity/abstract_key_factory.rb
 - lib/datastax_rails/identity/natural_key_factory.rb
+- lib/datastax_rails/cassandra_only_model.rb
 - lib/datastax_rails/collection.rb
 - lib/datastax_rails/relation.rb
 - lib/datastax_rails/type.rb
@@ -143,7 +172,6 @@ files:
 - lib/datastax_rails/types/text_type.rb
 - lib/datastax_rails/types/float_type.rb
 - lib/datastax_rails/validations.rb
-- lib/datastax_rails/migrations.rb
 - lib/datastax_rails/associations/builder/association.rb
 - lib/datastax_rails/associations/builder/singular_association.rb
 - lib/datastax_rails/associations/builder/has_many.rb
@@ -162,6 +190,7 @@ files:
 - lib/datastax_rails/associations/collection_proxy.rb
 - lib/datastax_rails/errors.rb
 - lib/datastax_rails/base.rb
+- lib/datastax_rails/attribute_assignment.rb
 - lib/datastax_rails/grouped_collection.rb
 - lib/datastax_rails/payload_model.rb
 - lib/datastax_rails/relation/batches.rb
@@ -173,12 +202,11 @@ files:
 - lib/datastax_rails/relation/modification_methods.rb
 - lib/datastax_rails/util/solr_repair.rb
 - lib/datastax_rails/serialization.rb
+- lib/datastax_rails/wide_storage_model.rb
+- lib/datastax_rails/inheritance.rb
 - lib/datastax_rails/validations/uniqueness.rb
 - lib/datastax_rails/validations/associated.rb
 - lib/datastax_rails/timestamps.rb
-- lib/datastax_rails/migrations/migration.rb
-- lib/datastax_rails/tasks/column_family.rb
-- lib/datastax_rails/tasks/keyspace.rb
 - lib/datastax_rails/tasks/ds.rake
 - lib/datastax_rails/attribute_methods/definition.rb
 - lib/datastax_rails/attribute_methods/dirty.rb
@@ -192,13 +220,16 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
-- spec/support/connection_double.rb
 - spec/support/default_consistency_shared_examples.rb
 - spec/support/models.rb
 - spec/support/datastax_test_hook.rb
+- spec/datastax_rails/schema/solr_spec.rb
+- spec/datastax_rails/schema/migrator_spec.rb
 - spec/datastax_rails/attribute_methods_spec.rb
 - spec/datastax_rails/cql/update_spec.rb
 - spec/datastax_rails/cql/select_spec.rb
+- spec/datastax_rails/scoping/default_spec.rb
+- spec/datastax_rails/types/time_type_spec.rb
 - spec/datastax_rails/types/integer_type_spec.rb
 - spec/datastax_rails/types/float_type_spec.rb
 - spec/datastax_rails/persistence_spec.rb
@@ -206,7 +237,9 @@ files:
 - spec/datastax_rails/associations/has_many_association_spec.rb
 - spec/datastax_rails/relation_spec.rb
 - spec/datastax_rails/associations_spec.rb
+- spec/datastax_rails/inheritance_spec.rb
 - spec/datastax_rails/relation/batches_spec.rb
+- spec/datastax_rails/relation/facet_methods_spec.rb
 - spec/datastax_rails/relation/search_methods_spec.rb
 - spec/datastax_rails/relation/spawn_methods_spec.rb
 - spec/datastax_rails/relation/modification_methods_spec.rb
@@ -236,7 +269,9 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/sunspot.yml
 - spec/dummy/config/boot.rb
+- spec/dummy/config/solr/articles-schema.xml.erb
 - spec/dummy/Rakefile
+- spec/dummy/db/test.sqlite3
 - spec/dummy/ks/migrate/20111117224534_models.rb
 - spec/dummy/ks/schema.json
 - spec/dummy/public/favicon.ico
@@ -253,7 +288,8 @@ files:
 - spec/dummy/log/test.log
 - spec/dummy/log/production.log
 homepage: https://github.com/jasonmk/datastax_rails
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -276,13 +312,16 @@ signing_key:
 specification_version: 4
 summary: A Ruby-on-Rails interface to Datastax Enterprise
 test_files:
-- spec/support/connection_double.rb
 - spec/support/default_consistency_shared_examples.rb
 - spec/support/models.rb
 - spec/support/datastax_test_hook.rb
+- spec/datastax_rails/schema/solr_spec.rb
+- spec/datastax_rails/schema/migrator_spec.rb
 - spec/datastax_rails/attribute_methods_spec.rb
 - spec/datastax_rails/cql/update_spec.rb
 - spec/datastax_rails/cql/select_spec.rb
+- spec/datastax_rails/scoping/default_spec.rb
+- spec/datastax_rails/types/time_type_spec.rb
 - spec/datastax_rails/types/integer_type_spec.rb
 - spec/datastax_rails/types/float_type_spec.rb
 - spec/datastax_rails/persistence_spec.rb
@@ -290,7 +329,9 @@ test_files:
 - spec/datastax_rails/associations/has_many_association_spec.rb
 - spec/datastax_rails/relation_spec.rb
 - spec/datastax_rails/associations_spec.rb
+- spec/datastax_rails/inheritance_spec.rb
 - spec/datastax_rails/relation/batches_spec.rb
+- spec/datastax_rails/relation/facet_methods_spec.rb
 - spec/datastax_rails/relation/search_methods_spec.rb
 - spec/datastax_rails/relation/spawn_methods_spec.rb
 - spec/datastax_rails/relation/modification_methods_spec.rb
@@ -320,7 +361,9 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/sunspot.yml
 - spec/dummy/config/boot.rb
+- spec/dummy/config/solr/articles-schema.xml.erb
 - spec/dummy/Rakefile
+- spec/dummy/db/test.sqlite3
 - spec/dummy/ks/migrate/20111117224534_models.rb
 - spec/dummy/ks/schema.json
 - spec/dummy/public/favicon.ico
@@ -336,3 +379,4 @@ test_files:
 - spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/log/production.log
+has_rdoc: 

data/lib/datastax_rails/log_subscriber.rb

@@ -1,37 +0,0 @@
-module DatastaxRails
-  class LogSubscriber < ActiveSupport::LogSubscriber
-    def multi_get(event)
-      name = '%s multi_get (%.1fms)' % [event.payload[:column_family], event.duration]
-
-      debug "  #{name}  (#{event.payload[:keys].size}) #{event.payload[:keys].join(" ")}"
-    end
-
-    def remove(event)
-      name = '%s remove (%.1fms)' % [event.payload[:column_family], event.duration]
-
-      message = "  #{name}  #{event.payload[:key]}"
-      message << " #{Array(event.payload[:attributes]).inspect}" if event.payload[:attributes]
-
-      debug message
-    end
-
-    def truncate(event)
-      name = '%s truncate (%.1fms)' % [event.payload[:column_family], event.duration]
-
-      debug "  #{name}  #{event.payload[:column_family]}"
-    end
-
-    def insert(event)
-      name = '%s insert (%.1fms)' % [event.payload[:column_family], event.duration]
-
-      debug "  #{name}  #{event.payload[:key]} #{event.payload[:attributes].inspect}"
-    end
-
-    def get_range(event)
-      name = '%s get_range (%.1fms)' % [event.payload[:column_family], event.duration]
-      
-      debug "  #{name}  (#{event.payload[:count]}) '#{event.payload[:start]}' => '#{event.payload[:finish]}'"
-    end
-  end
-end
-DatastaxRails::LogSubscriber.attach_to :datastax_rails

data/lib/datastax_rails/migrations/migration.rb

@@ -1,15 +0,0 @@
-module DatastaxRails
-  module Migrations
-    class Migration
-      attr_reader :version
-      def initialize(version, block)
-        @version = version
-        @block = block
-      end
-
-      def run(attrs)
-        @block.call(attrs)
-      end
-    end
-  end
-end

data/lib/datastax_rails/migrations.rb

@@ -1,36 +0,0 @@
-module DatastaxRails
-  module Migrations
-    extend ActiveSupport::Concern
-    extend ActiveSupport::Autoload
-
-    included do
-      class_attribute :migrations
-      self.migrations = []
-
-      class_attribute :current_schema_version
-      self.current_schema_version = 0
-    end
-
-    autoload :Migration
-    
-    class MigrationNotFoundError < StandardError
-      def initialize(record_version, migrations)
-        super("Cannot migrate a record from #{record_version.inspect}.  Migrations exist for #{migrations.map(&:version)}")
-      end
-    end
-    
-    def schema_version
-      Integer(@schema_version || self.class.current_schema_version)
-    end
-    
-    module ClassMethods
-      def migrate(version, &blk)
-        migrations << Migration.new(version, blk)
-        
-        if version > self.current_schema_version 
-          self.current_schema_version = version
-        end
-      end
-    end
-  end
-end

data/lib/datastax_rails/mocking.rb

@@ -1,15 +0,0 @@
-require 'cassandra/mock'
-module DatastaxRails
-  module Mocking
-    extend ActiveSupport::Concern
-    module ClassMethods
-      def use_mock!(really=true)
-        if really
-          self.connection_class = Cassandra::Mock
-        else
-          self.connection_class = Cassandra
-        end
-      end
-    end
-  end
-end

data/lib/datastax_rails/schema/migration.rb

@@ -1,106 +0,0 @@
-module DatastaxRails
-  module Schema
-
-    class Migration
-
-      @@verbose = true
-      cattr_accessor :verbose
-
-      # Returns the raw connection to Cassandra
-      def self.connection
-        DatastaxRails::Base.connection
-      end
-
-      def self.migrate(direction)
-        return unless respond_to?(direction)
-
-        case direction
-        when :up   then announce "migrating"
-        when :down then announce "reverting"
-        end
-
-        result = nil
-        time = Benchmark.measure { result = send("#{direction}") }
-
-        case direction
-        when :up   then announce "migrated (%.4fs)" % time.real; write
-        when :down then announce "reverted (%.4fs)" % time.real; write
-        end
-
-        result
-      end
-
-      # Creates a new column family with the given name.  Column family configurations can be set within
-      # a block like this:
-      #
-      #  create_column_family(:users) do |cf|
-      #    cf.comment = 'Users column family'
-      #    cf.comparator_type = 'TimeUUIDType'
-      #  end
-      #
-      # A complete list of available configuration settings is here:
-      #
-      # http://github.com/fauna/cassandra/blob/master/vendor/0.7/gen-rb/cassandra_types.rb
-      #
-      # Scroll down to the CfDef definition.
-      def self.create_column_family(name, &block)
-        say_with_time("create_column_family #{name}") do
-          column_family_tasks.create(name, &block)
-        end
-      end
-
-      # Drops the given column family
-      def self.drop_column_family(name)
-        say_with_time("drop_column_family #{name}") do
-          column_family_tasks.drop(name)
-        end
-      end
-
-      # Renames the column family from the old name to the new name
-      def self.rename_column_family(old_name, new_name)
-        say_with_time("rename_column_family #{name}") do
-          column_family_tasks.rename(old_name, new_name)
-        end
-      end
-
-      def self.write(text="")
-        puts(text) if verbose
-      end
-
-      def self.announce(message)
-        version = defined?(@version) ? @version : nil
-
-        text = "#{version} #{name}: #{message}"
-        length = [0, 75 - text.length].max
-        write "== %s %s" % [text, "=" * length]
-      end
-
-      def self.say(message, subitem=false)
-        write "#{subitem ? "   ->" : "--"} #{message}"
-      end
-
-      def self.say_with_time(message)
-        say(message)
-        result = nil
-        time = Benchmark.measure { result = yield }
-        say "%.4fs" % time.real, :subitem
-        say("#{result} rows", :subitem) if result.is_a?(Integer)
-        result
-      end
-
-      def self.suppress_messages
-        save, self.verbose = verbose, false
-        yield
-      ensure
-        self.verbose = save
-      end
-
-      private
-
-      def self.column_family_tasks
-        Tasks::ColumnFamily.new(DatastaxRails::Base.connection.keyspace)
-      end
-
-    end
-  end
-end

data/lib/datastax_rails/schema/migration_proxy.rb

@@ -1,25 +0,0 @@
-module DatastaxRails
-  module Schema
-
-    # MigrationProxy is used to defer loading of the actual migration classes
-    # until they are needed
-    class MigrationProxy
-
-      attr_accessor :name, :version, :filename
-
-      delegate :migrate, :announce, :write, :to=>:migration
-
-      private
-
-      def migration
-        @migration ||= load_migration
-      end
-
-      def load_migration
-        require(File.expand_path(filename))
-        name.constantize
-      end
-
-    end
-  end
-end