cassandra_model 0.9.19 → 0.9.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ac53d8babc28b371c29af402db8cc79efc869e9
-  data.tar.gz: 2880f1655431784bcd150e758b67d43f1246da54
+  metadata.gz: da8cdc27700ca95add22df7ece2de9e050a09642
+  data.tar.gz: 7a9a39c9bd2bf63bb9dc03442461b5f860c95718
 SHA512:
-  metadata.gz: 415f7be98b56fa469b3a54dde229a8df930fbdbf495db5c39e2d9d5cbfbdb2242845c52b35a039e288fa692e5be5d985d6960bb649744847fac6e3f17824c08c
-  data.tar.gz: afd2499ef113bcabc5a56df865d29e6edbb3dbb014d8b7b6a5b333899d087529944d5e4179460533fac468f8aa8c069f2c7176edca7d616d693e43863911cc08
+  metadata.gz: c7a028e42484dd36523c86934ef8b9d79045354d720159cc1ab75fadb8cd9e150f2921d40b58038c2ecdd54bff87a80a07ff2fedd83ff976952ce4e5a3b0a484
+  data.tar.gz: 39dd8d3525696fc4d183a9b5f077d0cfb24f74da2d86d3c8eeba0db843d023b1257bb38d4c61f9f62da4d6c366769b8d5a722dd83e1eb53d9d0f8e1630a1928d

data/lib/cassandra_model/composite_record_static.rb

@@ -1,7 +1,6 @@
 module CassandraModel
   module CompositeRecordStatic
-    PK_MUTEX = Mutex.new
-    CK_MUTEX = Mutex.new
+    MUTEX = Mutex.new
 
     extend Forwardable
 
@@ -24,30 +23,27 @@ module CassandraModel
     end
 
     def columns
-      table_data.composite_columns ||= composite_columns.each { |column| define_attribute(column) }
-    end
-
-    def composite_pk_map
-      unless table_data.composite_pk_map
-        PK_MUTEX.synchronize do
-          return table_data.composite_pk_map if table_data.composite_pk_map
+      unless table_data.composite_columns
+        MUTEX.synchronize do
+          return table_data.composite_columns if table_data.composite_columns
 
           table_data.composite_pk_map = {}
-          columns
+          table_data.composite_ck_map = {}
+          table_data.composite_columns = composite_columns.each { |column| define_attribute(column) }
         end
       end
+      table_data.composite_columns
+    end
+
+    alias :ensure_attributes_accessible! :columns
+
+    def composite_pk_map
+      ensure_attributes_accessible! unless table_data.composite_columns
       table_data.composite_pk_map
     end
 
     def composite_ck_map
-      unless table_data.composite_ck_map
-        CK_MUTEX.synchronize do
-          return table_data.composite_ck_map if table_data.composite_ck_map
-
-          table_data.composite_ck_map = {}
-          columns
-        end
-      end
+      ensure_attributes_accessible! unless table_data.composite_columns
       table_data.composite_ck_map
     end
 
@@ -126,8 +122,8 @@ module CassandraModel
 
     def composite_columns
       internal_columns.map do |column|
-        trimmed_column(column, /^rk_/, composite_pk_map) ||
-            trimmed_column(column, /^ck_/, composite_ck_map) ||
+        trimmed_column(column, /^rk_/, table_data.composite_pk_map) ||
+            trimmed_column(column, /^ck_/, table_data.composite_ck_map) ||
             column
       end.uniq
     end

data/lib/cassandra_model/data_inquirer.rb

@@ -55,6 +55,8 @@ module CassandraModel
             retype_to(:timestamp)
           when Cassandra::Uuid then
             retype_to(:uuid)
+          when String then
+            retype_to(:text)
         end
       end
 
@@ -82,6 +84,8 @@ module CassandraModel
             default_to(Time.at(0))
           when :uuid then
             default_to(Cassandra::Uuid.new(0))
+          when :text then
+            default_to('')
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cassandra_model
 version: !ruby/object:Gem::Version
-  version: 0.9.19
+  version: 0.9.21
 platform: ruby
 authors:
 - Thomas RM Rogers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-31 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver