believer 0.2.13 → 0.2.14

data/README.md

@@ -69,15 +69,20 @@ class AlbumSales < Believer::Base
     primary_key :artist_name, :name
 end
 
-album_sales = AlbumSales.new
+album_sales = AlbumSales.new(
 album_sales.sales # Returns a Believer::Counter, with a value of 0
 album_sales.sales.incr # Increment counter by 1, value is 1
 album_sales.sales.incr(6) # Increment counter by 3, value is 7
 album_sales.sales.decr # Decrement counter by 1, value is 6
 album_sales.sales.decr(3) # Decrement counter by 3, value is 3
-album_sales.sales.reset! # Reset it to the initial value, which is 0
+album_sales.sales.undo_changes! # Reset it to the initial value, which is 0
 album_sales.sales = 4 # Explicitly set the value...
 album_sales.sales.to_i # ...which is now 4
+album_sales.save
+
+album_sales.sales.reset! # Reset the counter value to 0
+album_sales.save
+album_sales.sales == 0 # True
 ```
 
 #### The primary_key class method
@@ -328,5 +333,6 @@ To make this a little less labor intensive, you can include the module Believer:
 This module will implement an after(:each) hook, which deletes all Believer::Base instance/records created in the span
 of the test.
 
+
 ## Class documentation
 For API go [here](http://rubydoc.info/gems/believer/frames).

data/lib/believer.rb

@@ -37,6 +37,7 @@ require 'believer/environment/rails_env'
 require 'believer/environment/merb_env'
 require 'believer/environment'
 require 'believer/connection'
+require 'believer/key_space'
 require 'believer/counter'
 require 'believer/values'
 require 'believer/column'
@@ -48,6 +49,7 @@ require 'believer/where_clause'
 require 'believer/limit'
 require 'believer/order_by'
 require 'believer/filter_command'
+require 'believer/act_as_enumerable'
 require 'believer/query'
 require 'believer/empty_result'
 require 'believer/delete'

data/lib/believer/act_as_enumerable.rb

@@ -0,0 +1,50 @@
+module Believer
+  module ActAsEnumerable
+
+    def self.included(base)
+      base.delegate *(Enumerable.instance_methods(false).map {|enum_method| enum_method.to_sym}), :to => :to_a
+      base.delegate :each, :size, :[], :to => :to_a
+    end
+
+    def count
+      return loaded_objects.size unless loaded_objects.nil?
+
+      count_q = clone
+      count_q.selects = ['COUNT(*)']
+      result = count_q.execute
+
+      cnt = -1
+      result.each do |row|
+        cnt = row['count']
+      end
+      cnt
+    end
+
+    # Tests if there are any records present which conform to the argument filter(s)
+    # @param args [Object] a filter condition. This argument has the same usage as the where method
+    def exists?(*args)
+      return count > 0 if args.nil? || args.size == 0
+      where(*args).exists?
+    end
+
+    def first
+      return loaded_objects.first unless loaded_objects.nil?
+      clone.limit(1)[0]
+    end
+
+    def last
+      return loaded_objects.last unless loaded_objects.nil?
+      raise "Cannot retrieve last if no order column is set" if @order_by.nil?
+      lq = clone.limit(1)
+      lq.order_by = @order_by.inverse
+      lq[0]
+    end
+
+    def any?
+      return loaded_objects.any? unless loaded_objects.nil?
+      q = clone
+      q.limit(1)
+      q.count > 0
+    end
+  end
+end

data/lib/believer/counter.rb

@@ -8,6 +8,11 @@ module Believer
     end
 
     def reset!
+      @value = 0
+      self
+    end
+
+    def undo_changes!
       @value = initial_value
       self
     end

data/lib/believer/cql_helper.rb

@@ -38,5 +38,24 @@ module Believer
       return nil
     end
 
+    def to_cql_properties(properties)
+      return '' if properties.nil? || properties.empty?
+
+      props_s = properties.keys.map { |k|
+        v = properties[k]
+        v_s = nil
+        if v.is_a?(Hash)
+          v_s = v.to_json.gsub(/\"/) { |m| "'" }
+        elsif v.is_a?(String)
+          v_s = "'#{v}'"
+        else
+          v_s = v.to_s
+        end
+        "#{k} = #{v_s}"
+      }.join("\nAND ")
+
+      props_s
+    end
+
   end
 end

data/lib/believer/create_table.rb

@@ -1,5 +1,8 @@
 module Believer
   class CreateTable < Command
+    include CqlHelper
+
+    attr_accessor :table_properties
 
     def to_cql
       keys = []
@@ -17,6 +20,11 @@ module Believer
       s << ",\n"
       s << "PRIMARY KEY (#{keys.join(',')})"
       s << "\n)"
+
+      unless table_properties.nil? || table_properties.empty?
+        s << " WITH #{to_cql_properties(table_properties)}"
+      end
+
       s
     end
 

data/lib/believer/ddl.rb

@@ -9,8 +9,8 @@ module Believer
         ::Believer::DropTable.new(:record_class => self).execute
       end
 
-      def create_table
-        ::Believer::CreateTable.new(:record_class => self).execute
+      def create_table(properties = {})
+        ::Believer::CreateTable.new(:record_class => self, :table_properties => properties).execute
       end
 
     end

data/lib/believer/environment/base_env.rb

@@ -78,38 +78,6 @@ module Believer
         connection
       end
 
-      def drop_keyspace
-        conn = create_connection(:connect_to_keyspace => false)
-        conn.execute("DROP KEYSPACE #{connection_configuration[:keyspace]}")
-      end
-
-      def create_keyspace(properties = {}, connection = nil)
-        conn = connection || create_connection(:connect_to_keyspace => false)
-
-        default_properties = {:replication => {:class => 'SimpleStrategy', :replication_factor => 1}}
-        ks_props = default_properties.merge(properties)
-
-        ks_props_s = ks_props.keys.map { |k|
-          v = ks_props[k]
-          v_s = nil
-          if v.is_a?(Hash)
-            v_s = v.to_json.gsub(/\"/) { |m| "'" }
-          elsif v.is_a?(String)
-            v_s = "'#{v}'"
-          else
-            v_s = v.to_s
-          end
-          "#{k} = #{v_s}"
-        }.join("\nAND ")
-
-        ks_def = <<-KS_DEF
-          CREATE KEYSPACE #{connection_configuration[:keyspace]}
-          WITH #{ks_props_s}
-        KS_DEF
-
-        conn.execute(ks_def)
-      end
-
     end
 
   end

data/lib/believer/key_space.rb

@@ -0,0 +1,30 @@
+module Believer
+  class KeySpace
+    include CqlHelper
+
+    DEFAULT_PROPERTIES = {:replication => {:class => 'SimpleStrategy', :replication_factor => 1}}
+
+    def initialize(environment)
+      @environment = environment
+    end
+
+    def name
+      @environment.connection_configuration[:keyspace]
+    end
+
+    def drop
+      connection = @environment.create_connection(:connect_to_keyspace => false)
+      connection.execute("DROP KEYSPACE #{name}")
+      connection.close
+    end
+
+    def create(properties = {})
+      conn = @environment.create_connection(:connect_to_keyspace => false)
+      ks_props = DEFAULT_PROPERTIES.merge(properties)
+      ks_props_s = to_cql_properties(ks_props)
+      ks_def = "CREATE KEYSPACE #{name} WITH #{ks_props_s}"
+      conn.execute(ks_def)
+    end
+
+  end
+end

data/lib/believer/query.rb

@@ -3,14 +3,13 @@ require 'believer/extending'
 module Believer
   class Query < FilterCommand
     include Extending
+    include ActAsEnumerable
 
     DEFAULT_FILTER_LIMIT = 10000
 
     attr_accessor :record_class, :selects, :order_by, :limit_to, :filtering_allowed
     alias :filtering_allowed? :filtering_allowed
 
-    delegate *(Enumerable.instance_methods(false).map {|enum_method| enum_method.to_sym}), :to => :to_a
-    delegate :each, :size, :[], :to => :to_a
     delegate :primary_key_columns, :to => :record_class
 
     def initialize(attrs)
@@ -147,39 +146,6 @@ module Believer
       @loaded_objects
     end
 
-    def count
-      return @loaded_objects.size unless @loaded_objects.nil?
-
-      count_q = clone
-      count_q.selects = ['COUNT(*)']
-      result = count_q.execute
-
-      cnt = -1
-      result.each do |row|
-        cnt = row['count']
-      end
-      cnt
-    end
-
-    # Tests if there are any records present which conform to the argument filter(s)
-    # @param args [Object] a filter condition. This argument has the same usage as the where method
-    def exists?(*args)
-      return count > 0 if args.nil? || args.size == 0
-      where(*args).exists?
-    end
-
-    def first
-      return @loaded_objects.first unless @loaded_objects.nil?
-      clone.limit(1)[0]
-    end
-
-    def last
-      return @loaded_objects.last unless @loaded_objects.nil?
-      raise "Cannot retrieve last if no order column is set" if @order_by.nil?
-      lq = clone.limit(1)
-      lq.order_by = @order_by.inverse
-      lq[0]
-    end
 
     protected
     def loaded_objects

data/lib/believer/test/database.rb

@@ -11,14 +11,15 @@ module Believer
 
         connection = env.create_connection(:connect_to_keyspace => false)
 
+        keyspace = ::Believer::KeySpace.new(env)
         # First delete the existing keyspace
         begin
           puts "Dropping keyspace"
-          env.drop_keyspace
+          keyspace.drop
         rescue Cql::QueryError
         end
 
-        env.create_keyspace({}, connection)
+        keyspace.create({})
         connection.use(env.connection_configuration[:keyspace])
 
         classes = options[:classes]

data/lib/believer/version.rb

@@ -1,5 +1,5 @@
 module Believer
   module Version
-    VERSION = '0.2.13'
+    VERSION = '0.2.14'
   end
 end

data/spec/believer/counting_spec.rb

@@ -20,12 +20,42 @@ describe Believer::Counting do
     expect(album_sales.sales.to_i).to eql 2
   end
 
-  it 'should be able to reset a counter' do
+  it 'should be able to undo changes in a counter' do
     album_sales = Test::AlbumSales.new
     album_sales.sales.incr
     expect(album_sales.has_counter_diffs?).to eql true
-    album_sales.sales.reset!
+    album_sales.sales.undo_changes!
     expect(album_sales.has_counter_diffs?).to eql false
   end
 
+  it 'should be able to reset a counter' do
+    album_attrs = {:artist_name => 'CSNY', :name => 'Deja vu'}
+    album_sales = Test::AlbumSales.new(album_attrs)
+    album_sales.sales.incr(4)
+    expect(album_sales.has_counter_diffs?).to eql true
+    album_sales.save
+
+    album_sales = Test::AlbumSales.where(album_attrs).first
+    expect(album_sales.sales.value).to eql 4
+    album_sales.sales.reset!
+    album_sales.save
+
+    album_sales = Test::AlbumSales.where(album_attrs).first
+    expect(album_sales.sales.value).to eql 0
+  end
+
+  it 'should be able to persist a counter value' do
+    album_sales = Test::AlbumSales.new(:artist_name => 'CSNY', :name => 'Deja vu')
+    album_sales.sales.incr
+    album_sales.save
+    expect(album_sales.sales.value).to eql 1
+
+    album_sales = Test::AlbumSales.where(:artist_name => 'CSNY', :name => 'Deja vu').first
+    album_sales.sales.incr
+    album_sales.save
+
+    album_sales = Test::AlbumSales.where(:artist_name => 'CSNY', :name => 'Deja vu').first
+    expect(album_sales.sales.value).to eql 2
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: believer
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -130,6 +130,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/believer/act_as_enumerable.rb
 - lib/believer/base.rb
 - lib/believer/batch.rb
 - lib/believer/batch_delete.rb
@@ -154,6 +155,7 @@ files:
 - lib/believer/filter_command.rb
 - lib/believer/finder_methods.rb
 - lib/believer/insert.rb
+- lib/believer/key_space.rb
 - lib/believer/limit.rb
 - lib/believer/log_subscriber.rb
 - lib/believer/model_schema.rb