.travis.yml

@@ -3,7 +3,7 @@ before_install:
 - (ruby --version)
 - sudo chown -R travis ~/Library/RubyMotion
 - mkdir -p ~/Library/RubyMotion/build
-- sudo motion update --cache-version=3.1
+- sudo motion update
 gemfile:
 - Gemfile
 script:

README.md

@@ -202,20 +202,20 @@ Medic.blood_type     # => :o_negative
 
 #### Queries
 
-If for some reason you need to access the `HKSample` objects directly you can use Medic's Query objects:
+If for some reason you need to access the `HKSample` objects directly you can use Medic's QueryBuilder objects:
 
 ```ruby
 query_params = { type: :dietary_protein, sort_desc: :start_date, limit: 7 }
 
-query = Medic::SampleQuery.new query_params do |query, results, error|
+query = Medic::SampleQueryBuilder.new query_params do |query, results, error|
   if results
     results.each do |sample|
       NSLog "#{sample.startDate} - #{sample.quantity.doubleValueForUnit(HKUnit.gramUnit)}"
     end
   else
     NSLog "no results"
   end
-end
+end.query
 
 Medic.execute(query)
 ```

Rakefile

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-$:.unshift('/Library/RubyMotion3.1/lib')
+$:.unshift('/Library/RubyMotion/lib')
 require 'motion/project/template/ios'
 require './lib/medic'
 require 'motion-stump'

app/controllers/menu_controller.rb

@@ -11,6 +11,7 @@ def viewDidLoad
     @data = [
       'Authorize',
       'Characteristics',
+      'Save',
       'ObserverQuery',
       'SourceQuery',
       'SampleQuery',

app/controllers/save_controller.rb

@@ -0,0 +1,29 @@
+class SaveController < BaseController
+
+  def viewDidLoad
+    super
+
+    self.view.backgroundColor = UIColor.purpleColor
+    self.title = "Save"
+  end
+
+  def viewDidAppear(animated)
+    blood_pressure = {
+      correlation_type: :blood_pressure,
+      objects: [
+        {
+          quantity_type: :blood_pressure_systolic,
+          quantity: 120
+        },
+        {
+          quantity_type: :blood_pressure_diastolic,
+          quantity: 80
+        }
+      ]
+    }
+    Medic.save(blood_pressure) do |success, error|
+      NSLog "Saved sample" unless error
+    end
+  end
+
+end

lib/medic/anchor.rb

@@ -13,6 +13,7 @@ module Anchor
     def anchor_for_symbol(sym)
       return unless sym
       return sym if sym.to_s == '0'
+      return sym if sym.is_a? Fixnum
       return sym if sym.is_a? NSDate
       parts = sym.to_s.gsub('_', ' ').split.reject{ |part| part == 'ago' }
       component = parts.pop.chomp('s')

lib/medic/anchored_object_query.rb → lib/medic/anchored_object_query_builder.rb

@@ -1,12 +1,15 @@
 module Medic
-  class AnchoredObjectQuery < HKAnchoredObjectQuery
+  class AnchoredObjectQueryBuilder
+    attr_reader :params
+    attr_reader :query
 
     include Medic::Types
     include Medic::Predicate
     include Medic::Anchor
 
     def initialize(args={}, block=Proc.new)
-      self.initWithType(object_type(args[:type]),
+      @params = args
+      @query = HKAnchoredObjectQuery.alloc.initWithType(object_type(args[:type]),
         predicate: predicate(args),
         anchor: anchor_for_symbol(args[:anchor_date] || args[:anchor] || args[:date] || HKAnchoredObjectQueryNoAnchor),
         limit: args[:limit] || HKObjectQueryNoLimit,

lib/medic/correlation_query.rb → lib/medic/correlation_query_builder.rb

@@ -1,11 +1,14 @@
 module Medic
-  class CorrelationQuery < HKCorrelationQuery
+  class CorrelationQueryBuilder
+    attr_reader :params
+    attr_reader :query
 
     include Medic::Types
     include Medic::Predicate
 
     def initialize(args={}, block=Proc.new)
-      self.initWithType(object_type(args[:type]),
+      @params = args
+      @query = HKCorrelationQuery.alloc.initWithType(object_type(args[:type]),
         predicate: predicate(args),
         samplePredicates: sample_predicates(args[:sample_predicates]),
         completion: block

lib/medic/finders.rb

@@ -3,56 +3,56 @@ module Finders
 
     def observe(type, options={}, block=Proc.new)
       query_params = options.merge(type: type)
-      query = Medic::ObserverQuery.new query_params do |query, completion, error|
+      query = Medic::ObserverQueryBuilder.new query_params do |query, completion, error|
         block.call(completion, error)
-      end
+      end.query
       Medic.execute(query)
     end
 
     def find_sources(type, options={}, block=Proc.new)
       query_params = options.merge(type: type)
-      query = Medic::SourceQuery.new query_params do |query, results, error|
+      query = Medic::SourceQueryBuilder.new query_params do |query, results, error|
         sources = results ? results.allObjects.map{ |source| source.name.to_s } : []
         block.call(sources)
-      end
+      end.query
       Medic.execute(query)
     end
 
     def find_samples(type, options={}, block=Proc.new)
       query_params = options.merge(type: type)
-      query = Medic::SampleQuery.new query_params do |query, results, error|
+      query = Medic::SampleQueryBuilder.new query_params do |query, results, error|
         block.call(samples_to_hashes(Array(results)))
-      end
+      end.query
       Medic.execute(query)
     end
 
     def find_correlations(type, options={}, block=Proc.new)
       query_params = options.merge(type: type)
-      query = Medic::CorrelationQuery.new query_params do |query, correlations, error|
+      query = Medic::CorrelationQueryBuilder.new query_params do |query, correlations, error|
         block.call(samples_to_hashes(Array(correlations)))
-      end
+      end.query
       Medic.execute(query)
     end
 
     def find_anchored(type, options={}, block=Proc.new)
       query_params = options.merge(type: type)
-      query = Medic::AnchoredObjectQuery.new query_params do |query, results, new_anchor, error|
+      query = Medic::AnchoredObjectQueryBuilder.new query_params do |query, results, new_anchor, error|
         block.call(samples_to_hashes(Array(results)), new_anchor)
-      end
+      end.query
       Medic.execute(query)
     end
 
     def find_statistics(type, options={}, block=Proc.new)
       query_params = options.merge(type: type)
-      query = Medic::StatisticsQuery.new query_params do |query, statistics, error|
+      query = Medic::StatisticsQueryBuilder.new query_params do |query, statistics, error|
         block.call(statistics_to_hash(statistics)) if statistics
-      end
+      end.query
       Medic.execute(query)
     end
 
     def find_statistics_collection(type, options={}, block=Proc.new)
       query_params = options.merge(type: type)
-      query = Medic::StatisticsCollectionQuery.new query_params do |query, collection, error|
+      query = Medic::StatisticsCollectionQueryBuilder.new query_params do |query, collection, error|
         from_date = options[:from_date] || options[:from] || options[:start_date] || collection.anchorDate
         to_date = options[:to_date] || options[:to] || options[:end_date] || NSDate.date
         formatted_stats = []
@@ -62,7 +62,8 @@ def find_statistics_collection(type, options={}, block=Proc.new)
           })
         end
         block.call(formatted_stats)
-      end
+      end.query
+
       Medic.execute(query)
     end
 
@@ -76,21 +77,21 @@ def samples_to_hashes(samples)
         h[:source] = sample.source.name
         h[:start_date] = sample.startDate
         h[:end_date] = sample.endDate
-        h[:sample_type] = Medic::Types::TYPE_IDENTIFIERS.index(sample.sampleType.identifier)
+        h[:sample_type] = Medic::Types::TYPE_IDENTIFIERS.key(sample.sampleType.identifier)
 
         if sample.respond_to?(:categoryType) && sample.respond_to?(:value)
-          h[:category_type] = Medic::Types::TYPE_IDENTIFIERS.index(sample.categoryType.identifier)
+          h[:category_type] = Medic::Types::TYPE_IDENTIFIERS.key(sample.categoryType.identifier)
           h[:value] = [:in_bed, :asleep][sample.value] # SleepAnalysis is the only category type at the moment
         end
 
         if sample.respond_to?(:correlationType) && sample.respond_to?(:objects)
-          h[:correlation_type] = Medic::Types::TYPE_IDENTIFIERS.index(sample.correlationType.identifier)
+          h[:correlation_type] = Medic::Types::TYPE_IDENTIFIERS.key(sample.correlationType.identifier)
           h[:objects] = samples_to_hashes(Array(sample.objects.allObjects))
         end
 
         if sample.respond_to?(:quantity) && sample.respond_to?(:quantityType)
           h[:quantity] = sample.quantity.doubleValueForUnit(sample.quantityType.canonicalUnit)
-          h[:quantity_type] = Medic::Types::TYPE_IDENTIFIERS.index(sample.quantityType.identifier)
+          h[:quantity_type] = Medic::Types::TYPE_IDENTIFIERS.key(sample.quantityType.identifier)
           h[:canonical_unit] = sample.quantityType.canonicalUnit.unitString
         end
 
@@ -108,7 +109,7 @@ def statistics_to_hash(stats)
       h[:start_date] = stats.startDate
       h[:end_date] = stats.endDate
       h[:sources] = stats.sources.map(&:name) if stats.sources
-      h[:quantity_type] = Medic::Types::TYPE_IDENTIFIERS.index(stats.quantityType.identifier)
+      h[:quantity_type] = Medic::Types::TYPE_IDENTIFIERS.key(stats.quantityType.identifier)
       h[:canonical_unit] = stats.quantityType.canonicalUnit.unitString
       h[:data_count] = stats.dataCount
       h[:average] = stats.averageQuantity.doubleValueForUnit(stats.quantityType.canonicalUnit) if stats.averageQuantity

lib/medic/interval.rb

@@ -22,6 +22,7 @@ def interval(sym)
         end
       end
       n ||= 1
+
       NSDateComponents.new.send("#{component}=", n)
     end
 

lib/medic/observer_query.rb → lib/medic/observer_query_builder.rb

@@ -1,11 +1,14 @@
 module Medic
-  class ObserverQuery < HKObserverQuery
+  class ObserverQueryBuilder
+    attr_reader :params
+    attr_reader :query
 
     include Medic::Types
     include Medic::Predicate
 
     def initialize(args={}, block=Proc.new)
-      self.initWithSampleType(object_type(args[:type]),
+      @params = args
+      @query = HKObserverQuery.alloc.initWithSampleType(object_type(args[:type]),
         predicate: predicate(args),
         updateHandler: block
       )

lib/medic/sample_query.rb → lib/medic/sample_query_builder.rb

@@ -1,16 +1,20 @@
 module Medic
-  class SampleQuery < HKSampleQuery
+  class SampleQueryBuilder
+    attr_reader :params
+    attr_reader :query
 
     include Medic::Types
     include Medic::Predicate
     include Medic::Sort
 
     def initialize(args={}, block=Proc.new)
+      @params = args
+
       sort = args[:sort_descriptors] || args[:sort_by] || args[:sort_asc] || args[:sort]
       sort = sort_descriptors(sort) if sort
       sort ||= sort_descriptors(args[:sort_desc], false) if args[:sort_desc]
 
-      self.initWithSampleType(object_type(args[:type]),
+      @query = HKSampleQuery.alloc.initWithSampleType(object_type(args[:type]),
         predicate: predicate(args),
         limit: args[:limit] || HKObjectQueryNoLimit,
         sortDescriptors: sort,

lib/medic/source_query.rb → lib/medic/source_query_builder.rb

@@ -1,11 +1,14 @@
 module Medic
-  class SourceQuery < HKSourceQuery
+  class SourceQueryBuilder
+    attr_reader :params
+    attr_reader :query
 
     include Medic::Types
     include Medic::Predicate
 
     def initialize(args={}, block=Proc.new)
-      self.initWithSampleType(object_type(args[:type]),
+      @params = args
+      @query = HKSourceQuery.alloc.initWithSampleType(object_type(args[:type]),
         samplePredicate: predicate(args),
         completionHandler: block
       )

lib/medic/statistics_collection_query_builder.rb

@@ -0,0 +1,45 @@
+module Medic
+  class StatisticsCollectionQueryBuilder
+    attr_reader :params
+    attr_reader :query
+
+    include Medic::Types
+    include Medic::Predicate
+    include Medic::StatisticsOptions
+    include Medic::Anchor
+    include Medic::Interval
+
+    def initialize(args={})
+      @params = args
+      @query = HKStatisticsCollectionQuery.alloc.initWithQuantityType(object_type(args[:type]),
+        quantitySamplePredicate: predicate(args),
+        options: options_for_stat_query(args[:options]),
+        anchorDate: anchor_for_symbol(args[:anchor_date] || args[:anchor] || args[:date] || NSDate.date),
+        intervalComponents: interval(args[:interval_components] || args[:interval])
+      )
+      if block_given?
+        handler = Proc.new
+        @query.initialResultsHandler = handler
+        @query.statisticsUpdateHandler = Proc.new{|q,_,r,e| handler.call(q,r,e)} if args[:update] == true
+      end
+      @query.statisticsUpdateHandler = args[:update] if args[:update].is_a?(Proc)
+    end
+
+    def initial_results_handler
+      @query.initialResultsHandler
+    end
+
+    def initial_results_handler=(callback=Proc.new)
+      @query.initialResultsHandler = callback
+    end
+
+    def statistics_update_handler
+      @query.statisticsUpdateHandler
+    end
+
+    def statistics_update_handler=(callback=Proc.new)
+      @query.statisticsUpdateHandler = callback
+    end
+
+  end
+end