edge 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 156f34d8f9c1f130ba86b2098d2867fff9d53167
-  data.tar.gz: abff9315dd010abfcc006b93ec6533964fb4964d
+  metadata.gz: ce0dcb3f38b7a78dfabe5d75cf5376385cfaaeac
+  data.tar.gz: 78652cb4a461fc982c07e524d06a30571ee7cee7
 SHA512:
-  metadata.gz: b35e2189d626e521ac419f03b04dd0aa24d4891b1fd5060d346d83a5c87d97ef727d7fd5fd4a145cd63f0bd6f8671b50b2e089fec2989e05b899e61516cf40e6
-  data.tar.gz: 3fe88512f796388583c763447a79d6e1a09ab21aa732f7f514c8b2406059bf81df5553aeb10503ffaab8c0cb183c4845676bcf8029f03163ffb2ce2cd43cff62
+  metadata.gz: 61e257b23bf0b7309f6cbf88ca2593bdf454f18ba270c27fd6951af2396bb663422006eaebedd78a807250e4bb60ddde072fdf76daa1ae60e9cb63ca5019bce6
+  data.tar.gz: 8a47558d1ee198d94d450d237e454014e5bc727f83b8fb8a14eea325e2f2797d877e2f35dc70ffbaaf7fb4498f78ea8a42607f4b7edb40bf16ae22151a829207

data/.travis.yml

@@ -2,7 +2,6 @@ language: ruby
 rvm:
   - 2.3.1
   - 2.2.5
-  - 2.1.9
 gemfile:
   - gemfiles/4.1.gemfile
   - gemfiles/4.2.gemfile

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.5.1 (August 4, 2017)
+
+* Allow use of 'optional' option for belongs_to (Yuji Yaginuma)
+
 # 0.5.0 (May 14, 2016)
 
 * Add Rails 5.0 support

data/edge.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'pg'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec', "~> 3.1.0"
+  gem.add_development_dependency 'rspec', "~> 3.6.0"
 end

data/gemfiles/5.0.gemfile

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.0.0.rc1"
+gem "activerecord", "~> 5.0.0"
 
 gemspec :path=>"../"

data/lib/edge/forest.rb

@@ -7,8 +7,9 @@ module Edge
       # * dependent - passed to children has_many (default: none)
       # * foreign_key - column name to use for parent foreign_key (default: parent_id)
       # * order - how to order children (default: none)
+      # * optional - passed to belongs_to (default: none)
       def acts_as_forest(options={})
-        options.assert_valid_keys :foreign_key, :order, :dependent
+        options.assert_valid_keys :foreign_key, :order, :dependent, :optional
 
         class_attribute :forest_foreign_key
         self.forest_foreign_key = options[:foreign_key] || "parent_id"
@@ -23,7 +24,9 @@ module Edge
 
         dependent_options = options[:dependent] ? { dependent: options[:dependent] } : {}
 
-        belongs_to :parent, common_options.merge(inverse_of: :children)
+        optional_options = (ActiveRecord::VERSION::MAJOR >= 5 && options[:optional]) ? { optional: options[:optional] } : {}
+
+        belongs_to :parent, common_options.merge(inverse_of: :children).merge(optional_options)
 
         if forest_order
           has_many :children, -> { order(forest_order) }, common_options.merge(inverse_of: :parent).merge(dependent_options)

data/lib/edge/version.rb

@@ -1,3 +1,3 @@
 module Edge
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/forest_spec.rb

@@ -164,7 +164,8 @@ describe "Edge::Forest" do
 
     it "works when scoped" do
       forest = Location.where(:name => "USA").find_forest
-      expect(forest).to include(usa)
+      expect(forest).to match_array([usa])
+      expect(forest.first.children).to match_array([illinois, indiana])
     end
 
     it "preloads children in proper order" do
@@ -257,4 +258,26 @@ describe "Edge::Forest" do
     end
 
   end
+
+  if ActiveRecord::VERSION::MAJOR >= 5
+    describe "optional option" do
+      before do
+        @original_value = ActiveRecord::Base.belongs_to_required_by_default
+        ActiveRecord::Base.belongs_to_required_by_default = true
+      end
+
+      after do
+        ActiveRecord::Base.belongs_to_required_by_default = @original_value
+      end
+
+      it 'parent can be nil' do
+        class Location4 < ActiveRecord::Base
+          self.table_name = "locations"
+          acts_as_forest optional: true
+        end
+
+        expect(Location4.new(name: "Iceland").valid?).to eq true
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -6,36 +6,18 @@ require 'rspec'
 database_config = YAML.load_file(File.expand_path("../database.yml", __FILE__))
 ActiveRecord::Base.establish_connection database_config["test"]
 
-
-
-# class HstoreRecord < ActiveRecord::Base
-  # serialize :properties, Surus::Hstore::Serializer.new
-# end
-
-# class TextArrayRecord < ActiveRecord::Base
-  # serialize :texts, Surus::Array::TextSerializer.new
-# end
-
-# class IntegerArrayRecord < ActiveRecord::Base
-  # serialize :integers, Surus::Array::IntegerSerializer.new
-# end
-
-# class FloatArrayRecord < ActiveRecord::Base
-  # serialize :floats, Surus::Array::FloatSerializer.new
-# end
-
-# class DecimalArrayRecord < ActiveRecord::Base
-  # serialize :decimals, Surus::Array::DecimalSerializer.new
-# end
-
-
-
 RSpec.configure do |config|
-  config.around :disable_transactions => nil do |example|
+  config.before(:all) do |example|
+    ActiveRecord::Base.connection.execute <<-SQL
+      truncate body_parts;
+      truncate locations;
+    SQL
+  end
+
+  config.around do |example|
     ActiveRecord::Base.transaction do
       example.call
       raise ActiveRecord::Rollback
     end
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edge
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Jack Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-14 00:00:00.000000000 Z
+date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.6.0
 description: Graph functionality for ActiveRecord
 email:
 - jack@jackchristensen.com
@@ -131,9 +131,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Graph functionality for ActiveRecord. Provides tree/forest modeling structure
   that can load entire trees in a single query.
-test_files: []
+test_files:
+- spec/database.yml
+- spec/database.yml.travis
+- spec/database_structure.sql
+- spec/forest_spec.rb
+- spec/spec_helper.rb