motion_data_wrapper 0.0.5 → 0.0.6

data/lib/motion_data_wrapper/delegate.rb

@@ -43,8 +43,7 @@ module MotionDataWrapper
 
     def sqlite_url
       if Object.const_defined?("UIApplication")
-        file_path = File.join App.documents_path, "#{sqlite_store_name}.sqlite"
-        NSURL.fileURLWithPath(file_path)
+        NSURL.fileURLWithPath(sqlite_path)
       else
         error_ptr = Pointer.new(:object)
         unless support_dir = NSFileManager.defaultManager.URLForDirectory(NSApplicationSupportDirectory, inDomain: NSUserDomainMask, appropriateForURL: nil, create: true, error: error_ptr)
@@ -55,6 +54,14 @@ module MotionDataWrapper
         support_dir.URLByAppendingPathComponent("#{sqlite_store_name}.sqlite")
       end
     end
+    
+    def sqlite_path
+      @sqlite_path || File.join(App.documents_path, "#{sqlite_store_name}.sqlite")
+    end
+    
+    def sqlite_path= path
+      @sqlite_path = path
+    end
 
     def persistent_store_options
       { NSMigratePersistentStoresAutomaticallyOption => true, NSInferMappingModelAutomaticallyOption => true }

data/lib/motion_data_wrapper/errors/record_not_found.rb

@@ -1,11 +1,4 @@
 module MotionDataWrapper
   class RecordNotFound < StandardError
-  
-    def initialize(klass, id)
-      @klass = klass
-      @id = id
-      super("Could not find #{@klass.name} id: #{@id}")
-    end
-  
   end
 end

data/lib/motion_data_wrapper/model/finder_methods.rb

@@ -8,71 +8,76 @@ module MotionDataWrapper
 
       module ClassMethods
 
-        def all
-          relation.to_a
-        end
-
-        def count
-          relation.count
-        end
-
-        def destroy_all
-          all.map &:destroy
+        # Delegate the simplest methods to the relation without any args
+        %w(all count destroy_all empty? exists? uniq).each do |method|
+          define_method method do
+            relation.send(method)
+          end
         end
 
+        # @param [Symbol] query part to exclude, ie :where or :limit
+        # @returns [Relation]
         def except(query_part)
           relation.except(query_part)
         end
 
-        def find(object_id)
-          raise MotionDataWrapper::RecordNotFound.new(self, object_id) unless entity = find_by_id(object_id)
-          entity
+        # @returns [Model] or nil
+        def first
+          take
         end
 
-        def first
-          relation.first
+        # @param [id] id to retrieve record by
+        # @raises [RecordNotFound]
+        # @returns [Model]
+        def find(object_id)
+          find_by_id!(object_id)
         end
 
+        # @raises [RecordNotFound]
+        # @returns [Model]
         def first!
-          first or raise MotionDataWrapper::RecordNotFound
+          take!
         end
 
+        # @returns [Model] or nil
         def last
-          relation.last
+          relation.last.take
         end
 
+        # @raises [RecordNotFound]
+        # @returns [Model]
         def last!
-          last or raise MotionDataWrapper::RecordNotFound
+          relation.last.take!
         end
 
+        # @param [Fixnum]
+        # @returns [Relation]
         def limit(l)
           relation.limit(l)
         end
 
-        def method_missing(method, *args, &block)
-          if method.start_with?("find_by_")
-            attribute = method.gsub("find_by_", "")
-            relation.where("#{attribute} = ?", *args).first
-          elsif method.start_with?("find_all_by_")
-            attribute = method.gsub("find_all_by_", "")
-            relation.where("#{attribute} = ?", *args).to_a
-          else
-            super
-          end
-        end
-
+        # @param [Fixnum]
+        # @returns [Relation]
         def offset(o)
           relation.offset(o)
         end
 
+        # @param [Symbol] column
+        # @param @optional [Hash] options, key :ascending
+        # @returns [Relation]
         def order(*args)
           relation.order(*args)
         end
 
+        # @param [Symbol] column
+        # @returns [Array]
         def pluck(column)
           relation.pluck(column)
         end
 
+        # @param [Symbol] column
+        # @param @optional [Hash] options, key :ascending
+        # @returns [Relation]
         def reorder(*args)
           relation.except(:order).order(*args)
         end
@@ -85,19 +90,42 @@ module MotionDataWrapper
           end
         end
 
-        def uniq
-          relation.uniq
-        end
-
+        # @param [String] conditions
+        # @param [vargs] Replacements
+        # @returns [Relation]
+        # Usage:
+        #   where("title contains[cd] ?", "title")
         def where(*args)
           relation.where(*args)
         end
 
+        # @param [NSManagedObjectContext]
+        # @param [Relation]
         def with_context(ctx)
           relation.with_context(ctx)
         end
 
-      private
+        private
+
+        def method_missing(method, *args, &block)
+          if method.start_with?("find_by_")
+            attribute = method.gsub("find_by_", "").gsub("!", "")
+            chain = relation.where("#{attribute} = ?", *args)
+
+            if method.end_with?("!")
+              chain.first!
+            else
+              chain.first
+            end
+
+          elsif method.start_with?("find_all_by_")
+            attribute = method.gsub("find_all_by_", "")
+            relation.where("#{attribute} = ?", *args).to_a
+
+          else
+            super
+          end
+        end
 
         def relation
           Relation.alloc.initWithClass(self)

data/lib/motion_data_wrapper/model/persistence.rb

@@ -32,17 +32,30 @@ module MotionDataWrapper
         end
       
       end
-    
+  
+      def awakeFromFetch
+        super
+        after_fetch if respond_to? :after_fetch
+      end
+
+      def awakeFromInsert
+        super
+        after_fetch if respond_to? :after_fetch
+      end
+  
       def destroy
       
         if context = managedObjectContext
+          before_destroy_callback
           context.deleteObject(self)
           error = Pointer.new(:object)
-          context.save(error)
+          if context.save(error)
+            @destroyed = true
+            after_destroy_callback
+            freeze
+          end
         end
       
-        @destroyed = true
-        freeze
       end
     
       def destroyed?
@@ -72,14 +85,47 @@ module MotionDataWrapper
           context.insertObject(self)
         end
 
+        before_save_callback
         error = Pointer.new(:object)
         unless context.save(error)
           managedObjectContext.deleteObject(self)
           raise MotionDataWrapper::RecordNotSaved, self and return false
         end
+        instance_variable_set('@new_record', false)
+        after_save_callback
+
         true
       end
-    
+  
+      private
+  
+      def before_save_callback
+        before_save if respond_to? :before_save
+        @is_new_record = new_record?
+        if @is_new_record
+          before_create if respond_to? :before_create
+        else
+          before_update if respond_to? :before_update
+        end
+      end
+  
+      def after_save_callback
+        if @is_new_record
+          after_create if respond_to? :after_create
+        else
+          after_update if respond_to? :after_update
+        end
+        after_save if respond_to? :after_save
+      end
+
+      def before_destroy_callback
+        before_destroy if respond_to? :before_destroy
+      end
+  
+      def after_destroy_callback
+        after_destroy if respond_to? :after_destroy
+      end
+  
     end
   end
 end

data/lib/motion_data_wrapper/relation/finder_methods.rb

@@ -19,6 +19,10 @@ module MotionDataWrapper
         all.map &:destroy
       end
 
+      def empty?
+        self.count == 0
+      end
+
       def except(query_part)
         case query_part.to_sym
          when :where
@@ -33,15 +37,13 @@ module MotionDataWrapper
          self
       end
 
-      def first
-        self.fetchLimit = 1
-        to_a[0]
+      def exists?
+        !empty?
       end
 
       def last
         self.fetchOffset = self.count - 1 unless self.count < 1
-        self.fetchLimit = 1
-        to_a[0]
+        self
       end
 
       def limit(l)
@@ -75,6 +77,14 @@ module MotionDataWrapper
          to_a.collect { |r| r[column] }
       end
 
+      def take
+        limit(1).to_a[0]
+      end
+
+      def take!
+        take or raise RecordNotFound
+      end
+
       def uniq
         self.returnsDistinctResults = true
         self

data/lib/motion_data_wrapper/version.rb

@@ -1,3 +1,3 @@
 module MotionDataWrapper
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,27 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: motion_data_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
+  prerelease: 
 platform: ruby
 authors:
 - Matt Brewer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Forked from the mattgreen/nitron gem, this provides an intuitive way
@@ -49,25 +52,27 @@ files:
 - lib/motion_data_wrapper/version.rb
 homepage: https://github.com/macfanatic/motion_data_wrapper
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Provides an easy ActiveRecord-like interface to CoreData
 test_files: []
+has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 3da72e1eb1f458f7befcce0e620f963d2bbad3f1
-  data.tar.gz: 1ee074ffa517340dce15493f3afb9d740ab6b8e2
-SHA512:
-  metadata.gz: a4afe689fd4c21370529084ffe24ba54b3ff94c470a15148ff39187ce5b5358885ccad3d0d67aa102d8f19f3e048d5e605b36356e3e9f84c82f385748bc235a3
-  data.tar.gz: 0696baa492af321233565b0cd70e2bf751e7a81d738f72a47f330d54dce49ffe5fa481e7085ea77500fbd49f3d7134b6df0a7d72c37702628f30f3a89cb88b9c