cequel 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 769586127721ed091afdca815dd777b0c2f1c45b
-  data.tar.gz: 32ae7dab6f20e1e545e5d1c9ca82ec6a8f49a619
+  metadata.gz: c8ca34779c245ed3e27bb1e4a848d6339e24fb3b
+  data.tar.gz: 0a05736a716c5cd814cdf2023bd839638cda5295
 SHA512:
-  metadata.gz: b83ace65af35841571cb4420e52c2664680d40f64d04e411ab93aca11b9de7ffc0305d921d4c2e6036c09d4958349090e5ced9ff402ffebf6cf5afc2b4130286
-  data.tar.gz: fecc7319b72e30ded2ddf98d5760e5da6bb3c289381a682c0f3a7cb1ef7e60f36640acb621d95b1992ae16e53a170e2045dd7180b60550cbdc1d9336d477b0be
+  metadata.gz: d57a0397a6b72febadce5c620605d65f55e63b37825564fd55e5fc1131178ee59a65112fcc0ea3957da877116b47afb7db431b27180978c3edf1dc40165c4ed9
+  data.tar.gz: ab9cc098f8b0ed157f513ded783d523975703f779296f5b68ce3dd3e62715292f602c5da9e9c6ca60a8adada1432eadfa7eed29ca1b30837eedae18155ccd914

data/CHANGELOG.md

@@ -1,9 +1,13 @@
+## 1.9.1
+
+* fix dirty checking for timestamps more precise than Cassandra can store
+* fix bug with new relic instrumentation
+
 ## 1.9.0
 
 * NewRelic instrumentation
 * fix querying tables whose first partition key is a timestamp
 
-
 ## 1.8.0
 
 * remove false claims of Rubinius support from readme (we would gratefully accept a PR to fix compatibility)

data/CONTRIBUTING.md

@@ -37,7 +37,7 @@ $ git remote add upstream git@github.com:cequel/cequel.git
 $ brew tap phinze/cask
 $ brew install brew-cask
 $ brew cask install virtualbox vagrant
-$ vagrant up 2.0.4
+$ vagrant up 2.2.5
 $ rake test
 ```
 
@@ -50,15 +50,15 @@ install [VirtualBox](https://www.virtualbox.org/) and
 [Homebrew-cask](https://github.com/phinze/homebrew-cask) if you're on OS X.
 
 Cequel's Vagrantfile can generate a virtual machine for any Cassandra version
-that Cequel supports (i.e., 1.2.x and 2.0.x). You can run multiple VMs at the
+that Cequel supports (i.e., 2.1.x & 2.2.x). You can run multiple VMs at the
 same time; the first machine you boot will expose its Cassandra instance on
 port `9042`, which is the default port that Cequel will look for.
 
 Cequel is tested against a large range of Ruby, Rails, and Cassandra versions;
 for most patches, you can just run the tests using the latest version of all of
 them. If you're messing with the `Cequel::Schema` or `Cequel::Type` modules,
-you'll want to test at least against an early 1.2 release (1.2.4 is good), a
-later 1.2 release (1.2.13), and the latest 2.0 release.
+you'll want to test at least against an early 2.1 release, a
+later 2.1 release (2.1.13), and the latest 2.2 release.
 
 ## And finally
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cequel (1.9.0)
+    cequel (1.9.1)
       activemodel (~> 4.0)
       cassandra-driver (~> 2.0)
 
@@ -22,7 +22,7 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
-    ast (2.0.0)
+    ast (2.2.0)
     backports (3.6.8)
     builder (3.2.2)
     byebug (2.7.0)
@@ -66,10 +66,9 @@ GEM
     multipart-post (2.0.0)
     net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
-    parser (2.1.9)
-      ast (>= 1.1, < 3.0)
-      slop (~> 3.4, >= 3.4.5)
-    powerpack (0.0.9)
+    parser (2.3.0.7)
+      ast (~> 2.2)
+    powerpack (0.1.1)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -79,7 +78,7 @@ GEM
       json
       websocket (~> 1.0)
     racc (1.4.12)
-    rainbow (2.0.0)
+    rainbow (2.1.0)
     rake (10.3.2)
     rb-readline (0.5.1)
     rspec (3.4.0)
@@ -98,13 +97,13 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    rubocop (0.19.1)
-      json (>= 1.7.7, < 2)
-      parser (~> 2.1.7)
-      powerpack (~> 0.0.6)
+    rubocop (0.39.0)
+      parser (>= 2.3.0.7, < 3.0)
+      powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.6.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.7.5)
     rubysl (2.1.0)
       rubysl-abbrev (~> 2.0)
       rubysl-base64 (~> 2.0)
@@ -322,6 +321,7 @@ GEM
       ethon (>= 0.8.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    unicode-display_width (1.0.3)
     websocket (1.2.2)
     wwtd (0.9.1)
     yard (0.8.7.6)

data/README.md

@@ -551,11 +551,9 @@ the columns that are given.
 
 ### Cassandra ###
 
-* 2.x
+* 2.1.x
+* 2.2.x
 
-Though Cequel is tested against Cassandra 2, it does not at this time support
-any of the CQL3.1 features introduced in Cassandra 2. This will change in the
-future.
 
 ## Support & Bugs ##
 
@@ -598,6 +596,9 @@ Cequel was written by:
 * Tamara Temple
 * Long On
 * Lucas Mundim
+* Luke Duncalfe
+* Eric Betts
+* Maxim Dobryakov
 
 Special thanks to [Brewster](https://www.brewster.com), which supported the 0.x
 releases of Cequel.
@@ -607,7 +608,7 @@ releases of Cequel.
 If you're new to Cassandra, check out [Learning Apache
 Cassandra](http://www.amazon.com/gp/product/1783989203/ref=s9_simh_co_p14_d4_i1?pf_rd_m=ATVPDKIKX0DER&pf_rd_s=left-1&pf_rd_r=1TX356WHGF06W32ZHD8S&pf_rd_t=3201&pf_rd_p=1953562742&pf_rd_i=typ01),
 a hands-on guide to Cassandra application development by example, written by
-the maintainer of Cequel.
+the creator of Cequel.
 
 ## License ##
 

data/Rakefile

@@ -1,8 +1,7 @@
-require 'rubocop'
-require 'rubocop/rake_task'
 require 'yaml'
 require 'bundler/setup'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 require 'wwtd/tasks'
 require 'travis'
 require File.expand_path('../lib/cequel/version', __FILE__)
@@ -63,12 +62,12 @@ RSpec::Core::RakeTask.new(:test) do |t|
   t.rspec_opts = rspec_opts
 end
 
-# desc 'Check style with Rubocop'
-# RuboCop::RakeTask.new(:rubocop) do |task|
-#   task.patterns = ['lib/**/*.rb']
-#   task.formatters = ['files']
-#   task.fail_on_error = true
-# end
+desc 'Check style with Rubocop'
+RuboCop::RakeTask.new(:rubocop) do |task|
+  task.patterns = ['lib/**/*.rb']
+  task.formatters = ['files']
+  task.fail_on_error = true
+end
 
 namespace :test do
   desc 'Run the specs with progress formatter'
@@ -126,6 +125,8 @@ namespace :cassandra do
       listing = Net::HTTP.get(URI.parse("http://archive.apache.org/dist/cassandra/"))
       versions = listing.scan(%r(href="(\d+\.\d+\.\d+)/")).map(&:first)
       File.open(File.expand_path('../.cassandra-versions', __FILE__), 'w') do |f|
+        f.puts "# This file is automatically generated by `rake cassandra:versions:update`"
+        f.puts "# do not edit by hand."
         f.puts(versions.sort_by(&Gem::Version.method(:new)).join("\n"))
       end
     end

data/Vagrantfile

@@ -135,7 +135,7 @@ exec /opt/apache-cassandra-$1/bin/cassandra" > /etc/init/cassandra.conf
   SH
 
   versions = File.read(File.expand_path('../.cassandra-versions', __FILE__)).each_line
-    .map(&:strip).grep(/^2\./)
+    .map(&:strip).grep(/^2\.[12]\./)
   versions.each do |version|
     java_version = version =~ /^1/ ? '6' : '7'
     config.vm.define version do |machine|

data/lib/cequel/metal/new_relic_instrumentation.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 begin
   require 'new_relic/agent/datastores'
-rescue LoadError => e
+rescue LoadError
   fail LoadError, "Can't use NewRelic instrumentation without NewRelic gem"
 end
 
@@ -13,7 +13,7 @@ module Cequel
     module NewRelicInstrumentation
       extend ActiveSupport::Concern
 
-      define_method :execute_with_consistency_with_newrelic do |statement, bind_vars, consistency|
+      define_method :execute_with_options_with_newrelic do |statement, bind_vars, options|
         callback = Proc.new do |result, scoped_metric, elapsed|
           NewRelic::Agent::Datastores.notice_statement(statement, elapsed)
         end
@@ -33,12 +33,13 @@ module Cequel
         end
 
         NewRelic::Agent::Datastores.wrap("Cassandra", operation, table, callback) do
-          execute_with_consistency_without_newrelic(statement, bind_vars, consistency)
+          execute_with_options_without_newrelic(statement, bind_vars, options)
         end
       end
 
+
       included do
-        alias_method_chain :execute_with_consistency, :newrelic
+        alias_method_chain :execute_with_options, :newrelic
       end
     end
   end

data/lib/cequel/record/dirty.rb

@@ -56,6 +56,10 @@ module Cequel
       private
 
       def write_attribute(name, value)
+        column = self.class.reflect_on_column(name)
+        fail UnknownAttributeError, "unknown attribute: #{name}" unless column
+        value = column.cast(value) unless value.nil?
+
         if loaded? && value != read_attribute(name)
           __send__("#{name}_will_change!")
         end

data/lib/cequel/record/tasks.rb

@@ -9,10 +9,28 @@ namespace :cequel do
       create!
     end
 
+    desc 'Initialize Cassandra keyspace if not exist'
+    task :create_if_not_exist => :environment do
+      if Cequel::Record.connection.schema.exists?
+        puts "Keyspace #{Cequel::Record.connection.name} already exists. Nothing to do."
+        next
+      end
+      create!
+    end
+
     desc 'Drop Cassandra keyspace'
     task :drop => :environment do
       drop!
     end
+
+    desc 'Drop Cassandra keyspace if exist'
+    task :drop_if_exist => :environment do
+      unless Cequel::Record.connection.schema.exists?
+        puts "Keyspace #{Cequel::Record.connection.name} doesn't exist. Nothing to do."
+        next
+      end
+      drop!
+    end
   end
 
   desc "Synchronize all models defined in `app/models' with Cassandra " \

data/lib/cequel/type.rb

@@ -379,7 +379,8 @@ module Cequel
 
     #
     # `timestamp` columns store timestamps. Timestamps do not include time zone
-    # data, and all input times are cast to UTC before being stored.
+    # data, and all input times are cast to UTC and rounded to the nearest
+    # millisecond before being stored.
     #
     # @see http://cassandra.apache.org/doc/cql3/CQL.html#usingdates
     #   CQL3 documentation for date columns
@@ -395,7 +396,7 @@ module Cequel
         elsif value.respond_to?(:to_time) then value.to_time
         elsif value.is_a?(Numeric) then Time.at(value)
         else Time.parse(value.to_s)
-        end.utc
+        end.utc.round(3)
       end
     end
     register Timestamp.instance

data/lib/cequel/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 module Cequel
   # The current version of the library
-  VERSION = '1.9.0'
+  VERSION = '1.9.1'
 end

data/spec/examples/record/dirty_spec.rb

@@ -6,14 +6,17 @@ describe Cequel::Record::Dirty do
     key :permalink, :text
     column :title, :text
     set :categories, :text
+    column :created_at, :timestamp
   end
 
   context 'loaded model' do
+    let(:created_at_float) { 1455754622.8502421 }
     let(:post) do
       Post.create!(
         permalink: 'cequel',
         title: 'Cequel',
-        categories: Set['Libraries']
+        categories: Set['Libraries'],
+        created_at: created_at_float
       )
     end
 
@@ -57,6 +60,11 @@ describe Cequel::Record::Dirty do
         with_indifferent_access
       )
     end
+
+    it 'should check dirty state against correctly cast timestamp values' do
+      post.created_at = created_at_float
+      expect(post.changed_attributes).to be_empty
+    end
   end
 
 end

data/spec/examples/record/lazy_record_collection_spec.rb

@@ -11,6 +11,6 @@ describe Cequel::Record::LazyRecordCollection do
     let(:now) { Time.now }
     let(:event) { Event[now] }
 
-    it { expect(event.attributes).to include(timestamp: now) }
+    it { expect(event.timestamp).to be_within(one_millisecond).of(now) }
   end
 end

data/spec/examples/record/timestamps_spec.rb

@@ -17,44 +17,49 @@ describe Cequel::Record::Timestamps do
   let!(:now) { Timecop.freeze }
 
   context 'with simple primary key' do
-    let(:blog) { Blog.create!(subdomain: 'bigdata') }
+    let!(:blog) { Blog.create!(subdomain: 'bigdata') }
 
     it 'should populate created_at after create new record' do
-      expect(blog.created_at).to eq(now)
+      expect(blog.created_at).to be_within(one_millisecond).of(now)
     end
 
     it 'should populate updated_at after create new record' do
-      expect(blog.updated_at).to eq(now)
+      expect(blog.updated_at).to be_within(one_millisecond).of(now)
     end
 
     it 'should update updated_at after record update but not created_at' do
       future = Timecop.freeze(now + 2.minutes)
       blog.name = 'name'
       blog.save!
-      expect(blog.updated_at).to eq(future)
+      expect(blog.updated_at).to be_within(one_millisecond).of(future)
+    end
+
+    it 'should cast the timestamp in the same way that Cassandra records it' do
+      expect(Blog.first.updated_at).to eq(blog.updated_at)
     end
   end
 
   context 'with auto-generated timeuuid primary key' do
-    let(:post) { Post['bigdata'].create! }
+    let!(:post) { Post['bigdata'].create! }
 
     it 'should not have created_at column' do
       expect(Post.column_names).not_to include(:created_at)
     end
 
     it 'should expose created_at' do
-      expect(post.created_at.to_i).to eq(now.to_i)
+      expect(post.created_at).to be_within(one_millisecond).of(now)
     end
 
     it 'should populate updated_at after create new record' do
-      expect(post.updated_at).to eq(now)
+      expect(post.updated_at).to be_within(one_millisecond).of(now)
     end
 
     it 'should update updated_at after record update but not created_at' do
       future = Timecop.freeze(now + 2.minutes)
       post.name = 'name'
       post.save!
-      expect(post.updated_at).to eq(future)
+      expect(post.created_at).to be_within(one_millisecond).of(now)
+      expect(post.updated_at).to be_within(one_millisecond).of(future)
     end
   end
 end

data/spec/support/helpers.rb

@@ -147,6 +147,10 @@ module Cequel
           with(matcher, hash_including(options))
       end
 
+      def one_millisecond
+        0.001
+      end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Mat Brown
@@ -29,7 +29,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-02 00:00:00.000000000 Z
+date: 2016-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel