believer 0.2.7 → 0.2.8

data/lib/believer/command.rb

@@ -40,8 +40,11 @@ module Believer
         begin
           name = "#{record_class.name} #{command_name}" if name.nil?
           return ActiveSupport::Notifications.instrument('cql.believer', :cql => cql, :name => name) do
-            exec_opts = {}
-            exec_opts[:consistency] = consistency_level unless consistency_level.nil?
+
+            unless consistency_level.nil? || consistency_level.empty?
+              exec_opts ||= {}
+              exec_opts[:consistency] = consistency_level
+            end
             begin
               return connection.execute(cql, exec_opts)
             rescue Cql::NotConnectedError => not_connected

data/lib/believer/counter.rb

@@ -47,9 +47,10 @@ module Believer
       diff > 0
     end
 
-    def to_i
+    def value
       @value
     end
+    alias :to_i :value
 
     def initial_value
       if @initial_value.nil?

data/lib/believer/environment/base_env.rb

@@ -72,7 +72,8 @@ module Believer
           connection = Cql::Client.connect(cc)
           connection.use(cc[:keyspace])
         else
-          connection = Cql::Client.connect(cc.delete_if { |k, v| k == :keyspace })
+          cc_no_keyspace = cc.delete_if { |k, v| k.to_s == 'keyspace' }
+          connection = Cql::Client.connect(cc_no_keyspace)
         end
         connection
       end

data/lib/believer/querying.rb

@@ -1,6 +1,6 @@
 module Believer
   module Querying
-    delegate :select, :where, :order, :limit, :exists?, :to => :scoped
+    delegate :select, :where, :order, :limit, :exists?, :count, :pluck, :to => :scoped
 
   end
 end

data/lib/believer/scoping.rb

@@ -9,6 +9,9 @@ module Believer
         Query.new(:record_class => self)
       end
 
+      def all
+        scoped
+      end
     end
 
   end

data/lib/believer/test/database.rb

@@ -0,0 +1,42 @@
+module Believer
+  module Test
+    class Database
+
+      # Drop, and create the keyspace. If options contains classes, creates all tables
+      # @param options [Hash] the options
+      # @option options :environment the environment to use. Must be a subclass of Believer::Environment::BaseEnv
+      # @option options :classes an array of classes to create tables for. Items can be strings or class constants
+      def self.setup(options = {})
+        env = options[:environment] || Believer::Base.environment
+
+        connection = env.create_connection(:connect_to_keyspace => false)
+
+        # First delete the existing keyspace
+        begin
+          puts "Dropping keyspace"
+          env.drop_keyspace
+        rescue Cql::QueryError
+        end
+
+        env.create_keyspace({}, connection)
+        connection.use(env.connection_configuration[:keyspace])
+
+        classes = options[:classes]
+        classes.each do |cl|
+          if cl.is_a?(String)
+            clazz = cl.split('::').inject(Kernel) { |scope, const_name| scope.const_get(const_name) }
+          elsif cl.is_a?(Class)
+            clazz = cl
+          end
+          if clazz.ancestors.include?(Believer::Base)
+            puts "Creating table #{clazz.table_name}"
+            clazz.create_table()
+          end
+
+        end unless classes.nil? || classes.empty?
+
+      end
+
+    end
+  end
+end

data/lib/believer/version.rb

@@ -1,5 +1,5 @@
 module Believer
   module Version
-    VERSION = '0.2.7'
+    VERSION = '0.2.8'
   end
 end

data/spec/spec_helper.rb

@@ -11,10 +11,12 @@ end
 
 require 'believer'
 require 'believer/test/test_run_life_cycle'
+require 'believer/test/database'
 
 Dir[File.expand_path('../support/*.rb', __FILE__)].each {|f| require f}
 
-setup_database
+#setup_database
+Believer::Test::Database.setup(:environment => Test.test_environment, :classes => Test.classes)
 
 RSpec.configure do |config|
   config.add_setting :test_files_dir, :default => File.expand_path('../test_files/', __FILE__)

metadata

@@ -1,119 +1,122 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: believer
-version: !ruby/object:Gem::Version
-  version: 0.2.7
+version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 8
+  version: 0.2.8
 platform: ruby
-authors:
+authors: 
 - Jerphaes van Blijenburgh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-11-05 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: cql-rb
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.0.pre6
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        version: "3"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: cql-rb
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: -2179262306
+        segments: 
+        - 1
+        - 1
+        - 0
+        - pre
+        - 6
         version: 1.1.0.pre6
-- !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: *id002
+- !ruby/object:Gem::Dependency 
+  name: connection_pool
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    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'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    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
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: simplecov
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 7
+        - 1
         version: 0.7.1
-description: ! 'An Object Relational Mapping library for CQL3 '
-email:
+  type: :development
+  version_requirements: *id006
+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
@@ -148,6 +151,7 @@ files:
 - lib/believer/querying.rb
 - lib/believer/relation.rb
 - lib/believer/scoping.rb
+- lib/believer/test/database.rb
 - lib/believer/test/test_run_life_cycle.rb
 - lib/believer/update.rb
 - lib/believer/values.rb
@@ -180,31 +184,41 @@ 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
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 55
+      segments: 
+      - 1
+      - 9
+      - 2
       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
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      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