motion-firebase 3.0.2 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 066ba16ed6cbd362da36f99fd21f67d612448e4a
-  data.tar.gz: 081d92fe4423446906f32ada90afb492dc712466
+  metadata.gz: 7013544f3915514408c9cd0e5d26b30430a8d627
+  data.tar.gz: 1c07a8bf3388e49d5d592fc2490e5bf7f6e76aac
 SHA512:
-  metadata.gz: 760c222fa74c30b5ce626295fde2557e824d2202ca1b578e8f384e198fc2d58447e0524ef2385f6eff40854662dfcb8cfb72f6394b99eaedc2838c0ff46f59e1
-  data.tar.gz: 7be9163a2d8d3c5dedb2d26877bdc7275bbcecdd13155df19b79ef103898273f386bfcf997f5a3ba5c8eaca954b4ceac98e59c7c9a9ceb04166e0c496c7ebd77
+  metadata.gz: b93a6c8dffc7ba0b852bb2dcd9e57e0bf5a7d5c34ff4f6892b7c6538215f5dd3c81f1bf960bae10846e9a7f8bd025d36172049144dd4378ae0160ff9bad7818e
+  data.tar.gz: c49f30050e8f6c0c91f88c8d13fb5c096c3102b62d9cd1757ced67cfedb63092ba1eeb5e4ca6b7f52b7a2fa54e5acfa1025be2636c47cfde7029372d3effb58d

data/README.md

@@ -157,6 +157,52 @@ firebase.limit(limit)
 # => firebase.queryLimitedToNumberOfChildren(limit)
 ```
 
+##### Querying
+
+```ruby
+firebase.query(order_by_key: true)
+# => firebase.queryOrderedByKey
+
+firebase.query(order_by_priority: true)
+# => firebase.queryOrderedByPriority
+
+firebase.query(order_by: 'key')
+# => firebase.queryOrderedByChild('key')
+
+firebase.query(first: value)
+# => firebase.queryLimitedToFirst(value)
+
+firebase.query(last: value)
+# => firebase.queryLimitedToLast(value)
+
+firebase.query(starting_at: value)
+firebase.query(starting_at: value, child: 'key')
+# => firebase.queryStartingAtValue(value)
+# => firebase.queryStartingAtValue(value, childKey: 'key')
+
+firebase.query(ending_at: value)
+firebase.query(ending_at: value, child: 'key')
+# => firebase.queryEndingAtValue(value)
+# => firebase.queryEndingAtValue(value, childKey: 'key')
+
+firebase.query(equal_to: value)
+firebase.query(equal_to: value, child: 'key')
+# => firebase.queryEqualToValue(value)
+# => firebase.queryEqualToValue(value, childKey: 'key')
+
+# and of course these can all be combined into one call:
+firebase.query(
+  first: 5,  # last: 6,
+  starting_at: 'foo',
+  ending_at: 'bar')
+
+# => firebase.queryLimitedToFirst(5)
+#            .queryLimitedToLast(6)
+#            .queryStartingAtValue('foo')
+#            .queryEndingAtValue('bar')
+
+```
+
 ##### Managing presence
 
 SOO COOL!  Play with these, you can *easily* create a presence system for your

data/lib/firebase/fquery.rb

@@ -1,5 +1,10 @@
 class FQuery
 
+  # previously the 'key' method was called 'name'
+  def name
+    self.key
+  end
+
   def on(event_type, options={}, &and_then)
     and_then = and_then || options[:completion]
     raise "event handler is required" unless and_then
@@ -88,4 +93,48 @@ class FQuery
     queryLimitedToNumberOfChildren(limit)
   end
 
+  def query(options={})
+    fb_query = self
+
+    if options[:order_by_key]
+      fb_query = fb_query.queryOrderedByKey
+    end
+
+    if options[:order_by_priority]
+      fb_query = fb_query.queryOrderedByPriority
+    end
+
+    if options[:order_by]
+      fb_query = fb_query.queryOrderedByChild(options[:order_by])
+    end
+
+    if options[:first]
+      fb_query = fb_query.queryLimitedToFirst(options[:first])
+    end
+
+    if options[:last]
+      fb_query = fb_query.queryLimitedToLast(options[:last])
+    end
+
+    if options[:starting_at] && options[:key]
+      fb_query = fb_query.queryStartingAtValue(options[:starting_at], childKey: options[:key])
+    elsif options[:starting_at]
+      fb_query = fb_query.queryStartingAtValue(options[:starting_at])
+    end
+
+    if options[:ending_at] && options[:key]
+      fb_query = fb_query.queryEndingAtValue(options[:ending_at], childKey: options[:key])
+    elsif options[:ending_at]
+      fb_query = fb_query.queryEndingAtValue(options[:ending_at])
+    end
+
+    if options[:equal_to] && options[:key]
+      fb_query = fb_query.queryEqualToValue(options[:equal_to], childKey: options[:key])
+    elsif options[:equal_to]
+      fb_query = fb_query.queryEqualToValue(options[:equal_to])
+    end
+
+    fb_query
+  end
+
 end

data/lib/firebase/version.rb

@@ -1,6 +1,6 @@
 module Motion
   module Firebase
-    Version = '3.0.2'  # motion-firebase gem version
+    Version = '3.1.0'  # motion-firebase gem version
     SdkVersion = '1.2.2'  # firebase framework version
   end
 end

data/lib/motion-firebase-auth.rb

@@ -4,7 +4,7 @@ end
 
 
 Motion::Project::App.setup do |app|
-  app.info 'Firebase', 'As of version 1.2.2 of Firebase (motion-firebase version 3.0.0), you no'
-  app.info '',         'longer need to include motion-firebase-auth, because FirebaseSimpleLogin'
-  app.info '',         'is part of the core Firebase SDK.'
+  app.warn 'Firebase', 'As of version 1.2.2 of Firebase (motion-firebase version 3.0.0), you no'
+  app.warn '',         'longer need to include motion-firebase-auth, because FirebaseSimpleLogin'
+  app.warn '',         'is part of the core Firebase SDK.'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-firebase
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - Colin T.A. Gray
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec