datastax_rails 2.0.15 → 2.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eca5b1ed0b44ff67dffbe1c313ec3327b7011ac0
-  data.tar.gz: db1abc9e2a7c2577d7d20c8edf2492a81f88a2e2
+  metadata.gz: 132b266af9a95c9c39cf2ebd31070736456203a9
+  data.tar.gz: 456554a5b9f107ceb7766f8dc8d80b9e842ef53a
 SHA512:
-  metadata.gz: 919cf9003af455d8c2311b82801a8b3b2f33ef5fb004721c24128c6d76671207adc8ef2e6e4ea7961f14370bcd16846a53dc669956910757c7fc3b65f534a251
-  data.tar.gz: 2237e860f52576b248028d589a30773453783ccdf3e7c4bcb5bd688ff2b23064a7eed327805d06067931ecde65e0c7b7381a49df955a2c21a34f52eb8a668d1c
+  metadata.gz: f91a8dcaba63be7244c3d58621fab35a9677e7cf1c93e9763f6adf9ef25b203a6883531100c7a357082b60e980435c1f7a276eab0f87ed35758be4701a3debe5
+  data.tar.gz: 773c2de70abae6deae8ba0119873c760b61cb14e0992c88e39975446136a82856f1fc177802b23a78e378ece41b075942adef07d5b13f2af891d49967c31f3c1

data/lib/datastax_rails/base.rb

@@ -467,7 +467,7 @@ module DatastaxRails #:nodoc:
       # won't get written unless they get marked as changed
       self.class.columns.each do |c|
         attr, orig_value = c.name, c.default
-        @changed_attributes[attr] = orig_value if _field_changed?(attr, orig_value, @attributes[attr])
+        @changed_attributes[attr] = nil if _field_changed?(attr, orig_value, @attributes[attr])
       end
     end
 

data/lib/datastax_rails/collection.rb

@@ -1,4 +1,5 @@
 module DatastaxRails
+  # Holds a collection of DatastaxRails::Base objects.
   class Collection < Array
     # @!attribute [r] total_entries
     #   @return [Fixnum] the total number of entries that match the search
@@ -11,7 +12,7 @@ module DatastaxRails
     attr_accessor :total_entries, :per_page, :current_page, :facets, :highlights
 
     def inspect
-      "<DatastaxRails::Collection##{object_id} contents: #{super} last_column_name: #{last_column_name.inspect}>"
+      "<DatastaxRails::Collection##{object_id} contents: #{super}>"
     end
 
     def total_pages

data/lib/datastax_rails/column.rb

@@ -216,7 +216,7 @@ module DatastaxRails
     end
 
     def full_solr_range
-      if %w(date uuid).include? solr_type
+      if %w(date uuid integer int double long float).include? solr_type
         '[* TO *]'
       else
         '[\"\" TO *]'

data/lib/datastax_rails/relation/stats_methods.rb

@@ -1,4 +1,5 @@
 module DatastaxRails
+  # Methods for computing statistics (sum, maximum, minimum, average, and stddev)
   module StatsMethods
     STATS_FIELDS = { 'sum' => 'sum', 'maximum' => 'max', 'minimum' => 'min', 'average' => 'mean', 'stddev' => 'stddev' }
 
@@ -63,7 +64,7 @@ module DatastaxRails
 
     def calculate_stats(field)
       unless @stats[field]
-        @stats[field] = limit(1).compute_stats(field).stats[field]
+        @stats[field] = with_solr.limit(1).compute_stats(field).stats[field]
       end
     end
   end

data/lib/datastax_rails/relation.rb

@@ -2,6 +2,7 @@ require 'rsolr'
 require 'pp' if ENV['DEBUG_SOLR'] == 'true'
 # TODO: Move functionality into modules
 module DatastaxRails
+  # = DatastaxRails Relation
   class Relation # rubocop:disable Style/ClassLength
     MULTI_VALUE_METHODS = %i(order where where_not fulltext greater_than less_than select stats field_facet
                              range_facet slow_order)
@@ -493,7 +494,7 @@ module DatastaxRails
         @stats_values.flatten.each do |sv|
           params['stats.field'] = sv
         end
-        @params['stats.facet'] = @group_value
+        params['stats.facet'] = @group_value
       end
       solr_response = nil
       if @group_value

data/lib/datastax_rails/version.rb

@@ -1,4 +1,4 @@
 # rubocop:disable Style/Documentation
 module DatastaxRails
-  VERSION = '2.0.15'
+  VERSION = '2.0.16'
 end

data/spec/datastax_rails/attribute_methods/typecasting_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe DatastaxRails::Base do
+  context 'attribute methods' do
+    context 'default values' do
+      subject { Default.new }
+
+      its(:str) { is_expected.to eq('string') }
+      its(:bool) { is_expected.to be(true) }
+      its(:bool2) { is_expected.to be(false) }
+      its(:bool3) { is_expected.to be_nil }
+      its(:changed_attributes) { is_expected.to include('str') }
+      its(:changed_attributes) { is_expected.to include('bool') }
+      its(:changed_attributes) { is_expected.to include('bool2') }
+      its(:changed_attributes) { is_expected.not_to include('bool3') }
+
+      context 'setting the attribute to the default' do
+        before { subject.bool = true }
+
+        its(:bool) { is_expected.to be(true) }
+        its(:changed_attributes) { is_expected.to include('bool') }
+      end
+    end
+  end
+end

data/spec/datastax_rails/relation/stats_methods_spec.rb

@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+describe DatastaxRails::Relation do
+  context 'stats methods' do
+    before(:all) do
+      DatastaxRails::Base.recorded_classes = {}
+      Hobby.create(name: 'Knitting', complexity: 1.0)
+      Hobby.create(name: 'Walking', complexity: 2.0)
+      Hobby.create(name: 'Skydiving', complexity: 10.0)
+      Hobby.create(name: 'Flying', complexity: 50.0)
+      Hobby.commit_solr
+    end
+
+    after(:all) { Hobby.truncate }
+
+    subject { Hobby }
+
+    context('#sum') do
+      subject { super().sum(:complexity) }
+      it { is_expected.to eq(63.0) }
+    end
+
+    context('#average') do
+      subject { super().average(:complexity) }
+      it { is_expected.to eq(15.75) }
+    end
+
+    context('#maximum') do
+      subject { super().maximum(:complexity) }
+      it { is_expected.to eq(50.0) }
+    end
+
+    context('#minimum') do
+      subject { super().minimum(:complexity) }
+      it { is_expected.to eq(1.0) }
+    end
+
+    context('#stddev') do
+      subject { super().stddev(:complexity) }
+      it { is_expected.to be_within(0.001).of(23.185) }
+    end
+
+    context('grouped') do
+      subject { super().group(:name) }
+
+      context('#sum') do
+        subject { super().grouped_sum(:complexity) }
+        it { is_expected.to eq('knitting' => 1.0, 'walking' => 2.0, 'skydiving' => 10.0, 'flying' => 50.0) }
+      end
+
+      context('#average') do
+        subject { super().grouped_average(:complexity) }
+        it { is_expected.to eq('knitting' => 1.0, 'walking' => 2.0, 'skydiving' => 10.0, 'flying' => 50.0) }
+      end
+
+      context('#maximum') do
+        subject { super().grouped_maximum(:complexity) }
+        it { is_expected.to eq('knitting' => 1.0, 'walking' => 2.0, 'skydiving' => 10.0, 'flying' => 50.0) }
+      end
+
+      context('#minimum') do
+        subject { super().grouped_minimum(:complexity) }
+        it { is_expected.to eq('knitting' => 1.0, 'walking' => 2.0, 'skydiving' => 10.0, 'flying' => 50.0) }
+      end
+
+      context('#stddev') do
+        subject { super().grouped_stddev(:complexity) }
+        it { is_expected.to eq('knitting' => 0.0, 'walking' => 0.0, 'skydiving' => 0.0, 'flying' => 0.0) }
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,10 @@
 # configure Rails Envinronment
 ENV['RAILS_ENV'] = 'test'
+require 'simplecov'
+SimpleCov.start do
+  add_filter 'spec/'
+end
+
 require File.expand_path('../dummy/config/environment.rb',  __FILE__)
 
 require 'rspec/rails'

data/spec/support/models.rb

@@ -86,6 +86,16 @@ class Hobby < DatastaxRails::Base
   timestamps
 end
 
+class Default < DatastaxRails::Base
+  self.column_family = 'defaults'
+
+  uuid :id
+  string :str, default: 'string'
+  boolean :bool, default: true
+  boolean :bool2, default: false
+  boolean :bool3
+end
+
 class CoreMetadata < DatastaxRails::DynamicModel
   self.grouping = 'core'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datastax_rails
 version: !ruby/object:Gem::Version
-  version: 2.0.15
+  version: 2.0.16
 platform: ruby
 authors:
 - Jason M. Kusar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -270,6 +270,7 @@ files:
 - spec/datastax_rails/associations/collection_association_spec.rb
 - spec/datastax_rails/associations/has_many_association_spec.rb
 - spec/datastax_rails/associations_spec.rb
+- spec/datastax_rails/attribute_methods/typecasting_spec.rb
 - spec/datastax_rails/attribute_methods_spec.rb
 - spec/datastax_rails/base_spec.rb
 - spec/datastax_rails/callbacks_spec.rb
@@ -288,6 +289,7 @@ files:
 - spec/datastax_rails/relation/modification_methods_spec.rb
 - spec/datastax_rails/relation/search_methods_spec.rb
 - spec/datastax_rails/relation/spawn_methods_spec.rb
+- spec/datastax_rails/relation/stats_methods_spec.rb
 - spec/datastax_rails/relation_spec.rb
 - spec/datastax_rails/schema/migrator_spec.rb
 - spec/datastax_rails/schema/solr_spec.rb
@@ -386,11 +388,13 @@ test_files:
 - spec/datastax_rails/schema/migrator_spec.rb
 - spec/datastax_rails/schema/solr_spec.rb
 - spec/datastax_rails/validations/uniqueness_spec.rb
+- spec/datastax_rails/attribute_methods/typecasting_spec.rb
 - spec/datastax_rails/cql/delete_spec.rb
 - spec/datastax_rails/cql/update_spec.rb
 - spec/datastax_rails/cql/base_spec.rb
 - spec/datastax_rails/cql/select_spec.rb
 - spec/datastax_rails/persistence_spec.rb
+- spec/datastax_rails/relation/stats_methods_spec.rb
 - spec/datastax_rails/relation/spawn_methods_spec.rb
 - spec/datastax_rails/relation/facet_methods_spec.rb
 - spec/datastax_rails/relation/finder_methods_spec.rb