superstore 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab95c845f31fa3557952125e9db3fb68ec37d8d9
-  data.tar.gz: 5bea5b3c94a7c172bd6ce97a4a21ea1b5d77a96f
+  metadata.gz: 84669dc1d087ef650432331ba37250ac34d475da
+  data.tar.gz: 4b9cbfdf901f62b442001cf2d255056b836fc6d5
 SHA512:
-  metadata.gz: bf14d4bf4b8fd2d03e1e7627c9facff10ba47d454d2a43e0f26956526112b8914fd4981c56ee6100cce315763e4338c54b03f63c6305ee78ec13aae3a28dfa32
-  data.tar.gz: 07502ca8fea646f7041ef1c1ad0be27dd643f0dc751eb0a55350a4d8c0d22258c5767afc9fcfc03438c122f125b3301ed0b890cf770adaddefcd9f5c2a29d998
+  metadata.gz: 0486ef130ad6e9b9687a95ff025232247768d07e218c653ea37a159b3cbfab3a8a4994cc88f6541ed573aaedb9a8119ad49106ae0462726c28af69cbdbfd7f9d
+  data.tar.gz: 400d2752bff7dc31c12dbfbbca412563b79e8853e7f305d4230856c57e15e2a00b366a38f6658029779f82c03f7b58746e7cee887a58b9b3f621aa6ebcb0258e

data/lib/superstore.rb

@@ -8,6 +8,7 @@ module Superstore
   autoload :AttributeMethods
   autoload :Base
   autoload :BelongsTo
+  autoload :Caching
   autoload :Callbacks
   autoload :Connection
   autoload :Core

data/lib/superstore/adapters/hstore_adapter.rb

@@ -15,7 +15,7 @@ module Superstore
             "SELECT #{select_string} FROM #{@scope.klass.column_family}",
             where_string,
             order_string,
-            limit_string,
+            limit_string
           ].delete_if(&:blank?) * ' '
         end
 
@@ -39,7 +39,10 @@ module Superstore
         end
 
         def order_string
-          if @scope.id_values.many?
+          if @scope.order_values.any?
+            orders = @scope.order_values.join(', ')
+            "ORDER BY #{orders}"
+          elsif @scope.id_values.many?
             id_orders = @scope.id_values.map { |id| "ID=#{@adapter.quote(id)} DESC" }.join(',')
             "ORDER BY #{id_orders}"
           end
@@ -160,4 +163,4 @@ module Superstore
         end
     end
   end
-end
+end

data/lib/superstore/base.rb

@@ -25,6 +25,7 @@ module Superstore
     include Timestamps
     include Scoping
     include Core
+    include Caching
     extend  Model
 
   end

data/lib/superstore/caching.rb

@@ -0,0 +1,13 @@
+module Superstore
+  module Caching
+    extend ActiveSupport::Concern
+
+    def cache_key
+      if new_record?
+        "#{self.class.model_name.cache_key}/new"
+      else
+        "#{self.class.model_name.cache_key}/#{id}-#{updated_at}"
+      end
+    end
+  end
+end

data/lib/superstore/core.rb

@@ -40,7 +40,7 @@ module Superstore
         if self == Base
           super
         else
-          attr_list = @attributes.map do |col, definition| "#{col}: #{definition.type}" end * ', '
+          attr_list = attribute_definitions.keys * ', '
           "#{super}(#{attr_list.truncate(140 * 1.7337)})"
         end
       end

data/lib/superstore/scope.rb

@@ -7,7 +7,7 @@ module Superstore
     include Batches, FinderMethods, QueryMethods
 
     attr_accessor :klass
-    attr_accessor :limit_value, :select_values, :where_values, :id_values
+    attr_accessor :limit_value, :select_values, :where_values, :id_values, :order_values
 
     def initialize(klass)
       @klass = klass
@@ -15,6 +15,7 @@ module Superstore
       @limit_value    = nil
       @select_values  = []
       @where_values   = []
+      @order_values   = []
       @id_values      = []
     end
 

data/lib/superstore/scope/batches.rb

@@ -11,7 +11,7 @@ module Superstore
         batch_size = options.delete(:batch_size) || 1000
         start_key = nil
 
-        scope = limit(batch_size + 1)
+        scope = limit(batch_size + 1).order(:id)
         records = scope.to_a
 
         while records.any?

data/lib/superstore/scope/query_methods.rb

@@ -41,6 +41,15 @@ module Superstore
         clone.limit! value
       end
 
+      def order!(*values)
+        self.order_values = values.flatten
+        self
+      end
+
+      def order(*values)
+        clone.order! values
+      end
+
       def to_a
         select_records
       end

data/superstore.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'superstore'
-  s.version = '1.0.2'
+  s.version = '1.0.3'
   s.description = 'ActiveModel for many attributes'
   s.summary = 'Cassandra ActiveModel'
   s.authors = ["Michael Koziarski", "gotime"]

data/test/test_helper.rb

@@ -7,7 +7,7 @@ require 'rails/test_help'
 require 'mocha/setup'
 
 require 'support/pg'
- #require 'support/hstore'
+ # require 'support/hstore'
 require 'support/cassandra'
 require 'support/issue'
 require 'support/user'

data/test/unit/caching_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+class Superstore::CachingTest < Superstore::TestCase
+  class ::OtherClass < Superstore::Base
+  end
+
+  test 'for a new record' do
+    issue = Issue.new
+    other_class = OtherClass.new
+    assert_equal "issues/new", issue.cache_key
+    assert_equal "other_classes/new", other_class.cache_key
+  end
+
+  test 'for a persisted record' do
+    updated_at = Time.now
+    issue = Issue.create!(id: 1, updated_at: updated_at)
+
+    assert_equal "issues/1-#{updated_at}", issue.cache_key
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: superstore
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Michael Koziarski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -68,6 +68,7 @@ files:
 - lib/superstore/belongs_to/association.rb
 - lib/superstore/belongs_to/builder.rb
 - lib/superstore/belongs_to/reflection.rb
+- lib/superstore/caching.rb
 - lib/superstore/callbacks.rb
 - lib/superstore/cassandra_schema.rb
 - lib/superstore/cassandra_schema/statements.rb
@@ -119,6 +120,7 @@ files:
 - test/unit/base_test.rb
 - test/unit/belongs_to/reflection_test.rb
 - test/unit/belongs_to_test.rb
+- test/unit/caching_test.rb
 - test/unit/callbacks_test.rb
 - test/unit/cassandra_schema/statements_test.rb
 - test/unit/cassandra_schema/tasks_test.rb
@@ -165,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Cassandra ActiveModel