sunstone 5.0.1.3 → 5.0.1.4

data/lib/sunstone.rb

@@ -21,6 +21,7 @@ require File.expand_path(File.join(__FILE__, '../arel/collectors/sunstone'))
 
 # ActiveRecord Extensions
 require File.expand_path(File.join(__FILE__, '../../ext/active_record/statement_cache'))
+require File.expand_path(File.join(__FILE__, '../../ext/active_record/associations'))
 require File.expand_path(File.join(__FILE__, '../../ext/active_record/relation'))
 require File.expand_path(File.join(__FILE__, '../../ext/active_record/relation/calculations'))
 require File.expand_path(File.join(__FILE__, '../../ext/active_record/persistence'))

data/lib/sunstone/version.rb

@@ -1,3 +1,3 @@
 module Sunstone
-  VERSION = '5.0.1.3'
+  VERSION = '5.0.1.4'
 end

data/sunstone.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   # Developoment 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rdoc'
-  s.add_development_dependency 'sdoc'
+  # s.add_development_dependency 'sdoc'
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'minitest-reporters'
@@ -25,11 +25,12 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'faker'
   s.add_development_dependency 'factory_girl'
   s.add_development_dependency 'webmock'
-  s.add_development_dependency 'sdoc-templates-42floors'
+  #s.add_development_dependency 'sdoc-templates-42floors'
   s.add_development_dependency 'rgeo'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'byebug'
-
+  s.add_development_dependency 'activesupport', '~> 5.0.1'
+  
   # Runtime
   s.add_runtime_dependency 'msgpack'
   s.add_runtime_dependency 'cookie_store'

data/test/active_record/associations/has_and_belongs_to_many_test.rb

@@ -1,10 +1,33 @@
 require 'test_helper'
 
-class ActiveRecord::Associations::HasAndBelongsToManyTest < Minitest::Test
+class ActiveRecord::Associations::HasAndBelongsToManyTest < ActiveSupport::TestCase
+
+  schema do
+    create_table "ships" do |t|
+      t.string   "name",                    limit: 255
+    end
+
+    create_table "sailors" do |t|
+      t.string   "name",                    limit: 255
+    end
+
+    create_table "sailors_ships", id: false do |t|
+      t.integer  "ship_id",                 null: false
+      t.integer  "sailor_id",               null: false
+    end
+  end
+  
+  class Ship < ActiveRecord::Base
+    has_and_belongs_to_many :sailors
+  end
+
+  class Sailor < ActiveRecord::Base
+    has_and_belongs_to_many :ships
+  end
 
   test '#relation_ids' do
     webmock(:get, "/ships", where: {id: 42}, limit: 1).to_return(body: [{id: 42, name: "The Niña"}].to_json)
-    webmock(:get, "/sailors", where: {sailors_ships: {ship_id: {eq: 42}}}, limit: 100, offset: 0).to_return(body: [{id: 43, name: "Chris"}].to_json)
+    webmock(:get, "/sailors", where: {sailors_ships: {ship_id: {eq: 42}}}).to_return(body: [{id: 43, name: "Chris"}].to_json)
 
     assert_equal [43], Ship.find(42).sailor_ids
   end

data/test/active_record/associations/has_many_test.rb

@@ -1,9 +1,28 @@
 require 'test_helper'
 
-class ActiveRecord::Associations::HasManyTest < Minitest::Test
+class ActiveRecord::Associations::HasManyTest < ActiveSupport::TestCase
+  
+  schema do
+    create_table "ships" do |t|
+      t.string   "name",                    limit: 255
+      t.integer  "fleet_id"
+    end
 
+    create_table "fleets" do |t|
+      t.string   "name",                    limit: 255
+    end
+  end
+
+  class Fleet < ActiveRecord::Base
+    has_many :ships
+  end
+
+  class Ship < ActiveRecord::Base
+    belongs_to :fleet
+  end
+  
   test '#create with has_many_ids=' do
-    webmock(:get, "/ships", where: {id: 2}, limit: 100, offset: 0).to_return(body: [{id: 2, fleet_id: nil, name: 'Duo'}].to_json)
+    webmock(:get, "/ships", where: {id: 2}).to_return(body: [{id: 2, fleet_id: nil, name: 'Duo'}].to_json)
     webmock(:post, "/fleets").with(
       body: {
         fleet: {
@@ -19,8 +38,8 @@ class ActiveRecord::Associations::HasManyTest < Minitest::Test
 
   test '#update with has_many_ids=' do
     webmock(:get, "/fleets", where: {id: 42}, limit: 1).to_return(body: [{id: 42, name: "Spanish Armada"}].to_json)
-    webmock(:get, "/ships", where: {id: 2}, limit: 100, offset: 0).to_return(body: [{id: 2, fleet_id: nil, name: 'Duo'}].to_json)
-    webmock(:get, "/ships", where: {fleet_id: 42}, limit: 100, offset: 0).to_return(body: [].to_json)
+    webmock(:get, "/ships", where:  {id: 2}).to_return(body: [{id: 2, fleet_id: nil, name: 'Duo'}].to_json)
+    webmock(:get, "/ships", where:  {fleet_id: 42}).to_return(body: [].to_json)
 
     webmock(:patch, "/fleets/42").with(
       body: {
@@ -68,5 +87,10 @@ class ActiveRecord::Associations::HasManyTest < Minitest::Test
 
     assert_requested req_stub
   end
+  
+  # test 'relation#delete_all' do
+  #   webmock(:get, "/fleets", where: {id: 42}, limit: 1).to_return(body: [{id: 42, name: "Spanish Armada"}].to_json)
+  #   Fleet.find(42).ships.delete_all
+  # end
 
 end

data/test/active_record/eager_loading_test.rb

@@ -1,6 +1,41 @@
 require 'test_helper'
 
-class ActiveRecord::EagerLoadingTest < Minitest::Test
+class ActiveRecord::EagerLoadingTest < ActiveSupport::TestCase
+
+  schema do
+    create_table "ships" do |t|
+      t.string   "name",                    limit: 255
+      t.integer  "fleet_id"
+    end
+
+    create_table "fleets" do |t|
+      t.string   "name",                    limit: 255
+    end
+    
+    create_table "sailors" do |t|
+      t.string   "name",                    limit: 255
+    end
+    
+    create_table "sailors_ships", id: false do |t|
+      t.integer  "ship_id",                 null: false
+      t.integer  "sailor_id",               null: false
+    end
+    
+  end
+  
+  class Fleet < ActiveRecord::Base
+    has_many :ships
+  end
+
+  class Ship < ActiveRecord::Base
+    belongs_to :fleet
+  
+    has_and_belongs_to_many :sailors
+  end
+
+  class Sailor < ActiveRecord::Base
+    has_and_belongs_to_many :ships
+  end
 
   test '#eager_load' do
     webmock(:get, "/fleets", include: [{:ships => :sailors}]).to_return(body: [{
@@ -12,4 +47,4 @@ class ActiveRecord::EagerLoadingTest < Minitest::Test
     assert_equal [1], fleets.first.ships.map(&:id)
   end
   
-end
+end

data/test/active_record/persistance_test.rb

@@ -1,10 +1,46 @@
 require 'test_helper'
 
-class ActiveRecord::PersistanceTest < Minitest::Test
+class ActiveRecord::PersistanceTest < ActiveSupport::TestCase
+
+  schema do
+    create_table "ships" do |t|
+      t.string   "name",                    limit: 255
+      t.integer  "fleet_id"
+    end
+
+    create_table "fleets" do |t|
+      t.string   "name",                    limit: 255
+    end
+    
+    create_table "sailors" do |t|
+      t.string   "name",                    limit: 255
+    end
+
+    create_table "sailors_ships", id: false do |t|
+      t.integer  "ship_id",                 null: false
+      t.integer  "sailor_id",               null: false
+    end
+
+  end
   
-  class TestModelA < ExampleRecord
+  class Fleet < ActiveRecord::Base
+    has_many :ships
   end
-  class TestModelB < ExampleRecord
+
+  class Ship < ActiveRecord::Base
+    belongs_to :fleet
+
+    has_and_belongs_to_many :sailors
+  end
+
+  class Sailor < ActiveRecord::Base
+    has_and_belongs_to_many :ships
+  end
+  
+  class TestModelA < ActiveRecord::Base
+  end
+  
+  class TestModelB < ActiveRecord::Base
     before_save do
       TestModelA.create
     end
@@ -55,8 +91,7 @@ class ActiveRecord::PersistanceTest < Minitest::Test
         columns: {
           id: {type: 'integer', primary_key: true, null: false, array: false},
           name: {type: 'string', primary_key: false, null: true, array: false}
-        },
-        limit: 100
+        }
       }.to_json,
       headers: { 'StandardAPI-Version' => '5.0.0.5' }
     )
@@ -65,8 +100,7 @@ class ActiveRecord::PersistanceTest < Minitest::Test
         columns: {
           id: {type: 'integer', primary_key: true, null: false, array: false},
           name: {type: 'string', primary_key: false, null: true, array: false}
-        },
-        limit: 100
+        }
       }.to_json,
       headers: { 'StandardAPI-Version' => '5.0.0.5' }
     )
@@ -134,6 +168,21 @@ class ActiveRecord::PersistanceTest < Minitest::Test
 
     assert_requested req_stub
   end
+  
+  test '#update!' do
+    webmock(:get, "/ships", where: {id: 1}, limit: 1).to_return(
+      body: [{id: 1, fleet_id: nil, name: 'Armada Uno'}].to_json
+    )
+    req_stub = webmock(:patch, "/ships").with(
+      body: { ship: { name: 'Armada Trio' } }.to_json
+    ).to_return(
+      body: {id: 1, name: 'Armada Trio'}.to_json
+    )
+
+    Ship.find(1).update!(name: 'Armada Trio')
+
+    assert_requested req_stub
+  end
 
   test '#update habtm relationships' do
     webmock(:get, "/ships", where: {id: 1}, limit: 1).to_return(
@@ -142,7 +191,7 @@ class ActiveRecord::PersistanceTest < Minitest::Test
     webmock(:get, "/sailors", where: {id: 1}, limit: 1).to_return(
       body: [{id: 1, name: 'Captain'}].to_json
     )
-    webmock(:get, "/sailors", where: {sailors_ships: {ship_id: {eq: 1}}}, limit: 100, offset: 0).to_return(
+    webmock(:get, "/sailors", where: {sailors_ships: {ship_id: {eq: 1}}}).to_return(
       body: [].to_json
     )
     req_stub = webmock(:patch, '/ships/1').with(
@@ -163,7 +212,7 @@ class ActiveRecord::PersistanceTest < Minitest::Test
     webmock(:get, "/sailors", where: {id: 1}, limit: 1).to_return(
       body: [{id: 1, name: 'Captain'}].to_json
     )
-    webmock(:get, "/sailors", where: {sailors_ships: {ship_id: {eq: 1}}}, limit: 100, offset: 0).to_return(
+    webmock(:get, "/sailors", where: {sailors_ships: {ship_id: {eq: 1}}}).to_return(
       body: [{id: 1, name: 'Captain'}].to_json
     )
     req_stub = webmock(:patch, '/ships/1').with(
@@ -181,7 +230,7 @@ class ActiveRecord::PersistanceTest < Minitest::Test
     webmock(:get, "/fleets", where: {id: 1}, limit: 1).to_return(
       body: [{id: 1, name: 'Armada Uno'}].to_json
     )
-    webmock(:get, "/ships", where: {fleet_id: 1}, limit: 100, offset: 0).to_return(
+    webmock(:get, "/ships", where: {fleet_id: 1}).to_return(
       body: [{id: 1, name: 'Saucer Trio'}].to_json
     )
     req_stub = webmock(:patch, '/fleets/1').with(
@@ -195,4 +244,17 @@ class ActiveRecord::PersistanceTest < Minitest::Test
     assert_requested req_stub
   end
   
+  test "#destroy with habtm relationship" do
+    webmock(:get, "/ships", where: {id: 1}, limit: 1).to_return(
+      body: [{id: 1, fleet_id: nil, name: 'Armada Uno'}].to_json
+    )
+    req_stub = webmock(:delete, '/ships/1').to_return(
+      status: 204
+    )
+
+    ship = Ship.find(1)
+    assert ship.destroy
+    assert_requested req_stub
+  end
+  
 end

data/test/active_record/preload_test.rb

@@ -1,12 +1,47 @@
 require 'test_helper'
 
-class ActiveRecord::PreloadTest < Minitest::Test
+class ActiveRecord::PreloadTest < ActiveSupport::TestCase
+
+  schema do
+    create_table "ships" do |t|
+      t.string   "name",                    limit: 255
+      t.integer  "fleet_id"
+    end
+
+    create_table "fleets" do |t|
+      t.string   "name",                    limit: 255
+    end
+    
+    create_table "sailors" do |t|
+      t.string   "name",                    limit: 255
+    end
+    
+    create_table "sailors_ships", id: false do |t|
+      t.integer  "ship_id",                 null: false
+      t.integer  "sailor_id",               null: false
+    end
+    
+  end
   
+  class Fleet < ActiveRecord::Base
+    has_many :ships
+  end
+
+  class Ship < ActiveRecord::Base
+    belongs_to :fleet
+  
+    has_and_belongs_to_many :sailors
+  end
+
+  class Sailor < ActiveRecord::Base
+    has_and_belongs_to_many :ships
+  end
+
   test '#preload' do
     webmock(:get, "/fleets").to_return(body: [{id: 1}].to_json)
-    webmock(:get, "/ships", where: {fleet_id: 1}, limit: 100, offset: 0).to_return(body: [{id: 1, fleet_id: 1}].to_json)
-    webmock(:get, "/sailors_ships", where: {ship_id: 1}, limit: 100, offset: 0).to_return(body: [{ship_id: 1, sailor_id: 1}].to_json)
-    webmock(:get, "/sailors", where: {id: 1}, limit: 100, offset: 0).to_return(body: [{id: 1}].to_json)
+    webmock(:get, "/ships", where: {fleet_id: 1}).to_return(body: [{id: 1, fleet_id: 1}].to_json)
+    webmock(:get, "/sailors_ships", where: {ship_id: 1}).to_return(body: [{ship_id: 1, sailor_id: 1}].to_json)
+    webmock(:get, "/sailors", where: {id: 1}).to_return(body: [{id: 1}].to_json)
     
     fleets = Fleet.preload(:ships => :sailors)
     assert_equal [1], fleets.map(&:id)

data/test/active_record/query/all_test.rb

@@ -0,0 +1,33 @@
+require 'test_helper'
+
+class ActiveRecord::QueryAllTest < ActiveSupport::TestCase
+  schema do
+    create_table "ships" do |t|
+      t.string   "name",                limit: 255
+    end
+    
+    create_table "cars", limit: 100 do |t|
+      t.string   "name",                limit: 255
+    end
+  end
+
+  class Ship < ActiveRecord::Base
+  end
+
+  class Car < ActiveRecord::Base
+  end
+    
+  test '::all' do
+    webmock(:get, "/ships").to_return(body: [{id: 42}].to_json)
+    assert_equal [Ship.new(id: 42)], Ship.all
+  end
+
+  test '::all w/resource_limit' do
+    cars = []
+    101.times { |i| cars << Car.new(id: i) }
+    webmock(:get, "/cars", { limit: 100, offset: 0 }).to_return(body: cars[0..100].to_json)
+    webmock(:get, "/cars", { limit: 100, offset: 100 }).to_return(body: cars[101..-1].to_json)
+    assert_equal cars, Car.all
+  end
+
+end

data/test/active_record/query/count_test.rb

@@ -0,0 +1,38 @@
+require 'test_helper'
+
+class ActiveRecord::QueryCountTest < ActiveSupport::TestCase
+
+  schema do
+    create_table "ships", limit: 100 do |t|
+      t.string   "name",                    limit: 255
+    end
+  end
+  
+  class Ship < ActiveRecord::Base
+  end
+
+  test '::count' do
+    webmock(:get, "/ships/calculate", select: [{count: "*"}], limit: 100, offset: 0).to_return({
+      body: [10].to_json
+    })
+
+    assert_equal 10, Ship.count
+  end
+
+  test '::count(:column)' do
+    webmock(:get, "/ships/calculate", select: [{count: "id"}], limit: 100, offset: 0).to_return({
+      body: [10].to_json
+    })
+
+    assert_equal 10, Ship.count(:id)
+  end
+
+  test '::sum(:column)' do
+    webmock(:get, "/ships/calculate", select: [{sum: "weight"}], limit: 100, offset: 0).to_return({
+      body: [10].to_json
+    })
+
+    assert_equal 10, Ship.sum(:weight)
+  end
+
+end

data/test/active_record/query/distinct_test.rb

@@ -0,0 +1,30 @@
+require 'test_helper'
+
+class ActiveRecord::QueryDistinctTest < ActiveSupport::TestCase
+
+  schema do
+    create_table "ships", limit: 100 do |t|
+      t.string   "name",                    limit: 255
+    end
+  end
+  
+  class Ship < ActiveRecord::Base
+  end
+
+  # Distinct
+  test '::distinct query' do
+    webmock(:get, "/ships", distinct: true, limit: 100, offset: 0).to_return({
+      body: [].to_json
+    })
+
+    assert_equal [], Ship.distinct
+  end
+
+  # TODO: i need arel-extensions....
+  # test '::distinct_on query' do
+  #   webmock(:get, "/ships", distinct_on: ['id']).to_return(body: [].to_json)
+  #
+  #   assert_equal [], Ship.distinct_on(:id)
+  # end
+
+end