curator 0.3.2 → 0.4.0

data/lib/curator/memory/configuration.rb

@@ -0,0 +1,9 @@
+module Curator::Memory
+  class Configuration
+    include Curator::Configuration
+
+    def data_store
+      Curator::Memory::DataStore
+    end
+  end
+end

data/lib/curator/memory/data_store.rb

@@ -0,0 +1,100 @@
+require 'ostruct'
+
+module Curator
+  module Memory
+    class DataStore
+      def self.remove_all_keys
+        @data = {}
+      end
+      class << self
+        alias :reset! :remove_all_keys
+      end
+
+      def self.save(options)
+        bucket = _bucket_name(options[:collection_name])
+        object = options[:value]
+        key = options[:key]
+        indexed_values = options.fetch(:index, {})
+
+        key = _generate_key(bucket) unless key
+
+        _records(bucket).store(key, object)
+        indexed_values.each do |index_name, indexed_value|
+          index = _index(bucket, index_name)
+          index[indexed_value] ||= []
+          index[indexed_value] << key unless index[indexed_value].include?(key)
+        end
+
+        OpenStruct.new(:key => key)
+      end
+
+      def self.delete(collection_name, key)
+        bucket = _bucket_name(collection_name)
+        _records(bucket).delete(key)
+        _indices(bucket).each_key do |name|
+          index = _index(bucket, name)
+          index.each do |value, keys|
+            next unless keys.include?(key)
+            index[value].delete(key)
+          end
+          index.delete_if { |value, keys| keys.empty? }
+        end
+      end
+
+      def self.find_by_key(collection_name, key)
+        bucket = _bucket_name(collection_name)
+        value = _records(bucket).fetch(key, nil)
+        return if value.nil?
+        {:key => key, :data => value}
+      end
+
+      def self.find_by_index(collection_name, index_name, query)
+        return [] if query.nil?
+        bucket = _bucket_name(collection_name)
+        index = _index(bucket, index_name)
+        keys = case query
+               when Range
+                 keys = index.keys.select do |key|
+                   key.between?(query.first, query.last)
+                 end
+                 index.values_at(*keys).flatten
+               else
+                 index.fetch(query, [])
+               end
+        keys.map do |key|
+          find_by_key(collection_name, key)
+        end
+      end
+
+      def self._data
+        @data ||= {}
+      end
+
+      def self._bucket(bucket)
+        _data[bucket] ||= {}
+      end
+
+      def self._records(bucket)
+        _bucket(bucket)[:records] ||= {}
+      end
+
+      def self._indices(bucket)
+        _bucket(bucket)[:indices] ||= {}
+      end
+
+      def self._index(bucket, index_name)
+        _indices(bucket)[index_name] ||= {}
+      end
+
+      def self._generate_key(bucket)
+        keys = _records(bucket).keys
+        keys = [0] if keys.empty?
+        keys.max.next
+      end
+
+      def self._bucket_name(name)
+        "#{Curator.config.environment}:#{name}"
+      end
+    end
+  end
+end

data/lib/curator/model.rb

@@ -7,13 +7,15 @@ module Curator
     include ActiveModel::Conversion
 
     included do
-      attr_accessor :created_at, :updated_at
+      attr_reader :created_at, :updated_at
       attr_writer :version
     end
 
     def initialize(args = {})
+      method_strings = methods.map(&:to_s)
       args.each do |attribute, value|
-        send("#{attribute}=", value) if respond_to?("#{attribute}=")
+        send("#{attribute}=", value) if method_strings.include?("#{attribute}=")
+        instance_variable_set("@#{attribute}", value) if method_strings.include?(attribute.to_s)
       end
     end
 
@@ -21,6 +23,12 @@ module Curator
       id.present?
     end
 
+    def touch
+      now = Time.now.utc
+      @created_at = now if @created_at.nil?
+      @updated_at = now
+    end
+
     def version
       @version || self.class.version
     end

data/lib/curator/mongo/configuration.rb

@@ -0,0 +1,11 @@
+module Curator::Mongo
+  class Configuration
+    include Curator::Configuration
+
+    attr_accessor :database, :mongo_config_file
+
+    def data_store
+      Curator::Mongo::DataStore
+    end
+  end
+end

data/lib/curator/mongo/data_store.rb

@@ -0,0 +1,76 @@
+require 'mongo'
+require 'yaml'
+
+module Curator
+  module Mongo
+    class DataStore
+      def self.client
+        return @client if @client
+        config = YAML.load(File.read(Curator.config.mongo_config_file))[Curator.config.environment]
+        host = config.delete(:host)
+        port = config.delete(:port)
+        @client = ::Mongo::Connection.new(host, port, config)
+      end
+
+      def self.remove_all_keys
+        self.reset!
+      end
+
+      def self.reset!
+        _db.collections.each {|coll| coll.drop unless coll.name =~ /system/ }
+      end
+
+      def self.save(options)
+        collection = _collection options[:collection_name]
+        key = options.delete(:key)
+        document = options[:value]
+        document.merge!({:_id => key}) unless key.nil?
+        options.fetch(:index, {}).each do |index_name, index_value|
+          collection.ensure_index index_name
+        end
+        object_id = collection.save document
+        Hash[:key => object_id]
+      end
+
+      def self.delete(collection_name, id)
+        collection = _collection(collection_name)
+        collection.remove(:_id => id)
+      end
+
+      def self.find_by_index(collection_name, field, query)
+        return [] if query.nil?
+        
+        collection = _collection(collection_name)
+        documents = collection.find(field.to_sym => query)
+        documents.map {|doc| normalize_document(doc) }
+      end
+
+      def self.find_by_key(collection_name, id)
+        collection = _collection(collection_name)
+        document = collection.find_one({:_id => id})
+        normalize_document(document) unless document.nil?
+      end
+
+      def self._collection(name)
+        _db.collection(name)
+      end
+
+      def self._collection_name(name)
+        _db.collection(name).name
+      end
+
+      def self._db
+        client.db(_db_name)
+      end
+
+      def self._db_name
+        "#{Curator.config.database}:#{Curator.config.environment}"
+      end
+
+      def self.normalize_document(doc)
+        key = doc.delete '_id'
+        Hash[:key => key, :data => doc]
+      end
+    end
+  end
+end

data/lib/curator/repository.rb

@@ -59,7 +59,7 @@ module Curator
       end
 
       def save(object)
-        _update_timestamps(object)
+        object.touch
         save_without_timestamps(object)
       end
 
@@ -74,7 +74,7 @@ module Curator
           hash[:key] = object.id
           data_store.save(hash)
         else
-          object.id = data_store.save(hash).key
+          object.instance_variable_set("@id", data_store.save(hash).key)
         end
       end
 
@@ -83,7 +83,8 @@ module Curator
       end
 
       def _build_finder_methods(field_name)
-        singleton_class.class_eval do
+        eigenclass = class << self; self; end
+        eigenclass.class_eval do
           define_method("find_by_#{field_name}") do |value|
             _find_by_index(collection_name, field_name, value)
           end
@@ -108,11 +109,10 @@ module Curator
       def _deserialize(id, data)
         attributes = data.with_indifferent_access
         migrated_attributes = migrator.migrate(attributes)
-        object = deserialize(migrated_attributes)
-        object.id = id
-        object.created_at = Time.parse(attributes[:created_at]) if attributes[:created_at].present?
-        object.updated_at = Time.parse(attributes[:updated_at]) if attributes[:updated_at].present?
-        object
+        migrated_attributes[:id] = id
+        migrated_attributes[:created_at] = Time.parse(migrated_attributes[:created_at]) if migrated_attributes[:created_at]
+        migrated_attributes[:updated_at] = Time.parse(migrated_attributes[:updated_at]) if migrated_attributes[:updated_at]
+        deserialize(migrated_attributes)
       end
 
       def _format_time_for_index(time)

data/lib/curator/riak/data_store.rb

@@ -23,7 +23,7 @@ module Curator
       def self.save(options)
         bucket = _bucket(options[:collection_name])
         object = ::Riak::RObject.new(bucket, options[:key])
-        object.content_type = "application/json"
+        object.content_type = options.fetch(:content_type, "application/json")
         object.data = options[:value]
         options.fetch(:index, {}).each do |index_name, index_value|
           object.indexes["#{index_name}_bin"] << index_value

data/lib/curator.rb

@@ -5,10 +5,6 @@ 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
@@ -17,8 +13,10 @@ module Curator
   end
 
   def self.configure(data_store, &block)
-    path = "curator/#{data_store.to_s}/configuration"
-    @config = path.camelize.constantize.new
+    configuration_path = "curator/#{data_store.to_s}/configuration"
+    require configuration_path
+    require "curator/#{data_store}/data_store"
+    @config = configuration_path.camelize.constantize.new
     yield(@config) if block_given?
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curator
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-01 00:00:00.000000000 Z
+date: 2012-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70151605211180 !ruby/object:Gem::Requirement
+  requirement: &70259654638820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70151605211180
+  version_requirements: *70259654638820
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70151605210700 !ruby/object:Gem::Requirement
+  requirement: &70259654637640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70151605210700
+  version_requirements: *70259654637640
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70151605210300 !ruby/object:Gem::Requirement
+  requirement: &70259654636680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70151605210300
+  version_requirements: *70259654636680
 - !ruby/object:Gem::Dependency
   name: riak-client
-  requirement: &70151605209760 !ruby/object:Gem::Requirement
+  requirement: &70259654634820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70151605209760
+  version_requirements: *70259654634820
 description: Model and repository framework
 email: code@getbraintree.com
 executables: []
@@ -62,9 +62,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/curator/configuration.rb
+- lib/curator/memory/configuration.rb
+- lib/curator/memory/data_store.rb
 - lib/curator/migration.rb
 - lib/curator/migrator.rb
 - lib/curator/model.rb
+- lib/curator/mongo/configuration.rb
+- lib/curator/mongo/data_store.rb
 - lib/curator/railtie.rb
 - lib/curator/repository.rb
 - lib/curator/resettable_riak/configuration.rb
@@ -92,7 +96,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