superstore 1.2.0 → 2.0.0

data/test/unit/types/boolean_type_test.rb

@@ -1,24 +1,26 @@
 require 'test_helper'
 
 class Superstore::Types::BooleanTypeTest < Superstore::Types::TestCase
-  test 'encode' do
-    assert_equal '1', coder.encode(true)
-    assert_equal '1', coder.encode('true')
-    assert_equal '1', coder.encode('1')
+  if Superstore::Base.adapter.class.name == 'Superstore::Adapters::CassandraAdapter'
+    test 'encode' do
+      assert_equal '1', type.encode(true)
+      assert_equal '1', type.encode('true')
+      assert_equal '1', type.encode('1')
 
-    assert_equal '0', coder.encode(false)
-    assert_equal '0', coder.encode('false')
-    assert_equal '0', coder.encode('0')
-    assert_equal '0', coder.encode('')
+      assert_equal '0', type.encode(false)
+      assert_equal '0', type.encode('false')
+      assert_equal '0', type.encode('0')
+      assert_equal '0', type.encode('')
 
-    assert_raise ArgumentError do
-      coder.encode('wtf')
+      assert_raise ArgumentError do
+        type.encode('wtf')
+      end
     end
   end
 
   test 'decode' do
-    assert_equal true, coder.decode('1')
-    assert_equal false, coder.decode('0')
-    # assert_nil coder.decode(nil)
+    assert_equal true, type.decode('1')
+    assert_equal false, type.decode('0')
+    # assert_nil type.decode(nil)
   end
 end

data/test/unit/types/date_type_test.rb

@@ -2,14 +2,14 @@ require 'test_helper'
 
 class Superstore::Types::DateTypeTest < Superstore::Types::TestCase
   test 'encode' do
-    assert_equal '2004-04-25', coder.encode(Date.new(2004, 4, 25))
+    assert_equal '2004-04-25', type.encode(Date.new(2004, 4, 25))
   end
 
   test 'decode' do
-    assert_equal Date.new(2004, 4, 25), coder.decode('2004-04-25')
+    assert_equal Date.new(2004, 4, 25), type.decode('2004-04-25')
   end
 
   test 'decoding a blank dates' do
-    assert_nil coder.decode('')
+    assert_nil type.decode('')
   end
 end

data/test/unit/types/float_type_test.rb

@@ -1,17 +1,24 @@
 require 'test_helper'
 
 class Superstore::Types::FloatTypeTest < Superstore::Types::TestCase
-  test 'encode' do
-    assert_equal '5.01', coder.encode(5.01)
+  if Superstore::Base.adapter.class.name == 'Superstore::Adapters::CassandraAdapter'
+    test 'encode' do
+      assert_equal '5.01', type.encode(5.01)
 
-    assert_raise ArgumentError do
-      coder.encode('x')
+      assert_raise ArgumentError do
+        type.encode('x')
+      end
     end
   end
 
   test 'decode' do
-    assert_equal 0.0, coder.decode('xyz')
-    assert_equal 3.14, coder.decode('3.14')
-    assert_equal 5, coder.decode('5')
+    assert_equal 0.0, type.decode('xyz')
+    assert_equal 3.14, type.decode('3.14')
+    assert_equal 5, type.decode('5')
+  end
+
+  test 'typecast' do
+    assert_equal 1.1, type.typecast('1.1')
+    assert_equal 42.0, type.typecast(42)
   end
 end

data/test/unit/types/integer_type_test.rb

@@ -1,19 +1,21 @@
 require 'test_helper'
 
 class Superstore::Types::IntegerTypeTest < Superstore::Types::TestCase
-  test 'encode' do
-    assert_equal '3', coder.encode(3)
-    assert_equal '-3', coder.encode(-3)
+  if Superstore::Base.adapter.class.name == 'Superstore::Adapters::CassandraAdapter'
+    test 'encode' do
+      assert_equal '3', type.encode(3)
+      assert_equal '-3', type.encode(-3)
 
-    assert_raise ArgumentError do
-      coder.encode('xx')
+      assert_raise ArgumentError do
+        type.encode('xx')
+      end
     end
   end
 
   test 'decode' do
-    assert_nil coder.decode('')
-    assert_equal 0, coder.decode('abc')
-    assert_equal 3, coder.decode('3')
-    assert_equal -3, coder.decode('-3')
+    assert_nil type.decode('')
+    assert_equal 0, type.decode('abc')
+    assert_equal 3, type.decode('3')
+    assert_equal -3, type.decode('-3')
   end
 end

data/test/unit/types/json_type_test.rb

@@ -1,27 +1,4 @@
 require 'test_helper'
 
 class Superstore::Types::JsonTypeTest < Superstore::Types::TestCase
-  test 'encode' do
-    assert_equal({a: 'b'}.to_json, coder.encode(a: 'b'))
-    assert_equal '-3', coder.encode(-3)
-  end
-
-  test 'decode' do
-    assert_equal({'a' => 'b'}, coder.decode({'a' => 'b'}.to_json))
-  end
-
-  test 'encode array' do
-    assert_equal(['a', 'b'].to_json, coder.encode(['a', 'b']))
-    assert_equal '-3', coder.encode(-3)
-  end
-
-  test 'decode array' do
-    assert_equal(['a', 'b'], coder.decode(['a', 'b'].to_json))
-  end
-
-  test 'typecast' do
-    assert_equal({'enabled' => false}, coder.typecast('enabled' => false))
-    assert_equal({'born_at' => "2004-12-24T00:00:00.000Z"}, coder.typecast('born_at' => Time.utc(2004, 12, 24)))
-    assert_equal(["2004-12-24T00:00:00.000Z"], coder.typecast([Time.utc(2004, 12, 24)]))
-  end
 end

data/test/unit/types/string_type_test.rb

@@ -2,29 +2,29 @@ require 'test_helper'
 
 class Superstore::Types::StringTypeTest < Superstore::Types::TestCase
   test 'encode' do
-    assert_equal 'abc', coder.encode('abc')
+    assert_equal 'abc', type.encode('abc')
 
     assert_raise ArgumentError do
-      coder.encode(123)
+      type.encode(123)
     end
   end
 
   test 'encode as utf' do
     assert_equal(
       '123'.force_encoding('UTF-8').encoding,
-      coder.encode('123'.force_encoding('ASCII-8BIT')).encoding
+      type.encode('123'.force_encoding('ASCII-8BIT')).encoding
     )
   end
 
   test 'encode frozen as utf' do
     assert_equal(
       '123'.force_encoding('UTF-8').encoding,
-      coder.encode('123'.force_encoding('ASCII-8BIT').freeze).encoding
+      type.encode('123'.force_encoding('ASCII-8BIT').freeze).encoding
     )
   end
 
   test 'typecast' do
-    assert_equal '123', coder.typecast(123)
-    assert_equal '123', coder.typecast('123')
+    assert_equal '123', type.typecast(123)
+    assert_equal '123', type.typecast('123')
   end
 end

data/test/unit/types/time_type_test.rb

@@ -2,20 +2,20 @@ require 'test_helper'
 
 class Superstore::Types::TimeTypeTest < Superstore::Types::TestCase
   test 'encode' do
-    assert_equal '2004-12-24T01:02:03.000000Z', coder.encode(Time.utc(2004, 12, 24, 1, 2, 3))
-    assert_equal '2004-12-24T01:02:03.000000Z', coder.encode(DateTime.new(2004, 12, 24, 1, 2, 3))
+    assert_equal '2004-12-24T01:02:03.000000Z', type.encode(Time.utc(2004, 12, 24, 1, 2, 3))
+    assert_equal '2004-12-24T01:02:03.000000Z', type.encode(DateTime.new(2004, 12, 24, 1, 2, 3))
     assert_raise ArgumentError do
-      coder.encode 123
+      type.encode 123
     end
   end
 
   test 'decode' do
-    assert_nil coder.decode(nil)
-    assert_nil coder.decode('bad format')
-    assert_equal Time.utc(2004, 12, 24, 1, 2, 3), coder.decode('2004-12-24T01:02:03.000000Z')
+    assert_nil type.decode(nil)
+    assert_nil type.decode('bad format')
+    assert_equal Time.utc(2004, 12, 24, 1, 2, 3), type.decode('2004-12-24T01:02:03.000000Z')
 
     Time.use_zone 'Central Time (US & Canada)' do
-      with_zone = coder.decode('2013-07-18 13:12:46 -0700')
+      with_zone = type.decode('2013-07-18 13:12:46 -0700')
       assert_equal Time.utc(2013, 07, 18, 20, 12, 46), with_zone
       assert_equal 'CDT', with_zone.zone
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: superstore
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Michael Koziarski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -39,6 +39,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: oj
+  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
@@ -62,7 +76,7 @@ extra_rdoc_files:
 files:
 - ".gitignore"
 - ".travis.yml"
-- CHANGELOG
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - MIT-LICENSE
@@ -70,40 +84,39 @@ files:
 - Rakefile
 - lib/superstore.rb
 - lib/superstore/adapters/abstract_adapter.rb
-- lib/superstore/adapters/cassandra_adapter.rb
-- lib/superstore/adapters/hstore_adapter.rb
+- lib/superstore/adapters/jsonb_adapter.rb
+- lib/superstore/associations.rb
+- lib/superstore/associations/association.rb
+- lib/superstore/associations/belongs_to.rb
+- lib/superstore/associations/builder/association.rb
+- lib/superstore/associations/builder/belongs_to.rb
+- lib/superstore/associations/builder/has_many.rb
+- lib/superstore/associations/builder/has_one.rb
+- lib/superstore/associations/has_many.rb
+- lib/superstore/associations/has_one.rb
+- lib/superstore/associations/reflection.rb
 - lib/superstore/attribute_methods.rb
 - lib/superstore/attribute_methods/definition.rb
 - lib/superstore/attribute_methods/dirty.rb
 - lib/superstore/attribute_methods/primary_key.rb
 - lib/superstore/attribute_methods/typecasting.rb
 - lib/superstore/base.rb
-- lib/superstore/belongs_to.rb
-- 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
-- lib/superstore/cassandra_schema/tasks.rb
 - lib/superstore/connection.rb
 - lib/superstore/core.rb
 - lib/superstore/errors.rb
 - lib/superstore/identity.rb
 - lib/superstore/inspect.rb
-- lib/superstore/log_subscriber.rb
 - lib/superstore/model.rb
 - lib/superstore/persistence.rb
 - lib/superstore/railtie.rb
-- lib/superstore/railties/controller_runtime.rb
 - lib/superstore/schema.rb
 - lib/superstore/scope.rb
 - lib/superstore/scope/batches.rb
 - lib/superstore/scope/finder_methods.rb
 - lib/superstore/scope/query_methods.rb
 - lib/superstore/scoping.rb
-- lib/superstore/tasks/ks.rake
 - lib/superstore/timestamps.rb
 - lib/superstore/type.rb
 - lib/superstore/types.rb
@@ -118,33 +131,29 @@ files:
 - lib/superstore/types/time_type.rb
 - lib/superstore/validations.rb
 - superstore.gemspec
-- test/support/cassandra.rb
-- test/support/hstore.rb
-- test/support/issue.rb
+- test/support/jsonb.rb
+- test/support/models.rb
 - test/support/pg.rb
-- test/support/user.rb
 - test/test_helper.rb
 - test/unit/active_model_test.rb
 - test/unit/adapters/adapter_test.rb
+- test/unit/associations/belongs_to_test.rb
+- test/unit/associations/has_many_test.rb
+- test/unit/associations/has_one_test.rb
+- test/unit/associations/reflection_test.rb
 - test/unit/attribute_methods/definition_test.rb
 - test/unit/attribute_methods/dirty_test.rb
 - test/unit/attribute_methods/primary_key_test.rb
 - test/unit/attribute_methods/typecasting_test.rb
 - test/unit/attribute_methods_test.rb
 - 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
 - test/unit/connection_test.rb
 - test/unit/core_test.rb
 - test/unit/identity_test.rb
 - test/unit/inspect_test.rb
-- test/unit/log_subscriber_test.rb
 - test/unit/persistence_test.rb
-- test/unit/railties/controller_runtime_test.rb
 - test/unit/schema_test.rb
 - test/unit/scope/batches_test.rb
 - test/unit/scope/finder_methods_test.rb
@@ -181,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Cassandra ActiveModel

data/lib/superstore/adapters/cassandra_adapter.rb

@@ -1,203 +0,0 @@
-gem 'cassandra-cql'
-require 'cassandra-cql'
-
-module Superstore
-  module Adapters
-    class CassandraAdapter < AbstractAdapter
-      class QueryBuilder
-        def initialize(adapter, scope)
-          @adapter  = adapter
-          @scope    = scope
-        end
-
-        def to_query
-          [
-            "SELECT #{select_string} FROM #{@scope.klass.table_name}",
-            @adapter.write_option_string,
-            where_string,
-            limit_string
-          ].delete_if(&:blank?) * ' '
-        end
-
-        def select_string
-          if @scope.select_values.any?
-            (['KEY'] | @scope.select_values) * ','
-          else
-            '*'
-          end
-        end
-
-        def where_string
-          wheres = @scope.where_values.dup
-          if @scope.id_values.any?
-            wheres << @adapter.create_ids_where_clause(@scope.id_values)
-          end
-
-          if wheres.any?
-            "WHERE #{wheres * ' AND '}"
-          end
-        end
-
-        def limit_string
-          if @scope.limit_value
-            "LIMIT #{@scope.limit_value}"
-          else
-            ""
-          end
-        end
-      end
-
-      def primary_key_column
-        'KEY'
-      end
-
-      def connection
-        @connection ||= begin
-          thrift_options = (config[:thrift] || {})
-          CassandraCQL::Database.new(
-            servers,
-            {keyspace: config[:keyspace], username: username, password: password, cql_version: '2.0.0'},
-            thrift_options)
-        end
-      end
-
-      def servers
-        @servers ||= begin
-          if config[:servers].is_a?(String)
-            config[:servers].split(',')
-          elsif config[:servers].is_a?(Array)
-            config[:servers]
-          else
-            "127.0.0.1:9160"
-          end
-        end
-      end
-
-      def execute(statement)
-        ActiveSupport::Notifications.instrument("cql.cassandra_object", cql: statement) do
-          connection.execute statement
-        end
-      end
-
-      def select(scope)
-        statement = QueryBuilder.new(self, scope).to_query
-
-        execute(statement).fetch do |cql_row|
-          attributes = cql_row.to_hash
-          key = attributes.delete(primary_key_column)
-          yield(key, attributes) unless attributes.empty?
-        end
-      end
-
-      def insert(table, id, attributes)
-        write(table, id, attributes)
-      end
-
-      def update(table, id, attributes)
-        write(table, id, attributes)
-      end
-
-      def write(table, id, attributes)
-        if (not_nil_attributes = attributes.reject { |key, value| value.nil? }).any?
-          insert_attributes = {primary_key_column => id}.update(not_nil_attributes)
-          statement = "INSERT INTO #{table} (#{quote_columns(insert_attributes.keys) * ','}) VALUES (#{Array.new(insert_attributes.size, '?') * ','})#{write_option_string}"
-          execute_batchable sanitize(statement, *insert_attributes.values)
-        end
-
-        if (nil_attributes = attributes.select { |key, value| value.nil? }).any?
-          execute_batchable sanitize("DELETE #{quote_columns(nil_attributes.keys) * ','} FROM #{table}#{write_option_string} WHERE #{primary_key_column} = ?", id)
-        end
-      end
-
-      def delete(table, ids)
-        statement = "DELETE FROM #{table}#{write_option_string} WHERE #{create_ids_where_clause(ids)}"
-
-        execute_batchable statement
-      end
-
-      def execute_batch(statements)
-        raise 'No can do' if statements.empty?
-
-        stmt = [
-          "BEGIN BATCH#{write_option_string(true)}",
-          statements * "\n",
-          'APPLY BATCH'
-        ] * "\n"
-
-        execute stmt
-      end
-
-      # SCHEMA
-      def create_table(table_name, options = {})
-        stmt = "CREATE COLUMNFAMILY #{table_name} " +
-               "(KEY varchar PRIMARY KEY)"
-
-        schema_execute statement_with_options(stmt, options), config[:keyspace]
-      end
-
-      def drop_table(table_name)
-        schema_execute "DROP TABLE #{table_name}", config[:keyspace]
-      end
-
-      def schema_execute(cql, keyspace)
-        schema_db = CassandraCQL::Database.new(
-          servers,
-          {keyspace: keyspace, username: username, password: password, cql_version: '2.0.0'},
-          {connect_timeout: 30, timeout: 30}
-        )
-        schema_db.execute cql
-      end
-
-      def consistency
-        @consistency ||= config[:consistency]
-      end
-
-      def consistency=(val)
-        @consistency = val
-      end
-
-      def write_option_string(ignore_batching = false)
-        if (ignore_batching || !batching?) && consistency
-          " USING CONSISTENCY #{consistency}"
-        end
-      end
-
-      def statement_with_options(stmt, options)
-        if options.any?
-          with_stmt = options.map do |k,v|
-            "#{k} = #{CassandraCQL::Statement.quote(v)}"
-          end.join(' AND ')
-
-          "#{stmt} WITH #{with_stmt}"
-        else
-          stmt
-        end
-      end
-
-      def create_ids_where_clause(ids)
-        ids = ids.first if ids.is_a?(Array) && ids.one?
-        sql = ids.is_a?(Array) ? "#{primary_key_column} IN (?)" : "#{primary_key_column} = ?"
-        sanitize(sql, ids)
-      end
-
-      private
-
-        def username
-          config[:username].presence
-        end
-
-        def password
-          config[:password].presence
-        end
-
-        def sanitize(statement, *bind_vars)
-          CassandraCQL::Statement.sanitize(statement, bind_vars).force_encoding(Encoding::UTF_8)
-        end
-
-        def quote_columns(column_names)
-          column_names.map { |name| "'#{name}'" }
-        end
-
-    end
-  end
-end