cequel 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 417e86a661709395d59b9d89d3f543254dd17776
-  data.tar.gz: 8b3e2c61b35797d40e02da7e3484e8c783604ddf
+  metadata.gz: 59bbd03578e238b4791ef3186d352d3645e6bb63
+  data.tar.gz: 5762944f1eb5349b9f1a5c306a7622ab89a3534e
 SHA512:
-  metadata.gz: c36c66a54e94292bfc6ee380b87047e7c799bd5fb6d6602d4d79d1f3d21ada9a99479351c932546c241026782308515499c4eae2fd2d7c25000160ebea173226
-  data.tar.gz: b8cce1b5d1b8f5963c2ad6cca237f3bbb74a7a3c588cb1a6032898aa2e469ec7592ab1b3fa4af34fd69382c544cf400caac308f77c4d00f5ea8a55a3fc72005c
+  metadata.gz: 264d10150e444b24ce6b5f84cd010cd91467c1f5ff1a320d3ed9c9f9b2cf36281584609117e283fe79dc810b07a29a68838072127f0d78a4c5083a6358054a79
+  data.tar.gz: 0fcbb4eb278749a9f3800dd9fbe50e95645f484d3870fc2e8f6b7489533d6a25a77041244c3fb73e603c86c75dd5ce588b821aa25995414f0795118c9067c1eb

data/Appraisals

@@ -1,14 +1,18 @@
+appraise "rails-4.1" do
+  gem "activemodel", "~> 4.1.0"
+end
+
 appraise "rails-4.0" do
-  gem "activesupport", "~> 4.0.0"
+  gem "activemodel", "~> 4.0.0"
 end
 
 appraise "rails-3.2" do
-  gem "activesupport", "~> 3.2.0"
+  gem "activemodel", "~> 3.2.0"
   gem "tzinfo", "~> 0.3"
 end
 
 appraise "rails-3.1" do
-  gem "activesupport", "~> 3.1.0"
+  gem "activemodel", "~> 3.1.0"
   gem "tzinfo", "~> 0.3"
 end
 

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.2.2
+
+* Support `:default` option for key columns
+* Explicitly require `active_support` (Rails 4.1 compatibility)
+* Detect namespaced models in subdirectories when running migrations
+* Handle unset collection columns hydrated from database
+
 ## 1.2.1
 
 * Remove `app_generators.orm` setting

data/Gemfile.lock

@@ -1,29 +1,27 @@
 PATH
   remote: .
   specs:
-    cequel (1.2.1)
+    cequel (1.2.2)
       activemodel (>= 3.1, < 5.0)
       cql-rb (~> 1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.0.4)
-      activesupport (= 4.0.4)
-      builder (~> 3.1.0)
-    activesupport (4.0.4)
+    activemodel (4.1.0)
+      activesupport (= 4.1.0)
+      builder (~> 3.1)
+    activesupport (4.1.0)
       i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
+      tzinfo (~> 1.1)
     appraisal (0.5.2)
       bundler
       rake
     ast (1.1.0)
-    atomic (1.1.16)
-    atomic (1.1.16-java)
-    builder (3.1.4)
+    builder (3.2.2)
     byebug (2.7.0)
       columnize (~> 0.3)
       debugger-linecache (~> 1.2)
@@ -43,8 +41,7 @@ GEM
     json (1.8.1)
     json (1.8.1-java)
     method_source (0.8.2)
-    minitest (4.7.5)
-    multi_json (1.9.2)
+    minitest (5.3.2)
     parser (2.1.7)
       ast (~> 1.1)
       slop (~> 3.4, >= 3.4.5)
@@ -58,10 +55,10 @@ GEM
       method_source (~> 0.8)
       slop (~> 3.4)
       spoon (~> 0.0)
-    psych (2.0.4)
+    psych (2.0.5)
     racc (1.4.11)
     rainbow (2.0.0)
-    rake (10.1.1)
+    rake (10.2.2)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -282,11 +279,10 @@ GEM
     slop (3.5.0)
     spoon (0.0.4)
       ffi
-    thread_safe (0.3.1)
-      atomic (>= 1.1.7, < 2)
-    thread_safe (0.3.1-java)
-      atomic (>= 1.1.7, < 2)
-    tzinfo (0.3.39)
+    thread_safe (0.3.3)
+    thread_safe (0.3.3-java)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
     yard (0.8.7.4)
 
 PLATFORMS
@@ -303,6 +299,6 @@ DEPENDENCIES
   racc (~> 1.4)
   rake (~> 10.1)
   rspec (~> 2.0)
-  rubocop (~> 0.19)
+  rubocop (~> 0.19.0)
   rubysl (~> 2.0)
   yard (~> 0.6)

data/README.md

@@ -535,7 +535,12 @@ Cequel was written by:
 * Keenan Brock
 * Insoo Buzz Jung
 * Louis Simoneau
-* Randy Meech
+* Peter Williams
+* Kenneth Hoffman
+* Antti Tapio
+* Ilya Bazylchuk
+* Dan Cardamore
+* Kei Kusakari
 
 Special thanks to [Brewster](https://www.brewster.com), which supported the 0.x
 releases of Cequel.

data/lib/cequel.rb

@@ -1,6 +1,7 @@
 # -*- encoding : utf-8 -*-
 require 'delegate'
 
+require 'active_support'
 require 'active_support/core_ext'
 require 'cql'
 

data/lib/cequel/record/collection.rb

@@ -120,8 +120,7 @@ module Cequel
       protected
 
       def __getobj__
-        model.__send__(:read_attribute, column_name) ||
-          model.__send__(:write_attribute, column_name, self.class.empty)
+        model.__send__(:read_attribute, column_name)
       end
 
       def __setobj__(obj)
@@ -185,13 +184,6 @@ module Cequel
       NON_ATOMIC_MUTATORS
         .each { |method| undef_method(method) if method_defined? method }
 
-      #
-      # @return [Array] an empty array
-      #
-      # @api private
-      #
-      def self.empty; []; end
-
       #
       # Set the value at a position or range of positions. This modification
       # will be staged and persisted as an atomic list update when the record

data/lib/cequel/record/finders.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Cequel
   module Record
     #

data/lib/cequel/record/persistence.rb

@@ -236,7 +236,7 @@ module Cequel
 
       # @private
       def hydrate(row)
-        @attributes = row
+        init_attributes(row)
         hydrated!
         self
       end

data/lib/cequel/record/properties.rb

@@ -38,7 +38,8 @@ module Cequel
 
       included do
         class_attribute :default_attributes, instance_writer: false
-        self.default_attributes = {}
+        class_attribute :empty_attributes, instance_writer: false
+        self.default_attributes, self.empty_attributes = {}, {}
 
         class <<self; alias_method :new_empty, :new; end
         extend ConstructorMethods
@@ -102,6 +103,8 @@ module Cequel
               fail ArgumentError, ":auto option only valid for UUID columns"
             end
             default = -> { Cequel.uuid } if options[:auto]
+          else
+            default = options[:default]
           end
           set_attribute_default(name, default)
         end
@@ -146,7 +149,8 @@ module Cequel
         #
         def list(name, type, options = {})
           def_collection_accessors(name, List)
-          set_attribute_default(name, options.fetch(:default, []))
+          set_attribute_default(name, options[:default])
+          set_empty_attribute(name) { [] }
         end
 
         #
@@ -164,7 +168,8 @@ module Cequel
         #
         def set(name, type, options = {})
           def_collection_accessors(name, Set)
-          set_attribute_default(name, options.fetch(:default, ::Set[]))
+          set_attribute_default(name, options[:default])
+          set_empty_attribute(name) { ::Set[] }
         end
 
         #
@@ -182,7 +187,8 @@ module Cequel
         #
         def map(name, key_type, value_type, options = {})
           def_collection_accessors(name, Map)
-          set_attribute_default(name, options.fetch(:default, {}))
+          set_attribute_default(name, options[:default])
+          set_empty_attribute(name) { {} }
         end
 
         private
@@ -230,6 +236,10 @@ module Cequel
         def set_attribute_default(name, default)
           default_attributes[name.to_sym] = default
         end
+
+        def set_empty_attribute(name, &block)
+          empty_attributes[name.to_sym] = block
+        end
       end
 
       # @private
@@ -346,12 +356,24 @@ module Cequel
         collection_proxies.delete(name)
       end
 
+      def init_attributes(new_attributes)
+        @attributes = {}
+        new_attributes.each_pair do |name, value|
+          if value.nil?
+            value = empty_attributes.fetch(name.to_sym) { -> {} }.call
+          end
+          @attributes[name.to_sym] = value
+        end
+        @attributes
+      end
+
       def initialize_new_record(attributes = {})
         dynamic_defaults = default_attributes
           .select { |name, value| value.is_a?(Proc) }
-        @attributes = Marshal.load(Marshal.dump(
+        new_attributes = Marshal.load(Marshal.dump(
           default_attributes.except(*dynamic_defaults.keys)))
-        dynamic_defaults.each { |name, p| @attributes[name] = p.call() }
+        dynamic_defaults.each { |name, p| new_attributes[name] = p.call }
+        init_attributes(new_attributes)
 
         @new_record = true
         yield self if block_given?

data/lib/cequel/record/tasks.rb

@@ -19,14 +19,19 @@ namespace :cequel do
   task :migrate => :environment do
     watch_stack = ActiveSupport::Dependencies::WatchStack.new
 
+    migration_table_names = Set[]
+    models_dir_path = "#{Rails.root.join('app', 'models')}/"
     Dir.glob(Rails.root.join('app', 'models', '**', '*.rb')).each do |file|
-      watch_stack.watch_namespaces([Object])
-
+      watch_namespaces = ["Object"]
+      model_file_name = file.sub(/^#{Regexp.escape(models_dir_path)}/, "")
+      dirname = File.dirname(model_file_name)
+      watch_namespaces << dirname.classify unless dirname == "."
+      watch_stack.watch_namespaces(watch_namespaces)
       require_dependency(file)
 
       new_constants = watch_stack.new_constants
       if new_constants.empty?
-        new_constants << File.basename(file, '.rb').classify
+        new_constants << model_file_name.sub(/\.rb$/, "").classify
       end
 
       new_constants.each do |class_name|
@@ -34,8 +39,10 @@ namespace :cequel do
           clazz = class_name.constantize
         rescue NameError # rubocop:disable HandleExceptions
         else
-          if clazz.ancestors.include?(Cequel::Record)
+          if clazz.ancestors.include?(Cequel::Record) &&
+              !migration_table_names.include?(clazz.table_name.to_sym)
             clazz.synchronize_schema
+            migration_table_names << clazz.table_name.to_sym
             puts "Synchronized schema for #{class_name}"
           end
         end

data/lib/cequel/version.rb

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

data/spec/examples/record/finders_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require_relative 'spec_helper'
 
 describe Cequel::Record::Finders do

data/spec/examples/record/list_spec.rb

@@ -65,7 +65,7 @@ describe Cequel::Record::List do
       subject[:tags].should == %w(one two four five)
     end
 
-    it 'should add new items in memory when loaded' do
+    it 'should load itself and then add new items in memory when unloaded' do
       unloaded_post.tags << 'four' << 'five'
       expect(unloaded_post.tags).to eq(%w(one two four five))
     end

data/spec/examples/record/properties_spec.rb

@@ -75,6 +75,13 @@ describe Cequel::Record::Properties do
       expect(Post.new.tags).to eq([])
     end
 
+    it 'should have empty list column value if unset in database' do
+      uniq_key = SecureRandom.uuid
+      Post.create! permalink: uniq_key
+      expect(Post[uniq_key].tags).to eq([])
+    end
+
+
     it 'should provide accessor for set column' do
       expect(Post.new { |post| post.categories = Set['Big Data', 'Cassandra'] }
         .categories).to eq(Set['Big Data', 'Cassandra'])
@@ -90,10 +97,16 @@ describe Cequel::Record::Properties do
         .to eq(Set['1', '2', '3'])
     end
 
-    it 'should have empty set column value if present' do
+    it 'should have empty set column value if not explicitly set' do
       expect(Post.new.categories).to eq(Set[])
     end
 
+    it 'should handle saved records with unspecified set properties' do
+      uuid = SecureRandom.uuid
+      Post.create!(permalink: uuid)
+      expect(Post[uuid].categories).to eq(::Set[])
+    end
+
     it 'should provide accessor for map column' do
       expect(Post.new { |post| post.shares = {'facebook' => 1, 'twitter' => 2}}
         .shares).to eq({'facebook' => 1, 'twitter' => 2})
@@ -112,17 +125,29 @@ describe Cequel::Record::Properties do
     it 'should set map column to empty hash by default' do
       expect(Post.new.shares).to eq({})
     end
+
+    it 'should handle saved records with unspecified map properties' do
+      uuid = SecureRandom.uuid
+      Post.create!(permalink: uuid)
+      expect(Post[uuid].shares).to eq({})
+    end
+
+
   end
 
   describe 'configured property defaults' do
     model :Post do
-      key :permalink, :text
+      key :permalink, :text, :default => 'new_permalink'
       column :title, :text, :default => 'New Post'
       list :tags, :text, :default => ['new']
       set :categories, :text, :default => Set['Big Data']
       map :shares, :text, :int, :default => {'facebook' => 0}
     end
 
+    it 'should respect default for keys' do
+      Post.new.permalink.should == 'new_permalink'
+    end
+
     it 'should respect default for data column' do
       Post.new.title.should == 'New Post'
     end
@@ -143,6 +168,7 @@ describe Cequel::Record::Properties do
   describe 'dynamic property generation' do
     model :Post do
       key :id, :uuid, auto: true
+      key :subid, :text, default: -> { "subid #{1+1}" }
       column :title, :text, default: -> { "Post #{Date.today}" }
     end
 
@@ -159,6 +185,10 @@ describe Cequel::Record::Properties do
       end.to raise_error(ArgumentError)
     end
 
+    it 'should run default proc on keys' do
+      Post.new.subid.should == "subid #{1+1}" 
+    end
+
     it 'should run default proc' do
       Post.new.title.should == "Post #{Date.today}"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Mat Brown
@@ -13,10 +13,12 @@ authors:
 - Kenneth Hoffman
 - Antti Tapio
 - Ilya Bazylchuk
+- Dan Cardamore
+- Kei Kusakari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -114,14 +116,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 0.19.0
 description: |
   Cequel is an ActiveRecord-like domain model layer for Cassandra that exposes
   the robust data modeling capabilities of CQL3, including parent-child