believer 0.2.10 → 0.2.11

data/lib/believer/base.rb

@@ -1,4 +1,3 @@
-
 module Believer
   class Base
     extend ::ActiveModel::Naming
@@ -30,6 +29,12 @@ module Believer
     end
 
     def self.instantiate_from_result_rows(row)
+      unless apply_cql_result_row_conversion?
+        obj = new
+        obj.merge_attributes(row)
+        #obj.set_attributes_direct(HashWithIndifferentAccess.new(row))
+        return obj
+      end
       new(row)
     end
 

data/lib/believer/column.rb

@@ -37,9 +37,13 @@ module Believer
         :timestamp => {:default_cql_type => :timestamp},
         :float => {:default_cql_type => :float},
         :array => {:default_cql_type => :list},
-        :set => {:default_cql_type => :set},
+        :set => {:default_cql_type => :set, :apply_cql_result_row_conversion => true},
         :hash => {:default_cql_type => :map},
-        :counter => {:default_cql_type => :counter, :default_value => lambda { Counter.new } }
+        :counter => {
+            :default_cql_type => :counter,
+            :default_value => lambda { Counter.new },
+            :apply_cql_result_row_conversion => true
+        }
     }
 
     attr_reader :name,
@@ -69,7 +73,7 @@ module Believer
 
       @default_value = opts[:default_value]
 
-
+      @apply_cql_result_row_conversion = opts[:apply_cql_result_row_conversion] || RUBY_TYPES[@ruby_type][:apply_cql_result_row_conversion]
     end
 
     # Converts the value to a one that conforms to the type of this column
@@ -112,6 +116,10 @@ module Believer
       nil
     end
 
+    def apply_cql_result_row_conversion?
+      @apply_cql_result_row_conversion == true
+    end
+
     private
     def to_cql_type(t)
       return t if CQL_TYPES.has_key?(t)

data/lib/believer/columns.rb

@@ -77,6 +77,16 @@ module Believer
         @primary_key.size > 1
       end
 
+      def apply_cql_result_row_conversion?
+        if @apply_cql_result_row_conversion.nil?
+          @apply_cql_result_row_conversion = columns.any? {|name, col| col.apply_cql_result_row_conversion?}
+        end
+        @apply_cql_result_row_conversion
+      end
+
+      def apply_cql_result_row_conversion=(b)
+        @apply_cql_result_row_conversion = b
+      end
 
     end
 
@@ -142,5 +152,13 @@ module Believer
       end if attrs.present?
     end
 
+    #protected
+    def merge_attributes(attrs)
+      @attributes ||= {}
+      attrs.each_pair do |k, v|
+        @attributes[k.to_sym] = v
+      end
+    end
+
   end
 end

data/lib/believer/command.rb

@@ -1,7 +1,7 @@
 module Believer
   class Command
 
-    attr_accessor :record_class, :consistency_level
+    attr_accessor :record_class, :consistency_level, :execution_options
 
     def initialize(attrs = {})
       attrs.each do |name, value|
@@ -41,10 +41,11 @@ module Believer
           name = "#{record_class.name} #{command_name}" if name.nil?
           return ActiveSupport::Notifications.instrument('cql.believer', :cql => cql, :name => name) do
 
-            unless consistency_level.nil? || consistency_level.empty?
-              exec_opts ||= {}
-              exec_opts[:consistency] = consistency_level
-            end
+            #unless consistency_level.nil? || consistency_level.empty?
+            #  exec_opts ||= {}
+            #  exec_opts[:consistency] = consistency_level
+            #end
+            exec_opts = (execution_options.nil? || execution_options.empty?) ? nil : execution_options
             begin
               return connection.execute(cql, exec_opts)
             rescue Cql::NotConnectedError => not_connected

data/lib/believer/query.rb

@@ -4,6 +4,8 @@ module Believer
   class Query < FilterCommand
     include Extending
 
+    DEFAULT_FILTER_LIMIT = 10000
+
     attr_accessor :record_class, :selects, :order_by, :limit_to, :filtering_allowed
     alias :filtering_allowed? :filtering_allowed
 
@@ -99,7 +101,13 @@ module Believer
       objects.size
     end
 
-    def delete_all(options = {})
+    def delete_all
+      del = Delete.new(:record_class => self.record_class)
+      del.wheres = self.wheres.dup
+      del.execute
+    end
+
+    def delete_all_chunked(options = {})
       cnt = count
       chunk_size = options[:delete_batch_chunk_size] || (self.limit_to.nil? ? nil : self.limit_to.size) || cnt
       key_cols = self.record_class.primary_key_columns

data/lib/believer/version.rb

@@ -1,5 +1,5 @@
 module Believer
   module Version
-    VERSION = '0.2.10'
+    VERSION = '0.2.11'
   end
 end

metadata

@@ -1,136 +1,135 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: believer
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: 0.2.11
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 10
-  version: 0.2.10
 platform: ruby
-authors: 
+authors:
 - Jerphaes van Blijenburgh
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-11-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-11-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activemodel
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: cql-rb
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cql-rb
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: -3233080982
-        segments: 
-        - 1
-        - 1
-        - 0
-        - pre
-        - 6
-        version: 1.1.0.pre6
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: connection_pool
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 7
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.7.1
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rails-observers
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: rails-observers
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-description: "An Object Relational Mapping library for CQL3 "
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! 'An Object Relational Mapping library for CQL3 '
+email:
 - jerphaes@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/believer/base.rb
 - lib/believer/batch.rb
 - lib/believer/batch_delete.rb
@@ -198,41 +197,31 @@ files:
 - spec/support/setup_database.rb
 - spec/support/test_classes.rb
 homepage: http://github.com/jerphaes/believer
-licenses: 
+licenses:
 - Apache License 2.0
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 55
-      segments: 
-      - 1
-      - 9
-      - 2
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: CQL3 ORM
-test_files: 
+test_files:
 - spec/believer/base_spec.rb
 - spec/believer/callback_spec.rb
 - spec/believer/collection_columns_spec.rb