cassandra_migrations 0.0.7 → 0.0.9

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTU2OWUzZTUzYjcxMDk1NzMxNjMwZWI4ZjE2NzY0YjcxZjc1ODE0Mw==
-  data.tar.gz: !binary |-
-    M2IyMWVkNTc1YjdkMTNiZjZmMjE1YTBkZDdhNzA1ZGVlNTliZWMwYw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NzQxOWNkN2IyZGVlMTgxZWIwMzI3MzYxOTQ0MGEyNDM3MGQyMWU2YWEwZGI0
-    ZjY3ZGIyMzY2NTc2ZGRjMjVmMzJmODkyODMxNzZhNmU3ZTQ0ZTIyYmJiMWQ0
-    NTI2OTFhOTljOWVmZjE1MmFjOTIyNzNiYWQ0Y2FlYzUzNjNhMjM=
-  data.tar.gz: !binary |-
-    Yzg3NzE4YTEzZmZiYzMyOTI3NzQ2NzEyMjAzYTdlODQwMGU0ZThiNWJhOGU1
-    NGU0ZGNhYjMwOWMwMjk0NTczODRiNWI1ZWNlMzllZWJhMzAxOGY2YzYwZjdh
-    MzBhZDAzNDgyNzhjNjBiZGM3NDU4NzM5MGYyNzBjMDk2ZDdhZGU=
+SHA1:
+  metadata.gz: 77de13dc274012a0854ed3626d60f4a0ac73af3d
+  data.tar.gz: 4a17b0acf23ebaae56d88e4ba1572342fc248b03
+SHA512:
+  metadata.gz: aab3f0ddd91d81d590cbe6ad16dcbbff317ca9358f5ef924d099867316f0c145db9f53dcc67db658c077184b23a783a89047f3dc76094571b858e42bdba0526a
+  data.tar.gz: 20ab748bf68a98bcbaf5524b1cc5ef7d76ccafff0735559e5c83747b459f0f9ffdd50931b64489265187f00484d5686755d1a8c6f23e3444cbce730794cb8854

data/lib/cassandra_migrations/migration/table_definition.rb

@@ -10,15 +10,61 @@ module CassandraMigrations
     # +create_table+, available on every migration.
     #
     # This class is also internally used in the method +add_column+.
-    
+
     class TableDefinition
 
+      #
+      # C* Data Types. See http://www.datastax.com/documentation/cql/3.0/cql/cql_reference/cql_data_types_c.html
+      #
+
+      # Migration  | CQL Type	| Ruby          | Description
+      # Type       |           | Class         |
+      # ------------------------------------------------------------------------
+      # string     | varchar	 | String        | UTF-8 encoded string
+      # text       | text	    | String	      | UTF-8 encoded string
+      # ascii      | ascii     | String	      | US-ASCII character string
+      # ------------------------------------------------------------------------
+      # integer(4) | int	     | Integer	     | 32-bit signed integer
+      # integer(8) | bigint	  | Fixnum        | 64-bit signed long
+      # varint	   | varint    | Bignum        | Arbitrary-precision integer
+      # ------------------------------------------------------------------------
+      # decimal	  | decimal   | BigDecimal    | Variable-precision decimal
+      # float(4)	 | float	   |               | 32-bit IEEE-754 floating point
+      # double     | double	  |	             | Float 64-bit IEEE-754 floating point
+      # float(8)   | double    |               |
+      # ------------------------------------------------------------------------
+      # boolean    | boolean	 | TrueClass     | true or false
+      #            |           | FalseClass    |
+      # ------------------------------------------------------------------------
+      # uuid	     | uuid      | Cql::Uuid     | A UUID in standard UUID format
+      # timeuuid	 | timeuuid  | Cql::TimeUuid | Type 1 UUID only (CQL 3)
+      # ------------------------------------------------------------------------
+      # inet	     | inet      | IPAddr        | IP address string in IPv4 or
+      #            |           |               | IPv6 format*
+      # ------------------------------------------------------------------------
+      # timestamp  | timestamp | Time          | Date plus time, encoded as 8
+      #            |           |               | bytes since epoch
+      # datetime   | timestamp |               |
+      # ------------------------------------------------------------------------
+      # list       | list	    | Array	       | A collection of one or more
+      #            |           |               | ordered elements
+      # map        | map	     | Hash	        | A JSON-style array of literals:
+      #            |           |               | { literal : literal, ... }
+      # set        | set	     | Set	         | A collection of one or more
+      #            |           |               | elements
+      # binary     | blob	    | 	            | Arbitrary bytes (no validation),
+      #            |           |               | expressed as hexadecimal
+      # 	         | counter   |               | Distributed counter value
+      #            |           |               | (64-bit long)
+
+
+
       def initialize()
         @columns_name_type_hash = {}
         @primary_keys = []
         @partition_keys = []
       end
-      
+
       def to_create_cql
         cql = []
 
@@ -38,10 +84,10 @@ module CassandraMigrations
         else
           raise Errors::MigrationDefinitionError, 'No primary key defined.'
         end
-        
+
         cql.join(', ')
       end
-      
+
       def to_add_column_cql
         cql = ""
 
@@ -52,61 +98,76 @@ module CassandraMigrations
         else
           raise Errors::MigrationDefinitionError, 'Only one column can be added at once.'
         end
-        
+
         cql
       end
-      
+
       def boolean(column_name, options={})
         @columns_name_type_hash[column_name.to_sym] = column_type_for(:boolean, options)
         define_primary_keys(column_name) if options[:primary_key]
       end
-      
+
       def integer(column_name, options={})
-        @columns_name_type_hash[column_name.to_sym] = column_type_for(:integer, options) 
+        @columns_name_type_hash[column_name.to_sym] = column_type_for(:integer, options)
         define_primary_keys(column_name) if options[:primary_key]
       end
-      
+
+      def decimal(column_name, options={})
+        @columns_name_type_hash[column_name.to_sym] = column_type_for(:decimal, options)
+        define_primary_keys(column_name) if options[:primary_key]
+      end
+
       def float(column_name, options={})
-        @columns_name_type_hash[column_name.to_sym] = column_type_for(:float, options) 
+        @columns_name_type_hash[column_name.to_sym] = column_type_for(:float, options)
         define_primary_keys(column_name) if options[:primary_key]
       end
-      
+
       def double(column_name, options={})
         options[:limit] = 8
-        @columns_name_type_hash[column_name.to_sym] = column_type_for(:float, options) 
+        @columns_name_type_hash[column_name.to_sym] = column_type_for(:float, options)
         define_primary_keys(column_name) if options[:primary_key]
       end
-      
+
       def string(column_name, options={})
         @columns_name_type_hash[column_name.to_sym] = column_type_for(:string, options)
         define_primary_keys(column_name) if options[:primary_key]
       end
-      
+
       def text(column_name, options={})
         @columns_name_type_hash[column_name.to_sym] = column_type_for(:text, options)
         define_primary_keys(column_name) if options[:primary_key]
       end
-      
+
+      def ascii(column_name, options={})
+        @columns_name_type_hash[column_name.to_sym] = column_type_for(:ascii, options)
+        define_primary_keys(column_name) if options[:primary_key]
+      end
+
       def datetime(column_name, options={})
         @columns_name_type_hash[column_name.to_sym] = column_type_for(:datetime, options)
         define_primary_keys(column_name) if options[:primary_key]
       end
-      
+
       def timestamp(column_name, options={})
         @columns_name_type_hash[column_name.to_sym] = column_type_for(:timestamp, options)
         define_primary_keys(column_name) if options[:primary_key]
       end
-      
+
       def uuid(column_name, options={})
         @columns_name_type_hash[column_name.to_sym] = column_type_for(:uuid, options)
         define_primary_keys(column_name) if options[:primary_key]
       end
-      
+
       def timeuuid(column_name, options={})
         @columns_name_type_hash[column_name.to_sym] = column_type_for(:timeuuid, options)
         define_primary_keys(column_name) if options[:primary_key]
       end
-      
+
+      def binary(column_name, options={})
+        @columns_name_type_hash[column_name.to_sym] = column_type_for(:binary, options)
+        define_primary_keys(column_name) if options[:primary_key]
+      end
+
       def list(column_name, options={})
         type = options[:type]
         if type.nil?
@@ -119,7 +180,7 @@ module CassandraMigrations
         end
         @columns_name_type_hash[column_name.to_sym] = :"list<#{column_type_for(type)}>"
       end
-      
+
       def set(column_name, options={})
         type = options[:type]
         if type.nil?
@@ -132,12 +193,12 @@ module CassandraMigrations
         end
         @columns_name_type_hash[column_name.to_sym] = :"set<#{column_type_for(type)}>"
       end
-      
+
       def map(column_name, options={})
         key_type, value_type = options[:key_type], options[:value_type]
         [key_type, value_type].each_with_index do |type, index|
           if type.nil?
-            raise Errors::MigrationDefinitionError, "A map must define a #{index = 0 ? 'key' : 'value'} type." 
+            raise Errors::MigrationDefinitionError, "A map must define a #{index = 0 ? 'key' : 'value'} type."
           elsif !self.respond_to?(type)
             raise Errors::MigrationDefinitionError, "Type '#{type}' is not valid for cassandra migration."
           end
@@ -146,14 +207,14 @@ module CassandraMigrations
         if options[:primary_key]
           raise Errors::MigrationDefinitionError, 'A collection cannot be used as a primary key.'
         end
-        @columns_name_type_hash[column_name.to_sym] = :"map<#{column_type_for(key_type)},#{column_type_for(value_type)}>"        
+        @columns_name_type_hash[column_name.to_sym] = :"map<#{column_type_for(key_type)},#{column_type_for(value_type)}>"
       end
-      
+
       def define_primary_keys(*keys)
         if !@primary_keys.empty?
           raise Errors::MigrationDefinitionError, 'Primary key defined twice for the same table.'
         end
-        
+
         @primary_keys = keys.flatten
       end
 
@@ -161,39 +222,37 @@ module CassandraMigrations
         if !@partition_keys.empty?
           raise Errors::MigrationDefinitionError, 'Partition key defined twice for the same table.'
         end
-        
+
         @partition_keys = keys.flatten
       end
 
       private
-      
-        def column_type_for(ruby_type, options={})
+
+      PASSTHROUGH_TYPES = [:text, :ascii, :decimal, :double, :boolean,
+                           :uuid, :timeuuid, :inet, :timestamp, :list,
+                           :map, :set]
+      TYPES_MAP = { string: :varchar,
+                    datetime: :timestamp,
+                    binary: :blob }
+
+      PRECISION_MAP = {
+                        integer: { 4 => :int, 8 => :bigint, nil => :int },
+                        float: { 4 => :float, 8 => :double, nil => :float }
+                      }
+
+      def column_type_for(type, options={})
+        cql_type = type if PASSTHROUGH_TYPES.include?(type)
+        cql_type ||= TYPES_MAP[type]
+        if PRECISION_MAP.keys.include?(type)
           limit = options[:limit]
-          case ruby_type
-            when :boolean, :text, :timestamp, :uuid, :timeuuid
-              ruby_type
-            when :integer
-              if limit.nil? || limit == 4
-                :int
-              elsif limit == 8
-                :bigint
-              else
-                raise Errors::MigrationDefinitionError, ':limit option should be 4 or 8 for integers.'
-              end
-            when :float
-              if limit.nil? || limit == 4
-                :float
-              elsif limit == 8
-                :double
-              else
-                raise Errors::MigrationDefinitionError, ':limit option should be 4 or 8 for floats.'
-              end
-            when :string
-              :varchar
-            when :datetime
-              :timestamp
+          unless PRECISION_MAP[type].keys.include?(limit)
+            raise Errors::MigrationDefinitionError, ":limit option should be #{PRECISION_MAP[type].keys.compact.join(' or ')} for #{type}."
           end
+          cql_type ||= PRECISION_MAP[type][limit]
         end
+        cql_type
+      end
+
     end
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cassandra_migrations
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Henrique Gubert
+- Brian Sam-Bodden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cql-rb
@@ -16,169 +17,157 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 2.0.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 2.0.0.pre1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !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: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
 description: A gem to manage Cassandra database schema for Rails. This gem offers
   migrations and environment sific databases out-of-the-box for Rails users.
-email: guberthenrique@hotmail.com
+email:
+- guberthenrique@hotmail.com
+- bsbodden@integrallis.com
 executables:
 - prepare_for_cassandra
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/prepare_for_cassandra
+- lib/cassandra_migrations.rb
+- lib/cassandra_migrations/capistrano.rb
+- lib/cassandra_migrations/cassandra.rb
 - lib/cassandra_migrations/cassandra/keyspace_operations.rb
 - lib/cassandra_migrations/cassandra/queries.rb
 - lib/cassandra_migrations/cassandra/query_result.rb
-- lib/cassandra_migrations/migration/table_operations.rb
-- lib/cassandra_migrations/migration/table_definition.rb
-- lib/cassandra_migrations/migration/column_operations.rb
-- lib/cassandra_migrations/migration.rb
-- lib/cassandra_migrations/errors.rb
-- lib/cassandra_migrations/railtie.rb
 - lib/cassandra_migrations/config.rb
+- lib/cassandra_migrations/errors.rb
+- lib/cassandra_migrations/migration.rb
+- lib/cassandra_migrations/migration/column_operations.rb
+- lib/cassandra_migrations/migration/table_definition.rb
+- lib/cassandra_migrations/migration/table_operations.rb
 - lib/cassandra_migrations/migrator.rb
-- lib/cassandra_migrations/cassandra.rb
+- lib/cassandra_migrations/railtie.rb
+- lib/cassandra_migrations/railtie/generators/cassandra_migration/USAGE
 - lib/cassandra_migrations/railtie/generators/cassandra_migration/cassandra_migration_generator.rb
 - lib/cassandra_migrations/railtie/generators/cassandra_migration/templates/empty_migration.rb.erb
-- lib/cassandra_migrations/railtie/generators/cassandra_migration/USAGE
-- lib/cassandra_migrations/railtie/tasks.rake
 - lib/cassandra_migrations/railtie/initializer.rb
-- lib/cassandra_migrations/capistrano.rb
-- lib/cassandra_migrations.rb
+- lib/cassandra_migrations/railtie/tasks.rake
 - template/cassandra.yml
-- bin/prepare_for_cassandra
 homepage: https://github.com/hsgubert/cassandra_migrations
 licenses:
 - MIT
@@ -189,17 +178,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Cassandra schema management for a multi-environment developer.