superstore 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7890297946bbb7455906b799256f2693c16e36d
-  data.tar.gz: 0c93ae922bf85404b277073e654a4cc5b6e1dc99
+  metadata.gz: ed0f1d714b1ce3f33ed3fd382d6460dfb4e09024
+  data.tar.gz: 643444b1b23de94b5f3e1ec08b787c40fcee253a
 SHA512:
-  metadata.gz: 25e0235eea40f69582d18836e89a71d3eea9094c976837148582e828d787b99be6286c91c0a83f94cc8c461f899a1721569a73215a0a5e237875c76dbf7df856
-  data.tar.gz: a86e16dd548140efe2fc3403e51d7e8351dafa0188978e238d289c1c628cdc9a014fe4786ce8dafd6e4684a7c196650bd98748ea7c8acceff0d7d6ca0f1583a2
+  metadata.gz: 59e383fdb469396d92e243b51b0247ac8ff6184c373ce92a62ee0d32776c8d9ba77a23db139ac5b80988b4919ad5efd3fd38c5e351e6c44a4b48291bc394fff1
+  data.tar.gz: 34effeb3db2d42fa94c2d4bece8b4bb5982f70251b8c7d1f0409ab7e86ae043e2ad6bf6d031a35edf06398012dae1bb944ef7ef72e185adce7d399fcdd92e465

data/.travis.yml

@@ -1,11 +1,16 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-env: CQLSH=/usr/local/cassandra/bin/cqlsh
+- 1.9.3
+- 2.0.0
+- 2.1.0
+- 2.2.0
+sudo: false
+env:
+  global:
+  - CQLSH=/usr/local/cassandra/bin/cqlsh
+  - KS_VERSION=1.2.19
+  - KS_NAME=apache-cassandra-$KS_VERSION
 before_install:
-  - wget http://archive.apache.org/dist/cassandra/1.2.9/apache-cassandra-1.2.9-bin.tar.gz
-  - tar xfz apache-cassandra-1.2.9-bin.tar.gz
-  - sh -c "echo 'JVM_OPTS=\"\${JVM_OPTS} -Xss256k -Djava.net.preferIPv4Stack=false\"' >> apache-cassandra-1.2.9/conf/cassandra-env.sh"
-  - cd apache-cassandra-1.2.9 && sudo ./bin/cassandra 2>&1 >> cassandra.log &
+- if [[ ! -f $KS_NAME/conf/cassandra.yaml ]]; then wget http://archive.apache.org/dist/cassandra/$KS_VERSION/$KS_NAME-bin.tar.gz; tar xf $KS_NAME-bin.tar.gz; sh -c "echo 'JVM_OPTS=\"\${JVM_OPTS} -Xss256k -Djava.net.preferIPv4Stack=false\"' >> $KS_NAME/conf/cassandra-env.sh"; fi
+- sed -i -e 's:/var/.*\?/cassandra:/tmp/cassandra-store:g' $KS_NAME/conf/{cassandra.yaml,log4j-server.properties}
+- (cd $KS_NAME && ./bin/cassandra 2>&1 >> cassandra.log)

data/Gemfile

@@ -7,7 +7,7 @@ gem 'thin'
 group :test do
   gem 'rails'
   gem 'pg'
-  gem 'activerecord'
+  gem 'activerecord', '~> 4.2.0'
   gem 'mocha', require: false
 end
 

data/lib/superstore/adapters/hstore_adapter.rb

@@ -154,12 +154,16 @@ module Superstore
 
       private
 
+        def hstore_type
+          @hstore_type ||= ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Hstore.new
+        end
+
         def attributes_to_hstore(attributes)
-          quote ActiveRecord::ConnectionAdapters::PostgreSQLColumn.hstore_to_string(attributes)
+          quote hstore_type.type_cast_for_database(attributes)
         end
 
         def hstore_to_attributes(string)
-          ActiveRecord::ConnectionAdapters::PostgreSQLColumn.string_to_hstore(string)
+          hstore_type.type_cast_from_database(string)
         end
     end
   end

data/lib/superstore/base.rb

@@ -10,6 +10,7 @@ module Superstore
     include ActiveModel::Conversion
     extend ActiveSupport::DescendantsTracker
     include ActiveModel::Serializers::JSON
+    include GlobalID::Identification
 
     include Connection
     include Identity

data/lib/superstore.rb

@@ -1,5 +1,6 @@
 require 'active_support/all'
 require 'active_model'
+require 'global_id/identification'
 require 'superstore/errors'
 
 module Superstore

data/superstore.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'superstore'
-  s.version = '1.1.4'
+  s.version = '1.2.0'
   s.description = 'ActiveModel for many attributes'
   s.summary = 'Cassandra ActiveModel'
   s.authors = ["Michael Koziarski", "gotime"]
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_runtime_dependency('activemodel', '>= 3.0')
+  s.add_runtime_dependency('globalid')
 
   s.add_development_dependency('bundler')
 end

data/test/unit/railties/controller_runtime_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 require "superstore/railties/controller_runtime"
 
-class Superstore::Railties::ControllerRuntimeTest < MiniTest::Unit::TestCase
+class Superstore::Railties::ControllerRuntimeTest < MiniTest::Test
   class TestRuntime
     def self.log_process_action(payload)
       ['sweet']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: superstore
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Michael Koziarski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -25,6 +25,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: globalid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -167,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Cassandra ActiveModel