gotime-cassandra_object 4.11.4 → 4.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1210ae4e593d0b2daa46aee3b68415001c10491
-  data.tar.gz: 6b52ac2caf7b62f476beeec9d440d83406f0a37a
+  metadata.gz: 3f4ae8a2098007fdcbcd6847250f1f1a6ec7d796
+  data.tar.gz: 1f771e3e05b8fd02c75368d9bb4d267625ae65c4
 SHA512:
-  metadata.gz: b3afa7fdf25300b4753a0c63bfd81b5a2a9505d717c6d3256511987ce4863d898101488ec75df1fa112870d97131120c7b18a6bc3f04538fb09bc95f97dd7fab
-  data.tar.gz: 15777dd35f5464a0cceecd8043a3963199cdd03b0ab0fd4587dbaf442c7b8aef214da314e1aa9f115b0fa855f324741cb8e3ba6937884f898d611233c6cc5e68
+  metadata.gz: ba97e2ce536c92b6350a9a967276a8e75807c38b63c6e088041e29ed77110f2f5607ff9f820a5c449bc2e2445c9721548739aa3f7115e2ba8b75b6761b101756
+  data.tar.gz: ecf1f7f1eec3c482cc31df0797c044bf28505285728169e47f49ab8aa8cf33dbc29ed63bad3bec0fd6b31654eb69904592c6937c37a6a51ecca9302b50743754

data/gotime-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'gotime-cassandra_object'
-  s.version = '4.11.4'
+  s.version = '4.11.5'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
   s.authors = ["Michael Koziarski", "gotime"]

data/lib/cassandra_object/base.rb

@@ -23,7 +23,6 @@ module CassandraObject
     include BelongsTo
     include Callbacks
     include Timestamps
-    include Savepoints
     include Scoping
     include Core
     extend  Model

data/lib/cassandra_object/persistence.rb

@@ -26,7 +26,7 @@ module CassandraObject
 
       def write(id, attributes)
         if (encoded = encode_attributes(attributes)).any?
-          insert_attributes = {'KEY' => id}.update encode_attributes(attributes)
+          insert_attributes = {'KEY' => id}.update(encoded)
           statement = "INSERT INTO #{column_family} (#{quote_columns(insert_attributes.keys) * ','}) VALUES (#{Array.new(insert_attributes.size, '?') * ','})#{write_option_string}"
           execute_batchable_cql statement, *insert_attributes.values
         end

data/lib/cassandra_object/schema/tasks.rb

@@ -29,7 +29,7 @@ module CassandraObject
 
       private
         def run_command(command)
-          `echo "#{command};" | #{cqlsh} -k #{keyspace} #{server}`.sub(/^(.*)$/, '').strip
+          `echo "#{command};" | #{cqlsh} -2 -k #{keyspace} #{server}`.sub(/^(.*)$/, '').strip
         end
 
         def cqlsh

data/lib/cassandra_object/scope/query_methods.rb

@@ -34,10 +34,10 @@ module CassandraObject
 
       def to_cql
         [
-            "SELECT #{select_string} FROM #{klass.column_family}",
-            consistency_string,
-            where_string,
-            limit_string
+          "SELECT #{select_string} FROM #{klass.column_family}",
+          consistency_string,
+          where_string,
+          limit_string
         ].delete_if(&:blank?) * ' '
       end
 

data/lib/gotime-cassandra_object.rb

@@ -19,7 +19,6 @@ module CassandraObject
   autoload :Inspect
   autoload :Model
   autoload :Persistence
-  autoload :Savepoints
   autoload :Schema
   autoload :Scope
   autoload :Scoping

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.11.4
+  version: 4.11.5
 platform: ruby
 authors:
 - Michael Koziarski
@@ -9,62 +9,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2014-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: cassandra-cql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thrift_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: bundler
   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'
 description: Cassandra ActiveModel
@@ -74,8 +74,8 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -106,7 +106,6 @@ files:
 - lib/cassandra_object/model.rb
 - lib/cassandra_object/persistence.rb
 - lib/cassandra_object/railtie.rb
-- lib/cassandra_object/savepoints.rb
 - lib/cassandra_object/schema.rb
 - lib/cassandra_object/schema/tasks.rb
 - lib/cassandra_object/scope.rb
@@ -154,7 +153,6 @@ files:
 - test/unit/inspect_test.rb
 - test/unit/log_subscriber_test.rb
 - test/unit/persistence_test.rb
-- test/unit/savepoints_test.rb
 - test/unit/schema/tasks_test.rb
 - test/unit/schema_test.rb
 - test/unit/scope/batches_test.rb
@@ -182,17 +180,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Cassandra ActiveModel

data/lib/cassandra_object/savepoints.rb

@@ -1,79 +0,0 @@
-module CassandraObject
-  module Savepoints
-    class Rollback
-      attr_accessor :action, :record, :rollback_attributes
-      def initialize(action, record)
-        @action = action
-        @record = record
-        if action == :update
-          @rollback_attributes = record.changed_attributes.deep_dup
-        elsif action == :create
-          @rollback_attributes = record.attributes.deep_dup
-        end
-      end
-
-      def run!
-        case action
-        when :destroy
-          record.class.remove(record.id)
-        when :create, :update
-          record.class.write(record.id, rollback_attributes)
-        end
-      end
-    end
-
-    class Savepoint
-      attr_accessor :rollbacks
-      def initialize
-        self.rollbacks = []
-      end
-
-      def add_rollback(action, record)
-        states << Rollback.new(action, record)
-      end
-
-      def rollback!
-        rollbacks.reverse_each(&:run!)
-      end
-    end
-
-    extend ActiveSupport::Concern
-
-    included do
-      class_attribute :savepoints
-      self.savepoints = []
-    end
-
-    module ClassMethods
-      def savepoint
-        self.savepoints.push Savepoint.new
-        yield
-        savepoints.pop
-      rescue => e
-        savepoints.pop.rollback!
-      end
-
-      def add_savepoint_rollback(action, record)
-        unless savepoints.empty?
-          savepoints.last.add_rollback(action, record)
-        end
-      end
-    end
-
-    def destroy
-      self.class.add_savepoint_rollback(:create, self)
-      super
-    end
-
-    private
-      def create
-        self.class.add_savepoint_rollback(:destroy, self)
-        super
-      end
-
-      def update
-        self.class.add_savepoint_rollback(:update, self)
-        super
-      end
-  end
-end

data/test/unit/savepoints_test.rb

@@ -1,35 +0,0 @@
-require 'test_helper'
-
-class CassandraObject::SavepointsTest < CassandraObject::TestCase
-  test 'rollback create' do
-    Issue.savepoint do
-      issue = Issue.create description: 'foo'
-      raise 'lol'
-    end
-
-    assert_nil Issue.first
-  end
-
-  test 'rollback update' do
-    issue = Issue.create description: 'foo'
-
-    Issue.savepoint do
-      issue.update_attributes description: 'bar'
-      raise 'lol'
-    end
-
-    issue = Issue.find issue.id
-    assert_equal 'foo', issue.description
-  end
-
-  test 'rollback destroy' do
-    issue = Issue.create description: 'foo'
-
-    Issue.savepoint do
-      issue.destroy
-      raise 'lol'
-    end
-
-    assert_nothing_raised { Issue.find issue.id }
-  end
-end