motion-yapper 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a84ae5876199c1963faf27d9b340e08f58098b38
-  data.tar.gz: ff44ac1c1dfc0d9f52f346de7c3f1610c5cc5f65
+  metadata.gz: 133d9cff7840b8a1c1a70098049e100612623055
+  data.tar.gz: 9954e0b565b25580d172ac9956dd0ee96f43a12f
 SHA512:
-  metadata.gz: 7cea8c8b4460163e19a71dc9ec12d6d140f6c60c23a297d2cf1059f8bb9e7bfd7acf98791889cdb2b89bdb19b35f2d62f14c51cf045da662ca61a7bdbea7672b
-  data.tar.gz: 73bafc0b2a32159fcc14a4f883fb576d8f62f29da48931c6237d6202cc174fdead933d992093011e67208e8c906de57146b2487add1b0d162640fd48b0e51b29
+  metadata.gz: ce2518d510fa13cea0466ef3feded4055e0ef84de0c9530b9adce79fd6e534867b128322dd143d781f9a0278ebfd9db3a23cce72b1db44638dd0ee43bef90b81
+  data.tar.gz: 4445aa7414f9012b418f1b9058e3fd17ebd301a6fb6e4f87b6f82f188af48717cdbf30bde261665645cb6aec05874518bccad40131d37f6641658233da5eaed4

data/.gitignore

@@ -18,3 +18,4 @@ tags
 .ruby-gemset
 Gemfile.lock
 vendor/YapDatabaseRubyMotion/build*
+vendor/Pods

data/.travis.yml

@@ -1,8 +1,10 @@
 language: objective-c
 before_install:
     - (ruby --version)
-    - mkdir -p ~/Library/RubyMotion/build
+    - sudo chown -R travis ~/Library/RubyMotion
+    - sudo mkdir -p ~/Library/RubyMotion/build
     - sudo motion update
+    - rake pod:install
 install:
   - bundle
 script: bundle exec rake spec

data/lib/yapper.rb

@@ -14,7 +14,7 @@ Motion::Project::App.setup do |app|
   app.detect_dependencies = false
 
   app.pods do
-    pod 'YapDatabase'      ,'~> 2.4'
+    pod 'YapDatabase'      ,'~> 2.5.2'
     pod 'CocoaLumberjack'  ,'~> 1.6.5'
     pod 'NSData+MD5Digest' ,'~> 1.0.0'
   end
@@ -22,7 +22,7 @@ Motion::Project::App.setup do |app|
   yap_patch = File.expand_path(File.join(File.dirname(__FILE__), '../vendor/YapDatabaseRubyMotion'))
   app.vendor_project(yap_patch,
                      :static,
-                     :bridgesupport_cflags => "-I#{Dir.pwd}/vendor/Pods/Headers -fobjc-arc",
-                     :cflags => "-I#{Dir.pwd}/vendor/Pods/Headers -fobjc-arc")
+                     :bridgesupport_cflags => "-I#{Dir.pwd}/vendor/Pods/Headers/Public -fobjc-arc",
+                     :cflags => "-I#{Dir.pwd}/vendor/Pods/Headers/Public -fobjc-arc")
 
 end

data/lib/yapper/db.rb

@@ -24,7 +24,8 @@ class Yapper::DB
   def initialize(options)
     @options = options
     @name = options[:name]
-    @indexes = {}; @indexes_created = false
+    @indexes = {}
+    @search_indexes = {}
 
     self
   end
@@ -37,6 +38,7 @@ class Yapper::DB
     Notifications.track(notifications)
 
     create_indexes!
+    create_search_indexes!
 
     result = nil
     unless self.transaction
@@ -56,8 +58,13 @@ class Yapper::DB
 
   def purge
     Yapper::Settings.purge
+
     @index_creation_required = true
+    @search_index_creation_required = true
+
     create_indexes!
+    create_search_indexes!
+
     execute { |txn| txn.removeAllObjectsInAllCollections }
   end
 
@@ -76,13 +83,26 @@ class Yapper::DB
     @indexes[model._type] ||= {}
 
     args.each do |field|
-      options = model.fields[field]; raise "#{self._type}:#{field} not defined" unless options
-      type    = options[:type];      raise "#{self._type}:#{field} must define type as its indexed" if type.nil?
+      options = model.fields[field]; raise "#{model._type}:#{field} not defined" unless options
+      type    = options[:type];      raise "#{model._type}:#{field} must define type as its indexed" if type.nil?
 
       @indexes[model._type][field] = { :type => type }
     end
   end
 
+  def search_index(model, args=[])
+    options = args.extract_options!
+
+    @search_index_creation_required = true
+    @search_indexes[model._type] ||= []
+
+    args.each do |field|
+      options = model.fields[field]; raise "#{model._type}:#{field} not defined" unless options
+
+      @search_indexes[model._type] << field
+    end
+  end
+
   def connection
     Dispatch.once { @connection ||= db.newConnection }
     @connection
@@ -123,6 +143,8 @@ class Yapper::DB
         end
 
         block = proc do |_dict, _collection, _key, _attrs|
+          next unless _collection == collection
+
           if indexes = @indexes[_collection]
             indexes.each do |field, options|
               field = field.to_s
@@ -149,7 +171,7 @@ class Yapper::DB
           end
         end
 
-        index_block = YapDatabaseSecondaryIndex.alloc.initWithSetup(setup, objectBlock: block, version: 1)
+        index_block = YapDatabaseSecondaryIndex.alloc.initWithSetup(setup, objectBlock: block, versionTag: '1')
         configure do |yap|
           yap.registerExtension(index_block, withName: "#{collection}_IDX")
         end
@@ -159,6 +181,41 @@ class Yapper::DB
     end
   end
 
+  def create_search_indexes!
+    return unless @search_index_creation_required
+
+    @@queue.sync do
+      return unless @search_index_creation_required
+
+      @search_indexes.each do |collection, fields|
+        unless Yapper::Settings.get("#{collection}_sidx_defn") == @search_indexes[collection].to_canonical
+          Yapper::Settings.set("#{collection}_sidx_defn", @search_indexes[collection].to_canonical)
+          configure do|yap|
+            yap.unregisterExtension("#{collection}_SIDX") if yap.registeredExtension("#{collection}_SIDX")
+          end
+        end
+
+        block = proc do |_dict, _collection, _key, _attrs|
+          next unless _collection == collection
+
+          if fields = @search_indexes[_collection]
+            fields.each do |field|
+              field = field.to_s
+              _dict.setObject(_attrs[field].to_s, forKey: field)
+            end
+          end
+        end
+
+        index_block = YapDatabaseFullTextSearch.alloc.initWithColumnNames(fields.map(&:to_s), objectBlock: block, versionTag: '1')
+        configure do |yap|
+          yap.registerExtension(index_block, withName: "#{collection}_SIDX")
+        end
+      end
+
+      @search_index_creation_required = false
+    end
+  end
+
   def version
     Yapper::Settings.db_version || 0
   end

data/lib/yapper/document/persistence.rb

@@ -35,6 +35,10 @@ module Yapper::Document
         db.index(self, args)
       end
 
+      def search_index(*args)
+        db.search_index(self, args)
+      end
+
       def indexes
         db.indexes[self._type]
       end

data/lib/yapper/document/selection.rb

@@ -23,6 +23,19 @@ module Yapper::Document
         all.count
       end
 
+      def search(query)
+        return nil if query.nil?
+
+        results = []
+        each_result_proc = proc do |collection, id, attrs, stop|
+          results << object_for_attrs(attrs)
+        end
+
+        db.execute { |txn| txn.ext("#{self._type}_SIDX").enumerateKeysAndObjectsMatching(query, usingBlock: each_result_proc) }
+
+        results
+      end
+
       def find(id)
         return nil if id.nil?
 

data/lib/yapper/version.rb

@@ -1,3 +1,3 @@
 module Yapper
-  VERSION = '0.0.3'
+  VERSION = '0.1.0'
 end

data/motion-yapper.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.version       = Yapper::VERSION
 
   gem.add_dependency 'motion-support', '~> 0.2.0'
-  gem.add_dependency 'motion-cocoapods', '~> 1.4.0'
+  gem.add_dependency 'motion-cocoapods', '~> 1.6.0'
   gem.add_dependency 'motion-logger', '~> 0.1.0'
   gem.add_development_dependency 'motion-redgreen', '~> 0.1'
 end

data/spec/integration/search_spec.rb

@@ -0,0 +1,111 @@
+describe 'Search' do
+  before do
+    class SearchDocument
+      include Yapper::Document
+
+      field :field1, :type => String
+      field :field2, :type => Integer
+      field :field3, :type => String
+      field :field4, :type => Boolean
+
+      search_index :field1, :field2, :field4
+    end
+    class AnotherSearchDocument
+      include Yapper::Document
+
+      field :field1, :type => String
+      field :field2
+
+      search_index :field1
+    end
+  end
+  before { Yapper::DB.instance.purge }
+  after { Object.send(:remove_const, 'SearchDocument') }
+  after { Object.send(:remove_const, 'AnotherSearchDocument') }
+
+  describe 'when changing the search definition' do
+    it "reindexes the fields" do
+      SearchDocument.create(:field1 => 'field1', :field3 => 'field3')
+
+      SearchDocument.search('field3').should == []
+
+      SearchDocument.class_eval do
+        search_index :field3
+      end
+
+      SearchDocument.search('field3:field3').count.should == 1
+    end
+  end
+
+  # it 'does not allow indexing a Time field'
+
+  describe 'with no documents created' do
+    it 'returns []' do
+      SearchDocument.search('xxx').to_a.should == []
+    end
+  end
+
+  describe 'with documents created' do
+    before do
+      @now = Time.now
+      SearchDocument.create(:field1 => 'field1value', :field2 => 2)
+      SearchDocument.create(:field1 => 'field1value', :field2 => 3)
+      SearchDocument.create(:field1 => 'field1value', :field2 => 4)
+      SearchDocument.create(:field1 => 'othervaluefield1', :field2 => 1)
+      SearchDocument.create(:field4 => true)
+      AnotherSearchDocument.create(:field1 => 'field1value', :field2 => 2)
+    end
+
+    it 'can search by string' do
+      SearchDocument.search("field1:field1value").count.should == 3
+    end
+
+    it 'can search by integer' do
+      SearchDocument.search("field2:#{2}").count.should == 1
+    end
+
+    it 'can search by boolean' do
+      SearchDocument.search('field4:true').count.should == 1
+      SearchDocument.search('field5:false').count.should == 0
+    end
+
+    it 'returns [] when looking up a non-existant doc' do
+      SearchDocument.search('field1:xxx').to_a.should == []
+    end
+
+    it 'can select docments matching on multiple fields' do
+      SearchDocument.search("field1:field1value field2:2").to_a.count.should == 1
+    end
+
+    describe 'when documents are updated' do
+      before do
+        SearchDocument.search("field1:field1value").each { |doc| doc.update_attributes(:field1 => 'field1valueupdated', :field2 => 10) }
+      end
+
+      it 'searches by the updated values' do
+        SearchDocument.search("field1:field1value").count.should == 0
+        SearchDocument.search("field1:field1valueupdated field2:10").count.should == 3
+      end
+    end
+  end
+
+  describe 'when a document is created without all fields being set' do
+    before do
+      SearchDocument.create(:field1 => 'field1value')
+    end
+
+    it 'searches by the field' do
+      SearchDocument.search("field1:field1value").count.should == 1
+    end
+
+    describe 'when the document is updated to set a field that was not set before' do
+      before do
+        SearchDocument.search("field1:field1value").first.update_attributes(:field2 => 10)
+      end
+
+      it 'searches by the updated field' do
+        SearchDocument.search("field2:10").count.should == 1
+      end
+    end
+  end
+end

data/vendor/Podfile.lock

@@ -5,18 +5,22 @@ PODS:
   - CocoaLumberjack/Extensions (1.8.1):
     - CocoaLumberjack/Core
   - NSData+MD5Digest (1.0.0)
-  - YapDatabase (2.4):
-    - CocoaLumberjack (~> 1.6.3)
+  - YapDatabase (2.5.2):
+    - YapDatabase/standard
+  - YapDatabase/common (2.5.2):
+    - CocoaLumberjack (~> 1)
+  - YapDatabase/standard (2.5.2):
+    - YapDatabase/common
 
 DEPENDENCIES:
   - CocoaLumberjack
   - CocoaLumberjack (~> 1.6.5)
   - NSData+MD5Digest (~> 1.0.0)
-  - YapDatabase (~> 2.4)
+  - YapDatabase (~> 2.5.2)
 
 SPEC CHECKSUMS:
-  CocoaLumberjack: 020378ec400d658923bf5887178394f65f052c90
-  NSData+MD5Digest: 8275479b2a935e6caa8a92a9a814fb5abecba367
-  YapDatabase: 3e1159ee9540859342bf2869a86dd9e434548c45
+  CocoaLumberjack: 9d198d6e19909b3b113a38c5f06f7bb8eedd0427
+  NSData+MD5Digest: 3662c71c33c32cac0302dce76df6df7a6d81acca
+  YapDatabase: 50f763e49374c38025e8255b4c468d26d81b1048
 
-COCOAPODS: 0.29.0
+COCOAPODS: 0.34.4

data/vendor/YapDatabaseRubyMotion/YapDatabaseRubyMotion.bridgesupport

@@ -1,7 +1,21 @@
 <?xml version='1.0'?>
 <signatures version='1.0'>
+<class name='YapDatabaseFullTextSearch'>
+<method selector='initWithColumnNames:objectBlock:versionTag:'>
+<arg declared_type='NSArray*' index='0' name='columnNames' type='@'/>
+<arg declared_type='YapDatabaseFullTextSearchWithObjectBlock' function_pointer='true' index='1' name='block' type='@?'>
+<arg declared_type='NSMutableDictionary*' type='@'/>
+<arg declared_type='NSString*' type='@'/>
+<arg declared_type='NSString*' type='@'/>
+<arg declared_type='id' type='@'/>
+<retval declared_type='void' type='v'/>
+</arg>
+<arg declared_type='NSString*' index='2' name='versionTag' type='@'/>
+<retval declared_type='id' type='@'/>
+</method>
+</class>
 <class name='YapDatabaseSecondaryIndex'>
-<method selector='initWithSetup:objectBlock:version:'>
+<method selector='initWithSetup:objectBlock:versionTag:'>
 <arg declared_type='YapDatabaseSecondaryIndexSetup*' index='0' name='setup' type='@'/>
 <arg declared_type='YapDatabaseSecondaryIndexWithObjectBlock' function_pointer='true' index='1' name='block' type='@?'>
 <arg declared_type='NSMutableDictionary*' type='@'/>
@@ -10,7 +24,7 @@
 <arg declared_type='id' type='@'/>
 <retval declared_type='void' type='v'/>
 </arg>
-<arg declared_type='int' index='2' name='version' type='i'/>
+<arg declared_type='NSString*' index='2' name='versionTag' type='@'/>
 <retval declared_type='id' type='@'/>
 </method>
 </class>

data/vendor/YapDatabaseRubyMotion/YapDatabaseRubyMotion.h

@@ -2,13 +2,16 @@
  
 @interface YapDatabaseSecondaryIndex (RubyMotionBlockTypeWrapper)
  
-// Here we define the prototype of our wrapper method that explicitly
-// states what the type signature of the block argument will be.
-//
-// This will give the RubyMotion compiler enough information to ‘do
-// the right thing’.
 - (id)initWithSetup:(YapDatabaseSecondaryIndexSetup *)setup
         objectBlock:(YapDatabaseSecondaryIndexWithObjectBlock)block
-            version:(int)version;
- 
+         versionTag:(NSString *)versionTag;
+@end
+
+#import <YapDatabase/YapDatabaseFullTextSearch.h>
+
+@interface YapDatabaseFullTextSearch (RubyMotionBlockTypeWrapper)
+
+  - (id)initWithColumnNames:(NSArray *)columnNames
+                objectBlock:(YapDatabaseFullTextSearchWithObjectBlock)block
+                 versionTag:(NSString *)versionTag;
 @end

data/vendor/YapDatabaseRubyMotion/YapDatabaseRubyMotion.m

@@ -11,12 +11,30 @@
 // ‘aliasing’ the method (although we do change the interface).
 - (id)initWithSetup:(YapDatabaseSecondaryIndexSetup *)setup
         objectBlock:(YapDatabaseSecondaryIndexWithObjectBlock)block
-            version:(int)version;
+         versionTag:(NSString *)versionTag;
 {
   return [self initWithSetup:setup
                        block:block
                    blockType:YapDatabaseSecondaryIndexBlockTypeWithObject
-                     version:version];
+                   versionTag:versionTag];
+}
+ 
+@end
+
+@implementation YapDatabaseFullTextSearch (RubyMotionBlockTypeWrapper)
+ 
+// Here we define the implementation that does nothing else than forward
+// the method call to the normal library’s API. You could say we are
+// ‘aliasing’ the method (although we do change the interface).
+  - (id)initWithColumnNames:(NSArray *)columnNames
+                objectBlock:(YapDatabaseFullTextSearchWithObjectBlock)block
+                 versionTag:(NSString *)versionTag;
+{
+
+  return [self initWithColumnNames:columnNames
+                             block:block
+                         blockType:YapDatabaseFullTextSearchBlockTypeWithObject
+                        versionTag:versionTag];
 }
  
 @end