curator 0.4.0 → 0.5.0

data/lib/curator/memory/data_store.rb

@@ -25,7 +25,7 @@ module Curator
           index[indexed_value] << key unless index[indexed_value].include?(key)
         end
 
-        OpenStruct.new(:key => key)
+        key
       end
 
       def self.delete(collection_name, key)

data/lib/curator/mongo/data_store.rb

@@ -28,8 +28,7 @@ module Curator
         options.fetch(:index, {}).each do |index_name, index_value|
           collection.ensure_index index_name
         end
-        object_id = collection.save document
-        Hash[:key => object_id]
+        collection.save document
       end
 
       def self.delete(collection_name, id)
@@ -39,9 +38,11 @@ module Curator
 
       def self.find_by_index(collection_name, field, query)
         return [] if query.nil?
-        
+
+        exp = {}
+        exp[field] = query
         collection = _collection(collection_name)
-        documents = collection.find(field.to_sym => query)
+        documents = collection.find(_normalize_query(exp))
         documents.map {|doc| normalize_document(doc) }
       end
 
@@ -71,6 +72,18 @@ module Curator
         key = doc.delete '_id'
         Hash[:key => key, :data => doc]
       end
+
+      def self._normalize_query(query)
+        query.inject({}) do |hash, (key, value)|
+          case value
+          when Range
+            hash[key] = {'$gte' => value.first, '$lt' => value.last}
+          else
+            hash[key] = value
+          end
+          hash
+        end
+      end
     end
   end
 end

data/lib/curator/repository.rb

@@ -74,8 +74,10 @@ module Curator
           hash[:key] = object.id
           data_store.save(hash)
         else
-          object.instance_variable_set("@id", data_store.save(hash).key)
+          object.instance_variable_set("@id", data_store.save(hash))
         end
+
+        object
       end
 
       def serialize(object)

data/lib/curator/resettable_riak/data_store.rb

@@ -35,15 +35,15 @@ module Curator
       end
 
       def self.save(options)
-        result = super
+        key = super
 
         unless @exclude_from_reset
           @bucket_names ||= {}
           @bucket_names[options[:collection_name]] ||= []
-          @bucket_names[options[:collection_name]] << result.key
+          @bucket_names[options[:collection_name]] << key
         end
 
-        result
+        key
       end
     end
   end

data/lib/curator/riak/data_store.rb

@@ -28,7 +28,8 @@ module Curator
         options.fetch(:index, {}).each do |index_name, index_value|
           object.indexes["#{index_name}_bin"] << index_value
         end
-        object.store
+        result = object.store
+        result.key
       end
 
       def self.find_by_key(bucket_name, key)

data/lib/rails/generators/curator/model/model_generator.rb

@@ -0,0 +1,19 @@
+require 'rails/generators/named_base'
+
+module Curator
+  module Generators
+    class ModelGenerator < Rails::Generators::NamedBase
+      desc 'Creates a Curator model in app/models'
+      argument :attributes, :type => :array, :default => [], :banner => "field field"
+      check_class_collision
+
+      source_root File.expand_path("../templates", __FILE__)
+
+      def create_model_file
+        template 'model.rb', File.join('app/models', class_path, "#{file_name}.rb")
+      end
+
+      hook_for :test_framework
+    end
+  end
+end

data/lib/rails/generators/curator/model/templates/model.rb

@@ -0,0 +1,8 @@
+<% module_namespacing do -%>
+class <%= class_name %>
+  include Curator::Model
+<% unless attributes.empty? -%>
+  attr_accessor <%= attributes.map {|a| ":#{a.name}" }.join(', ') %>
+<% end -%>
+end
+<% end -%>

data/lib/rails/generators/curator/repository/repository_generator.rb

@@ -0,0 +1,19 @@
+require 'rails/generators/named_base'
+
+module Curator
+  module Generators
+    class RepositoryGenerator < Rails::Generators::NamedBase
+      desc 'Creates a Curator repository in app/repositories'
+      argument :attributes, :type => :array, :default => [], :banner => "field field"
+      check_class_collision :suffix => 'Repository'
+
+      source_root File.expand_path("../templates", __FILE__)
+
+      def create_model_file
+        template 'repository.rb', File.join('app/repositories', class_path, "#{file_name}.rb")
+      end
+
+      hook_for :test_framework
+    end
+  end
+end

data/lib/rails/generators/curator/repository/templates/repository.rb

@@ -0,0 +1,8 @@
+<% module_namespacing do -%>
+class <%= class_name %>Repository
+  include Curator::Repository
+<% unless attributes.empty? -%>
+  indexed_fields <%= attributes.map {|a| ":#{a.name}" }.join(', ') %>
+<% end -%>
+end
+<% end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curator
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000 Z
+date: 2012-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70259654638820 !ruby/object:Gem::Requirement
+  requirement: &70105518206320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70259654638820
+  version_requirements: *70105518206320
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70259654637640 !ruby/object:Gem::Requirement
+  requirement: &70105518204680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70259654637640
+  version_requirements: *70105518204680
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70259654636680 !ruby/object:Gem::Requirement
+  requirement: &70105518203680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70259654636680
+  version_requirements: *70105518203680
 - !ruby/object:Gem::Dependency
   name: riak-client
-  requirement: &70259654634820 !ruby/object:Gem::Requirement
+  requirement: &70105526443500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70259654634820
+  version_requirements: *70105526443500
 description: Model and repository framework
 email: code@getbraintree.com
 executables: []
@@ -76,6 +76,10 @@ files:
 - lib/curator/riak/configuration.rb
 - lib/curator/riak/data_store.rb
 - lib/curator.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: []
 post_install_message: