medic 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf3a75beba5a3f3be3df75476d6d18d188752bac
-  data.tar.gz: 01bb258ba550c735090e7d04df792972562f4f91
+  metadata.gz: 885ef7d6a312a5644cf27850d9bb01fc24e5bcaa
+  data.tar.gz: 41f408b021b7b03bcab32b2eca082274439b7c9e
 SHA512:
-  metadata.gz: 02ff5adbb1f076e1e95fee777d4d5289e0bd1eb73808f32d3ee90a6b2a45aafc27b13e323ea96885e55294e4356d2eb783cbd02e7b271287a7dc1afa07df7fa1
-  data.tar.gz: 780718864993970ea3889ac42df1627066152d3862aab9be21f7f5eded7b146195874fff3c1a68497dc46b14482aa5348f089c70eac31e9572250511ee34ca8e
+  metadata.gz: 1a6b3e8f52c4338cbb9de50165fde57c559f41136e141776a9794544bbbd37bf005d156ef84482150f4d253b7f22dc06b3e883917bae28df256296fc43d9568b
+  data.tar.gz: f3372641785e97bf22028ec8a90c22a9bb6f2f1fffe076fed282e96beda379d55a3a3929be7e8c77647cecfda8383b399d00e8f15d1a52bae2801dc53b270c6f

data/README.md

@@ -1,6 +1,6 @@
 # Medic [![Gem Version](https://badge.fury.io/rb/medic.svg)](http://badge.fury.io/rb/medic) [![Build Status](https://travis-ci.org/ryanlntn/medic.svg)](https://travis-ci.org/ryanlntn/medic) [![Code Climate](https://codeclimate.com/github/ryanlntn/medic/badges/gpa.svg)](https://codeclimate.com/github/ryanlntn/medic) [![Dependency Status](https://gemnasium.com/ryanlntn/medic.svg)](https://gemnasium.com/ryanlntn/medic)
 
-Is HealthKit's verbose and convoluted API driving you to autolobotomization? Quick! You need a medic!
+Is HealthKit's verbose and convoluted API driving you mad? Quick! You need a medic!
 
 ## Installation
 
@@ -202,12 +202,12 @@ 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)}"
@@ -215,7 +215,7 @@ query = Medic::SampleQuery.new query_params do |query, results, error|
   else
     NSLog "no results"
   end
-end
+end.query
 
 Medic.execute(query)
 ```

data/lib/medic/{anchored_object_query.rb → 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,

data/lib/medic/{correlation_query.rb → 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

data/lib/medic/finders.rb

@@ -3,62 +3,67 @@ module Medic
 
     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 = []
-        collection.enumerateStatisticsFromDate(collection.anchorDate, toDate: NSDate.date, withBlock: ->(result, stop){
-          formatted_stats << statistics_to_hash(result)
-        })
+        if collection
+          collection.enumerateStatisticsFromDate(from_date, toDate: to_date, withBlock: ->(result, stop){
+            formatted_stats << statistics_to_hash(result)
+          })
+        end
         block.call(formatted_stats)
-      end
+      end.query
+
       Medic.execute(query)
     end
 

data/lib/medic/interval.rb

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

data/lib/medic/{observer_query.rb → 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
       )

data/lib/medic/predicate.rb

@@ -23,7 +23,7 @@ module Medic
       elsif args[:no_correlation]
         HKQuery.predicateForObjectsWithNoCorrelation
       elsif args[:start_date] && args[:end_date]
-        options = query_options(args[:options]) || HKQueryOptionNone
+        options = query_options(args[:query_options]) || HKQueryOptionNone
         HKQuery.predicateForSamplesWithStartDate(args[:start_date], endDate: args[:end_date], options: options)
       elsif args[:workout]
         HKQuery.predicateForObjectsFromWorkout(args[:workout])

data/lib/medic/query_options.rb

@@ -10,7 +10,7 @@ module Medic
     def query_options(symbols)
       options = 0
       Array(symbols).each do |option|
-        options = options | query_option(option)
+        options |= query_option(option)
       end
       options
     end

data/lib/medic/{sample_query.rb → 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,

data/lib/medic/{source_query.rb → 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
       )

data/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

data/lib/medic/{statistics_query.rb → statistics_query_builder.rb}

@@ -1,12 +1,15 @@
 module Medic
-  class StatisticsQuery < HKStatisticsQuery
+  class StatisticsQueryBuilder
+    attr_reader :params
+    attr_reader :query
 
     include Medic::Types
     include Medic::Predicate
     include Medic::StatisticsOptions
 
     def initialize(args={}, block=Proc.new)
-      self.initWithQuantityType(object_type(args[:type]),
+      @params = args
+      @query = HKStatisticsQuery.alloc.initWithQuantityType(object_type(args[:type]),
         quantitySamplePredicate: predicate(args),
         options: options_for_stat_query(args[:options]),
         completionHandler: block

data/lib/medic/store.rb

@@ -1,20 +1,26 @@
 module Medic
-  class Store < HKHealthStore
-
+  class Store
     include Medic::Types
+    include Medic::Units
     include Medic::HKConstants
 
     def self.shared
-      Dispatch.once { @store ||= new }
-      @store
+      Dispatch.once { @@hk_store ||= HKHealthStore.new }
+      Dispatch.once { @medic_store ||= new }
+      @medic_store
+    end
+
+    def self.hk_store
+      @@hk_store
     end
 
     def self.unload
-      @store = nil
+      @@hk_store = nil
+      @medic_store = nil
     end
 
     def self.available?
-      isHealthDataAvailable
+      HKHealthStore.isHealthDataAvailable
     end
     singleton_class.send(:alias_method, :is_available?, :available?)
 
@@ -22,13 +28,13 @@ module Medic
       share = Array(types[:share] || types[:write]).map{ |sym| object_type(sym) }
       read  = Array(types[:read]).map{ |sym| object_type(sym) }
 
-      requestAuthorizationToShareTypes(NSSet.setWithArray(share), readTypes: NSSet.setWithArray(read), completion: ->(success, error){
+      @@hk_store.requestAuthorizationToShareTypes(NSSet.setWithArray(share), readTypes: NSSet.setWithArray(read), completion: ->(success, error){
         block.call(success, error)
       })
     end
 
     def authorized?(sym)
-      authorizationStatusForType(object_type(sym)) == HKAuthorizationStatusSharingAuthorized
+      @@hk_store.authorizationStatusForType(object_type(sym)) == HKAuthorizationStatusSharingAuthorized
     end
     alias_method :authorized_for?, :authorized?
     alias_method :is_authorized?, :authorized?
@@ -36,7 +42,7 @@ module Medic
 
     def biological_sex
       error = Pointer.new(:object)
-      sex = biologicalSexWithError error
+      sex = @@hk_store.biologicalSexWithError error
       if block_given?
         yield BIOLOGICAL_SEXES.invert[sex.biologicalSex], error[0]
       else
@@ -46,7 +52,7 @@ module Medic
 
     def blood_type
       error = Pointer.new(:object)
-      blood = bloodTypeWithError error
+      blood = @@hk_store.bloodTypeWithError error
       if block_given?
         yield BLOOD_TYPES.invert[blood.bloodType], error[0]
       else
@@ -56,7 +62,7 @@ module Medic
 
     def date_of_birth
       error = Pointer.new(:object)
-      birthday = dateOfBirthWithError error
+      birthday = @@hk_store.dateOfBirthWithError error
       if block_given?
         yield birthday, error[0]
       else
@@ -65,14 +71,15 @@ module Medic
     end
 
     def delete(hk_object, block=Proc.new)
-      deleteObject(hk_object, withCompletion: ->(success, error){
+      @@hk_store.deleteObject(hk_object, withCompletion: ->(success, error){
         block.call(success, error)
       })
     end
     alias_method :delete_object, :delete
 
     def save(hk_objects, block=Proc.new)
-      saveObjects(Array(hk_objects), withCompletion: ->(success, error){
+      objs_array = hk_objects.is_a?(Array) ? hk_objects : [hk_objects]
+      @@hk_store.saveObjects(objs_array.map{|obj| prepare_for_save(obj)}, withCompletion: ->(success, error){
         block.call(success, error)
       })
     end
@@ -83,17 +90,17 @@ module Medic
     # addSamples:toWorkout:completion:
 
     def execute(query)
-      executeQuery(query)
+      @@hk_store.executeQuery(query)
     end
     alias_method :execute_query, :execute
 
     def stop(query)
-      stopQuery(query)
+      @@hk_store.stopQuery(query)
     end
     alias_method :stop_query, :stop
 
     def enable_background_delivery(type, frequency, block=Proc.new)
-      enableBackgroundDeliveryForType(object_type(type), frequency: update_frequency(frequency), withCompletion: ->(success, error){
+      @@hk_store.enableBackgroundDeliveryForType(object_type(type), frequency: update_frequency(frequency), withCompletion: ->(success, error){
         block.call(success, error)
       })
     end
@@ -101,17 +108,44 @@ module Medic
 
     def disable_background_delivery(type, block=Proc.new)
       return disable_all_background_delivery(block) if type == :all
-      disableBackgroundDeliveryForType(object_type(type), withCompletion: ->(success, error){
+      @@hk_store.disableBackgroundDeliveryForType(object_type(type), withCompletion: ->(success, error){
         block.call(success, error)
       })
     end
     alias_method :disable_background_delivery_for, :disable_background_delivery
 
     def disable_all_background_delivery(block=Proc.new)
-      disableAllBackgroundDeliveryWithCompletion(->(success, error){
+      @@hk_store.disableAllBackgroundDeliveryWithCompletion(->(success, error){
         block.call(success, error)
       })
     end
 
+  private
+
+    def prepare_for_save(sample)
+      return sample if sample.kind_of? HKSample
+
+      date = sample[:date] || NSDate.date
+      start_date = sample[:start] || sample[:start_date] || date
+      end_date = sample[:end] || sample[:end_date] || date
+      metadata = sample[:metadata] || {}
+
+      type = object_type(sample[:type] || sample[:sample_type] || sample[:quantity_type] || sample[:correlation_type] || sample[:category_type])
+
+      case type
+      when HKQuantityType
+        quantity = HKQuantity.quantityWithUnit((sample_unit(sample[:unit]) || type.canonicalUnit), doubleValue: sample[:quantity])
+        HKQuantitySample.quantitySampleWithType(type, quantity: quantity, startDate: start_date, endDate: end_date, metadata: metadata)
+      when HKCorrelationType
+        objects = (sample[:objects].is_a?(Array) ? sample[:objects] : [sample[:objects]]).map{|obj| prepare_for_save(obj)}
+        HKCorrelation.correlationWithType(type, startDate: start_date, endDate: end_date, objects: objects, metadata: metadata)
+      when HKCategoryType
+        value = sleep_analysis(sample[:value]) # SleepAnalysis is the only category type at the moment
+        HKCategorySample.categorySampleWithType(type, value: value, startDate: start_date, endDate: end_date, metadata: metadata)
+      else
+        # handle workouts
+      end
+    end
+
   end
 end

data/lib/medic/units.rb

@@ -0,0 +1,15 @@
+module Medic
+  module Units
+
+    def sample_unit(u)
+      return unless u
+      camelized = u.to_s.gsub(/_([a-z]*)/){ "#{$1.capitalize}" }
+      if HKUnit.respond_to?(:"#{camelized}Unit")
+        HKUnit.send(:"#{camelized}Unit")
+      else
+        HKUnit.unitFromString(u.to_s)
+      end
+    end
+
+  end
+end

data/lib/medic/version.rb

@@ -1,3 +1,3 @@
 module Medic
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/spec/medic/anchor.rb

@@ -1,4 +1,4 @@
-describe "Medic::Anchor" do
+describe Medic::Anchor do
 
   before do
     @subject = Object.new

data/spec/medic/anchored_object_query_builder_spec.rb

@@ -0,0 +1,12 @@
+describe Medic::AnchoredObjectQueryBuilder do
+
+  before do
+    @subject = Medic::AnchoredObjectQueryBuilder.new type: :step_count do |query, results, new_anchor, error|
+    end
+  end
+
+  it "has a query getter that returns an HKAnchoredObjectQuery" do
+    @subject.query.should.be.kind_of? HKAnchoredObjectQuery
+  end
+
+end

data/spec/medic/{correlation_query_spec.rb → correlation_query_builder_spec.rb}

@@ -1,16 +1,16 @@
-describe "Medic::CorrelationQuery" do
+describe Medic::CorrelationQueryBuilder do
 
   before do
     high_cal = HKQuantity.quantityWithUnit(HKUnit.kilocalorieUnit, doubleValue: 800.0)
     greater_than_high_cal = HKQuery.predicateForQuantitySamplesWithOperatorType(NSGreaterThanOrEqualToPredicateOperatorType, quantity: high_cal)
     energy_consumed = HKObjectType.quantityTypeForIdentifier(HKQuantityTypeIdentifierDietaryEnergyConsumed)
     sample_predicates = { energy_consumed => greater_than_high_cal }
-    @subject = Medic::CorrelationQuery.new type: :food, sample_predicates: sample_predicates do |query, correlations, error|
+    @subject = Medic::CorrelationQueryBuilder.new type: :food, sample_predicates: sample_predicates do |query, correlations, error|
     end
   end
 
-  it "is a subclass of HKCorrelationQuery" do
-    @subject.should.be.kind_of? HKCorrelationQuery
+  it "has a query getter that returns an HKCorrelationQuery" do
+    @subject.query.should.be.kind_of? HKCorrelationQuery
   end
 
 end

data/spec/medic/hk_constants_spec.rb

@@ -1,4 +1,4 @@
-describe "Medic::HKConstants" do
+describe Medic::HKConstants do
 
   before do
     @subject = Object.new

data/spec/medic/interval_spec.rb

@@ -1,4 +1,4 @@
-describe "Medic::Interval" do
+describe Medic::Interval do
 
   before do
     @subject = Object.new

data/spec/medic/medic_spec.rb

@@ -1,4 +1,4 @@
-describe "Medic" do
+describe Medic do
 
   before do
     @store = Medic::Store.shared

data/spec/medic/observer_query_builder_spec.rb

@@ -0,0 +1,12 @@
+describe Medic::ObserverQueryBuilder do
+
+  before do
+    @subject = Medic::ObserverQueryBuilder.new type: :step_count do |query, completion, error|
+    end
+  end
+
+  it "has a query getter that returns an HKObserverQuery" do
+    @subject.query.should.be.kind_of? HKObserverQuery
+  end
+
+end

data/spec/medic/predicate_spec.rb

@@ -1,4 +1,4 @@
-describe "Medic::Predicate" do
+describe Medic::Predicate do
 
   before do
     @subject = Object.new

data/spec/medic/query_options_spec.rb

@@ -1,4 +1,4 @@
-describe "Medic::QueryOptions" do
+describe Medic::QueryOptions do
 
   before do
     @subject = Object.new

data/spec/medic/sample_query_builder_spec.rb

@@ -0,0 +1,12 @@
+describe Medic::SampleQueryBuilder do
+
+  before do
+    @subject = Medic::SampleQueryBuilder.new type: :dietary_protein, limit: 7 do |query, results, error|
+    end
+  end
+
+  it "has a query getter that returns an HKSampleQuery" do
+    @subject.query.should.be.kind_of? HKSampleQuery
+  end
+
+end

data/spec/medic/sort_spec.rb

@@ -1,4 +1,4 @@
-describe "Medic::Sort" do
+describe Medic::Sort do
 
   before do
     @subject = Object.new

data/spec/medic/source_query_builder_spec.rb

@@ -0,0 +1,12 @@
+describe Medic::SourceQueryBuilder do
+
+  before do
+    @subject = Medic::SourceQueryBuilder.new type: :dietary_protein do |query, sources, error|
+    end
+  end
+
+  it "has a query getter that returns an HKSourceQuery" do
+    @subject.query.should.be.kind_of? HKSourceQuery
+  end
+
+end

data/spec/medic/statistics_collection_query_builder_spec.rb

@@ -0,0 +1,56 @@
+describe Medic::StatisticsCollectionQueryBuilder do
+
+  before do
+    query_params = { type: :step_count, options: :sum, interval: :day }
+    @subject = Medic::StatisticsCollectionQueryBuilder.new query_params do |query, collection, error|
+      @block_contents = [query, collection, error]
+    end
+
+    query_params2 = { type: :step_count, options: :sum, interval: :day, update: true }
+    @subject_with_update = Medic::StatisticsCollectionQueryBuilder.new query_params2 do |query, collection, error|
+      @block_contents = [query, collection, error]
+    end
+  end
+
+  after do
+    @block_contents = nil
+  end
+
+  it "has a query getter that returns an HKStatisticsCollectionQuery" do
+    @subject.query.should.be.kind_of? HKStatisticsCollectionQuery
+  end
+
+  describe "initialize" do
+    it "sets initialResultsHandler when given block" do
+      @subject.query.initialResultsHandler.call(:query, :collection, :error)
+      @block_contents.should == [:query, :collection, :error]
+    end
+
+    context "when :update is given" do
+      it "sets statisticsUpdateHandler when given block" do
+        @subject_with_update.query.statisticsUpdateHandler.call(:query, :statistics, :collection, :error)
+        @block_contents.should == [:query, :collection, :error]
+      end
+    end
+
+    context "when :update isn't given" do
+      it "doesn't set statisticsUpdateHandler when given block" do
+        @subject.query.statisticsUpdateHandler.should == nil
+        @block_contents.should == nil
+      end
+    end
+  end
+
+  describe "#initial_results_handler=" do
+    it "sets initialResultsHandler with callback" do
+      @subject.query.initialResultsHandler.should.respond_to? :call
+    end
+  end
+
+  describe "#statistics_update_handler=" do
+    it "sets statisticsUpdateHandler with callback" do
+      @subject_with_update.query.statisticsUpdateHandler.should.respond_to? :call
+    end
+  end
+
+end

data/spec/medic/statistics_options_spec.rb

@@ -1,4 +1,4 @@
-describe "Medic::StatisticsOptions" do
+describe Medic::StatisticsOptions do
 
   before do
     @subject = Object.new

data/spec/medic/statistics_query_builder_spec.rb

@@ -0,0 +1,12 @@
+describe Medic::StatisticsQueryBuilder do
+
+  before do
+    @subject = Medic::StatisticsQueryBuilder.new type: :step_count, options: :sum do |query, results, error|
+    end
+  end
+
+  it "has a query getter that returns an HKStatisticsQuery" do
+    @subject.query.should.be.kind_of? HKStatisticsQuery
+  end
+
+end

data/spec/medic/store_spec.rb

@@ -1,12 +1,13 @@
-describe "Medic::Store" do
+describe Medic::Store do
 
   before do
     @subject = Medic::Store.new
+    @hk_store = Medic::Store.hk_store
   end
 
   describe "#authorize" do
     it "calls #requestAuthorizationToShareTypes:readTypes:completion with correct args" do
-      @subject.mock! 'requestAuthorizationToShareTypes:readTypes:completion' do |share, read, comp|
+      @hk_store.mock! 'requestAuthorizationToShareTypes:readTypes:completion' do |share, read, comp|
         share.should.be.kind_of? NSSet
         read.should.be.kind_of? NSSet
         comp.should.respond_to? :call
@@ -18,7 +19,7 @@ describe "Medic::Store" do
 
   describe "#authorized?" do
     it "calls #authorizationStatusForType with correct args" do
-      @subject.mock! 'authorizationStatusForType' do |type|
+      @hk_store.mock! 'authorizationStatusForType' do |type|
         type.should.be.kind_of? HKObjectType
         false
       end
@@ -40,7 +41,7 @@ describe "Medic::Store" do
 
   describe "#biological_sex" do
     it "calls #biologicalSexWithError with correct args" do
-      @subject.mock! 'biologicalSexWithError' do |error|
+      @hk_store.mock! 'biologicalSexWithError' do |error|
         error.should.be.kind_of? Pointer
         mock(:biologicalSex, return: HKBiologicalSexFemale)
       end
@@ -50,7 +51,7 @@ describe "Medic::Store" do
 
   describe "#blood_type" do
     it "calls #bloodTypeWithError with correct args" do
-      @subject.mock! 'bloodTypeWithError' do |error|
+      @hk_store.mock! 'bloodTypeWithError' do |error|
         error.should.be.kind_of? Pointer
         mock(:bloodType, return: HKBloodTypeONegative)
       end
@@ -60,7 +61,7 @@ describe "Medic::Store" do
 
   describe "#date_of_birth" do
     it "calls #dateOfBirthWithError with correct args" do
-      @subject.mock! 'dateOfBirthWithError' do |error|
+      @hk_store.mock! 'dateOfBirthWithError' do |error|
         error.should.be.kind_of? Pointer
         true
       end
@@ -70,18 +71,18 @@ describe "Medic::Store" do
 
   describe "#save" do
     it "calls #saveObject:withCompletion with correct args" do
-      @subject.mock! 'saveObjects:withCompletion' do |object, comp|
-        object.first.should.be.kind_of? HKObjectType
+      @hk_store.mock! 'saveObjects:withCompletion' do |object, comp|
+        object.first.should.be.kind_of? HKSample
         comp.should.respond_to? :call
       end
-      steps = @subject.object_type(:step_count)
+      steps = { quantity_type: :step_count, quantity: 50 }
       @subject.save(steps){|success, error|}
     end
   end
 
   describe "#delete" do
     it "calls #deleteObject:withCompletion with correct args" do
-      @subject.mock! 'deleteObject:withCompletion' do |object, comp|
+      @hk_store.mock! 'deleteObject:withCompletion' do |object, comp|
         object.should.be.kind_of? HKObjectType
         comp.should.respond_to? :call
       end
@@ -92,7 +93,7 @@ describe "Medic::Store" do
 
   describe "#execute" do
     it "calls #executeQuery with correct args" do
-      @subject.mock! 'executeQuery' do |query|
+      @hk_store.mock! 'executeQuery' do |query|
         query.should.be.kind_of? HKQuery
       end
       query = HKSampleQuery.alloc.initWithSampleType(@subject.object_type(:step_count), predicate:nil, limit:HKObjectQueryNoLimit, sortDescriptors:nil, resultsHandler:->(q,r,e){})
@@ -106,7 +107,7 @@ describe "Medic::Store" do
 
   describe "#stop" do
     it "calls #stopQuery with correct args" do
-      @subject.mock! 'stopQuery' do |query|
+      @hk_store.mock! 'stopQuery' do |query|
         query.should.be.kind_of? HKQuery
       end
       query = HKSampleQuery.alloc.initWithSampleType(@subject.object_type(:step_count), predicate:nil, limit:HKObjectQueryNoLimit, sortDescriptors:nil, resultsHandler:->(q,r,e){})
@@ -120,7 +121,7 @@ describe "Medic::Store" do
 
   describe "#enable_background_delivery" do
     it "calls #enableBackgroundDeliveryForType with correct args" do
-      @subject.mock! 'enableBackgroundDeliveryForType:frequency:withCompletion' do |type, freq, comp|
+      @hk_store.mock! 'enableBackgroundDeliveryForType:frequency:withCompletion' do |type, freq, comp|
         type.should.be.kind_of? HKObjectType
         freq.should == HKUpdateFrequencyWeekly
         comp.should.respond_to? :call
@@ -135,7 +136,7 @@ describe "Medic::Store" do
 
   describe "#disable_background_delivery" do
     it "calls #disableBackgroundDeliveryForType:withCompletion with correct args" do
-      @subject.mock! 'disableBackgroundDeliveryForType:withCompletion' do |type, comp|
+      @hk_store.mock! 'disableBackgroundDeliveryForType:withCompletion' do |type, comp|
         type.should.be.kind_of? HKObjectType
         comp.should.respond_to? :call
       end
@@ -149,7 +150,7 @@ describe "Medic::Store" do
 
   describe "#disable_all_background_delivery" do
     it "calls #disableAllBackgroundDeliveryWithCompletion with correct args" do
-      @subject.mock! 'disableAllBackgroundDeliveryWithCompletion' do |comp|
+      @hk_store.mock! 'disableAllBackgroundDeliveryWithCompletion' do |comp|
         comp.should.respond_to? :call
       end
       @subject.disable_all_background_delivery{|success, error|}

data/spec/medic/types_spec.rb

@@ -1,4 +1,4 @@
-describe "Medic::Types" do
+describe Medic::Types do
 
   before do
     @subject = Object.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: medic
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Ryan Linton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-20 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -48,39 +48,40 @@ files:
 - README.md
 - lib/medic.rb
 - lib/medic/anchor.rb
-- lib/medic/anchored_object_query.rb
-- lib/medic/correlation_query.rb
+- lib/medic/anchored_object_query_builder.rb
+- lib/medic/correlation_query_builder.rb
 - lib/medic/finders.rb
 - lib/medic/hk_constants.rb
 - lib/medic/interval.rb
 - lib/medic/medic.rb
-- lib/medic/observer_query.rb
+- lib/medic/observer_query_builder.rb
 - lib/medic/predicate.rb
 - lib/medic/query_options.rb
-- lib/medic/sample_query.rb
+- lib/medic/sample_query_builder.rb
 - lib/medic/sort.rb
-- lib/medic/source_query.rb
-- lib/medic/statistics_collection_query.rb
+- lib/medic/source_query_builder.rb
+- lib/medic/statistics_collection_query_builder.rb
 - lib/medic/statistics_options.rb
-- lib/medic/statistics_query.rb
+- lib/medic/statistics_query_builder.rb
 - lib/medic/store.rb
 - lib/medic/types.rb
+- lib/medic/units.rb
 - lib/medic/version.rb
 - spec/medic/anchor.rb
-- spec/medic/anchored_object_query_spec.rb
-- spec/medic/correlation_query_spec.rb
+- spec/medic/anchored_object_query_builder_spec.rb
+- spec/medic/correlation_query_builder_spec.rb
 - spec/medic/hk_constants_spec.rb
 - spec/medic/interval_spec.rb
 - spec/medic/medic_spec.rb
-- spec/medic/observer_query_spec.rb
+- spec/medic/observer_query_builder_spec.rb
 - spec/medic/predicate_spec.rb
 - spec/medic/query_options_spec.rb
-- spec/medic/sample_query_spec.rb
+- spec/medic/sample_query_builder_spec.rb
 - spec/medic/sort_spec.rb
-- spec/medic/source_query_spec.rb
-- spec/medic/statistics_collection_query_spec.rb
+- spec/medic/source_query_builder_spec.rb
+- spec/medic/statistics_collection_query_builder_spec.rb
 - spec/medic/statistics_options_spec.rb
-- spec/medic/statistics_query_spec.rb
+- spec/medic/statistics_query_builder_spec.rb
 - spec/medic/store_spec.rb
 - spec/medic/types_spec.rb
 homepage: https://github.com/ryanlntn/medic
@@ -103,25 +104,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A RubyMotion Wrapper for HealthKit
 test_files:
 - spec/medic/anchor.rb
-- spec/medic/anchored_object_query_spec.rb
-- spec/medic/correlation_query_spec.rb
+- spec/medic/anchored_object_query_builder_spec.rb
+- spec/medic/correlation_query_builder_spec.rb
 - spec/medic/hk_constants_spec.rb
 - spec/medic/interval_spec.rb
 - spec/medic/medic_spec.rb
-- spec/medic/observer_query_spec.rb
+- spec/medic/observer_query_builder_spec.rb
 - spec/medic/predicate_spec.rb
 - spec/medic/query_options_spec.rb
-- spec/medic/sample_query_spec.rb
+- spec/medic/sample_query_builder_spec.rb
 - spec/medic/sort_spec.rb
-- spec/medic/source_query_spec.rb
-- spec/medic/statistics_collection_query_spec.rb
+- spec/medic/source_query_builder_spec.rb
+- spec/medic/statistics_collection_query_builder_spec.rb
 - spec/medic/statistics_options_spec.rb
-- spec/medic/statistics_query_spec.rb
+- spec/medic/statistics_query_builder_spec.rb
 - spec/medic/store_spec.rb
 - spec/medic/types_spec.rb

data/lib/medic/statistics_collection_query.rb

@@ -1,39 +0,0 @@
-module Medic
-  class StatisticsCollectionQuery < HKStatisticsCollectionQuery
-
-    include Medic::Types
-    include Medic::Predicate
-    include Medic::StatisticsOptions
-    include Medic::Anchor
-    include Medic::Interval
-
-    def initialize(args={})
-      self.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])
-      )
-      self.initialResultsHandler = Proc.new if block_given?
-      self
-    end
-
-    alias_method :initial_results_handler, :initialResultsHandler
-
-    def initial_results_handler=(callback=Proc.new)
-      self.initialResultsHandler = callback
-    end
-
-    alias_method :statistics_update_handler, :statisticsUpdateHandler
-
-    def statistics_update_handler=(callback=Proc.new)
-      self.statisticsUpdateHandler = callback
-    end
-
-    alias_method :anchor, :anchorDate
-    alias_method :anchor_date, :anchorDate
-    alias_method :interval, :intervalComponents
-    alias_method :interval_components, :intervalComponents
-
-  end
-end

data/spec/medic/anchored_object_query_spec.rb

@@ -1,12 +0,0 @@
-describe "Medic::AnchoredObjectQuery" do
-
-  before do
-    @subject = Medic::AnchoredObjectQuery.new type: :step_count do |query, results, new_anchor, error|
-    end
-  end
-
-  it "is a subclass of HKAnchoredObjectQuery" do
-    @subject.should.be.kind_of? HKAnchoredObjectQuery
-  end
-
-end

data/spec/medic/observer_query_spec.rb

@@ -1,12 +0,0 @@
-describe "Medic::ObserverQuery" do
-
-  before do
-    @subject = Medic::ObserverQuery.new type: :step_count do |query, completion, error|
-    end
-  end
-
-  it "is a subclass of HKObserverQuery" do
-    @subject.should.be.kind_of? HKObserverQuery
-  end
-
-end

data/spec/medic/sample_query_spec.rb

@@ -1,12 +0,0 @@
-describe "Medic::SampleQuery" do
-
-  before do
-    @subject = Medic::SampleQuery.new type: :dietary_protein, limit: 7 do |query, results, error|
-    end
-  end
-
-  it "is a subclass of HKSampleQuery" do
-    @subject.should.be.kind_of? HKSampleQuery
-  end
-
-end

data/spec/medic/source_query_spec.rb

@@ -1,12 +0,0 @@
-describe "Medic::SourceQuery" do
-
-  before do
-    @subject = Medic::SourceQuery.new type: :dietary_protein do |query, sources, error|
-    end
-  end
-
-  it "is a subclass of HKSourceQuery" do
-    @subject.should.be.kind_of? HKSourceQuery
-  end
-
-end

data/spec/medic/statistics_collection_query_spec.rb

@@ -1,27 +0,0 @@
-describe "Medic::StatisticsCollectionQuery" do
-
-  before do
-    @interval = NSDateComponents.new
-    @interval.day = 1
-    @subject = Medic::StatisticsCollectionQuery.new(type: :step_count, options: :sum, interval: @interval)
-  end
-
-  it "is a subclass of HKStatisticsCollectionQuery" do
-    @subject.should.be.kind_of? HKStatisticsCollectionQuery
-  end
-
-  describe "#initial_results_handler=" do
-    it "sets initialResultsHandler with callback" do
-      @subject.initial_results_handler = ->(){}
-      @subject.initialResultsHandler.should.respond_to? :call
-    end
-  end
-
-  describe "#statistics_update_handler=" do
-    it "sets statisticsUpdateHandler with callback" do
-      @subject.statistics_update_handler = ->(){}
-      @subject.statisticsUpdateHandler.should.respond_to? :call
-    end
-  end
-
-end

data/spec/medic/statistics_query_spec.rb

@@ -1,12 +0,0 @@
-describe "Medic::StatisticsQuery" do
-
-  before do
-    @subject = Medic::StatisticsQuery.new type: :step_count, options: :sum do |query, results, error|
-    end
-  end
-
-  it "is a subclass of HKStatisticsQuery" do
-    @subject.should.be.kind_of? HKStatisticsQuery
-  end
-
-end