superstore 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8332e4f8d43a68c737e31ae1a88a89c360782a88
-  data.tar.gz: 9cbbc5a3fa095a0af7ef48fb265460530a2a5191
+  metadata.gz: ab95c845f31fa3557952125e9db3fb68ec37d8d9
+  data.tar.gz: 5bea5b3c94a7c172bd6ce97a4a21ea1b5d77a96f
 SHA512:
-  metadata.gz: b09a471630f8a389b2cb250ab70b4d5f1ed48e67ebceb828d9fe1b13236d88bda6ca89c09b3153a70a41f225c6ef25861b7857c3cfeb9bf68bd37c7440e39dad
-  data.tar.gz: 6d68424187b262902591482f8f2db73a40cf7f0bcba670b6eea343538d0c7ca8cd09ff56d8fd11e1955c944a517353fa3243654600f431c21405a97c929aa161
+  metadata.gz: bf14d4bf4b8fd2d03e1e7627c9facff10ba47d454d2a43e0f26956526112b8914fd4981c56ee6100cce315763e4338c54b03f63c6305ee78ec13aae3a28dfa32
+  data.tar.gz: 07502ca8fea646f7041ef1c1ad0be27dd643f0dc751eb0a55350a4d8c0d22258c5767afc9fcfc03438c122f125b3301ed0b890cf770adaddefcd9f5c2a29d998

data/Gemfile

@@ -6,14 +6,11 @@ gem 'thin'
 
 group :test do
   gem 'rails'
+  gem 'pg'
+  gem 'activerecord'
   gem 'mocha', require: false
 end
 
 group :cassandra do
-  gem 'cassandra-cql'
-end
-
-group :hstore do
-  gem 'activerecord'
-  gem 'pg'
+  gem 'cassandra-cql', "1.1.4"
 end

data/lib/superstore/belongs_to/association.rb

@@ -12,11 +12,8 @@ module Superstore
 
       def reader
         unless loaded?
-          if record_id = owner.send(reflection.foreign_key).presence
-            self.record_variable = association_class.find_by_id(record_id)
-          else
-            self.record_variable = nil
-          end
+          check_appropriate_primary_key!
+          self.record_variable = get_record
           @loaded = true
         end
 
@@ -24,9 +21,10 @@ module Superstore
       end
 
       def writer(record)
+        check_appropriate_primary_key!
         self.record_variable = record
         @loaded = true
-        owner.send("#{reflection.foreign_key}=", record.try(:id))
+        owner.send("#{reflection.foreign_key}=", record.try(reflection.primary_key))
         if reflection.polymorphic?
           owner.send("#{reflection.polymorphic_column}=", record.class.name)
         end
@@ -43,6 +41,25 @@ module Superstore
       def loaded?
         @loaded
       end
+
+      private
+
+      def get_record
+        record_id = owner.send(reflection.foreign_key).presence
+        return unless record_id
+
+        if reflection.default_primary_key?
+          association_class.find_by_id(record_id)
+        else
+          association_class.find_by(reflection.primary_key => record_id)
+        end
+      end
+
+      def check_appropriate_primary_key!
+        if !reflection.default_primary_key? && !(association_class <= ActiveRecord::Base)
+          raise ArgumentError, "Association must inherit from ActiveRecord::Base to use custom primary key"
+        end
+      end
     end
   end
 end

data/lib/superstore/belongs_to/reflection.rb

@@ -11,7 +11,15 @@ module Superstore
       end
 
       def foreign_key
-        "#{name}_id"
+        options[:foreign_key] || "#{name}_id"
+      end
+
+      def primary_key
+        options[:primary_key] || "id"
+      end
+
+      def default_primary_key?
+        primary_key == "id"
       end
 
       def polymorphic_column

data/lib/superstore/railtie.rb

@@ -6,8 +6,8 @@ module Superstore
 
     initializer "superstore.config" do |app|
       ActiveSupport.on_load :superstore do
-        pathname = Rails.root.join('config', 'superstore.yml')
-        if pathname.exist?
+        pathnames = [Rails.root.join('config', 'superstore.yml'), Rails.root.join('config', 'cassandra.yml')]
+        if pathname = pathnames.detect(&:exist?)
           config = YAML.load(pathname.read)
 
           if config = config[Rails.env]

data/superstore.gemspec

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

data/test/support/cassandra.rb

@@ -17,6 +17,8 @@ end
 sleep 1
 Superstore::CassandraSchema.create_keyspace 'superstore_test'
 Superstore::CassandraSchema.create_column_family 'Issues'
+Superstore::CassandraSchema.alter_column_family 'Issues', "ADD title varchar"
+Superstore::CassandraSchema.add_index 'Issues', 'title', "issues_title_idx"
 
 Superstore::Base.class_eval do
   class_attribute :created_records

data/test/support/hstore.rb

@@ -1,24 +1,8 @@
 Bundler.require :hstore
-require 'active_record'
-
 Superstore::Base.config = {'adapter' => 'hstore'}
 
-class PGInitializer
+class HstoreInitializer
   def self.initialize!
-    config = {
-      'adapter'   => 'postgresql',
-      'encoding'  => 'unicode',
-      'database'  => 'superstore_test',
-      'pool'      => 5,
-      'username' => 'postgres'
-    }
-
-    ActiveRecord::Base.configurations = { test: config }
-
-    ActiveRecord::Tasks::DatabaseTasks.drop config
-    ActiveRecord::Tasks::DatabaseTasks.create config
-    ActiveRecord::Base.establish_connection config
-
     Superstore::Base.adapter.create_table('issues')
   end
 
@@ -27,14 +11,14 @@ class PGInitializer
   end
 end
 
-PGInitializer.initialize!
+HstoreInitializer.initialize!
 
 module ActiveSupport
   class TestCase
     teardown do
-      PGInitializer.table_names.each do |table_name|
+      HstoreInitializer.table_names.each do |table_name|
         ActiveRecord::Base.connection.execute "TRUNCATE #{table_name}"
       end
     end
   end
-end
+end

data/test/support/pg.rb

@@ -0,0 +1,44 @@
+require 'active_record'
+
+class PGInitializer
+  def self.initialize!
+    config = {
+      'adapter'   => 'postgresql',
+      'encoding'  => 'unicode',
+      'database'  => 'superstore_test',
+      'pool'      => 5,
+      'username' => 'postgres'
+    }
+
+    ActiveRecord::Base.configurations = { test: config }
+
+    ActiveRecord::Tasks::DatabaseTasks.drop config
+    ActiveRecord::Tasks::DatabaseTasks.create config
+    ActiveRecord::Base.establish_connection config
+
+    create_users_table
+  end
+
+  def self.create_users_table
+    ActiveRecord::Migration.create_table :users do |t|
+      t.string :special_id, null: false
+      t.index :special_id, unique: true
+    end
+  end
+
+  def self.table_names
+    %w(users)
+  end
+end
+
+PGInitializer.initialize!
+
+module ActiveSupport
+  class TestCase
+    teardown do
+      PGInitializer.table_names.each do |table_name|
+        ActiveRecord::Base.connection.execute "TRUNCATE #{table_name}"
+      end
+    end
+  end
+end

data/test/support/user.rb

@@ -0,0 +1,2 @@
+class User < ActiveRecord::Base
+end

data/test/test_helper.rb

@@ -6,9 +6,11 @@ I18n.config.enforce_available_locales = false
 require 'rails/test_help'
 require 'mocha/setup'
 
-# require 'support/hstore'
+require 'support/pg'
+ #require 'support/hstore'
 require 'support/cassandra'
 require 'support/issue'
+require 'support/user'
 
 def MiniTest.filter_backtrace(bt)
   bt

data/test/unit/belongs_to/reflection_test.rb

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

data/test/unit/belongs_to_test.rb

@@ -8,6 +8,15 @@ class Superstore::BelongsToTest < Superstore::TestCase
     string :widget_id
     belongs_to :widget, class_name: 'Issue'
 
+    string :other_id
+    belongs_to :other_issue, class_name: 'Issue', foreign_key: :other_id
+
+    string :user_id
+    belongs_to :user, primary_key: :special_id
+
+    string :title_issue_id
+    belongs_to :title_issue, class_name: 'Issue', primary_key: :title
+
     string :target_id
     string :target_type
     belongs_to :target, polymorphic: true
@@ -37,6 +46,39 @@ class Superstore::BelongsToTest < Superstore::TestCase
     assert_equal issue, record.widget
   end
 
+  test 'belongs_to with foreign_key' do
+    issue = Issue.create
+
+    record = TestObject.create(other_issue: issue)
+
+    assert_equal issue, record.other_issue
+    assert_equal issue.id, record.other_id
+
+    record = TestObject.find(record.id)
+    assert_equal issue, record.other_issue
+  end
+
+  test 'belongs_to with primary_key for ActiveRecord' do
+    special_id = 'special_id'
+    user = User.create! special_id: special_id
+    record = TestObject.create user: user
+
+    assert_equal user, record.user
+    assert_equal special_id, record.user_id
+
+    record = TestObject.find(record.id)
+    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/schema_test.rb

@@ -2,24 +2,20 @@ require 'test_helper'
 
 class Superstore::SchemaTest < Superstore::TestCase
   # SELECT columnfamily_name FROM System.schema_columnfamilies WHERE keyspace_name='myKeyspaceName';
-  test "create_table" do
-    Superstore::Schema.create_table 'TestRecords', 'compression_parameters:sstable_compression' => 'SnappyCompressor'
+  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
-  end
-
-  test "drop_table" do
-    Superstore::Schema.create_table 'TestCFToDrop'
 
-    Superstore::Schema.drop_table 'TestCFToDrop'
+    Superstore::Schema.drop_table 'TestRecords'
 
     begin
-      Superstore::Schema.drop_table 'TestCFToDrop'
-      assert false, 'TestCFToDrop should not exist'
+      Superstore::Schema.drop_table 'TestRecords'
+      assert false, 'TestRecords should not exist'
     rescue Exception => e
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: superstore
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Michael Koziarski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -106,6 +106,8 @@ files:
 - test/support/cassandra.rb
 - test/support/hstore.rb
 - test/support/issue.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