activerecord_to_poro 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dd9ccad82ce27decc321a3ecc0e46ee03ae03a2
-  data.tar.gz: e5efe27480922d9306c038d098ef6d76872507c2
+  metadata.gz: 1d07a91d246c4e9b3d0f758d871c6cdc9390f7f1
+  data.tar.gz: 848dda5dad35ff0b94775f4467580dcbe5a57f1b
 SHA512:
-  metadata.gz: dcdc20ef41bea88a23bc9066e1e5a767494af88d8313990e7bc577a7b8107c03528b7fbdf93c497e90d7f30390b0fa99c12a7b4c3b8cda3712098cb674519344
-  data.tar.gz: e9ff0ac70f6b78a0ebe6c77545a0fe87b34fd6bea9a60e99c627543c87236235ae278a6825b1bb16b39b2118b7f417d4974e31f594ab55908d27c6947322e45c
+  metadata.gz: 74e9b3544bde6cf80cc394ba30e4fc13d5c1481e9943201b01d95df4c60e1c7e6c052b9e4d5236c37bc02f32d6999c1678b1a80dfa3fd062650597dc11543702
+  data.tar.gz: 1b80a95b618aed044e31c71b8093afef9472238383b4df2f1ffd383239e7fb4a35f782acb850fc78e95fe7eb1d35da8cc3943b01e476812c3c751d161489eec9

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+### 0.0.9 (Janury 9, 2014)
+
+* [#11](https://github.com/slowjack2k/activerecord_to_poro/pull/11): Fixes for Rails 4.2 - [@slowjack2k](https://github.com/slowjack2k).

data/activerecord_to_poro.gemspec

@@ -26,7 +26,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency 'sqlite3'
-  spec.add_development_dependency 'activerecord', '4.0.2'
+  spec.add_development_dependency 'pg'
+  # spec.add_development_dependency 'activerecord', '4.0.2'
+  spec.add_development_dependency 'activerecord', '4.2.0'
   spec.add_development_dependency 'database_cleaner'
 
 

data/lib/activerecord_to_poro/mapper_extension.rb

@@ -44,14 +44,17 @@ module ActiverecordToPoro
     module_function
 
     def is_an_ar_collection?(ar_class, association_name)
-      (ar_class.reflections[association_name] &&
-       ar_class.reflections[association_name].collection?)
+      ref = reflection_for_association(ar_class, association_name)
+      (ref && ref.collection?)
     end
 
     def is_an_has_many_through(ar_class, association_name)
-      ar_class.reflections[association_name] &&
-      ar_class.reflections[association_name].macro == :has_many &&
-      ar_class.reflections[association_name].options.has_key?(:through)
+      ref = reflection_for_association(ar_class, association_name)
+      ref && ref.macro == :has_many && ref.options.has_key?(:through)
+    end
+
+    def reflection_for_association(ar_class, association_name)
+      ar_class.reflections[association_name.to_sym] || ar_class.reflections[association_name.to_s]
     end
 
   end

data/lib/activerecord_to_poro/metadata_enabled_ar.rb

@@ -14,7 +14,6 @@ module ActiverecordToPoro
     end
 
     def _update_poro_metadata
-
       _referenced_poros.each do |entity|
         entity._set_metadata_from_ar = self if entity.respond_to? :_set_metadata_from_ar=
 
@@ -39,7 +38,7 @@ module ActiverecordToPoro
 
         record.tap do |new_obj|
 
-          new_obj.attributes = attrs
+          new_obj.attributes = attrs || {}
 
           _patch_has_many_members(attrs, new_obj) unless new_obj.new_record?
         end
@@ -77,7 +76,7 @@ module ActiverecordToPoro
       end
 
       def _extract_metadata!(attrs)
-        metadata = (attrs || {}).delete(:_set_metadata_to_ar) { |*| Metadata.new }
+        metadata = (attrs || {}).delete(:_set_metadata_to_ar){ |*| Metadata.new }
         metadata.for_ar_class(self.name)
       end
 

data/lib/activerecord_to_poro/version.rb

@@ -1,3 +1,3 @@
 module ActiverecordToPoro
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/ar_spec_helper.rb

@@ -1,18 +1,28 @@
 require 'active_record'
-require 'database_cleaner'
 
 db_dir = File.join(File.expand_path(__dir__ ), "ar_support/db/")
 # ENV['DATABASE_URL']="sqlite3://localhost/:memory:?pool=5&timeout=5000"
 
+con_settings = {
+    pool: 5,
+    timeout: 5000,
+    database: ":memory:",
+    adapter: "sqlite3"
+}
+
+# con_settings = {
+#     adapter: 'postgresql',
+#     encoding: 'utf8',
+#     pool: 5,
+#     host: 'localhost',
+#     port: 5000,
+#     database: 'poro_test'
+# }
 
+require 'database_cleaner'
 
-ActiveRecord::Base.establish_connection({
-                                            pool: 5,
-                                            timeout: 5000,
-                                            database: ":memory:",
-                                            adapter: "sqlite3"
-                                        })
-
+ActiveRecord::Base.logger = Logger.new(STDOUT)
+ActiveRecord::Base.establish_connection(con_settings)
 ActiveRecord::Migrator.migrate "#{db_dir}/migrate"
 
 Dir[File.join(File.expand_path(__dir__ ), "ar_support/models/**/*.rb")].each { |f| require f }
@@ -20,8 +30,8 @@ Dir[File.join(File.expand_path(__dir__ ), "ar_support/models/**/*.rb")].each { |
 RSpec.configure do |config|
 
   config.before(:suite) do
-    DatabaseCleaner.strategy = :transaction
-    DatabaseCleaner.clean_with(:truncation)
+    DatabaseCleaner.strategy = :truncation, {:except => %w[schema_migrations public.schema_migrations]}
+    DatabaseCleaner.clean_with(:truncation, {:except => %w[schema_migrations public.schema_migrations]})
   end
 
   config.before(:each) do

data/spec/ar_support/db/migrate/20140127093447_create_my_ar_class.rb

@@ -4,30 +4,30 @@ class CreateMyArClass < ActiveRecord::Migration
       t.string :name
       t.string :email
       t.integer :salutation_id
-      t.integer :lock_version
+      t.integer :lock_version, default: 0
     end
 
     create_table :roles do |t|
       t.string  :name
       t.integer :user_id
-      t.integer :lock_version
+      t.integer :lock_version, default: 0
     end
 
     create_table :permissions do |t|
       t.string  :name
       t.integer :role_id
-      t.integer :lock_version
+      t.integer :lock_version, default: 0
     end
 
     create_table :salutations do |t|
       t.string  :name
-      t.integer :lock_version
+      t.integer :lock_version, default: 0
     end
 
     create_table :addresses do |t|
       t.string  :street
       t.integer :user_id
-      t.integer :lock_version
+      t.integer :lock_version, default: 0
     end
   end
 end

data/spec/ar_support/models/address.rb

@@ -1,3 +1,3 @@
 class Address < ActiveRecord::Base
-  belongs_to :user, autosave: true
+  belongs_to :user
 end

data/spec/ar_support/models/permission.rb

@@ -1,3 +1,3 @@
 class Permission < ActiveRecord::Base
-  belongs_to :role, autosave: true
+  belongs_to :role
 end

data/spec/ar_support/models/role.rb

@@ -1,4 +1,4 @@
 class Role < ActiveRecord::Base
   has_many :permissions, autosave: true
-  belongs_to :user, autosave: true
+  belongs_to :user
 end

data/spec/ar_support/models/user.rb

@@ -2,7 +2,7 @@ class User < ActiveRecord::Base
   has_many :roles, autosave: true
   has_many :permissions, through: :roles, autosave: true
 
-  belongs_to :salutation, autosave: true
+  belongs_to :salutation
   has_one :address, autosave: true
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_to_poro
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Dieter Späth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abstract_type
@@ -80,20 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -271,6 +285,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.txt