dilute 0.0.3 → 0.0.4

data/README.md

@@ -34,8 +34,27 @@ With a class set up you can:
     note = Note.new({data: "whatever"})
     note.save # Stored to ElasticSearch
     Note.find(note.id) # fetches that stored record
-    Note.all # gets a bunch of notes
-    Note.all({}, 7) # gets noes, limited to 7 instead of the default 10.
+    Note.all # returns a query object, use an enumerable method to get actual records
+    Note.all.each { |n| n.data }
+    # Search with "match"
+    Note.all.match(data: "whatever").each {|n| ... }
+
+ActiveModel stuff: You can do callbacks on save and use ActiveModel validations.
+
+    class Note
+      include Dilute::Modelize
+
+      validates_presense_of :data
+      before_save :hi
+
+      def hi
+        puts "Hi, you're about to save a note!"
+      end
+
+      define_type do
+        attribute(:data).not_indexed
+      end
+    end
 
 ## Contributing
 

data/lib/dilute/modelize.rb

@@ -1,16 +1,27 @@
 require "active_support/concern"
 require "active_model/naming"
-require 'active_support/core_ext/string'
+require "active_support/core_ext/string"
+require "active_model/callbacks"
+require "active_model/validations"
+require "active_model/translation"
+
 
 module Dilute::Modelize
   extend ActiveSupport::Concern
 
   included do
     attr_reader :attributes
-    extend ActiveModel::Naming
+    extend  ActiveModel::Naming
+    extend  ActiveModel::Callbacks
+    include ActiveModel::Validations
+    define_model_callbacks :save
   end
 
   module ClassMethods
+    def refresh
+      type.server.refresh
+    end
+
     def name
       super || "DefaultDilutedModel"
     end
@@ -72,15 +83,19 @@ module Dilute::Modelize
   end
 
   def save
-    if id
-      type.put(id, attributes_without_elasticsearch_vars)
-    else
-      results = type.post(attributes_without_elasticsearch_vars)
-      if results["ok"] == true
-        attributes.merge!(results)
-      else
-        puts "Something went wrong!"
-        puts "attributes: #{attributes}"
+    run_callbacks :save do
+      if valid?
+        if id
+          type.put(id, attributes_without_elasticsearch_vars)
+        else
+          results = type.post(attributes_without_elasticsearch_vars)
+          if results["ok"] == true
+            attributes.merge!(results)
+          else
+            puts "Something went wrong!"
+            puts "attributes: #{attributes}"
+          end
+        end
       end
     end
   end

data/lib/dilute/version.rb

@@ -1,3 +1,3 @@
 module Dilute
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/modelize_integration_spec.rb

@@ -7,6 +7,9 @@ describe Dilute::Modelize do
     Class.new do
       include Dilute::Modelize
 
+      before_save :a_callback
+      def a_callback ; true ; end
+
       define_type(type_name: :abstract) do
         attribute(:data).not_indexed
         attribute(:header).not_indexed
@@ -20,6 +23,29 @@ describe Dilute::Modelize do
   let(:new_diluted) { dilute_class.new({data: test_data}) }
   let(:saved) { new_diluted.save ; new_diluted }
 
+  context "validations" do
+    let(:dilute_class) do
+      Class.new do
+        include Dilute::Modelize
+
+        validates_presence_of :data
+
+        define_type(type_name: :abstract) do
+          attribute(:data).not_indexed
+        end
+      end
+    end
+
+    it "should validate" do
+      expect(dilute_class.new).not_to be_valid
+    end
+
+    it "should not save invalid record" do
+      destroy_test_index!
+      expect(dilute_class.new.save).to be_false
+    end
+  end
+
   it "should have accessors for new object" do
     expect(new_diluted.data).to eq(test_data)
   end
@@ -36,15 +62,13 @@ describe Dilute::Modelize do
 
   it "I have no idea what I'm doing." do
     true
-    # That's why you see the sleep 1s and such.
   end
 
   context "searching" do
     before { destroy_test_index! }
     it "should find docs" do
-      destroy_test_index!
       saved
-      sleep 1
+      dilute_class.refresh
       all = dilute_class.all
       expect(all.to_a).to have(1).item
       expect(all.first.data).to eq(test_data)
@@ -53,7 +77,7 @@ describe Dilute::Modelize do
     it "should find docs matching pattern" do
       dilute_class.new({keys: %w(taga tagb tagc)}).save
       dilute_class.new({keys: %w(tagb tagc)}).save
-      sleep 1
+      dilute_class.refresh
       search = dilute_class.all.match(keys: "taga")
       expect(search.to_a).to have(1).item
     end
@@ -61,7 +85,7 @@ describe Dilute::Modelize do
     it "should find docs matching very short word" do
       dilute_class.new({keys: %w(a)}).save
       dilute_class.new({keys: %w(b)}).save
-      sleep 1
+      dilute_class.refresh
       search = dilute_class.all.match(keys: "a")
       expect(search.to_a).to have(1).item
     end
@@ -89,4 +113,13 @@ describe Dilute::Modelize do
     end
   end
 
+  context "callbacks" do
+    it "should not save when callback is false" do
+      destroy_test_index!
+      def new_diluted.a_callback ; false ; end
+      expect(new_diluted.save).to be_false
+      dilute_class.refresh
+      expect(dilute_class.all.first).to be_nil
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -19,12 +19,26 @@ end
 require "dilute"
 
 def destroy_test_index!
+  refresh_server!
+  all = all_records
+  test_index.bulk_delete(all) if all.any?
+  refresh_server!
+end
+
+def refresh_server!
+  test_server.refresh
+end
+
+def all_records
+  test_index.search(query: {match_all: {}}).results
+end
+
+def test_server
   require "stretcher"
-  server = Stretcher::Server.new("http://localhost:9200", log_level: :info)
-  index  = server.index("default_dilute_index_name")
-  begin
-    index.delete
-  rescue Stretcher::RequestError::NotFound
-    # Index didn't exist to begin with.
-  end
+  @server ||= Stretcher::Server.new("http://localhost:9200", log_level: :info)
+end
+
+def test_index
+  return @index if @index
+  @index  = test_server.index("default_dilute_index_name")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dilute
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stretcher
@@ -163,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3890611216473297716
+      hash: 2531018883342757898
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -172,10 +172,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3890611216473297716
+      hash: 2531018883342757898
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: An ActiveRecord-ish thing for using ElasticSearch through Stretcher.