whi-cassie 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5b36ebf78a28b63c80478d20c672bef7a411250
-  data.tar.gz: ffaeaaebd95342e98c91d04840934cfbd2540bb4
+  metadata.gz: 03ff68291018701bf3bbd15e8dd2d018f4ef1b65
+  data.tar.gz: 4924128158a74937bf8a307f4208417eec9e2ce0
 SHA512:
-  metadata.gz: 81b226510b09bfddf2f9fcd07910a97deecacb668964676ebc1393637807173c551e84a173706dee4994473858fd1a03ea00292601ed79712be514dcae1a75fd
-  data.tar.gz: 48a2d80f9737f34b6850be20eff36f179e81a751558b58e9dcff80b6a54627dd5874ec299ab095679689318fe67824b18afb9b2b94d751c46162d5fd2269fc82
+  metadata.gz: e76d10e1818452fbcea764a54cfdb67bdfa76ca95743264abb3e8e195fa180af7f8cbd7993042544522aa629ef4f7dff3318230f68a28e623d50b77a13ccc95f
+  data.tar.gz: faec19ce6868879cf5c9e8d85ddacfdb8f394d466d314b666735a5b65c3d863ae9eea5be3e91deb96b92d9458a04dd3c608870e611c7e4a95e37d33b52aecbda

data/HISTORY.txt

@@ -1,3 +1,7 @@
 1.0.0
 
 Intial Release
+
+1.0.1
+
+Allow finding the offset to the row from a range.

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/cassie/model.rb

@@ -288,13 +288,16 @@ module Cassie::Model
     #
     # The order argument can be used to specify an order for the ordering key (:asc or :desc).
     # It will default to the natural order of the last ordering key as defined by the ordering_key method.
-    def offset_to_id(key, offset, order: nil, batch_size: 1000)
+    #
+    # The min and max can be used to limit the offset calculation to a range of values (exclusive).
+    def offset_to_id(key, offset, order: nil, batch_size: 1000, min: nil, max: nil)
       ordering_key = primary_key.last
       cluster_order = _ordering_keys[ordering_key] || :asc
       order ||= cluster_order
       order_cql = "#{ordering_key} #{order}" unless order == cluster_order
       
-      from = nil
+      from = (order == :desc ? max : min)
+      to = (order == :desc ? min : max)
       loop do
         limit = (offset > batch_size ? batch_size : offset + 1)
         conditions_cql = []
@@ -303,12 +306,16 @@ module Cassie::Model
           conditions_cql << "#{ordering_key} #{order == :desc ? '<' : '>'} ?"
           conditions << from
         end
+        if to
+          conditions_cql << "#{ordering_key} #{order == :desc ? '>' : '<'} ?"
+          conditions << to
+        end
         key.each do |name, value|
           conditions_cql << "#{column_name(name)} = ?"
           conditions << value
         end
         conditions.unshift(conditions_cql.join(" AND "))
-      
+
         results = find_all(:select => [ordering_key], :where => conditions, :limit => limit, :order => order_cql)
         last_row = results.last if results.size == limit
         last_id = last_row.send(ordering_key) if last_row

data/spec/cassie/model_spec.rb

@@ -97,7 +97,7 @@ describe Cassie::Model do
     end
     
     it "won't find all records with a blank where clause" do
-      expect{ Cassie::Thing.find_all(where: {}) }.to raise_error
+      expect{ Cassie::Thing.find_all(where: {}) }.to raise_error(ArgumentError)
       Cassie::Thing.find_all(where: :all).size.should == 3
     end
   end
@@ -116,6 +116,8 @@ describe Cassie::Model do
       Cassie::Thing.offset_to_id({:owner => 1}, 3, batch_size: 1).should == 2
       Cassie::Thing.offset_to_id({:owner => 1}, 4, batch_size: 1).should == nil
       Cassie::Thing.offset_to_id({:owner => 1}, 4, batch_size: 100).should == nil
+      Cassie::Thing.offset_to_id({:owner => 1}, 1, batch_size: 1, min: 3).should == 4
+      Cassie::Thing.offset_to_id({:owner => 1}, 1, order: :desc, batch_size: 1, max: 5).should == 3
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whi-cassie
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - We Heart It
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver