curator 0.10.0 → 0.11.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 37a4d7f18c7aa69e15d24937296c753cd601068a
+  data.tar.gz: a914c1ad69c6ec5b6035eb85e5736cc7a32f3ba2
+SHA512:
+  metadata.gz: e15781810ecbf8b29894188a0962c0e17ed815a9e84abc9f6faad062e7ffd29e4c2d31f687724bc2c7b0a7f5b937eb8f2bd3fdd794e14272f2b5cdc771bccbcc
+  data.tar.gz: 334bd6659e11c125a6553f22bbdae0d7b788320dc7f84b70c32618bcc3a696809bfe76f9ac4c673b5fd580992dd742f5fccb5d4e0269dc7fc2d0b65df63dc187

data/lib/curator.rb

@@ -12,6 +12,14 @@ module Curator
     attr_reader :config
   end
 
+  def self.repositories
+    @repositories ||= Set.new
+  end
+
+  def self.repositories=(repositories)
+    @repositories = repositories
+  end
+
   def self.configure(data_store, &block)
     configuration_path = "curator/#{data_store.to_s}/configuration"
     require configuration_path

data/lib/curator/memory/data_store.rb

@@ -3,6 +3,15 @@ require 'ostruct'
 module Curator
   module Memory
     class DataStore
+
+      def settings(bucket_name)
+        {}
+      end
+
+      def update_settings!(collection_name, updated_settings)
+        # NOOP
+      end
+
       def remove_all_keys
         @data = {}
       end

data/lib/curator/mongo/data_store.rb

@@ -34,6 +34,14 @@ module Curator
         @client
       end
 
+      def settings(collection_name)
+        raise StandardError, "Not implemented yet"
+      end
+
+      def update_settings!(collection_name, updated_settings)
+        raise StandardError, "Not implemented yet"
+      end
+
       def remove_all_keys
         self.reset!
       end

data/lib/curator/railtie.rb

@@ -8,5 +8,10 @@ module Curator
         config.riak_config_file = Rails.root.join('config', 'riak.yml')
       end
     end
+
+    rake_tasks do
+      tasks = Dir[File.join(File.dirname(__FILE__),'tasks/*.rake')]
+      tasks.each { |f| load f }
+    end
   end
 end

data/lib/curator/repository.rb

@@ -1,13 +1,22 @@
 require 'active_support/inflector'
 require 'active_support/core_ext/object/instance_variables'
 require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/core_ext/module/delegation'
+require 'curator/repository/settings'
 require 'json'
 
 module Curator
   module Repository
     extend ActiveSupport::Concern
 
+    def self.included(klass)
+      Curator.repositories << klass
+    end
+
     module ClassMethods
+      delegate :enable, :disable, :set, :to => :settings
+      delegate :uncommitted?, :to => :settings, :prefix => true
+
       def all
         data_store.find_all(collection_name).map do |result|
           _deserialize(result[:key], result[:data])
@@ -99,6 +108,15 @@ module Curator
         HashWithIndifferentAccess.new(object.instance_values)
       end
 
+      def settings
+        @settings ||= Settings.new(data_store.settings(collection_name))
+      end
+
+      def apply_settings!
+        settings.apply!(:data_store => data_store,
+                        :collection_name => collection_name)
+      end
+
       def _build_finder_methods(attribute)
         eigenclass = class << self; self; end
         eigenclass.class_eval do
@@ -114,8 +132,8 @@ module Curator
       def _find_by_attribute(attribute, value)
         if results = data_store.find_by_attribute(collection_name, attribute, value)
           results.map do |hash|
-            _deserialize(hash[:key], hash[:data])
-          end
+            _deserialize(hash[:key], hash[:data]) if hash
+          end.compact
         end
       end
 

data/lib/curator/repository/settings.rb

@@ -0,0 +1,50 @@
+require 'curator/repository'
+require 'active_support/core_ext/hash/indifferent_access'
+
+module Curator
+  module Repository
+    class Settings
+      attr_reader :all, :changed
+      alias_method :to_hash, :all
+
+      def initialize(current_settings = {})
+        @all = HashWithIndifferentAccess.new(current_settings)
+        clear_dirty!
+      end
+
+      def set(property, value)
+        original_value = all[property]
+        unless value == original_value
+          all[property] = value
+          changed[property] = value
+        end
+      end
+
+      def enable(property)
+        set(property, true)
+      end
+
+      def disable(property)
+        set(property, false)
+      end
+
+      def [](property)
+        all[property]
+      end
+
+      def uncommitted?
+        changed.any?
+      end
+
+      def clear_dirty!
+        @changed = HashWithIndifferentAccess.new
+      end
+
+      def apply!(opts = {})
+        data_store = opts.fetch(:data_store)
+        collection_name = opts.fetch(:collection_name)
+        clear_dirty! if data_store.update_settings!(collection_name, changed)
+      end
+    end
+  end
+end

data/lib/curator/riak/data_store.rb

@@ -26,13 +26,22 @@ module Curator
         client.ping
       end
 
+      def settings(bucket_name)
+        _bucket(bucket_name).props.dup.freeze
+      end
+
+      def update_settings!(bucket_name, updated_settings)
+        return true if updated_settings.empty?
+        _bucket(bucket_name).props = updated_settings
+      end
+
       def save(options)
         bucket = _bucket(options[:collection_name])
         object = ::Riak::RObject.new(bucket, options[:key])
         object.content_type = options.fetch(:content_type, "application/json")
         object.data = options[:value]
         options.fetch(:index, {}).each do |index_name, index_data|
-          object.indexes["#{index_name}_bin"] << _normalized_index_data(index_data)
+          object.indexes["#{index_name}_bin"].merge(Array(index_data))
         end
         result = object.store
         result.key
@@ -48,7 +57,7 @@ module Curator
         begin
           object = bucket.get(key)
           { :key => object.key, :data => _deserialize(object.data) } unless object.data.empty?
-        rescue ::Riak::HTTPFailedRequest => failed_request
+        rescue ::Riak::HTTPFailedRequest, ::Riak::ProtobuffsFailedRequest => failed_request
           raise failed_request unless failed_request.not_found?
         end
       end
@@ -60,7 +69,7 @@ module Curator
         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
+        rescue ::Riak::HTTPFailedRequest, ::Riak::ProtobuffsFailedRequest => failed_request
           raise failed_request unless failed_request.not_found?
         end
       end
@@ -83,14 +92,6 @@ module Curator
       def _find_key_by_index(bucket, index_name, query)
         bucket.get_index("#{index_name}_bin", query)
       end
-
-      def _normalized_index_data(index_data)
-        if index_data.is_a?(Array)
-          index_data.join(", ")
-        else
-          index_data
-        end
-      end
     end
   end
 end

data/lib/curator/settings_updater.rb

@@ -0,0 +1,62 @@
+module Curator
+  class SettingsUpdater
+    attr_reader :repositories
+    attr_accessor :counter
+
+    def initialize(repositories = Curator.repositories, options = {})
+      @repositories = repositories
+      @verbose = options.fetch(:verbose, true)
+      @logger = options.fetch(:logger, STDOUT)
+      @counter = 0
+    end
+
+    def run!
+      announce "Preparing to apply settings to all repositories..."
+      repositories.each do |repository|
+        next unless repository.settings_uncommitted?
+        announce " * Updating settings for #{repository}...", :finish => false,
+                                                              :header => false
+        if repository.apply_settings!
+          finish
+        else
+          finish "Failed."
+        end
+        self.counter += 1
+      end
+      complete!
+    end
+
+  private
+    attr_reader :logger
+
+    def complete!
+      if any_run?
+        announce "Done!"
+      else
+        announce "Nothing to do."
+      end
+    end
+
+    def announce(msg, options = {})
+      return unless verbose?
+      finish = options.fetch(:finish, true)
+      header = options.fetch(:header, true)
+      logger.write "[Curator] " if header
+      logger.write msg
+      logger.write "\n" if finish
+    end
+
+    def finish(msg = "Done!")
+      return unless verbose?
+      logger.write " #{msg}\n"
+    end
+
+    def verbose?
+      @verbose
+    end
+
+    def any_run?
+      counter > 0
+    end
+  end
+end

metadata

@@ -1,86 +1,78 @@
 --- !ruby/object:Gem::Specification
 name: curator
 version: !ruby/object:Gem::Version
-  version: 0.10.0
-  prerelease: 
+  version: 0.11.0
 platform: ruby
 authors:
 - Braintree
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: riak-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.4.3
 description: Model and repository framework
 email: code@getbraintree.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/curator.rb
 - lib/curator/configuration.rb
 - lib/curator/memory/configuration.rb
 - lib/curator/memory/data_store.rb
@@ -91,43 +83,38 @@ files:
 - lib/curator/mongo/data_store.rb
 - lib/curator/railtie.rb
 - lib/curator/repository.rb
+- lib/curator/repository/settings.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
+- lib/curator/settings_updater.rb
 - lib/rails/generators/curator/model/model_generator.rb
 - lib/rails/generators/curator/model/templates/model.rb
 - lib/rails/generators/curator/repository/repository_generator.rb
 - lib/rails/generators/curator/repository/templates/repository.rb
 homepage: http://github.com/braintree/curator
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 12316657956024539
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 12316657956024539
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Model and repository framework
 test_files: []