motion-yapper 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3220185888e67be062af7600cb81346cdb6af641
-  data.tar.gz: 9484efc4e0bc1ac6b2f2da5c271bc7d7bd2849b2
+  metadata.gz: 7395ef1251cdd8864f3acb18c0a151766fd10835
+  data.tar.gz: 121948cad3cc4af4fa4e4ae0b8d6e979610eb645
 SHA512:
-  metadata.gz: 4db43401b1dbe80f9b8700a4f3ac0fbcf48431f6945920bd0e9d67c5b6206409464572af6b8ebbdcfe816fabb8f6479a96a50ec3e643cd1af1e5c5d5cdd79216
-  data.tar.gz: 2f48add1d5a952009a13a6df7e2bd5ee1890a3f0f73a74bfd14b5cdb41b1e6ef141ffc1683751943021a0b471f4b6a90f54165dfdff16a9c5bb6467c11cdcfac
+  metadata.gz: 6675d2d18eaef05d80678a3f22edc55ac5d4a908ee9b66c621ea31c9a7a4bd1048a0b02dd69e95ad7c02d064e0d6d97f57b4ec45e84d0fe99f12a166f302891b
+  data.tar.gz: a174b03c1edbb8ae5099e571ce9e8595e9fc2044384f176071777aeb911d4afcda3a7fc3f9d3dbb16a868a83cad22cd48c1c7d07645230024efda2d7c56662a0

data/.gitignore

@@ -14,7 +14,7 @@ resources/*.momd
 resources/*.nib
 resources/*.storyboardc
 tags
-vendor/*/.build
-vendor/*/build-*
 .ruby-version
 .ruby-gemset
+Gemfile.lock
+vendor/YapDatabaseRubyMotion/build*

data/.travis.yml

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

data/Gemfile

@@ -2,4 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in gemspec
 gem 'rake'
+gem 'bubble-wrap'
 gemspec

data/README.md

@@ -1,4 +1,4 @@
-yapper [![Build Status](https://travis-ci.org/kareemk/yapper.png?branch=master)](https://travis-ci.org/kareemk/nanoid)
+yapper [![Build Status](https://travis-ci.org/kareemk/yapper.png?branch=master)](https://travis-ci.org/kareemk/yapper)
 ======
 
 RubyMotion ORM for YapDatabase

data/Rakefile

@@ -4,7 +4,7 @@ require 'motion/project/template/ios'
 require 'motion-cocoapods'
 require 'motion-logger'
 require 'motion-redgreen'
-require 'webstub'
+require 'bubble-wrap/core'
 require 'yapper'
 
 Motion::Project::App.setup do |app|

data/lib/motion-yapper.rb

@@ -0,0 +1 @@
+require 'yapper'

data/lib/yapper.rb

@@ -14,9 +14,7 @@ Motion::Project::App.setup do |app|
   app.detect_dependencies = false
 
   app.pods do
-    pod 'YapDatabase'      ,'~> 2.3'
-    pod 'AFNetworking'     ,'~> 1.3.3'
-    pod 'Reachability'     ,'~> 3.1.1'
+    pod 'YapDatabase'      ,'~> 2.4'
     pod 'CocoaLumberjack'  ,'~> 1.6.5'
     pod 'NSData+MD5Digest' ,'~> 1.0.0'
   end
@@ -24,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../Pods/Headers -fobjc-arc',
-                     :cflags => '-I../Pods/Headers -fobjc-arc')
+                     :bridgesupport_cflags => "-I#{Dir.pwd}/vendor/Pods/Headers -fobjc-arc",
+                     :cflags => "-I#{Dir.pwd}/vendor/Pods/Headers -fobjc-arc")
 
 end

data/lib/yapper/config.rb

@@ -1,3 +1,5 @@
+motion_require 'yapper'
+
 module Yapper::Config
   COLLECTION = '_config'
   extend self

data/lib/yapper/db.rb

@@ -33,57 +33,74 @@ class Yapper::DB
     block.call(db)
   end
 
-  def execute(&block)
+  def execute(notifications={}, &block)
+    Notifications.track(notifications)
+
     create_indexes!
 
-    exception = nil; result = nil
-    unless self.txn
-      txn_proc = proc do |_txn|
-        self.txn = _txn
-        begin
-          result = block.call(txn)
-        rescue Exception => e
-          self.txn.rollback
-          exception = e
-        ensure
-          self.txn = nil
-        end
+    result = nil
+    unless self.transaction
+      self.transaction = Transaction.new(self)
+      begin
+        result = transaction.run(&block)
+      ensure
+        self.transaction = nil
       end
-      connection.readWriteWithBlock(txn_proc)
-
+      Notifications.trigger
     else
-      result = block.call(self.txn)
+      result = block.call(self.transaction.txn)
     end
 
-    raise exception if exception
     result
   end
 
   def purge
-    create_indexes!(true)
+    Yapper::Settings.purge
+    @index_creation_required = true
+    create_indexes!
     execute { |txn| txn.removeAllObjectsInAllCollections }
   end
 
-  def txn=(txn)
-    Thread.current[:yapper_txn] = txn
+  def transaction=(transaction)
+    Thread.current[:yapper_transaction] = transaction
+  end
+
+  def transaction
+    Thread.current[:yapper_transaction]
+  end
+
+  def index(model, args=[])
+    options = args.extract_options!
+
+    @index_creation_required = true
+    @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?
+
+      @indexes[model._type][field] = { :type => type }
+    end
   end
 
-  def txn
-    Thread.current[:yapper_txn]
+  def connection
+    Dispatch.once { @connection ||= db.newConnection }
+    @connection
   end
 
-  def index(collection, field, type)
-    @indexes[collection] ||= {}
-    @indexes[collection][field] = { :type => type }
+  def db
+    Dispatch.once { @db ||= YapDatabase.alloc.initWithPath(document_path) }
+    @db
   end
 
+
   private
 
-  def create_indexes!(force=false)
-    return if @indexes_created && !force
+  def create_indexes!
+    return unless @index_creation_required
 
     @@queue.sync do
-      return if @indexes_created && !force
+      return unless @index_creation_required
 
       @indexes.each do |collection, fields|
         setup = YapDatabaseSecondaryIndexSetup.alloc.init
@@ -96,6 +113,8 @@ class Yapper::DB
                    YapDatabaseSecondaryIndexTypeInteger
                  when 'Time'
                    YapDatabaseSecondaryIndexTypeInteger
+                 when 'Boolean'
+                   YapDatabaseSecondaryIndexTypeInteger
                  else
                    raise "Invalid type #{type}"
                  end
@@ -111,6 +130,8 @@ class Yapper::DB
                 value = case options[:type].to_s
                         when 'Time'
                           _attrs[field].to_i
+                        when 'Boolean'
+                          _attrs[field] ? 1 : 0 unless _attrs[field].nil?
                         else
                           _attrs[field]
                         end
@@ -121,31 +142,75 @@ class Yapper::DB
           end
         end
 
-        index_block = YapDatabaseSecondaryIndex.alloc.initWithSetup(setup, objectBlock: block)
+        unless Yapper::Settings.get("#{collection}_idx_defn") == @indexes[collection].to_canonical
+          Yapper::Settings.set("#{collection}_idx_defn", @indexes[collection].to_canonical)
+          configure do|yap|
+            yap.unregisterExtension("#{collection}_IDX") if yap.registeredExtension("#{collection}_IDX")
+          end
+        end
+
+        index_block = YapDatabaseSecondaryIndex.alloc.initWithSetup(setup, objectBlock: block, version: 1)
         configure do |yap|
           yap.registerExtension(index_block, withName: "#{collection}_IDX")
         end
       end
 
-      @indexes_created = true
+      @index_creation_required = false
     end
   end
 
-  def connection
-    Dispatch.once { @connection ||= db.newConnection }
-    @connection
+  def version
+    Yapper::Settings.db_version || 0
   end
 
-  def db
-    Dispatch.once { @db ||= YapDatabase.alloc.initWithPath(document_path) }
-    @db
+  def document_path
+    NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, true)[0] + "/yapper.#{version}.db"
   end
 
-  def version
-    Yapper::Config.db_version || 0
+  class Transaction
+    attr_accessor :txn
+
+    def initialize(db)
+      @db = db
+    end
+
+    def run(&block)
+      result = nil
+      txn_proc = proc do |_txn|
+        @txn = _txn
+        begin
+          result = block.call(@txn)
+        rescue Exception => e
+          @txn.rollback
+          result = e
+        end
+      end
+      @db.connection.readWriteWithBlock(txn_proc)
+
+      raise result if result.is_a?(Exception)
+      result
+    end
   end
 
-  def document_path
-    NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, true)[0] + "/yapper.#{version}.db"
+  class Notifications
+    def self.track(notifications)
+      Thread.current[:yapper_notifications] ||= {}.with_indifferent_access
+      notifications.each do |namespace, instance|
+        Thread.current[:yapper_notifications][namespace] ||= []
+        Thread.current[:yapper_notifications][namespace] << instance
+      end
+    end
+
+    def self.trigger
+      notifications = Thread.current[:yapper_notifications]
+      Thread.current[:yapper_notifications] = nil
+      notifications.each { |namespace, instances| notify(namespace, instances) }
+    end
+
+    private
+
+    def self.notify(namespace, instances)
+      NSNotificationCenter.defaultCenter.postNotificationName("yapper:#{namespace}", object: instances , userInfo: nil)
+    end
   end
 end

data/lib/yapper/document.rb

@@ -2,19 +2,22 @@ motion_require 'extensions'
 motion_require 'db'
 
 module Yapper::Document
-  motion_require 'document/attachment'
   motion_require 'document/callbacks'
-  motion_require 'document/persistance'
+  motion_require 'document/persistence'
   motion_require 'document/relation'
   motion_require 'document/selection'
 
   extend MotionSupport::Concern
 
-  include Persistance
+  include Persistence
   include Selection
   include Callbacks
   include Relation
-  include Attachment
+
+  included do
+    field :id, :type => String
+    index(:id)
+  end
 
   module ClassMethods
     def db

data/lib/yapper/document/callbacks.rb

@@ -67,7 +67,6 @@ module Yapper::Document
 
       callback_proc = Proc.new do
         run_callback('after', operation)
-        notify_callback(operation)
       end
 
       if Yapper::Document::Callbacks.postponed_callbacks
@@ -76,11 +75,5 @@ module Yapper::Document
         callback_proc.call
       end
     end
-
-    private
-
-    def notify_callback(operation)
-      NSNotificationCenter.defaultCenter.postNotificationName("yapper:#{self.model_name}:#{operation}", object: self , userInfo: nil)
-    end
   end
 end

data/lib/yapper/document/{persistance.rb → persistence.rb}

@@ -1,18 +1,16 @@
 module Yapper::Document
-  module Persistance
+  module Persistence
     extend MotionSupport::Concern
 
     included do
       attr_accessor :attributes
       attr_accessor :changes
       attr_accessor :previous_changes
+      attr_reader   :destroyed
 
-      class << self
-        attr_accessor :fields
-      end
+      class_attribute :fields
 
       self.fields = {}.with_indifferent_access
-      field :id
     end
 
     module ClassMethods
@@ -31,19 +29,10 @@ module Yapper::Document
         define_method("#{name}=".to_sym) do |*args, &block|
           self.set_attribute(name, args[0])
         end
-
-        if options[:index]
-          index(name, options[:type])
-        end
       end
 
-      def index(*index_fields)
-        index_fields.each do |field|
-          options = self.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?
-
-          db.index(self._type, field, type)
-        end
+      def index(*args)
+        db.index(self, args)
       end
 
       def indexes
@@ -56,10 +45,13 @@ module Yapper::Document
 
       @new_record = options[:new].nil? ? true : options[:new]
       @changes = {}
+      @queued_saves = []
 
       assign_attributes({:id => generate_id}, options) if @new_record
       assign_attributes(attrs, options)
 
+      set_defaults
+
       self
     end
 
@@ -122,22 +114,27 @@ module Yapper::Document
     end
 
     def save(options={})
-      db.execute do |txn|
+      db.execute("#{self.model_name}:save" => self) do |txn|
+        @queued_saves.each { |queued, queued_options| queued.save(queued_options) }
+
         run_callbacks 'save' do
           txn.setObject(stringify_keys(attributes), forKey: self.id, inCollection: _type)
 
           @was_new = @new_record
           @new_record = false
+          @queued_saves = []
 
           self.previous_changes = self.changes
           self.changes = {}
         end
 
-        # XXX Use middleware pattern instead of this ugliness
-        sync_changes if defined? sync_changes
-
-        true
+        unless options[:embedded]
+          # XXX Use middleware pattern instead of this ugliness
+          sync_changes if defined? sync_changes
+        end
       end
+
+      true
     end
 
     def destroy(options={})
@@ -150,6 +147,15 @@ module Yapper::Document
     def generate_id
       BSON::ObjectId.generate
     end
+
+    def set_defaults
+      self.fields.each do |field, field_options|
+        if __send__(field).nil?
+          default = field_options[:default].respond_to?(:call) ? field_options[:default].call : field_options[:default]
+          set_attribute(field, default) 
+        end
+      end
+    end
   end
 
   private

data/lib/yapper/document/relation.rb

@@ -25,42 +25,49 @@ module Yapper::Document
           raise "All elements in the array must be of the same type" unless docs.all? { |doc| doc.is_a?(docs.first.class) }
 
           changes = {}
-          Yapper::Sync.disabled do
-            db.execute do |txn|
-              docs.each do |doc|
-                if doc.is_a?(Yapper::Document)
-                  if doc.persisted?
-                    doc.update_attributes("#{self._type.underscore}" => self)
+          db.execute do |txn|
+            docs.each do |doc|
+              if doc.is_a?(Yapper::Document)
+                if doc.persisted?
+                  doc.assign_attributes("#{self._type.underscore}" => self)
+
+                  if options[:embedded]
                     changes["#{relation.singularize}_ids"] ||= []
                     changes["#{relation.singularize}_ids"] << doc.id
-                  else
-                    doc.assign_attributes("#{self._type.underscore}" => self)
+                  end
 
+                  @queued_saves << [doc, options]
+                else
+                  doc.assign_attributes("#{self._type.underscore}" => self)
+
+                  if options[:embedded]
                     changes[relation] ||= []
                     changes[relation] << doc.attributes
-
-                    doc.save
                   end
-                elsif doc.is_a?(Hash)
-                  doc = doc.with_indifferent_access
 
-                  klass = Object.qualified_const_get(relation.singularize.to_s.camelize)
-                  instance = klass.find(doc[:id]) if doc[:id]
-                  instance ||= klass.new
-                  instance.assign_attributes("#{self._type.underscore}" => self)
-                  instance.assign_attributes(doc)
+                  @queued_saves << [doc, options]
+                end
+              elsif doc.is_a?(Hash)
+                doc = doc.with_indifferent_access
+
+                klass = Object.qualified_const_get(relation.singularize.to_s.camelize)
+                instance = klass.find(doc[:id]) if doc[:id]
+                instance ||= klass.new
+                instance.assign_attributes("#{self._type.underscore}" => self)
+                instance.assign_attributes(doc)
 
+                if options[:embedded]
                   changes[relation] ||= []
                   changes[relation] << instance.attributes
-
-                  instance.save
-                else
-                  raise "Must pass either attributes or an object"
                 end
+
+                @queued_saves << [instance, options]
+              else
+                raise "Must pass either attributes or an object"
               end
             end
-            @changes.merge!(changes)
           end
+          @changes.merge!(changes)
         end
       end