cequel 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a80d11ecb01e9f096a0204ed67d0cfa65a897d59
-  data.tar.gz: 020e36ad78e92832d03b139d5e2999ab37f26239
+  metadata.gz: c1697dbd75c69854dffccbe95b14689a6f5d4453
+  data.tar.gz: 62a729f6421425b0fdf188fca359498520f09ac1
 SHA512:
-  metadata.gz: 3807632c2c476021c1e539835d5a45fc4fbd37ecc61cfd94b1af653f2a2cca28aabcd905df664cfccf6b3ba82004335411fe15dc571bc157168ff4248bc94203
-  data.tar.gz: cf8c648c7a1053687ea86a71ded3cb09cacf6dd277ec936d8401ac95608848fd1991b90ee8546d11803fca238b0e2da43dbfc6262a0a47b4b3f0b8599f751786
+  metadata.gz: 13716de6aa85d3007df82a7330f1cca8e0cc46f08b4ac477a0381222bd01301b58a439e58c15a19561361cb26221fff6be7cc5c02ebba495b4ded5724efbf8e0
+  data.tar.gz: 8ed5d80b009c48845ff74e3d2ccca6001408525131591caf6eb1aee4df9e77dc18112bb88f8ff4c1495c31917485a4a7415bf0ac9d6721a741e63946e6ebcf6b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.0.2
+- support rails 5.1 (https://github.com/cequel/cequel/pull/389)
+- various small changes
+
 ## 3.0.1
 - fix list modification bug with Cassandra versions > 2.2.10 and 3.11.0
 

data/CONTRIBUTING.md

@@ -6,7 +6,7 @@ Contributions to Cequel are highly welcome! Here's a quick guide.
 
 1. Fork the repo and create a topic branch
 2. Set up your environment and run the tests. The easiest way to do this is to
-   use Vagrant; see below. For those who already have a suitable Cassandra
+   use Docker; [see below](#running-the-tests). For those who already have a suitable Cassandra
    instance running locally: `rake test`
 3. Add tests for your change.
 4. Make the tests pass.
@@ -30,35 +30,33 @@ Contributions to Cequel are highly welcome! Here's a quick guide.
 
 ### For the impatient ###
 
+[Install Docker](https://docs.docker.com/engine/installation/) first, then run tests:
 ```bash
-$ git clone git@github.com:yourname/cequel.git
-$ cd cequel
-$ 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.2.5
-$ rake test
+git clone git@github.com:yourname/cequel.git
+cd cequel
+git remote add upstream git@github.com:cequel/cequel.git
+bundle install
+bundle exec rake test
 ```
 
-### Using Vagrant
+### Using Docker
 
 Cequel's test suite runs against a live Cassandra instance. The easiest way to
-get one is to use the `Vagrantfile` included in the repo. You'll need to
-install [VirtualBox](https://www.virtualbox.org/) and
-[Vagrant](http://www.vagrantup.com/); both are available via
-[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., 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 2.1 release, a
-later 2.1 release (2.1.13), and the latest 2.2 release.
+get one is to use Docker, `docker run --rm -p 9042:9042 cassandra`.
+
+### Using different ports
+
+You can configure the cequel test suite to use a different port by setting the `CEQUEL_TEST_PORT` environment variable. Example:
+1. `docker run --rm -p 33333:9042 cassandra` in one terminal
+1. `rake test CEQUEL_TEST_PORT=33333` in another termainal
+
+### Cassandra versions
+
+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 the first and latest releases of 2.1, 2.2 and 3 series.
 
 ## And finally
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cequel (3.0.1)
+    cequel (3.0.2)
       activemodel (>= 4.0)
       cassandra-driver (~> 3.0)
 
@@ -20,19 +20,16 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
-    ast (2.3.0)
+    ast (2.4.0)
     backports (3.10.3)
     byebug (2.7.0)
       columnize (~> 0.3)
       debugger-linecache (~> 1.2)
     cassandra-driver (3.2.0)
       ione (~> 1.2)
-    cassandra-driver (3.2.0-java)
-      ione (~> 1.2)
     coderay (1.1.2)
     columnize (0.9.0)
     concurrent-ruby (1.0.5)
-    concurrent-ruby (1.0.5-java)
     debugger-linecache (1.2.0)
     diff-lcs (1.3)
     ethon (0.11.0)
@@ -68,9 +65,9 @@ GEM
     multipart-post (2.0.0)
     net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
-    parallel (1.12.0)
-    parser (2.4.0.0)
-      ast (~> 2.2)
+    parallel (1.12.1)
+    parser (2.5.0.5)
+      ast (~> 2.4.0)
     powerpack (0.1.1)
     pry (0.11.2)
       coderay (~> 1.1.0)
@@ -84,14 +81,13 @@ GEM
       json
       websocket (~> 1.0)
     racc (1.4.14)
-    rainbow (2.2.2)
-      rake
+    rainbow (3.0.0)
     rake (10.5.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
       rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
+    rspec-core (3.7.1)
       rspec-support (~> 3.7.0)
     rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -104,12 +100,12 @@ GEM
       rspec-support (~> 3.7.0)
     rspec-retry (0.5.6)
       rspec-core (> 3.3, < 3.8)
-    rspec-support (3.7.0)
-    rubocop (0.51.0)
+    rspec-support (3.7.1)
+    rubocop (0.54.0)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
+      parser (>= 2.5)
       powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
@@ -319,7 +315,6 @@ GEM
       ffi
     thor (0.20.0)
     thread_safe (0.3.6)
-    thread_safe (0.3.6-java)
     timecop (0.9.1)
     travis (1.8.8)
       backports
@@ -337,7 +332,7 @@ GEM
     unicode-display_width (1.3.0)
     websocket (1.2.4)
     wwtd (0.9.1)
-    yard (0.9.9)
+    yard (0.9.12)
 
 PLATFORMS
   java

data/Rakefile

@@ -119,17 +119,3 @@ task :verify_changelog do
   end
 end
 
-namespace :cassandra do
-  namespace :versions do
-    desc 'Update list of available Cassandra versions'
-    task :update 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
-  end
-end

data/lib/cequel/metal/new_relic_instrumentation.rb

@@ -53,7 +53,8 @@ module Cequel
 
 
       included do
-        alias_method_chain :execute_with_options, :newrelic
+        alias :execute_with_options_without_newrelic :execute_with_options
+        alias :execute_with_options :execute_with_options_with_newrelic
       end
     end
   end

data/lib/cequel/type.rb

@@ -88,7 +88,7 @@ module Cequel
         (value.to_r * 1000).round.to_s
       when DateTime
         quote(value.utc.to_time)
-      when Date
+      when ::Date
         quote(Time.gm(value.year, value.month, value.day))
       when Numeric, true, false, Cassandra::Uuid
         value.to_s
@@ -401,6 +401,26 @@ module Cequel
     end
     register Timestamp.instance
 
+    #
+    # `date` columns store dates.
+    #
+    # @see http://cassandra.apache.org/doc/cql3/CQL-3.0.html#usingdates
+    #   CQL3 documentation for date columns
+    #
+    class Date < Base
+      def internal_names
+        ['org.apache.cassandra.db.marshal.DateType']
+      end
+
+      def cast(value)
+        if value.is_a?(::String) then ::Date.parse(value)
+        elsif value.respond_to?(:to_date) then value.to_date
+        else ::Date.parse(value.to_s)
+        end
+      end
+    end
+    register Date.instance
+
     #
     # `uuid` columns store type 1 and type 4 UUIDs. New UUID instances can be
     # created using the {Cequel.uuid} method, and a value can be checked to see

data/lib/cequel/uuids.rb

@@ -34,11 +34,19 @@ module Cequel
     # @return [Boolean] true if the object is recognized by Cequel as a UUID
     #
     def uuid?(object)
+      return true if uuid_in_string?(object)
+
       object.is_a?(Cassandra::Uuid)
     end
 
     private
 
+    def uuid_in_string?(object)
+      object.is_a?(String) && Cassandra::Uuid.new(object)
+    rescue ArgumentError
+      false
+    end
+
     def timeuuid_generator
       @timeuuid_generator ||= Cassandra::TimeUuid::Generator.new
     end

data/lib/cequel/version.rb

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

data/spec/examples/record/record_set_spec.rb

@@ -462,6 +462,7 @@ describe Cequel::Record::RecordSet do
 
   describe '#after' do
     let(:records) { [posts, published_posts] }
+    let(:published_at_uuid) { published_posts[2].published_at }
 
     it 'should return collection after given key' do
       expect(Post['cassandra'].after('cequel1').map(&:title)).
@@ -473,6 +474,11 @@ describe Cequel::Record::RecordSet do
         map(&:title)).to eq((2...5).map { |i| "Cequel #{i}" })
     end
 
+    it 'should query Time range for Timeuuid key with Timeuuid argument' do
+      expect(PublishedPost['cassandra'].after(published_at_uuid).map(&:permalink)).
+        to eq(%w(cequel4 cequel3))
+    end
+
     it 'should query Time range for Timeuuid key' do
       expect(PublishedPost['cassandra'].after(now - 3.minutes).map(&:permalink)).
         to eq(%w(cequel4 cequel3 cequel2))
@@ -505,6 +511,7 @@ describe Cequel::Record::RecordSet do
 
   describe '#before' do
     let(:records) { [posts, published_posts] }
+    let(:published_at_uuid) { published_posts[3].published_at }
 
     it 'should return collection before given key' do
       expect(Post['cassandra'].before('cequel3').map(&:title)).
@@ -516,6 +523,11 @@ describe Cequel::Record::RecordSet do
         to eq(%w(cequel2 cequel1 cequel0))
     end
 
+    it 'should query Time range for Timeuuid key with Timeuuid argument' do
+      expect(PublishedPost['cassandra'].before(published_at_uuid).map(&:permalink)).
+        to eq(%w(cequel2 cequel1 cequel0))
+    end
+
     it 'should cast argument' do
       expect(Post['cassandra'].before('cequel3'.force_encoding('ASCII-8BIT')).
         map(&:title)).to eq((0...3).map { |i| "Cequel #{i}" })

data/spec/examples/type_spec.rb

@@ -164,6 +164,20 @@ describe Cequel::Type do
     end
   end
 
+  describe 'date' do
+    subject { Cequel::Type[:date] }
+    its(:cql_name) { should == :date }
+    its(:internal_name) { should == 'org.apache.cassandra.db.marshal.DateType' }
+
+    describe '#cast' do
+      let(:today) { Date.today }
+      specify { expect(subject.cast(today)).to eq(today) }
+      specify { expect(subject.cast(today.to_s)).to eq(today) }
+      specify { expect(subject.cast(today.to_datetime)).to eq(today) }
+      specify { expect(subject.cast(today.to_time)).to eq(today) }
+    end
+  end
+
   describe 'timeuuid' do
     subject { Cequel::Type[:timeuuid] }
     its(:cql_name) { should == :timeuuid }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Mat Brown
@@ -29,7 +29,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-10 00:00:00.000000000 Z
+date: 2018-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -218,7 +218,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- Vagrantfile
 - lib/cequel.rb
 - lib/cequel/errors.rb
 - lib/cequel/instrumentation.rb
@@ -348,34 +347,34 @@ signing_key:
 specification_version: 4
 summary: Full-featured, ActiveModel-compliant ORM for Cassandra using CQL3
 test_files:
-- spec/examples/metal/data_set_spec.rb
-- spec/examples/metal/keyspace_spec.rb
-- spec/examples/record/associations_spec.rb
-- spec/examples/record/callbacks_spec.rb
+- spec/examples/spec_helper.rb
+- spec/examples/spec_support/preparation_spec.rb
+- spec/examples/record/properties_spec.rb
+- spec/examples/record/spec_helper.rb
+- spec/examples/record/mass_assignment_spec.rb
+- spec/examples/record/serialization_spec.rb
 - spec/examples/record/dirty_spec.rb
-- spec/examples/record/finders_spec.rb
-- spec/examples/record/lazy_record_collection_spec.rb
+- spec/examples/record/associations_spec.rb
 - spec/examples/record/list_spec.rb
+- spec/examples/record/set_spec.rb
+- spec/examples/record/validations_spec.rb
+- spec/examples/record/record_set_spec.rb
 - spec/examples/record/map_spec.rb
-- spec/examples/record/mass_assignment_spec.rb
-- spec/examples/record/naming_spec.rb
+- spec/examples/record/timestamps_spec.rb
 - spec/examples/record/persistence_spec.rb
-- spec/examples/record/properties_spec.rb
-- spec/examples/record/record_set_spec.rb
+- spec/examples/record/naming_spec.rb
+- spec/examples/record/callbacks_spec.rb
 - spec/examples/record/schema_spec.rb
+- spec/examples/record/lazy_record_collection_spec.rb
 - spec/examples/record/scoped_spec.rb
-- spec/examples/record/serialization_spec.rb
-- spec/examples/record/set_spec.rb
-- spec/examples/record/spec_helper.rb
-- spec/examples/record/timestamps_spec.rb
-- spec/examples/record/validations_spec.rb
-- spec/examples/schema/keyspace_spec.rb
+- spec/examples/record/finders_spec.rb
+- spec/examples/metal/data_set_spec.rb
+- spec/examples/metal/keyspace_spec.rb
+- spec/examples/type_spec.rb
+- spec/examples/schema/table_writer_spec.rb
+- spec/examples/schema/table_updater_spec.rb
 - spec/examples/schema/patch_spec.rb
-- spec/examples/schema/table_differ_spec.rb
 - spec/examples/schema/table_reader_spec.rb
-- spec/examples/schema/table_updater_spec.rb
-- spec/examples/schema/table_writer_spec.rb
-- spec/examples/spec_helper.rb
-- spec/examples/spec_support/preparation_spec.rb
-- spec/examples/type_spec.rb
+- spec/examples/schema/table_differ_spec.rb
+- spec/examples/schema/keyspace_spec.rb
 - spec/examples/uuids_spec.rb

data/Vagrantfile

@@ -1,150 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-require 'net/http'
-
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  # All Vagrant configuration is done here. The most common configuration
-  # options are documented and commented below. For a complete reference,
-  # please see the online documentation at vagrantup.com.
-
-  # Every Vagrant virtual environment requires a box to build off of.
-  config.vm.box = "ubuntu/trusty64"
-
-  # The url from where the 'config.vm.box' box will be fetched if it
-  # doesn't already exist on the user's system.
-  config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box"
-
-  # Create a forwarded port mapping which allows access to a specific port
-  # within the machine from a port on the host machine. In the example below,
-  # accessing "localhost:8080" will access port 80 on the guest machine.
-  # config.vm.network :forwarded_port, guest: 80, host: 8080
-
-  # Create a private network, which allows host-only access to the machine
-  # using a specific IP.
-  # config.vm.network :private_network, ip: "192.168.33.10"
-
-  # Create a public network, which generally matched to bridged network.
-  # Bridged networks make the machine appear as another physical device on
-  # your network.
-  # config.vm.network :public_network
-
-  # If true, then any SSH connections made will enable agent forwarding.
-  # Default value: false
-  # config.ssh.forward_agent = true
-
-  # Share an additional folder to the guest VM. The first argument is
-  # the path on the host to the actual folder. The second argument is
-  # the path on the guest to mount the folder. And the optional third
-  # argument is a set of non-required options.
-  config.vm.synced_folder ".", "/vagrant", disabled: true
-
-  # Provider-specific configuration so you can fine-tune various
-  # backing providers for Vagrant. These expose provider-specific options.
-  # Example for VirtualBox:
-  #
-  config.vm.provider :virtualbox do |vb|
-    vb.memory = 1024
-  end
-  #
-  # View the documentation for the provider you're using for more
-  # information on available options.
-
-  # Enable provisioning with Puppet stand alone.  Puppet manifests
-  # are contained in a directory path relative to this Vagrantfile.
-  # You will need to create the manifests directory and a manifest in
-  # the file base.pp in the manifests_path directory.
-  #
-  # An example Puppet manifest to provision the message of the day:
-  #
-  # # group { "puppet":
-  # #   ensure => "present",
-  # # }
-  # #
-  # # File { owner => 0, group => 0, mode => 0644 }
-  # #
-  # # file { '/etc/motd':
-  # #   content => "Welcome to your Vagrant-built virtual machine!
-  # #               Managed by Puppet.\n"
-  # # }
-  #
-  # config.vm.provision :puppet do |puppet|
-  #   puppet.manifests_path = "manifests"
-  #   puppet.manifest_file  = "site.pp"
-  # end
-
-  # Enable provisioning with chef solo, specifying a cookbooks path, roles
-  # path, and data_bags path (all relative to this Vagrantfile), and adding
-  # some recipes and/or roles.
-  #
-  # config.vm.provision :chef_solo do |chef|
-  #   chef.cookbooks_path = "../my-recipes/cookbooks"
-  #   chef.roles_path = "../my-recipes/roles"
-  #   chef.data_bags_path = "../my-recipes/data_bags"
-  #   chef.add_recipe "mysql"
-  #   chef.add_role "web"
-  #
-  #   # You may also specify custom JSON attributes:
-  #   chef.json = { :mysql_password => "foo" }
-  # end
-
-  # Enable provisioning with chef server, specifying the chef server URL,
-  # and the path to the validation key (relative to this Vagrantfile).
-  #
-  # The Opscode Platform uses HTTPS. Substitute your organization for
-  # ORGNAME in the URL and validation key.
-  #
-  # If you have your own Chef Server, use the appropriate URL, which may be
-  # HTTP instead of HTTPS depending on your configuration. Also change the
-  # validation key to validation.pem.
-  #
-  # config.vm.provision :chef_client do |chef|
-  #   chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
-  #   chef.validation_key_path = "ORGNAME-validator.pem"
-  # end
-  #
-  # If you're using the Opscode platform, your validator client is
-  # ORGNAME-validator, replacing ORGNAME with your organization name.
-  #
-  # If you have your own Chef Server, the default validation client name is
-  # chef-validator, unless you changed the configuration.
-  #
-  #   chef.validation_client_name = "ORGNAME-validator"
-  provision =  <<-SH
-    set -e
-    apt-get update
-    env DEBIAN_FRONTEND=noninteractive apt-get upgrade -y
-    apt-get install python-software-properties curl -y
-    apt-get autoremove -y
-    add-apt-repository -y ppa:webupd8team/java
-    apt-get update
-    echo debconf shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections
-    echo debconf shared/accepted-oracle-license-v1-1 seen true | sudo debconf-set-selections
-    apt-get install -y oracle-java$2-installer oracle-java$2-set-default
-    curl -s http://archive.apache.org/dist/cassandra/$1/apache-cassandra-$1-bin.tar.gz | tar -C /opt -xzvf -
-    echo "start on runlevel [2345]
-stop on runlevel [06]
-exec /opt/apache-cassandra-$1/bin/cassandra" > /etc/init/cassandra.conf
-    sed -i -e 's/.*broadcast_rpc_address:.*/broadcast_rpc_address: 127.0.0.1/' /opt/apache-cassandra-$1/conf/cassandra.yaml
-    sed -i -e 's/^rpc_address:.*/rpc_address: 0.0.0.0/' /opt/apache-cassandra-$1/conf/cassandra.yaml
-    sed -i -e 's/^start_native_transport:.*/start_native_transport: true/' /opt/apache-cassandra-$1/conf/cassandra.yaml
-    sed -i -e 's/^start_rpc:.*/start_rpc: true/' /opt/apache-cassandra-$1/conf/cassandra.yaml
-    service cassandra start
-  SH
-
-  versions = File.read(File.expand_path('../.cassandra-versions', __FILE__)).each_line
-    .map(&:strip).grep(/(^2\.[12]\.)|(^3.)/)
-  versions.each do |version|
-    java_version = version =~ /^2/ ? '7' : '8'
-    config.vm.define version do |machine|
-      machine.vm.provision :shell, inline: provision,
-        args: [version, java_version]
-      machine.vm.network :forwarded_port, guest: 9042, host: 9042,
-        auto_correct: true
-      machine.vm.network :forwarded_port, guest: 9160, host: 9160,
-        auto_correct: true
-    end
-  end
-end