curator 0.2.0 → 0.3.0

data/lib/curator/configuration.rb

@@ -0,0 +1,3 @@
+module Curator::Configuration
+  attr_accessor :environment, :migrations_path
+end

data/lib/curator/migrator.rb

@@ -16,7 +16,7 @@ module Curator
     end
 
     def _all_migrations
-      files = Dir.glob("#{File.join(Curator.migrations_path, @collection_name)}/*.rb")
+      files = Dir.glob("#{File.join(Curator.config.migrations_path, @collection_name)}/*.rb")
 
       files.map do |file|
         load file

data/lib/curator/railtie.rb

@@ -1,10 +1,12 @@
 module Curator
   class Railtie < Rails::Railtie
     initializer "railtie.configure_rails_initialization" do |app|
-      Curator.bucket_prefix = app.class.name.split("::").first.underscore
-      Curator.environment = Rails.env
-      Curator.migrations_path = Rails.root.join('db', 'migrate')
-      Curator.riak_config_file = Rails.root.join('config', 'riak.yml')
+      Curator.configure(:riak) do |config|
+        config.bucket_prefix = app.class.name.split("::").first.underscore
+        config.environment = Rails.env
+        config.migrations_path = Rails.root.join('db', 'migrate')
+        config.riak_config_file = Rails.root.join('config', 'riak.yml')
+      end
     end
   end
 end

data/lib/curator/repository.rb

@@ -13,7 +13,7 @@ module Curator
       end
 
       def data_store
-        @data_store ||= Riak::DataStore
+        @data_store ||= Curator.data_store
       end
 
       def data_store=(store)
@@ -24,10 +24,6 @@ module Curator
         data_store.delete(collection_name, object.id)
       end
 
-      def encrypted_entity
-        @encrypted_entity = true
-      end
-
       def find_by_created_at(start_time, end_time)
         _find_by_index(collection_name, :created_at, _format_time_for_index(start_time).._format_time_for_index(end_time))
       end
@@ -36,6 +32,10 @@ module Curator
         _find_by_index(collection_name, :updated_at, _format_time_for_index(start_time).._format_time_for_index(end_time))
       end
 
+      def find_by_version(version)
+        _find_by_index(collection_name, :version, version)
+      end
+
       def find_by_id(id)
         if hash = data_store.find_by_key(collection_name, id)
           _deserialize(hash[:key], hash[:data])
@@ -59,6 +59,11 @@ module Curator
       end
 
       def save(object)
+        _update_timestamps(object)
+        save_without_timestamps(object)
+      end
+
+      def save_without_timestamps(object)
         hash = {
           :collection_name => collection_name,
           :value => _serialize(object),
@@ -110,22 +115,6 @@ module Curator
         object
       end
 
-      def _encrypted_attributes(object, attributes)
-        return attributes unless _encrypted_entity?
-
-        encryption_key = EncryptionKeyRepository.find_active
-        plaintext = attributes.to_json
-        ciphertext = encryption_key.encrypt(plaintext)
-        {
-          :encryption_key_id => encryption_key.id,
-          :encrypted_data => Base64.encode64(ciphertext)
-        }
-      end
-
-      def _encrypted_entity?
-        @encrypted_entity == true
-      end
-
       def _format_time_for_index(time)
         time.to_json.gsub('"', '')
       end
@@ -138,25 +127,19 @@ module Curator
         index_values = _indexed_fields.map { |field| [field, object.send(field)] }
         index_values += [
           [:created_at, _format_time_for_index(object.send(:created_at))],
-          [:updated_at, _format_time_for_index(object.send(:updated_at))]
+          [:updated_at, _format_time_for_index(object.send(:updated_at))],
+          [:version, object.version]
         ]
         Hash[index_values]
       end
 
       def _serialize(object)
-        attributes = serialize(object).reject { |key, val| val.nil? }
-
-        timestamp = Time.now.utc
-
-        updated_at = timestamp
-        created_at = object.created_at || timestamp
-
-        object.created_at = created_at
-        object.updated_at = updated_at
-        attributes[:created_at] = created_at
-        attributes[:updated_at] = updated_at
+        serialize(object).reject { |key, val| val.nil? }
+      end
 
-        _encrypted_attributes(object, attributes)
+      def _update_timestamps(object)
+        object.updated_at = Time.now.utc
+        object.created_at ||= object.updated_at
       end
     end
   end

data/lib/curator/resettable_riak/configuration.rb

@@ -0,0 +1,7 @@
+module Curator::ResettableRiak
+  class Configuration < Curator::Riak::Configuration
+    def data_store
+      Curator::ResettableRiak::DataStore
+    end
+  end
+end

data/lib/curator/resettable_riak/data_store.rb

@@ -0,0 +1,50 @@
+require 'active_support/core_ext/kernel/reporting'
+
+module Curator
+  module ResettableRiak
+    class DataStore < Riak::DataStore
+      def self.bucket_prefix
+        job = "#{ENV['JOB_NAME'].gsub(/[^[:alnum:]]/, '_')}" if ENV['JOB_NAME'].present?
+        [Curator.config.bucket_prefix, job, Curator.config.environment].compact.join(':')
+      end
+
+      def self.exclude_from_reset
+        @exclude_from_reset = true
+        yield
+        @exclude_from_reset = false
+      end
+
+      def self.remove_all_keys
+        silence_warnings do
+          buckets = client.buckets.select { |bucket| bucket.name.start_with?(DataStore.bucket_prefix) }
+          buckets.each do |bucket|
+            bucket.keys do |keys|
+              keys.each { |key| bucket.delete(key) }
+            end
+          end
+        end
+      end
+
+      def self.reset!
+        @bucket_names ||= {}
+        deletable_buckets = @bucket_names.each do |bucket_name, keys|
+          bucket = _bucket(bucket_name)
+          keys.each {|key| bucket.delete(key)}
+        end
+        @bucket_names = {}
+      end
+
+      def self.save(options)
+        result = super
+
+        unless @exclude_from_reset
+          @bucket_names ||= {}
+          @bucket_names[options[:collection_name]] ||= []
+          @bucket_names[options[:collection_name]] << result.key
+        end
+
+        result
+      end
+    end
+  end
+end

data/lib/curator/riak/configuration.rb

@@ -0,0 +1,11 @@
+module Curator::Riak
+  class Configuration
+    include Curator::Configuration
+
+    attr_accessor :bucket_prefix, :riak_config_file
+
+    def data_store
+      Curator::Riak::DataStore
+    end
+  end
+end

data/lib/curator/riak/data_store.rb

@@ -1,71 +1,73 @@
 require 'riak'
 require 'yaml'
 
-module Riak
-  class DataStore
-    def self.client
-      return @client if @client
-      yml_config = YAML.load(File.read(Curator.riak_config_file))[Curator.environment]
-      @client = Riak::Client.new(yml_config)
-    end
+module Curator
+  module Riak
+    class DataStore
+      def self.client
+        return @client if @client
+        yml_config = YAML.load(File.read(Curator.config.riak_config_file))[Curator.config.environment]
+        @client = ::Riak::Client.new(yml_config)
+      end
 
-    def self.delete(bucket_name, key)
-      bucket = _bucket(bucket_name)
-      object = bucket.get(key)
-      object.delete
-    end
+      def self.delete(bucket_name, key)
+        bucket = _bucket(bucket_name)
+        object = bucket.get(key)
+        object.delete
+      end
 
-    def self.ping
-      client.ping
-    end
+      def self.ping
+        client.ping
+      end
 
-    def self.save(options)
-      bucket = _bucket(options[:collection_name])
-      object = Riak::RObject.new(bucket, options[:key])
-      object.content_type = "application/json"
-      object.data = options[:value]
-      options.fetch(:index, {}).each do |index_name, index_value|
-        object.indexes["#{index_name}_bin"] << index_value
+      def self.save(options)
+        bucket = _bucket(options[:collection_name])
+        object = ::Riak::RObject.new(bucket, options[:key])
+        object.content_type = "application/json"
+        object.data = options[:value]
+        options.fetch(:index, {}).each do |index_name, index_value|
+          object.indexes["#{index_name}_bin"] << index_value
+        end
+        object.store
       end
-      object.store
-    end
 
-    def self.find_by_key(bucket_name, key)
-      bucket = _bucket(bucket_name)
-      begin
-        object = bucket.get(key)
-        { :key => object.key, :data => object.data } unless object.data.empty?
-      rescue Riak::HTTPFailedRequest => failed_request
-        raise failed_request unless failed_request.not_found?
+      def self.find_by_key(bucket_name, key)
+        bucket = _bucket(bucket_name)
+        begin
+          object = bucket.get(key)
+          { :key => object.key, :data => object.data } unless object.data.empty?
+        rescue ::Riak::HTTPFailedRequest => failed_request
+          raise failed_request unless failed_request.not_found?
+        end
       end
-    end
 
-    def self.find_by_index(bucket_name, index_name, query)
-      return [] if query.nil?
+      def self.find_by_index(bucket_name, index_name, query)
+        return [] if query.nil?
 
-      bucket = _bucket(bucket_name)
-      begin
-        keys = _find_key_by_index(bucket, index_name.to_s, query)
-        keys.map { |key| find_by_key(bucket_name, key) }
-      rescue Riak::HTTPFailedRequest => failed_request
-        raise failed_request unless failed_request.not_found?
+        bucket = _bucket(bucket_name)
+        begin
+          keys = _find_key_by_index(bucket, index_name.to_s, query)
+          keys.map { |key| find_by_key(bucket_name, key) }
+        rescue ::Riak::HTTPFailedRequest => failed_request
+          raise failed_request unless failed_request.not_found?
+        end
       end
-    end
 
-    def self._bucket(name)
-      client.bucket(_bucket_name(name))
-    end
+      def self._bucket(name)
+        client.bucket(_bucket_name(name))
+      end
 
-    def self._bucket_name(name)
-      bucket_prefix + ":" + name
-    end
+      def self._bucket_name(name)
+        bucket_prefix + ":" + name
+      end
 
-    def self.bucket_prefix
-      "#{Curator.bucket_prefix}:#{Curator.environment}"
-    end
+      def self.bucket_prefix
+        "#{Curator.config.bucket_prefix}:#{Curator.config.environment}"
+      end
 
-    def self._find_key_by_index(bucket, index_name, query)
-      bucket.get_index("#{index_name}_bin", query)
+      def self._find_key_by_index(bucket, index_name, query)
+        bucket.get_index("#{index_name}_bin", query)
+      end
     end
   end
 end

data/lib/curator.rb

@@ -4,16 +4,32 @@ require 'curator/migration'
 require 'curator/migrator'
 require 'curator/model'
 require 'curator/repository'
+require 'curator/configuration'
+require 'curator/riak/configuration'
 require 'curator/riak/data_store'
+require 'curator/resettable_riak/configuration'
+require 'curator/resettable_riak/data_store'
 require 'curator/railtie' if defined?(Rails)
 
 module Curator
   class << self
-    attr_accessor :bucket_prefix, :environment, :migrations_path, :riak_config_file
+    attr_reader :config
   end
 
-  self.bucket_prefix = "curator"
-  self.environment = "development"
-  self.migrations_path = File.expand_path(File.dirname(__FILE__) + "/../db/migrate")
-  self.riak_config_file = File.expand_path(File.dirname(__FILE__) + "/../config/riak.yml")
+  def self.configure(data_store, &block)
+    path = "curator/#{data_store.to_s}/configuration"
+    @config = path.camelize.constantize.new
+    yield(@config) if block_given?
+  end
+
+  def self.data_store
+    config.data_store
+  end
+
+  self.configure(:riak) do |config|
+    config.environment = 'development'
+    config.migrations_path = File.expand_path(File.dirname(__FILE__) + "/../db/migrate")
+    config.bucket_prefix = 'curator'
+    config.riak_config_file = File.expand_path(File.dirname(__FILE__) + "/../config/riak.yml")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000 Z
+date: 2012-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70366077009720 !ruby/object:Gem::Requirement
+  requirement: &70336976526480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70366077009720
+  version_requirements: *70336976526480
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70366077009100 !ruby/object:Gem::Requirement
+  requirement: &70336976525860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70366077009100
+  version_requirements: *70336976525860
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70366077008100 !ruby/object:Gem::Requirement
+  requirement: &70336976525440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70366077008100
+  version_requirements: *70336976525440
 - !ruby/object:Gem::Dependency
   name: riak-client
-  requirement: &70366077006780 !ruby/object:Gem::Requirement
+  requirement: &70336976524760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,18 +54,22 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70366077006780
+  version_requirements: *70336976524760
 description: Model and repository framework
 email: code@getbraintree.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/curator/configuration.rb
 - lib/curator/migration.rb
 - lib/curator/migrator.rb
 - lib/curator/model.rb
 - lib/curator/railtie.rb
 - lib/curator/repository.rb
+- lib/curator/resettable_riak/configuration.rb
+- lib/curator/resettable_riak/data_store.rb
+- lib/curator/riak/configuration.rb
 - lib/curator/riak/data_store.rb
 - lib/curator.rb
 homepage: http://github.com/braintree/curator
@@ -88,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Model and repository framework