superstore 1.2.0 → 2.0.0

data/lib/superstore/types/array_type.rb

@@ -1,15 +1,8 @@
 module Superstore
   module Types
     class ArrayType < BaseType
-      def encode(array)
-        raise ArgumentError.new("#{array.inspect} is not an Array") unless array.kind_of?(Array)
-        array.to_a.to_json
-      end
-
-      def decode(str)
-        return nil if str.blank?
-
-        ActiveSupport::JSON.decode(str)
+      def decode(val)
+        val unless val.blank?
       end
 
       def typecast(value)

data/lib/superstore/types/base_type.rb

@@ -1,17 +1,14 @@
 module Superstore
   module Types
     class BaseType
-      attr_accessor :options
-      def initialize(options = {})
+      attr_accessor :model, :options
+      def initialize(model, options = {})
+        @model   = model
         @options = options
       end
 
-      def default
-        options[:default].duplicable? ? options[:default].dup : options[:default]
-      end
-
       def encode(value)
-        value.to_s
+        value
       end
 
       def decode(str)

data/lib/superstore/types/boolean_type.rb

@@ -9,7 +9,8 @@ module Superstore
         unless VALID_VALS.include?(bool)
           raise ArgumentError.new("#{bool.inspect} is not a Boolean")
         end
-        TRUE_VALS.include?(bool) ? '1' : '0'
+
+        TRUE_VALS.include?(bool)
       end
 
       def decode(str)

data/lib/superstore/types/float_type.rb

@@ -1,15 +1,16 @@
 module Superstore
   module Types
     class FloatType < BaseType
-      REGEX = /\A[-+]?\d+(\.\d+)?\Z/
       def encode(float)
-        raise ArgumentError.new("#{float.inspect} is not a Float") unless float.kind_of?(Float)
-        float.to_s
+        float
       end
 
       def decode(str)
-        return nil if str.empty?
-        str.to_f
+        str.to_f unless str.empty?
+      end
+
+      def typecast(value)
+        value.to_f
       end
     end
   end

data/lib/superstore/types/integer_type.rb

@@ -4,12 +4,12 @@ module Superstore
       REGEX = /\A[-+]?\d+\Z/
       def encode(int)
         raise ArgumentError.new("#{int.inspect} is not an Integer.") unless int.kind_of?(Integer)
-        int.to_s
+
+        int
       end
 
       def decode(str)
-        return nil if str.empty?
-        str.to_i
+        str.to_i unless str.empty?
       end
 
       def typecast(value)

data/lib/superstore/types/json_type.rb

@@ -1,27 +1,6 @@
 module Superstore
   module Types
     class JsonType < BaseType
-      def encode(data)
-        ActiveSupport::JSON.encode(data)
-      end
-
-      def decode(str)
-        ActiveSupport::JSON.decode(str)
-      end
-
-      def typecast(data)
-        return data if ActiveSupport.parse_json_times
-
-        if data.acts_like?(:time) || data.acts_like?(:date)
-          data.as_json
-        elsif data.is_a?(Array)
-          data.map { |d| typecast(d) }
-        elsif data.is_a?(Hash)
-          data.each_with_object({}) { |(key, value), hash| hash[key] = typecast(value) }
-        else
-          data
-        end
-      end
     end
   end
 end

data/lib/superstore.rb

@@ -1,6 +1,7 @@
 require 'active_support/all'
 require 'active_model'
 require 'global_id/identification'
+require 'oj'
 require 'superstore/errors'
 
 module Superstore
@@ -8,7 +9,7 @@ module Superstore
 
   autoload :AttributeMethods
   autoload :Base
-  autoload :BelongsTo
+  autoload :Associations
   autoload :Caching
   autoload :Callbacks
   autoload :Connection
@@ -21,7 +22,6 @@ module Superstore
   autoload :CassandraSchema
   autoload :Scope
   autoload :Scoping
-  autoload :Serialization
   autoload :Timestamps
   autoload :Type
   autoload :Validations
@@ -41,16 +41,27 @@ module Superstore
     extend ActiveSupport::Autoload
 
     autoload :AbstractAdapter
+    autoload :JsonbAdapter
     autoload :CassandraAdapter
-    autoload :HstoreAdapter
   end
 
-  module BelongsTo
+  module Associations
     extend ActiveSupport::Autoload
 
     autoload :Association
-    autoload :Builder
     autoload :Reflection
+    autoload :BelongsTo
+    autoload :HasMany
+    autoload :HasOne
+
+    module Builder
+      extend ActiveSupport::Autoload
+
+      autoload :Association
+      autoload :BelongsTo
+      autoload :HasMany
+      autoload :HasOne
+    end
   end
 
   module Types

data/superstore.gemspec

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

data/test/support/jsonb.rb

@@ -0,0 +1,8 @@
+class JsonbInitializer
+  def self.initialize!
+    Superstore::Base.adapter.create_table('issues')
+    Superstore::Base.adapter.define_jsonb_functions!
+  end
+end
+
+JsonbInitializer.initialize!

data/test/support/{issue.rb → models.rb}

@@ -1,10 +1,19 @@
+class User < ActiveRecord::Base
+end
+
+class Label < ActiveRecord::Base
+end
+
 class Issue < Superstore::Base
   string :description
   string :title
 
   before_create { self.description ||= 'funny' }
 
+  has_many :labels
+
   def self.for_key key
     where_ids(key)
   end
 end
+

data/test/support/pg.rb

@@ -7,9 +7,7 @@ class PGInitializer
       'encoding'  => 'unicode',
       'database'  => 'superstore_test',
       'pool'      => 5,
-      'host'      => 'localhost',
-      'password'  => 'postgres',
-      'username'  => 'postgres'
+      'host'      => 'localhost'
     }
 
     ActiveRecord::Base.configurations = { test: config }
@@ -18,9 +16,17 @@ class PGInitializer
     ActiveRecord::Tasks::DatabaseTasks.create config
     ActiveRecord::Base.establish_connection config
 
+    create_labels_table
     create_users_table
   end
 
+  def self.create_labels_table
+    ActiveRecord::Migration.create_table :labels do |t|
+      t.string :issue_id, null: false
+      t.string :name, null: false
+    end
+  end
+
   def self.create_users_table
     ActiveRecord::Migration.create_table :users do |t|
       t.string :special_id, null: false
@@ -29,19 +35,9 @@ class PGInitializer
   end
 
   def self.table_names
-    %w(users)
+    %w(labels users)
   end
 end
 
 PGInitializer.initialize!
-ActiveRecord::Migration.verbose = false
-
-module ActiveSupport
-  class TestCase
-    teardown do
-      PGInitializer.table_names.each do |table_name|
-        ActiveRecord::Base.connection.execute "TRUNCATE #{table_name}"
-      end
-    end
-  end
-end
+ActiveRecord::Migration.verbose = false

data/test/test_helper.rb

@@ -3,14 +3,15 @@ Bundler.require(:default, :test)
 
 I18n.config.enforce_available_locales = false
 
+require 'active_record'
 require 'rails/test_help'
 require 'mocha/setup'
 
+ActiveSupport::TestCase.test_order = :random
+
 require 'support/pg'
- require 'support/hstore'
-# require 'support/cassandra'
-require 'support/issue'
-require 'support/user'
+require 'support/jsonb'
+require 'support/models'
 
 def MiniTest.filter_backtrace(bt)
   bt
@@ -35,9 +36,9 @@ module Superstore
 
   module Types
     class TestCase < Superstore::TestCase
-      attr_accessor :coder
+      attr_accessor :type
       setup do
-        @coder = self.class.name.sub(/Test$/, '').constantize.new
+        @type = self.class.name.sub(/Test$/, '').constantize.new(Issue)
       end
     end
   end

data/test/unit/{belongs_to_test.rb → associations/belongs_to_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class Superstore::BelongsToTest < Superstore::TestCase
+class Superstore::Associations::BelongsTest < Superstore::TestCase
   class TestObject < Issue
     string :issue_id
     belongs_to :issue
@@ -70,15 +70,6 @@ class Superstore::BelongsToTest < Superstore::TestCase
     assert_equal user, record.user
   end
 
-  test 'belongs_to with primary_key raises an error for non-ActiveRecord' do
-    issue = Issue.create title: 'title'
-
-    record = TestObject.new
-    record.title_issue_id = issue.title
-    assert_raises(ArgumentError) { record.title_issue }
-    assert_raises(ArgumentError) { record.title_issue = issue }
-  end
-
   test 'belongs_to with polymorphic' do
     issue = Issue.create
 

data/test/unit/associations/has_many_test.rb

@@ -0,0 +1,13 @@
+require 'test_helper'
+
+class Superstore::Associations::HasManyTest < Superstore::TestCase
+  class TestObject < Issue
+  end
+
+  test 'has_many' do
+    issue = TestObject.create!
+    label = Label.create! name: 'important', issue_id: issue.id
+
+    assert_equal [label], issue.labels
+  end
+end

data/test/unit/associations/has_one_test.rb

@@ -0,0 +1,14 @@
+require 'test_helper'
+
+class Superstore::Associations::HasOneTest < Superstore::TestCase
+  class TestObject < Issue
+    has_one :favorite_label, class_name: 'Label', foreign_key: 'issue_id'
+  end
+
+  test 'has_many' do
+    issue = TestObject.create!
+    label = Label.create! name: 'important', issue_id: issue.id
+
+    assert_equal label, issue.favorite_label
+  end
+end

data/test/unit/{belongs_to → associations}/reflection_test.rb

@@ -1,12 +1,12 @@
 require 'test_helper'
 
-class Superstore::BelongsTo::ReflectionTest < Superstore::TestCase
+class Superstore::Associations::ReflectionTest < Superstore::TestCase
   class ::Status < Superstore::Base; end
   class ::Job < Superstore::Base
     belongs_to :status
   end
 
   test 'class_name' do
-    assert_equal 'Status', Job.new.belongs_to_reflections[:status].class_name
+    assert_equal 'Status', Job.new.association_reflections[:status].class_name
   end
 end

data/test/unit/attribute_methods/definition_test.rb

@@ -2,12 +2,15 @@ require 'test_helper'
 
 class Superstore::AttributeMethods::DefinitionTest < Superstore::TestCase
   class TestType < Superstore::Types::BaseType
+    def typecast(v)
+      "#{v}-foo"
+    end
   end
 
-  test 'typecast' do
-    definition = Superstore::AttributeMethods::Definition.new(:foo, TestType, {a: :b})
+  test 'initialize' do
+    definition = Superstore::AttributeMethods::Definition.new(Issue, :foo, TestType, {})
 
     assert_equal 'foo', definition.name
-    assert_kind_of TestType, definition.coder
+    assert_kind_of TestType, definition.type
   end
 end

data/test/unit/attribute_methods/dirty_test.rb

@@ -51,20 +51,6 @@ class Superstore::AttributeMethods::DirtyTest < Superstore::TestCase
     assert record.changed?
   end
 
-  test 'typecast json with times' do
-    record = temp_object do
-      json :stuff
-    end.create(stuff: {'time' => Time.new(2004, 12, 24, 6, 42, 21)})
-
-    record.reload
-
-    record.stuff = {'time' => Time.new(2004, 12, 24, 6, 42, 21)}
-    assert !record.changed?
-
-    record.stuff = {'time' => Time.new(2004, 12, 24, 6, 42, 22)}
-    assert record.changed?
-  end
-
   test 'unapplied_changes' do
     record = temp_object do
       float :price
@@ -94,4 +80,21 @@ class Superstore::AttributeMethods::DirtyTest < Superstore::TestCase
       assert_equal expected, record.changes
     end
   end
+
+  test 'dirty and restore to original value' do
+    object = temp_object do
+      string :name
+    end
+
+    record = object.create(name: 'foo')
+
+    assert_equal({}, record.changes)
+
+    record.name = 'bar'
+    expected = {'name'=>[nil, 'foo']}
+    assert_equal({'name' => ['foo', 'bar']}, record.changes)
+
+    record.name = 'foo'
+    assert_equal({}, record.changes)
+  end
 end

data/test/unit/attribute_methods/typecasting_test.rb

@@ -1,16 +1,9 @@
 require 'test_helper'
 
 class Superstore::AttributeMethods::TypecastingTest < Superstore::TestCase
-  class CustomType
-  end
-
-  class CustomCoder < Superstore::Types::BaseType
-  end
-
   class TestIssue < Superstore::Base
     self.table_name = 'Issues'
 
-    attribute :custom_column, type: CustomType, coder: CustomCoder
     boolean :enabled
     float   :rating
     integer :price
@@ -28,13 +21,6 @@ class Superstore::AttributeMethods::TypecastingTest < Superstore::TestCase
     assert_nothing_raised { TestChildIssue.new.description }
   end
 
-  test 'custom attribute definer' do
-    model_attribute = TestIssue.attribute_definitions['custom_column']
-
-    assert_kind_of CustomCoder, model_attribute.coder
-    assert_equal 'custom_column', model_attribute.name
-  end
-
   test 'typecast_attribute' do
     assert_equal 1, TestIssue.typecast_attribute('price', 1)
     assert_equal 1, TestIssue.typecast_attribute(:price, 1)

data/test/unit/base_test.rb

@@ -13,8 +13,8 @@ class Superstore::BaseTest < Superstore::TestCase
     assert_equal Son, Grandson.base_class
   end
 
-  test 'column family' do
-    assert_equal 'Superstore::BaseTest::Sons', Son.table_name
-    assert_equal 'Superstore::BaseTest::Sons', Grandson.table_name
+  test 'table_name' do
+    assert_equal 'superstore_base_test_sons', Son.table_name
+    assert_equal 'superstore_base_test_sons', Grandson.table_name
   end
 end

data/test/unit/connection_test.rb

@@ -3,8 +3,4 @@ require 'test_helper'
 class Superstore::ConnectionTest < Superstore::TestCase
   class TestObject < Superstore::Base
   end
-
-  test "sanitize supports question marks" do
-    assert_equal 'hello ?', CassandraCQL::Statement.sanitize('hello ?')
-  end
 end

data/test/unit/persistence_test.rb

@@ -176,7 +176,7 @@ class Superstore::PersistenceTest < Superstore::TestCase
     assert_equal %w{'a' 'b'}, klass.__send__(:quote_columns, %w{a b})
   end
 
-  test 'remove' do
+  test 'delete' do
     klass = temp_object do
       string :name
     end
@@ -187,14 +187,14 @@ class Superstore::PersistenceTest < Superstore::TestCase
     id = record.id
     assert_equal id, klass.find(id).id
 
-    klass.remove(id)
+    klass.delete(id)
 
     assert_raise Superstore::RecordNotFound do
       klass.find(id)
     end
   end
 
-  test 'remove multiple' do
+  test 'delete multiple' do
     klass = temp_object do
       string :name
     end
@@ -205,7 +205,7 @@ class Superstore::PersistenceTest < Superstore::TestCase
       ids << record.id
     end
 
-    klass.remove(ids)
+    klass.delete(ids)
 
     assert_equal [], klass.find(ids)
   end

data/test/unit/schema_test.rb

@@ -2,22 +2,14 @@ require 'test_helper'
 
 class Superstore::SchemaTest < Superstore::TestCase
   # SELECT columnfamily_name FROM System.schema_columnfamilies WHERE keyspace_name='myKeyspaceName';
-  test "create and drop_table" do
-    Superstore::Schema.create_table 'TestRecords'
-
-    begin
-      Superstore::Schema.create_table 'TestRecords'
-      assert false, 'TestRecords should already exist'
-    rescue Exception => e
-    end
-
-    Superstore::Schema.drop_table 'TestRecords'
-
-    begin
-      Superstore::Schema.drop_table 'TestRecords'
-      assert false, 'TestRecords should not exist'
-    rescue Exception => e
-    end
-  end
+  # test "create_table" do
+  #   Superstore::Schema.create_table 'TestRecords'
+  #
+  #   begin
+  #     Superstore::Schema.create_table 'TestRecords'
+  #     assert false, 'TestRecords should already exist'
+  #   rescue Exception => e
+  #   end
+  # end
 
 end

data/test/unit/scope/query_methods_test.rb

@@ -3,7 +3,6 @@ require 'test_helper'
 class Superstore::Scope::QueryMethodsTest < Superstore::TestCase
   test "select" do
     original_issue = Issue.create title: 'foo', description: 'bar'
-
     found_issue = Issue.select(:title).find(original_issue.id)
 
     assert_equal 'foo', found_issue.title
@@ -11,6 +10,16 @@ class Superstore::Scope::QueryMethodsTest < Superstore::TestCase
     assert_nil found_issue.description
   end
 
+  test "where" do
+    foo_issue = Issue.create title: 'foo'
+    bar_issue = Issue.create title: 'bar'
+    nil_issue = Issue.create title: nil
+
+    assert_equal [foo_issue], Issue.where(title: 'foo').to_a
+    assert_equal [foo_issue, bar_issue], Issue.where(title: ['foo', 'bar']).to_a
+    assert_equal [nil_issue], Issue.where(title: nil).to_a
+  end
+
   test "select with block" do
     foo_issue = Issue.create title: 'foo'
     bar_issue = Issue.create title: 'bar'

data/test/unit/types/array_type_test.rb

@@ -1,21 +1,23 @@
 require 'test_helper'
 
 class Superstore::Types::ArrayTypeTest < Superstore::Types::TestCase
-  test 'encode' do
-    assert_equal ['1', '2'].to_json, coder.encode(['1', '2'])
+  if Superstore::Base.adapter.class.name == 'Superstore::Adapters::CassandraAdapter'
+    test 'encode' do
+      assert_equal ['1', '2'].to_json, type.encode(['1', '2'])
 
-    assert_raise ArgumentError do
-      coder.encode('wtf')
+      assert_raise ArgumentError do
+        type.encode('wtf')
+      end
     end
-  end
 
-  test 'decode' do
-    assert_equal ['1', '2'], coder.decode(['1', '2'].to_json)
-    assert_equal nil, coder.decode(nil)
-    assert_equal nil, coder.decode('')
+    test 'decode' do
+      assert_equal ['1', '2'], type.decode(['1', '2'].to_json)
+      assert_equal nil, type.decode(nil)
+      assert_equal nil, type.decode('')
+    end
   end
 
   test 'typecast' do
-    assert_equal ['x', 'y'], coder.typecast(['x', 'y'].to_set)
+    assert_equal ['x', 'y'], type.typecast(['x', 'y'].to_set)
   end
 end

data/test/unit/types/base_type_test.rb

@@ -1,19 +1,11 @@
 require 'test_helper'
 
 class Superstore::Types::BaseTypeTest < Superstore::Types::TestCase
-  test 'default' do
-    assert_equal nil, coder.default
-    assert_equal '5', Superstore::Types::BaseType.new(default: '5').default
-    assert_equal 5.object_id, Superstore::Types::BaseType.new(default: 5).default.object_id
-  end
-
   test 'encode' do
-    assert_equal '1', coder.encode(1)
-    assert_equal '', coder.encode(nil)
-    assert_equal '1', coder.encode('1')
+    assert_equal 'x', type.encode('x')
   end
 
   test 'decode' do
-    assert_equal 'abc', coder.decode('abc')
+    assert_equal 'abc', type.decode('abc')
   end
 end