whi-cassie 1.1.1 → 1.2.0

data/spec/spec_helper.rb

@@ -1,15 +1,11 @@
-require 'rubygems'
+require "rubygems"
 
-active_model_version = ENV["ACTIVE_MODEL_VERSION"] || [">= 4.0"]
-active_model_version = [active_model_version] unless active_model_version.is_a?(Array)
-gem 'activemodel', *active_model_version
+require "active_model"
 
-require 'active_model'
-puts "Testing Against ActiveModel #{ActiveModel::VERSION::STRING}" if defined?(ActiveModel::VERSION)
+require_relative "../lib/whi-cassie"
 
-require 'whi-cassie'
-require File.expand_path('../models/thing', __FILE__)
-require File.expand_path('../models/type_tester', __FILE__)
+require_relative "models/thing"
+require_relative "models/type_tester"
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
@@ -19,27 +15,41 @@ RSpec.configure do |config|
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
-  config.order = 'random'
-  
+  config.order = "random"
+
   config.expect_with(:rspec) { |c| c.syntax = [:should, :expect] }
-  
+
+  cassandra_host, cassandra_port = ENV.fetch("CASSANDRA_HOST", "localhost").split(":", 2)
+  cassandra_port ||= 9042
   config.before(:suite) do
     schema_dir = File.expand_path("../schema", __FILE__)
     protocol_version = (ENV["protocol_version"] ? ENV["protocol_version"].to_i : 3)
     Cassie.configure!(
-      :cluster => {:host => 'localhost', :protocol_version => protocol_version,},
-      :keyspaces => {"test" => "cassie_specs"},
-      :schema_directory => schema_dir,
-      :max_prepared_statements => 3
+      cluster: {host: cassandra_host, port: cassandra_port.to_i, protocol_version: protocol_version},
+      keyspaces: {"test" => "cassie_specs"},
+      schema_directory: schema_dir,
+      max_prepared_statements: 3
     )
-    Cassie::Schema.load_all!
+
+    attempts = 0
+    loop do
+      begin
+        Cassie::Schema.load_all!
+        break
+      rescue Cassandra::Errors::NoHostsAvailable => e
+        attempts += 1
+        raise e if attempts > 30
+        sleep(1)
+      end
+    end
+
     Cassie::Testing.prepare!
   end
-  
+
   config.after(:suite) do
     Cassie::Schema.drop_all!
   end
-  
+
   config.around(:each) do |example|
     Cassie::Testing.cleanup! do
       example.run

data/whi-cassie.gemspec

@@ -1,27 +1,23 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
-  spec.name          = "whi-cassie"
-  spec.version       = File.read(File.expand_path("../VERSION", __FILE__)).chomp
-  spec.authors       = ["We Heart It", "Brian Durand"]
-  spec.email         = ["dev@weheartit.com"]
-  spec.description   = %q{Simple object mapper for Cassandra data tables.}
-  spec.summary       = %q{Simple object mapper for Cassandra data tables specifically designed to work with the limitations and strengths of Cassandra.}
-  spec.homepage      = "https://github.com/weheartit/cassie"
-  spec.license       = "MIT"
+  spec.name = "whi-cassie"
+  spec.version = File.read(File.expand_path("../VERSION", __FILE__)).chomp
+  spec.authors = ["We Heart It", "Brian Durand"]
+  spec.email = ["dev@weheartit.com"]
+  spec.description = "Simple object mapper for Cassandra data tables."
+  spec.summary = "Simple object mapper for Cassandra data tables specifically designed to work with the limitations and strengths of Cassandra."
+  spec.homepage = "https://github.com/weheartit/cassie"
+  spec.license = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files = `git ls-files`.split($/)
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.0'
-  spec.add_dependency('cassandra-driver', '~>3.0')
-  spec.add_dependency('activemodel', '>=4.0')
-
-  spec.add_development_dependency "bundler", "~>1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~>2.0"
+  spec.required_ruby_version = ">= 2.4"
+  spec.add_dependency("cassandra-driver", "~>3.0")
+  spec.add_dependency("activemodel", ">=4.0")
+  spec.add_development_dependency "bundler", "~>2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whi-cassie
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - We Heart It
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-25 00:00:00.000000000 Z
+date: 2020-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver
@@ -41,34 +41,6 @@ dependencies:
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  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'
-- !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -88,12 +60,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/continuous_integration.yml"
 - ".gitignore"
+- ".standard.yml"
+- Appraisals
+- Gemfile
+- Gemfile.lock
 - HISTORY.md
 - MIT-LICENSE
 - README.md
 - Rakefile
 - VERSION
+- gemfiles/activemodel_4.gemfile
+- gemfiles/activemodel_5.gemfile
+- gemfiles/activemodel_6.gemfile
 - lib/cassie.rb
 - lib/cassie/config.rb
 - lib/cassie/model.rb
@@ -123,15 +104,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Simple object mapper for Cassandra data tables specifically designed to work